73
78
_parse_revision_str,
75
80
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
86
def _get_branch_location(control_dir, possible_transports=None):
87
"""Return location of branch for this control dir."""
89
this_branch = control_dir.open_branch(
90
possible_transports=possible_transports)
91
# This may be a heavy checkout, where we want the master branch
92
master_location = this_branch.get_bound_location()
93
if master_location is not None:
94
return master_location
95
# If not, use a local sibling
96
return this_branch.base
97
except errors.NotBranchError:
98
format = control_dir.find_branch_format()
99
if getattr(format, 'get_reference', None) is not None:
100
return format.get_reference(control_dir)
102
return control_dir.root_transport.base
105
def _is_colocated(control_dir, possible_transports=None):
106
"""Check if the branch in control_dir is colocated.
108
:param control_dir: Control directory
109
:return: Boolean indicating whether
111
# This path is meant to be relative to the existing branch
112
this_url = _get_branch_location(control_dir,
113
possible_transports=possible_transports)
114
# Perhaps the target control dir supports colocated branches?
116
root = controldir.ControlDir.open(this_url,
117
possible_transports=possible_transports)
118
except errors.NotBranchError:
119
return (False, this_url)
122
wt = control_dir.open_workingtree()
123
except (errors.NoWorkingTree, errors.NotLocalUrl):
124
return (False, this_url)
127
root._format.colocated_branches and
128
control_dir.control_url == root.control_url,
132
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
133
"""Lookup the location for a new sibling branch.
135
:param control_dir: Control directory relative to which to look up
137
:param location: Name of the new branch
138
:return: Full location to the new branch
140
location = directory_service.directories.dereference(location)
141
if '/' not in location and '\\' not in location:
142
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
145
return urlutils.join_segment_parameters(this_url,
146
{"branch": urlutils.escape(location)})
148
return urlutils.join(this_url, '..', urlutils.escape(location))
152
def lookup_sibling_branch(control_dir, location, possible_transports=None):
153
"""Lookup sibling branch.
155
:param control_dir: Control directory relative to which to lookup the
157
:param location: Location to look up
158
:return: branch to open
161
# Perhaps it's a colocated branch?
162
return control_dir.open_branch(location,
163
possible_transports=possible_transports)
164
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
166
return Branch.open(location)
167
except errors.NotBranchError:
168
this_url = _get_branch_location(control_dir)
171
this_url, '..', urlutils.escape(location)))
174
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
175
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
177
return internal_tree_files(file_list, default_branch, canonicalize,
88
181
def tree_files_for_add(file_list):
172
268
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
270
return WorkingTree.open_containing_paths(
271
file_list, default_directory='.',
223
276
def _get_view_info_for_change_reporter(tree):
353
424
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
427
def run(self, revision_id=None, revision=None, directory=u'.'):
357
428
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
429
raise errors.BzrCommandError(gettext('You can only supply one of'
430
' revision_id or --revision'))
360
431
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
432
raise errors.BzrCommandError(gettext('You must supply either'
433
' --revision or a revision_id'))
435
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
437
revisions = b.repository.revisions
366
438
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
439
raise errors.BzrCommandError(gettext('Repository %r does not support '
440
'access to raw revision texts'))
370
442
b.repository.lock_read()
491
566
location_list=['.']
493
568
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
569
d = controldir.ControlDir.open(location)
497
572
working = d.open_workingtree()
498
573
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
574
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
575
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
576
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
577
" of a remote path"))
504
579
if (working.has_changes()):
505
580
raise errors.UncommittedChanges(working)
581
if working.get_shelf_manager().last_shelf() is not None:
582
raise errors.ShelvedChanges(working)
507
584
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
585
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
586
" from a lightweight checkout"))
511
588
d.destroy_workingtree()
591
class cmd_repair_workingtree(Command):
592
__doc__ = """Reset the working tree state file.
594
This is not meant to be used normally, but more as a way to recover from
595
filesystem corruption, etc. This rebuilds the working inventory back to a
596
'known good' state. Any new modifications (adding a file, renaming, etc)
597
will be lost, though modified files will still be detected as such.
599
Most users will want something more like "bzr revert" or "bzr update"
600
unless the state file has become corrupted.
602
By default this attempts to recover the current state by looking at the
603
headers of the state file. If the state file is too corrupted to even do
604
that, you can supply --revision to force the state of the tree.
607
takes_options = ['revision', 'directory',
609
help='Reset the tree even if it doesn\'t appear to be'
614
def run(self, revision=None, directory='.', force=False):
615
tree, _ = WorkingTree.open_containing(directory)
616
self.add_cleanup(tree.lock_tree_write().unlock)
620
except errors.BzrError:
621
pass # There seems to be a real error here, so we'll reset
624
raise errors.BzrCommandError(gettext(
625
'The tree does not appear to be corrupt. You probably'
626
' want "bzr revert" instead. Use "--force" if you are'
627
' sure you want to reset the working tree.'))
631
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
633
tree.reset_state(revision_ids)
634
except errors.BzrError, e:
635
if revision_ids is None:
636
extra = (gettext(', the header appears corrupt, try passing -r -1'
637
' to set the state to the last commit'))
640
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
643
class cmd_revno(Command):
515
644
__doc__ = """Show current revision number.
520
649
_see_also = ['info']
521
650
takes_args = ['location?']
522
651
takes_options = [
523
Option('tree', help='Show revno of working tree'),
652
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
657
def run(self, tree=False, location=u'.', revision=None):
658
if revision is not None and tree:
659
raise errors.BzrCommandError(gettext("--tree and --revision can "
660
"not be used together"))
530
664
wt = WorkingTree.open_containing(location)[0]
665
self.add_cleanup(wt.lock_read().unlock)
532
666
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
667
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
669
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
671
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
672
self.add_cleanup(b.lock_read().unlock)
674
if len(revision) != 1:
675
raise errors.BzrCommandError(gettext(
676
"Tags can only be placed on a single revision, "
678
revid = revision[0].as_revision_id(b)
680
revid = b.last_revision()
682
revno_t = b.revision_id_to_dotted_revno(revid)
683
except errors.NoSuchRevision:
685
revno = ".".join(str(n) for n in revno_t)
546
686
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
687
self.outf.write(revno + '\n')
550
690
class cmd_revision_info(Command):
704
846
takes_args = ['dir+']
850
help='No error if existing, make parent directories as needed.',
705
854
encoding_type = 'replace'
707
def run(self, dir_list):
709
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
715
self.outf.write('added %s\n' % d)
857
def add_file_with_parents(cls, wt, relpath):
858
if wt.path2id(relpath) is not None:
860
cls.add_file_with_parents(wt, osutils.dirname(relpath))
864
def add_file_single(cls, wt, relpath):
867
def run(self, dir_list, parents=False):
869
add_file = self.add_file_with_parents
871
add_file = self.add_file_single
873
wt, relpath = WorkingTree.open_containing(dir)
878
if e.errno != errno.EEXIST:
717
raise errors.NotVersionedError(path=base)
882
add_file(wt, relpath)
884
self.outf.write(gettext('added %s\n') % dir)
720
887
class cmd_relpath(Command):
757
924
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
925
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
926
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
928
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)
929
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
930
self.add_cleanup(work_tree.lock_read().unlock)
765
931
if revision is not None:
766
932
tree = revision.as_tree(work_tree.branch)
768
934
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
935
self.add_cleanup(tree.lock_read().unlock)
940
self.add_cleanup(tree.lock_read().unlock)
775
941
if file_list is not None:
776
942
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
943
require_versioned=True)
778
944
# find_ids_across_trees may include some paths that don't
779
945
# 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)
946
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
783
entries = tree.inventory.entries()
948
entries = tree.iter_entries_by_dir()
786
for path, entry in entries:
950
for path, entry in sorted(entries):
787
951
if kind and kind != entry.kind:
790
956
self.outf.write('%-50s %s\n' % (path, entry.file_id))
828
994
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
996
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
997
if names_list is None:
833
999
if len(names_list) < 2:
834
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
1000
raise errors.BzrCommandError(gettext("missing file argument"))
1001
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1002
for file_name in rel_names[0:-1]:
1004
raise errors.BzrCommandError(gettext("can not move root of branch"))
1005
self.add_cleanup(tree.lock_tree_write().unlock)
838
1006
self._run(tree, names_list, rel_names, after)
840
1008
def run_auto(self, names_list, after, dry_run):
841
1009
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
1010
raise errors.BzrCommandError(gettext('Only one path may be specified to'
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
1013
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1015
work_tree, file_list = WorkingTree.open_containing_paths(
1016
names_list, default_directory='.')
1017
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
1018
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
1020
def _run(self, tree, names_list, rel_names, after):
960
1131
takes_options = ['remember', 'overwrite', 'revision',
961
1132
custom_help('verbose',
962
1133
help='Show logs of pulled revisions.'),
1134
custom_help('directory',
964
1135
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1136
'rather than the one containing the working directory.'),
970
1138
help="Perform a local pull in a bound "
971
1139
"branch. Local pulls are not applied to "
972
1140
"the master branch."
1143
help="Show base revision text in conflicts.")
975
1145
takes_args = ['location?']
976
1146
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1148
def run(self, location=None, remember=None, overwrite=False,
979
1149
revision=None, verbose=False,
980
directory=None, local=False):
1150
directory=None, local=False,
981
1152
# FIXME: too much stuff is in the command class
982
1153
revision_id = None
983
1154
mergeable = None
1110
1289
Option('strict',
1111
1290
help='Refuse to push if there are uncommitted changes in'
1112
1291
' the working tree, --no-strict disables the check.'),
1293
help="Don't populate the working tree, even for protocols"
1294
" that support it."),
1114
1296
takes_args = ['location?']
1115
1297
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1299
def run(self, location=None, remember=None, overwrite=False,
1118
1300
create_prefix=False, verbose=False, revision=None,
1119
1301
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1302
stacked=False, strict=None, no_tree=False):
1121
1303
from bzrlib.push import _show_push_branch
1123
1305
if directory is None:
1124
1306
directory = '.'
1125
1307
# Get the source branch
1126
1308
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1309
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1310
# Get the tip's revision_id
1129
1311
revision = _get_one_revision('push', revision)
1130
1312
if revision is not None:
1151
1333
# error by the feedback given to them. RBC 20080227.
1152
1334
stacked_on = parent_url
1153
1335
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1336
raise errors.BzrCommandError(gettext(
1337
"Could not determine branch to refer to."))
1157
1339
# Get the destination location
1158
1340
if location is None:
1159
1341
stored_loc = br_from.get_push_location()
1160
1342
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1343
parent_loc = br_from.get_parent()
1345
raise errors.BzrCommandError(gettext(
1346
"No push location known or specified. To push to the "
1347
"parent branch (at %s), use 'bzr push :parent'." %
1348
urlutils.unescape_for_display(parent_loc,
1349
self.outf.encoding)))
1351
raise errors.BzrCommandError(gettext(
1352
"No push location known or specified."))
1164
1354
display_url = urlutils.unescape_for_display(stored_loc,
1165
1355
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1356
note(gettext("Using saved push location: %s") % display_url)
1167
1357
location = stored_loc
1169
1359
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1360
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1361
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1362
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1365
class cmd_branch(Command):
1214
1408
def run(self, from_location, to_location=None, revision=None,
1215
1409
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1410
use_existing_dir=False, switch=False, bind=False,
1217
1412
from bzrlib import switch as _mod_switch
1218
1413
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1414
if self.invoked_as in ['get', 'clone']:
1415
ui.ui_factory.show_user_warning(
1416
'deprecated_command',
1417
deprecated_name=self.invoked_as,
1418
recommended_name='branch',
1419
deprecated_in_version='2.4')
1420
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1422
if not (hardlink or files_from):
1423
# accelerator_tree is usually slower because you have to read N
1424
# files (no readahead, lots of seeks, etc), but allow the user to
1425
# explicitly request it
1426
accelerator_tree = None
1427
if files_from is not None and files_from != from_location:
1428
accelerator_tree = WorkingTree.open(files_from)
1221
1429
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1430
self.add_cleanup(br_from.lock_read().unlock)
1224
1431
if revision is not None:
1225
1432
revision_id = revision.as_revision_id(br_from)
1230
1437
revision_id = br_from.last_revision()
1231
1438
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1439
to_location = getattr(br_from, "name", None)
1441
to_location = urlutils.derive_to_location(from_location)
1233
1442
to_transport = transport.get_transport(to_location)
1235
1444
to_transport.mkdir('.')
1236
1445
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1447
to_dir = controldir.ControlDir.open_from_transport(
1449
except errors.NotBranchError:
1450
if not use_existing_dir:
1451
raise errors.BzrCommandError(gettext('Target directory "%s" '
1452
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1457
to_dir.open_branch()
1243
1458
except errors.NotBranchError:
1246
1461
raise errors.AlreadyBranchError(to_location)
1247
1462
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1463
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)
1469
# preserve whatever source format we have.
1470
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1471
possible_transports=[to_transport],
1472
accelerator_tree=accelerator_tree,
1473
hardlink=hardlink, stacked=stacked,
1474
force_new_repo=standalone,
1475
create_tree_if_local=not no_tree,
1476
source_branch=br_from)
1477
branch = to_dir.open_branch(
1478
possible_transports=[
1479
br_from.bzrdir.root_transport, to_transport])
1480
except errors.NoSuchRevision:
1481
to_transport.delete_tree('.')
1482
msg = gettext("The branch {0} has no revision {1}.").format(
1483
from_location, revision)
1484
raise errors.BzrCommandError(msg)
1487
to_repo = to_dir.open_repository()
1488
except errors.NoRepositoryPresent:
1489
to_repo = to_dir.create_repository()
1490
to_repo.fetch(br_from.repository, revision_id=revision_id)
1491
branch = br_from.sprout(to_dir, revision_id=revision_id)
1265
1492
_merge_tags_if_possible(br_from, branch)
1266
1493
# If the source branch is stacked, the new branch may
1267
1494
# be stacked whether we asked for that explicitly or not.
1268
1495
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1497
note(gettext('Created new stacked branch referring to %s.') %
1271
1498
branch.get_stacked_on_url())
1272
1499
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1500
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1501
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1503
# Bind to the parent
1277
1504
parent_branch = Branch.open(from_location)
1278
1505
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1506
note(gettext('New branch bound to %s') % from_location)
1281
1508
# Switch to the new branch
1282
1509
wt, _ = WorkingTree.open_containing('.')
1283
1510
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1511
note(gettext('Switched to branch: %s'),
1285
1512
urlutils.unescape_for_display(branch.base, 'utf-8'))
1515
class cmd_branches(Command):
1516
__doc__ = """List the branches available at the current location.
1518
This command will print the names of all the branches at the current
1522
takes_args = ['location?']
1524
Option('recursive', short_name='R',
1525
help='Recursively scan for branches rather than '
1526
'just looking in the specified location.')]
1528
def run(self, location=".", recursive=False):
1530
t = transport.get_transport(location)
1531
if not t.listable():
1532
raise errors.BzrCommandError(
1533
"Can't scan this type of location.")
1534
for b in controldir.ControlDir.find_branches(t):
1535
self.outf.write("%s\n" % urlutils.unescape_for_display(
1536
urlutils.relative_url(t.base, b.base),
1537
self.outf.encoding).rstrip("/"))
1539
dir = controldir.ControlDir.open_containing(location)[0]
1541
active_branch = dir.open_branch(name="")
1542
except errors.NotBranchError:
1543
active_branch = None
1544
branches = dir.get_branches()
1546
for name, branch in branches.iteritems():
1549
active = (active_branch is not None and
1550
active_branch.base == branch.base)
1551
names[name] = active
1552
# Only mention the current branch explicitly if it's not
1553
# one of the colocated branches
1554
if not any(names.values()) and active_branch is not None:
1555
self.outf.write("* %s\n" % gettext("(default)"))
1556
for name in sorted(names.keys()):
1557
active = names[name]
1562
self.outf.write("%s %s\n" % (
1563
prefix, name.encode(self.outf.encoding)))
1288
1566
class cmd_checkout(Command):
1289
1567
__doc__ = """Create a new checkout of an existing branch.
1389
1668
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
1669
__doc__ = """Update a working tree to a new revision.
1671
This will perform a merge of the destination revision (the tip of the
1672
branch, or the specified revision) into the working tree, and then make
1673
that revision the basis revision for the working tree.
1675
You can use this to visit an older revision, or to update a working tree
1676
that is out of date from its branch.
1678
If there are any uncommitted changes in the tree, they will be carried
1679
across and remain as uncommitted changes after the update. To discard
1680
these changes, use 'bzr revert'. The uncommitted changes may conflict
1681
with the changes brought in by the change in basis revision.
1683
If the tree's branch is bound to a master branch, bzr will also update
1400
1684
the branch from the master.
1686
You cannot update just a single file or directory, because each Bazaar
1687
working tree has just a single basis revision. If you want to restore a
1688
file that has been removed locally, use 'bzr revert' instead of 'bzr
1689
update'. If you want to restore a file to its state in a previous
1690
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1691
out the old content of that file to a new location.
1693
The 'dir' argument, if given, must be the location of the root of a
1694
working tree to update. By default, the working tree that contains the
1695
current working directory is used.
1403
1698
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1699
takes_args = ['dir?']
1405
takes_options = ['revision']
1700
takes_options = ['revision',
1702
help="Show base revision text in conflicts."),
1406
1704
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1706
def run(self, dir=None, revision=None, show_base=None):
1409
1707
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]
1708
raise errors.BzrCommandError(gettext(
1709
"bzr update --revision takes exactly one revision"))
1711
tree = WorkingTree.open_containing('.')[0]
1713
tree, relpath = WorkingTree.open_containing(dir)
1716
raise errors.BzrCommandError(gettext(
1717
"bzr update can only update a whole tree, "
1718
"not a file or subdirectory"))
1413
1719
branch = tree.branch
1414
1720
possible_transports = []
1415
1721
master = branch.get_master_branch(
1416
1722
possible_transports=possible_transports)
1417
1723
if master is not None:
1419
1724
branch_location = master.base
1727
branch_location = tree.branch.base
1421
1728
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1729
self.add_cleanup(tree.unlock)
1424
1730
# get rid of the final '/' and be ready for display
1425
1731
branch_location = urlutils.unescape_for_display(
1451
1757
change_reporter,
1452
1758
possible_transports=possible_transports,
1453
1759
revision=revision_id,
1761
show_base=show_base)
1455
1762
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1763
raise errors.BzrCommandError(gettext(
1457
1764
"branch has no revision %s\n"
1458
1765
"bzr update --revision only works"
1459
" for a revision in the branch history"
1766
" for a revision in the branch history")
1460
1767
% (e.revision))
1461
1768
revno = tree.branch.revision_id_to_dotted_revno(
1462
1769
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1770
note(gettext('Updated to revision {0} of branch {1}').format(
1771
'.'.join(map(str, revno)), branch_location))
1465
1772
parent_ids = tree.get_parent_ids()
1466
1773
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'.")
1774
note(gettext('Your local commits will now show as pending merges with '
1775
"'bzr status', and can be committed with 'bzr commit'."))
1469
1776
if conflicts != 0:
1530
1838
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1839
'The file deletion mode to be used.',
1532
1840
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1841
safe='Backup changed files (default).',
1535
1842
keep='Delete from bzr but leave the working copy.',
1843
no_backup='Don\'t backup changed files.',
1536
1844
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1845
'recovered and even if they are non-empty directories. '
1846
'(deprecated, use no-backup)')]
1538
1847
aliases = ['rm', 'del']
1539
1848
encoding_type = 'replace'
1541
1850
def run(self, file_list, verbose=False, new=False,
1542
1851
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1852
if file_deletion_strategy == 'force':
1853
note(gettext("(The --force option is deprecated, rather use --no-backup "
1855
file_deletion_strategy = 'no-backup'
1857
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1859
if file_list is not None:
1546
1860
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1862
self.add_cleanup(tree.lock_write().unlock)
1550
1863
# Heuristics should probably all move into tree.remove_smart or
1742
2071
to_transport.ensure_base()
1743
2072
except errors.NoSuchFile:
1744
2073
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
2074
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
2075
" does not exist."
1747
2076
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2077
" leading parent directories.")
1750
2079
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2082
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
2083
except errors.NotBranchError:
1755
2084
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2085
create_branch = controldir.ControlDir.create_branch_convenience
2087
force_new_tree = False
2089
force_new_tree = None
1757
2090
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
2091
possible_transports=[to_transport],
2092
force_new_tree=force_new_tree)
1759
2093
a_bzrdir = branch.bzrdir
1761
2095
from bzrlib.transport.local import LocalTransport
1837
2173
def run(self, location, format=None, no_trees=False):
1838
2174
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2175
format = controldir.format_registry.make_bzrdir('default')
1841
2177
if location is None:
1844
2180
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)
2182
(repo, newdir, require_stacking, repository_policy) = (
2183
format.initialize_on_transport_ex(to_transport,
2184
create_prefix=True, make_working_trees=not no_trees,
2185
shared_repo=True, force_new_repo=True,
2186
use_existing_dir=True,
2187
repo_format_name=format.repository_format.get_format_string()))
1850
2188
if not is_quiet():
1851
2189
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2190
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2193
class cmd_diff(Command):
1969
2324
elif ':' in prefix:
1970
2325
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2327
raise errors.BzrCommandError(gettext(
1973
2328
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2329
' (eg "old/:new/")'))
1976
2331
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2332
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2333
' one or two revision specifiers'))
1980
2335
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2336
raise errors.BzrCommandError(gettext(
2337
'{0} and {1} are mutually exclusive').format(
2338
'--using', '--format'))
1984
2340
(old_tree, new_tree,
1985
2341
old_branch, new_branch,
1986
2342
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2343
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2344
# GNU diff on Windows uses ANSI encoding for filenames
2345
path_encoding = osutils.get_diff_header_encoding()
1988
2346
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2347
specific_files=specific_files,
1990
2348
external_diff_options=diff_options,
1991
2349
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2350
extra_trees=extra_trees,
2351
path_encoding=path_encoding,
1993
2353
format_cls=format)
2053
2409
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2410
takes_options = ['directory', 'null']
2060
2412
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2413
def run(self, null=False, directory=u'.'):
2414
wt = WorkingTree.open_containing(directory)[0]
2415
self.add_cleanup(wt.lock_read().unlock)
2065
2416
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):
2417
self.add_cleanup(basis.lock_read().unlock)
2418
root_id = wt.get_root_id()
2419
for file_id in wt.all_file_ids():
2420
if basis.has_id(file_id):
2422
if root_id == file_id:
2424
path = wt.id2path(file_id)
2425
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2428
self.outf.write(path + '\0')
2297
2654
Option('show-diff',
2298
2655
short_name='p',
2299
2656
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2657
Option('include-merged',
2301
2658
help='Show merged revisions like --levels 0 does.'),
2659
Option('include-merges', hidden=True,
2660
help='Historical alias for --include-merged.'),
2661
Option('omit-merges',
2662
help='Do not report commits with more than one parent.'),
2302
2663
Option('exclude-common-ancestry',
2303
2664
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2665
' of both ancestries (require -rX..Y).'
2667
Option('signatures',
2668
help='Show digital signature validity.'),
2671
help='Show revisions whose properties match this '
2674
ListOption('match-message',
2675
help='Show revisions whose message matches this '
2678
ListOption('match-committer',
2679
help='Show revisions whose committer matches this '
2682
ListOption('match-author',
2683
help='Show revisions whose authors match this '
2686
ListOption('match-bugs',
2687
help='Show revisions whose bugs match this '
2307
2691
encoding_type = 'replace'
2327
2720
_get_info_for_log_files,
2329
2722
direction = (forward and 'forward') or 'reverse'
2723
if symbol_versioning.deprecated_passed(include_merges):
2724
ui.ui_factory.show_user_warning(
2725
'deprecated_command_option',
2726
deprecated_name='--include-merges',
2727
recommended_name='--include-merged',
2728
deprecated_in_version='2.5',
2729
command=self.invoked_as)
2730
if include_merged is None:
2731
include_merged = include_merges
2733
raise errors.BzrCommandError(gettext(
2734
'{0} and {1} are mutually exclusive').format(
2735
'--include-merges', '--include-merged'))
2736
if include_merged is None:
2737
include_merged = False
2330
2738
if (exclude_common_ancestry
2331
2739
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2740
raise errors.BzrCommandError(gettext(
2741
'--exclude-common-ancestry requires -r with two revisions'))
2335
2743
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2746
raise errors.BzrCommandError(gettext(
2747
'{0} and {1} are mutually exclusive').format(
2748
'--levels', '--include-merged'))
2341
2750
if change is not None:
2342
2751
if len(change) > 1:
2343
2752
raise errors.RangeInChangeOption()
2344
2753
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2754
raise errors.BzrCommandError(gettext(
2755
'{0} and {1} are mutually exclusive').format(
2756
'--revision', '--change'))
2348
2758
revision = change
2528
2956
help='Recurse into subdirectories.'),
2529
2957
Option('from-root',
2530
2958
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2959
Option('unknown', short_name='u',
2960
help='Print unknown files.'),
2532
2961
Option('versioned', help='Print versioned files.',
2533
2962
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.'),
2963
Option('ignored', short_name='i',
2964
help='Print ignored files.'),
2965
Option('kind', short_name='k',
2539
2966
help='List entries of a particular kind: file, directory, symlink.',
2543
2972
@display_command
2544
2973
def run(self, revision=None, verbose=False,
2545
2974
recursive=False, from_root=False,
2546
2975
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2976
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2978
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2979
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2981
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2982
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2983
all = not (unknown or versioned or ignored)
2556
2985
selection = {'I':ignored, '?':unknown, 'V':versioned}
2725
3164
self.outf.write("%s\n" % pattern)
2727
3166
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3167
raise errors.BzrCommandError(gettext("ignore requires at least one "
3168
"NAME_PATTERN or --default-rules."))
2730
3169
name_pattern_list = [globbing.normalize_pattern(p)
2731
3170
for p in name_pattern_list]
3172
bad_patterns_count = 0
3173
for p in name_pattern_list:
3174
if not globbing.Globster.is_pattern_valid(p):
3175
bad_patterns_count += 1
3176
bad_patterns += ('\n %s' % p)
3178
msg = (ngettext('Invalid ignore pattern found. %s',
3179
'Invalid ignore patterns found. %s',
3180
bad_patterns_count) % bad_patterns)
3181
ui.ui_factory.show_error(msg)
3182
raise errors.InvalidPattern('')
2732
3183
for name_pattern in name_pattern_list:
2733
3184
if (name_pattern[0] == '/' or
2734
3185
(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'.')
3186
raise errors.BzrCommandError(gettext(
3187
"NAME_PATTERN should not be an absolute path"))
3188
tree, relpath = WorkingTree.open_containing(directory)
2738
3189
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3190
ignored = globbing.Globster(name_pattern_list)
3192
self.add_cleanup(tree.lock_read().unlock)
2742
3193
for entry in tree.list_files():
2744
3195
if id is not None:
2745
3196
filename = entry[0]
2746
3197
if ignored.match(filename):
2747
3198
matches.append(filename)
2749
3199
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3200
self.outf.write(gettext("Warning: the following files are version "
3201
"controlled and match your ignore pattern:\n%s"
2752
3202
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3203
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3206
class cmd_ignored(Command):
2842
3294
Option('per-file-timestamps',
2843
3295
help='Set modification time of files to that of the last '
2844
3296
'revision in which it was changed.'),
3297
Option('uncommitted',
3298
help='Export the working tree contents rather than that of the '
2846
3301
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3302
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2848
3304
from bzrlib.export import export
2850
3306
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3307
branch_or_subdir = directory
3309
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3311
if tree is not None:
3312
self.add_cleanup(tree.lock_read().unlock)
3316
raise errors.BzrCommandError(
3317
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)
3320
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3322
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3323
per_file_timestamps=per_file_timestamps)
2862
3324
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3325
raise errors.BzrCommandError(
3326
gettext('Unsupported export format: %s') % e.format)
2866
3329
class cmd_cat(Command):
2900
3362
if tree is None:
2901
3363
tree = b.basis_tree()
2902
3364
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3365
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3367
old_file_id = rev_tree.path2id(relpath)
3369
# TODO: Split out this code to something that generically finds the
3370
# best id for a path across one or more trees; it's like
3371
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3373
if name_from_revision:
2909
3374
# Try in revision if requested
2910
3375
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3376
raise errors.BzrCommandError(gettext(
3377
"{0!r} is not present in revision {1}").format(
2913
3378
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3380
actual_file_id = old_file_id
2917
3382
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" % (
3383
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3384
actual_file_id = cur_file_id
3385
elif old_file_id is not None:
3386
actual_file_id = old_file_id
3388
raise errors.BzrCommandError(gettext(
3389
"{0!r} is not present in revision {1}").format(
2935
3390
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)
3392
from bzrlib.filter_tree import ContentFilterTree
3393
filter_tree = ContentFilterTree(rev_tree,
3394
rev_tree._content_filter_stack)
3395
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3397
content = rev_tree.get_file_text(actual_file_id)
3399
self.outf.write(content)
2952
3402
class cmd_local_time_offset(Command):
3013
3463
to trigger updates to external systems like bug trackers. The --fixes
3014
3464
option can be used to record the association between a revision and
3015
3465
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
3468
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3469
takes_args = ['selected*']
3076
3501
Option('show-diff', short_name='p',
3077
3502
help='When no message is supplied, show the diff along'
3078
3503
' with the status summary in the message editor.'),
3505
help='When committing to a foreign version control '
3506
'system do not push data that can not be natively '
3080
3509
aliases = ['ci', 'checkin']
3082
3511
def _iter_bug_fix_urls(self, fixes, branch):
3512
default_bugtracker = None
3083
3513
# Configure the properties for bug fixing attributes.
3084
3514
for fixed_bug in fixes:
3085
3515
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3516
if len(tokens) == 1:
3517
if default_bugtracker is None:
3518
branch_config = branch.get_config_stack()
3519
default_bugtracker = branch_config.get(
3521
if default_bugtracker is None:
3522
raise errors.BzrCommandError(gettext(
3523
"No tracker specified for bug %s. Use the form "
3524
"'tracker:id' or specify a default bug tracker "
3525
"using the `bugtracker` option.\nSee "
3526
"\"bzr help bugs\" for more information on this "
3527
"feature. Commit refused.") % fixed_bug)
3528
tag = default_bugtracker
3530
elif len(tokens) != 2:
3531
raise errors.BzrCommandError(gettext(
3088
3532
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3533
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3534
"feature.\nCommit refused.") % fixed_bug)
3536
tag, bug_id = tokens
3093
3538
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3539
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3540
raise errors.BzrCommandError(gettext(
3541
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3542
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3543
raise errors.BzrCommandError(gettext(
3544
"%s\nCommit refused.") % (str(e),))
3101
3546
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3547
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3548
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3550
from bzrlib.errors import (
3105
3551
PointlessCommit,
3106
3552
ConflictsInTree,
3184
3628
# make_commit_message_template_encoded returns user encoding.
3185
3629
# 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")
3631
my_message = set_commit_message(commit_obj)
3632
if my_message is None:
3633
start_message = generate_commit_message_template(commit_obj)
3634
my_message = edit_commit_message_encoded(text,
3635
start_message=start_message)
3636
if my_message is None:
3637
raise errors.BzrCommandError(gettext("please specify a commit"
3638
" message with either --message or --file"))
3639
if my_message == "":
3640
raise errors.BzrCommandError(gettext("Empty commit message specified."
3641
" Please specify a commit message with either"
3642
" --message or --file or leave a blank message"
3643
" with --message \"\"."))
3195
3644
return my_message
3197
3646
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3654
reporter=None, verbose=verbose, revprops=properties,
3206
3655
authors=author, timestamp=commit_stamp,
3207
3656
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3657
exclude=tree.safe_relpath_files(exclude),
3209
3659
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3660
raise errors.BzrCommandError(gettext("No changes to commit."
3661
" Please 'bzr add' the files you want to commit, or use"
3662
" --unchanged to force an empty commit."))
3212
3663
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3664
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3665
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3667
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3668
raise errors.BzrCommandError(gettext("Commit refused because there are"
3669
" unknown files in the working tree."))
3219
3670
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3671
e.extra_help = (gettext("\n"
3221
3672
'To commit to master branch, run update and then commit.\n'
3222
3673
'You can also pass --local to commit to continue working '
3297
3748
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.
3749
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3751
When the default format has changed after a major new release of
3752
Bazaar, you may be informed during certain operations that you
3753
should upgrade. Upgrading to a newer format may improve performance
3754
or make new features available. It may however limit interoperability
3755
with older repositories or with older versions of Bazaar.
3757
If you wish to upgrade to a particular format rather than the
3758
current default, that can be specified using the --format option.
3759
As a consequence, you can use the upgrade command this way to
3760
"downgrade" to an earlier format, though some conversions are
3761
a one way process (e.g. changing from the 1.x default to the
3762
2.x default) so downgrading is not always possible.
3764
A backup.bzr.~#~ directory is created at the start of the conversion
3765
process (where # is a number). By default, this is left there on
3766
completion. If the conversion fails, delete the new .bzr directory
3767
and rename this one back in its place. Use the --clean option to ask
3768
for the backup.bzr directory to be removed on successful conversion.
3769
Alternatively, you can delete it by hand if everything looks good
3772
If the location given is a shared repository, dependent branches
3773
are also converted provided the repository converts successfully.
3774
If the conversion of a branch fails, remaining branches are still
3777
For more information on upgrades, see the Bazaar Upgrade Guide,
3778
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3781
_see_also = ['check', 'reconcile', 'formats']
3306
3782
takes_args = ['url?']
3307
3783
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'),
3784
RegistryOption('format',
3785
help='Upgrade to a specific format. See "bzr help'
3786
' formats" for details.',
3787
lazy_registry=('bzrlib.controldir', 'format_registry'),
3788
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3789
value_switches=True, title='Branch format'),
3791
help='Remove the backup.bzr directory if successful.'),
3793
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3796
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3797
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3798
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3800
if len(exceptions) == 1:
3801
# Compatibility with historical behavior
3321
3807
class cmd_whoami(Command):
3340
3827
encoding_type = 'replace'
3342
3829
@display_command
3343
def run(self, email=False, branch=False, name=None):
3830
def run(self, email=False, branch=False, name=None, directory=None):
3344
3831
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()
3832
if directory is None:
3833
# use branch if we're inside one; otherwise global config
3835
c = Branch.open_containing(u'.')[0].get_config_stack()
3836
except errors.NotBranchError:
3837
c = _mod_config.GlobalStack()
3839
c = Branch.open(directory).get_config_stack()
3840
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3842
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3845
self.outf.write(identity + '\n')
3849
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3852
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3854
_mod_config.extract_email_address(name)
3359
3855
except errors.NoEmailInUsername, e:
3360
3856
warning('"%s" does not seem to contain an email address. '
3361
3857
'This is allowed, but not recommended.', name)
3363
3859
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3861
if directory is None:
3862
c = Branch.open_containing(u'.')[0].get_config_stack()
3864
b = Branch.open(directory)
3865
self.add_cleanup(b.lock_write().unlock)
3866
c = b.get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3868
c = _mod_config.GlobalStack()
3869
c.set('email', name)
3371
3872
class cmd_nick(Command):
3586
4092
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4093
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4095
first=False, list_only=False,
3590
4096
randomize=None, exclude=None, strict=False,
3591
4097
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)
4098
parallel=None, lsprof_tests=False,
4101
# During selftest, disallow proxying, as it can cause severe
4102
# performance penalties and is only needed for thread
4103
# safety. The selftest command is assumed to not use threads
4104
# too heavily. The call should be as early as possible, as
4105
# error reporting for past duplicate imports won't have useful
4107
lazy_import.disallow_proxying()
4109
from bzrlib import tests
3602
4111
if testspecs_list is not None:
3603
4112
pattern = '|'.join(testspecs_list)
3608
4117
from bzrlib.tests import SubUnitBzrRunner
3609
4118
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4119
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4120
"needs to be installed to use --subunit."))
3612
4121
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
4122
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4123
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4124
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4125
# following code can be deleted when it's sufficiently deployed
4126
# -- vila/mgz 20100514
4127
if (sys.platform == "win32"
4128
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4130
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
4132
self.additional_selftest_args.setdefault(
3620
4133
'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)
4135
raise errors.BzrCommandError(gettext(
4136
"--benchmark is no longer supported from bzr 2.2; "
4137
"use bzr-usertest instead"))
4138
test_suite_factory = None
4140
exclude_pattern = None
3629
test_suite_factory = None
4142
exclude_pattern = '(' + '|'.join(exclude) + ')'
4144
self._disable_fsync()
3631
4145
selftest_kwargs = {"verbose": verbose,
3632
4146
"pattern": pattern,
3633
4147
"stop_on_failure": one,
3635
4149
"test_suite_factory": test_suite_factory,
3636
4150
"lsprof_timed": lsprof_timed,
3637
4151
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4152
"matching_tests_first": first,
3640
4153
"list_only": list_only,
3641
4154
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4155
"exclude_pattern": exclude_pattern,
3643
4156
"strict": strict,
3644
4157
"load_list": load_list,
3645
4158
"debug_flags": debugflag,
3646
4159
"starting_with": starting_with
3648
4161
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4163
# Make deprecation warnings visible, unless -Werror is set
4164
cleanup = symbol_versioning.activate_deprecation_warnings(
4167
result = tests.selftest(**selftest_kwargs)
3650
4170
return int(not result)
4172
def _disable_fsync(self):
4173
"""Change the 'os' functionality to not synchronize."""
4174
self._orig_fsync = getattr(os, 'fsync', None)
4175
if self._orig_fsync is not None:
4176
os.fsync = lambda filedes: None
4177
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4178
if self._orig_fdatasync is not None:
4179
os.fdatasync = lambda filedes: None
3653
4182
class cmd_version(Command):
3654
4183
__doc__ = """Show version of bzr."""
3709
4236
The source of the merge can be specified either in the form of a branch,
3710
4237
or in the form of a path to a file containing a merge directive generated
3711
4238
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.
4239
or the branch most recently merged using --remember. The source of the
4240
merge may also be specified in the form of a path to a file in another
4241
branch: in this case, only the modifications to that file are merged into
4242
the current working tree.
4244
When merging from a branch, by default bzr will try to merge in all new
4245
work from the other branch, automatically determining an appropriate base
4246
revision. If this fails, you may need to give an explicit base.
4248
To pick a different ending revision, pass "--revision OTHER". bzr will
4249
try to merge in all new work up to and including revision OTHER.
4251
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4252
through OTHER, excluding BASE but including OTHER, will be merged. If this
4253
causes some revisions to be skipped, i.e. if the destination branch does
4254
not already contain revision BASE, such a merge is commonly referred to as
4255
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4256
cherrypicks. The changes look like a normal commit, and the history of the
4257
changes from the other branch is not stored in the commit.
4259
Revision numbers are always relative to the source branch.
3725
4261
Merge will do its best to combine the changes in two branches, but there
3726
4262
are some kinds of problems only a human can fix. When it encounters those,
3727
4263
it will mark a conflict. A conflict means that you need to fix something,
3728
before you should commit.
4264
before you can commit.
3730
4266
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.
4268
If there is no default branch set, the first merge will set it (use
4269
--no-remember to avoid setting it). After that, you can omit the branch
4270
to use the default. To change the default, use --remember. The value will
4271
only be saved if the remote location can be accessed.
3737
4273
The results of the merge are placed into the destination working
3738
4274
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4275
committed to record the result of the merge.
3741
4277
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
4278
--force is given. If --force is given, then the changes from the source
4279
will be merged with the current working tree, including any uncommitted
4280
changes in the tree. The --force option can also be used to create a
3743
4281
merge revision which has more than two parents.
3745
4283
If one would like to merge changes from the working tree of the other
3873
4411
self.sanity_check_merger(merger)
3874
4412
if (merger.base_rev_id == merger.other_rev_id and
3875
4413
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4414
# check if location is a nonexistent file (and not a branch) to
4415
# disambiguate the 'Nothing to do'
4416
if merger.interesting_files:
4417
if not merger.other_tree.has_filename(
4418
merger.interesting_files[0]):
4419
note(gettext("merger: ") + str(merger))
4420
raise errors.PathsDoNotExist([location])
4421
note(gettext('Nothing to do.'))
4423
if pull and not preview:
3879
4424
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4425
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4426
if (merger.base_rev_id == tree.last_revision()):
3882
4427
result = tree.pull(merger.other_branch, False,
3883
4428
merger.other_rev_id)
3884
4429
result.report(self.outf)
3886
4431
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4432
raise errors.BzrCommandError(gettext(
3888
4433
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4434
" (perhaps you would prefer 'bzr pull')"))
3891
4436
return self._do_preview(merger)
3892
4437
elif interactive:
3988
4535
if other_revision_id is None:
3989
4536
other_revision_id = _mod_revision.ensure_null(
3990
4537
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):
4538
# Remember where we merge from. We need to remember if:
4539
# - user specify a location (and we don't merge from the parent
4541
# - user ask to remember or there is no previous location set to merge
4542
# from and user didn't ask to *not* remember
4543
if (user_location is not None
4545
or (remember is None
4546
and tree.branch.get_submit_branch() is None)))):
3994
4547
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4548
# Merge tags (but don't set them in the master branch yet, the user
4549
# might revert this merge). Commit will propagate them.
4550
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4551
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4552
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4553
if other_path != '':
4340
4898
theirs_only=False,
4341
4899
log_format=None, long=False, short=False, line=False,
4342
4900
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4901
include_merged=None, revision=None, my_revision=None,
4903
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4904
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4905
def message(s):
4346
4906
if not is_quiet():
4347
4907
self.outf.write(s)
4909
if symbol_versioning.deprecated_passed(include_merges):
4910
ui.ui_factory.show_user_warning(
4911
'deprecated_command_option',
4912
deprecated_name='--include-merges',
4913
recommended_name='--include-merged',
4914
deprecated_in_version='2.5',
4915
command=self.invoked_as)
4916
if include_merged is None:
4917
include_merged = include_merges
4919
raise errors.BzrCommandError(gettext(
4920
'{0} and {1} are mutually exclusive').format(
4921
'--include-merges', '--include-merged'))
4922
if include_merged is None:
4923
include_merged = False
4350
4925
mine_only = this
4430
5007
if mine_only and not local_extra:
4431
5008
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
5009
message(gettext('This branch has no new revisions.\n'))
4433
5010
elif theirs_only and not remote_extra:
4434
5011
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
5012
message(gettext('Other branch has no new revisions.\n'))
4436
5013
elif not (mine_only or theirs_only or local_extra or
4438
5015
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
5017
message(gettext("Branches are up to date.\n"))
4441
5018
self.cleanup_now()
4442
5019
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
5020
self.add_cleanup(local_branch.lock_write().unlock)
4445
5021
# handle race conditions - a parent might be set while we run.
4446
5022
if local_branch.get_parent() is None:
4447
5023
local_branch.set_parent(remote_branch.base)
4578
5137
Option('long', help='Show commit date in annotations.'),
4582
5142
encoding_type = 'exact'
4584
5144
@display_command
4585
5145
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5146
show_ids=False, directory=None):
5147
from bzrlib.annotate import (
4588
5150
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5151
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5152
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5153
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5155
self.add_cleanup(branch.lock_read().unlock)
4596
5156
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5157
self.add_cleanup(tree.lock_read().unlock)
5158
if wt is not None and revision is None:
4600
5159
file_id = wt.path2id(relpath)
4602
5161
file_id = tree.path2id(relpath)
4603
5162
if file_id is None:
4604
5163
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5164
if wt is not None and revision is None:
4607
5165
# If there is a tree and we're not annotating historical
4608
5166
# versions, annotate the working tree's content.
4609
5167
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
5168
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5170
annotate_file_tree(tree, file_id, self.outf, long, all,
5171
show_ids=show_ids, branch=branch)
4616
5174
class cmd_re_sign(Command):
4620
5178
hidden = True # is this right ?
4621
5179
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5180
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5182
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5183
if revision_id_list is not None and revision is not None:
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5184
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5185
if revision_id_list is None and revision is None:
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
5186
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5187
b = WorkingTree.open_containing(directory)[0].branch
5188
self.add_cleanup(b.lock_write().unlock)
4632
5189
return self._run(b, revision_id_list, revision)
4634
5191
def _run(self, b, revision_id_list, revision):
4635
5192
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5193
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5194
if revision_id_list is not None:
4638
5195
b.repository.start_write_group()
4694
5251
_see_also = ['checkouts', 'unbind']
4695
5252
takes_args = ['location?']
5253
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5255
def run(self, location=None, directory=u'.'):
5256
b, relpath = Branch.open_containing(directory)
4700
5257
if location is None:
4702
5259
location = b.get_old_bound_location()
4703
5260
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5261
raise errors.BzrCommandError(gettext('No location supplied. '
5262
'This format does not remember old locations.'))
4707
5264
if location is None:
4708
5265
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5266
raise errors.BzrCommandError(
5267
gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5269
raise errors.BzrCommandError(
5270
gettext('No location supplied'
5271
' and no previous location known'))
4713
5272
b_other = Branch.open(location)
4715
5274
b.bind(b_other)
4716
5275
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5276
raise errors.BzrCommandError(gettext('These branches have diverged.'
5277
' Try merging, and then bind again.'))
4719
5278
if b.get_config().has_explicit_nickname():
4720
5279
b.nick = b_other.nick
4784
5344
b = control.open_branch()
4786
5346
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5347
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)
5349
self.add_cleanup(b.lock_write().unlock)
5350
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5353
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5355
from bzrlib.log import log_formatter, show_log
4796
5356
from bzrlib.uncommit import uncommit
4827
5387
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5390
self.outf.write(gettext('Dry-run, pretending to remove'
5391
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5393
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')
5396
if not ui.ui_factory.confirm_action(
5397
gettext(u'Uncommit these revisions'),
5398
'bzrlib.builtins.uncommit',
5400
self.outf.write(gettext('Canceled\n'))
4840
5403
mutter('Uncommitting from {%s} to {%s}',
4841
5404
last_rev_id, rev_id)
4842
5405
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)
5406
revno=revno, local=local, keep_tags=keep_tags)
5407
self.outf.write(gettext('You can restore the old tip by running:\n'
5408
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5411
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5412
__doc__ = """Break a dead lock.
5414
This command breaks a lock on a repository, branch, working directory or
4851
5417
CAUTION: Locks should only be broken when you are sure that the process
4852
5418
holding the lock has been stopped.
4936
5519
return host, port
4938
5521
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5522
protocol=None, client_timeout=None):
5523
from bzrlib import transport
4941
5524
if directory is None:
4942
5525
directory = os.getcwd()
4943
5526
if protocol is None:
4944
protocol = transport_server_registry.get()
5527
protocol = transport.transport_server_registry.get()
4945
5528
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5529
url = transport.location_to_url(directory)
4947
5530
if not allow_writes:
4948
5531
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5532
t = transport.get_transport_from_url(url)
5534
protocol(t, host, port, inet, client_timeout)
5535
except TypeError, e:
5536
# We use symbol_versioning.deprecated_in just so that people
5537
# grepping can find it here.
5538
# symbol_versioning.deprecated_in((2, 5, 0))
5539
symbol_versioning.warn(
5540
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5541
'Most likely it needs to be updated to support a'
5542
' "timeout" parameter (added in bzr 2.5.0)'
5543
% (e, protocol.__module__, protocol),
5545
protocol(t, host, port, inet)
4953
5548
class cmd_join(Command):
5081
5678
if submit_branch is None:
5082
5679
submit_branch = branch.get_parent()
5083
5680
if submit_branch is None:
5084
raise errors.BzrCommandError('No submit branch specified or known')
5681
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5086
5683
stored_public_branch = branch.get_public_branch()
5087
5684
if public_branch is None:
5088
5685
public_branch = stored_public_branch
5089
5686
elif stored_public_branch is None:
5687
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5090
5688
branch.set_public_branch(public_branch)
5091
5689
if not include_bundle and public_branch is None:
5092
raise errors.BzrCommandError('No public branch specified or'
5690
raise errors.BzrCommandError(gettext('No public branch specified or'
5094
5692
base_revision_id = None
5095
5693
if revision is not None:
5096
5694
if len(revision) > 2:
5097
raise errors.BzrCommandError('bzr merge-directive takes '
5098
'at most two one revision identifiers')
5695
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5696
'at most two one revision identifiers'))
5099
5697
revision_id = revision[-1].as_revision_id(branch)
5100
5698
if len(revision) == 2:
5101
5699
base_revision_id = revision[0].as_revision_id(branch)
5359
5960
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5961
self.add_cleanup(branch.lock_write().unlock)
5363
5963
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5964
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5965
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5966
note(gettext('Deleted tag %s.') % tag_name)
5369
5969
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5970
raise errors.BzrCommandError(gettext(
5371
5971
"Tags can only be placed on a single revision, "
5373
5973
revision_id = revision[0].as_revision_id(branch)
5375
5975
revision_id = branch.last_revision()
5376
5976
if tag_name is None:
5377
5977
tag_name = branch.automatic_tag_name(revision_id)
5378
5978
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):
5979
raise errors.BzrCommandError(gettext(
5980
"Please specify a tag name."))
5982
existing_target = branch.tags.lookup_tag(tag_name)
5983
except errors.NoSuchTag:
5984
existing_target = None
5985
if not force and existing_target not in (None, revision_id):
5382
5986
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5987
if existing_target == revision_id:
5988
note(gettext('Tag %s already exists for that revision.') % tag_name)
5990
branch.tags.set_tag(tag_name, revision_id)
5991
if existing_target is None:
5992
note(gettext('Created tag %s.') % tag_name)
5994
note(gettext('Updated tag %s.') % tag_name)
5387
5997
class cmd_tags(Command):
5393
6003
_see_also = ['tag']
5394
6004
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
6005
custom_help('directory',
6006
help='Branch whose tags should be displayed.'),
6007
RegistryOption('sort',
5401
6008
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
6009
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
6015
@display_command
6016
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6017
from bzrlib.tag import tag_sort_methods
5416
6018
branch, relpath = Branch.open_containing(directory)
5418
6020
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
6024
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]])
6026
# Restrict to the specified range
6027
tags = self._tags_for_range(branch, revision)
6029
sort = tag_sort_methods.get()
5444
6031
if not show_ids:
5445
6032
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
6033
for index, (tag, revid) in enumerate(tags):
5457
6046
for tag, revspec in tags:
5458
6047
self.outf.write('%-20s %s\n' % (tag, revspec))
6049
def _tags_for_range(self, branch, revision):
6051
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6052
revid1, revid2 = rev1.rev_id, rev2.rev_id
6053
# _get_revision_range will always set revid2 if it's not specified.
6054
# If revid1 is None, it means we want to start from the branch
6055
# origin which is always a valid ancestor. If revid1 == revid2, the
6056
# ancestry check is useless.
6057
if revid1 and revid1 != revid2:
6058
# FIXME: We really want to use the same graph than
6059
# branch.iter_merge_sorted_revisions below, but this is not
6060
# easily available -- vila 2011-09-23
6061
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6062
# We don't want to output anything in this case...
6064
# only show revisions between revid1 and revid2 (inclusive)
6065
tagged_revids = branch.tags.get_reverse_tag_dict()
6067
for r in branch.iter_merge_sorted_revisions(
6068
start_revision_id=revid2, stop_revision_id=revid1,
6069
stop_rule='include'):
6070
revid_tags = tagged_revids.get(r[0], None)
6072
found.extend([(tag, r[0]) for tag in revid_tags])
5461
6076
class cmd_reconfigure(Command):
5462
6077
__doc__ = """Reconfigure the type of a bzr directory.
5476
6091
takes_args = ['location?']
5477
6092
takes_options = [
5478
6093
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6096
help='The relation between branch and tree.',
5482
6097
value_switches=True, enum_switch=False,
5483
6098
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6099
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6100
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6101
lightweight_checkout='Reconfigure to be a lightweight'
5487
6102
' checkout (with no local history).',
6104
RegistryOption.from_kwargs(
6106
title='Repository type',
6107
help='Location fo the repository.',
6108
value_switches=True, enum_switch=False,
5488
6109
standalone='Reconfigure to be a standalone branch '
5489
6110
'(i.e. stop using shared repository).',
5490
6111
use_shared='Reconfigure to use a shared repository.',
6113
RegistryOption.from_kwargs(
6115
title='Trees in Repository',
6116
help='Whether new branches in the repository have trees.',
6117
value_switches=True, enum_switch=False,
5491
6118
with_trees='Reconfigure repository to create '
5492
6119
'working trees on branches by default.',
5493
6120
with_no_trees='Reconfigure repository to not create '
5520
6147
# At the moment you can use --stacked-on and a different
5521
6148
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6150
if (tree_type is None and
6151
repository_type is None and
6152
repository_trees is None):
5524
6153
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6156
raise errors.BzrCommandError(gettext('No target configuration '
6158
reconfiguration = None
6159
if tree_type == 'branch':
5530
6160
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6161
elif tree_type == 'tree':
5532
6162
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6163
elif tree_type == 'checkout':
5534
6164
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6165
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6166
elif tree_type == 'lightweight-checkout':
5537
6167
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6168
directory, bind_to)
5539
elif target_type == 'use-shared':
6170
reconfiguration.apply(force)
6171
reconfiguration = None
6172
if repository_type == 'use-shared':
5540
6173
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6174
elif repository_type == 'standalone':
5542
6175
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6177
reconfiguration.apply(force)
6178
reconfiguration = None
6179
if repository_trees == 'with-trees':
5544
6180
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6181
directory, True)
5546
elif target_type == 'with-no-trees':
6182
elif repository_trees == 'with-no-trees':
5547
6183
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6184
directory, False)
5549
reconfiguration.apply(force)
6186
reconfiguration.apply(force)
6187
reconfiguration = None
5552
6190
class cmd_switch(Command):
5584
6223
def run(self, to_location=None, force=False, create_branch=False,
6224
revision=None, directory=u'.'):
5586
6225
from bzrlib import switch
6226
tree_location = directory
5588
6227
revision = _get_one_revision('switch', revision)
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6228
possible_transports = []
6229
control_dir = controldir.ControlDir.open_containing(tree_location,
6230
possible_transports=possible_transports)[0]
5590
6231
if to_location is None:
5591
6232
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6233
raise errors.BzrCommandError(gettext('You must supply either a'
6234
' revision or a location'))
6235
to_location = tree_location
5596
branch = control_dir.open_branch()
6237
branch = control_dir.open_branch(
6238
possible_transports=possible_transports)
5597
6239
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
6240
except errors.NotBranchError:
5600
6242
had_explicit_nick = False
5601
6243
if create_branch:
5602
6244
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)
6245
raise errors.BzrCommandError(
6246
gettext('cannot create branch without source branch'))
6247
to_location = lookup_new_sibling_branch(control_dir, to_location,
6248
possible_transports=possible_transports)
5611
6249
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6250
possible_transports=possible_transports,
6251
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))
6253
to_branch = lookup_sibling_branch(control_dir, to_location)
5621
6254
if revision is not None:
5622
6255
revision = revision.as_revision_id(to_branch)
5623
6256
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
6257
if had_explicit_nick:
5625
6258
branch = control_dir.open_branch() #get the new branch!
5626
6259
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6260
note(gettext('Switched to branch: %s'),
5628
6261
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
6265
class cmd_view(Command):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6352
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6354
current_view, view_dict = tree.views.get_view_info()
5737
6355
if name is None:
5738
6356
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6359
raise errors.BzrCommandError(gettext(
6360
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6362
raise errors.BzrCommandError(gettext(
6363
"Both --delete and --switch specified"))
5747
6365
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6366
self.outf.write(gettext("Deleted all views.\n"))
5749
6367
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6368
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6370
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6371
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6374
raise errors.BzrCommandError(gettext(
6375
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6377
raise errors.BzrCommandError(gettext(
6378
"Both --switch and --all specified"))
5761
6379
elif switch == 'off':
5762
6380
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6381
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6382
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6383
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6385
tree.views.set_view_info(switch, view_dict)
5768
6386
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6387
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6390
self.outf.write(gettext('Views defined:\n'))
5773
6391
for view in sorted(view_dict):
5774
6392
if view == current_view:
5778
6396
view_str = views.view_display_str(view_dict[view])
5779
6397
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6399
self.outf.write(gettext('No views defined.\n'))
5782
6400
elif file_list:
5783
6401
if name is None:
5784
6402
# No name given and no current view set
5786
6404
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6405
raise errors.BzrCommandError(gettext(
6406
"Cannot change the 'off' pseudo view"))
5789
6407
tree.views.set_view(name, sorted(file_list))
5790
6408
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6409
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6411
# list the files
5794
6412
if name is None:
5795
6413
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6414
self.outf.write(gettext('No current view.\n'))
5798
6416
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6417
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6420
class cmd_hooks(Command):
5883
6514
Option('destroy',
5884
6515
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6517
_see_also = ['unshelve', 'configuration']
5888
6519
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6520
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6522
return self.run_for_list(directory=directory)
5892
6523
from bzrlib.shelf_ui import Shelver
5893
6524
if writer is None:
5894
6525
writer = bzrlib.option.diff_writer_registry.get()
5896
6527
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6528
file_list, message, destroy=destroy, directory=directory)
6032
6666
self.outf.write('%s %s\n' % (path, location))
6669
class cmd_export_pot(Command):
6670
__doc__ = """Export command helps and error messages in po format."""
6673
takes_options = [Option('plugin',
6674
help='Export help text from named command '\
6675
'(defaults to all built in commands).',
6677
Option('include-duplicates',
6678
help='Output multiple copies of the same msgid '
6679
'string if it appears more than once.'),
6682
def run(self, plugin=None, include_duplicates=False):
6683
from bzrlib.export_pot import export_pot
6684
export_pot(self.outf, plugin, include_duplicates)
6035
6687
def _register_lazy_builtins():
6036
6688
# register lazy builtins from other modules; called at startup and should
6037
6689
# be only called once.
6038
6690
for (name, aliases, module_name) in [
6039
6691
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6692
('cmd_config', [], 'bzrlib.config'),
6040
6693
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6694
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6695
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6696
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6697
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6698
('cmd_verify_signatures', [],
6699
'bzrlib.commit_signature_commands'),
6700
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6702
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
