73
78
_parse_revision_str,
75
80
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
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]))
86
def _get_branch_location(control_dir, possible_transports=None):
87
"""Return location of branch for this control dir."""
89
target = control_dir.get_branch_reference()
90
except errors.NotBranchError:
91
return control_dir.root_transport.base
92
if target is not None:
94
this_branch = control_dir.open_branch(
95
possible_transports=possible_transports)
96
# This may be a heavy checkout, where we want the master branch
97
master_location = this_branch.get_bound_location()
98
if master_location is not None:
99
return master_location
100
# If not, use a local sibling
101
return this_branch.base
104
def _is_colocated(control_dir, possible_transports=None):
105
"""Check if the branch in control_dir is colocated.
107
:param control_dir: Control directory
108
:return: Tuple with boolean indicating whether the branch is colocated
109
and the full URL to the actual branch
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 to find sibling branches from
136
:param location: Name of the new branch
137
:return: Full location to the new branch
139
location = directory_service.directories.dereference(location)
140
if '/' not in location and '\\' not in location:
141
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
144
return urlutils.join_segment_parameters(this_url,
145
{"branch": urlutils.escape(location)})
147
return urlutils.join(this_url, '..', urlutils.escape(location))
151
def open_sibling_branch(control_dir, location, possible_transports=None):
152
"""Open a branch, possibly a sibling of another.
154
:param control_dir: Control directory relative to which to lookup the
156
:param location: Location to look up
157
:return: branch to open
160
# Perhaps it's a colocated branch?
161
return control_dir.open_branch(location,
162
possible_transports=possible_transports)
163
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
164
this_url = _get_branch_location(control_dir)
167
this_url, '..', urlutils.escape(location)))
170
def open_nearby_branch(near=None, location=None, possible_transports=None):
171
"""Open a nearby branch.
173
:param near: Optional location of container from which to open branch
174
:param location: Location of the branch
175
:return: Branch instance
181
return Branch.open(location,
182
possible_transports=possible_transports)
183
except errors.NotBranchError:
185
cdir = controldir.ControlDir.open(near,
186
possible_transports=possible_transports)
187
return open_sibling_branch(cdir, location,
188
possible_transports=possible_transports)
191
def iter_sibling_branches(control_dir, possible_transports=None):
192
"""Iterate over the siblings of a branch.
194
:param control_dir: Control directory for which to look up the siblings
195
:return: Iterator over tuples with branch name and branch object
199
reference = control_dir.get_branch_reference()
200
except errors.NotBranchError:
201
# There is no active branch, just return the colocated branches.
202
for name, branch in control_dir.get_branches().iteritems():
205
if reference is not None:
206
ref_branch = Branch.open(reference,
207
possible_transports=possible_transports)
210
if ref_branch is None or ref_branch.name:
211
if ref_branch is not None:
212
control_dir = ref_branch.bzrdir
213
for name, branch in control_dir.get_branches().iteritems():
216
repo = ref_branch.bzrdir.find_repository()
217
for branch in repo.find_branches(using=True):
218
name = urlutils.relative_url(repo.user_url,
219
branch.user_url).rstrip("/")
88
223
def tree_files_for_add(file_list):
153
# XXX: Bad function name; should possibly also be a class method of
154
# WorkingTree rather than a function.
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
This is typically used for command-line processors that take one or
160
more filenames, and infer the workingtree that contains them.
162
The filenames given are not required to exist.
164
:param file_list: Filenames to convert.
166
:param default_branch: Fallback tree path to use if file_list is empty or
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
172
: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)
223
288
def _get_view_info_for_change_reporter(tree):
224
289
"""Get the view information from a tree for change reporting."""
353
436
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
439
def run(self, revision_id=None, revision=None, directory=u'.'):
357
440
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')
441
raise errors.BzrCommandError(gettext('You can only supply one of'
442
' revision_id or --revision'))
360
443
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
444
raise errors.BzrCommandError(gettext('You must supply either'
445
' --revision or a revision_id'))
447
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
449
revisions = b.repository.revisions
366
450
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
451
raise errors.BzrCommandError(gettext('Repository %r does not support '
452
'access to raw revision texts'))
370
454
b.repository.lock_read()
491
578
location_list=['.']
493
580
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
581
d = controldir.ControlDir.open(location)
497
584
working = d.open_workingtree()
498
585
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
586
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
587
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
588
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
589
" of a remote path"))
504
591
if (working.has_changes()):
505
592
raise errors.UncommittedChanges(working)
593
if working.get_shelf_manager().last_shelf() is not None:
594
raise errors.ShelvedChanges(working)
507
596
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
597
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
598
" from a lightweight checkout"))
511
600
d.destroy_workingtree()
603
class cmd_repair_workingtree(Command):
604
__doc__ = """Reset the working tree state file.
606
This is not meant to be used normally, but more as a way to recover from
607
filesystem corruption, etc. This rebuilds the working inventory back to a
608
'known good' state. Any new modifications (adding a file, renaming, etc)
609
will be lost, though modified files will still be detected as such.
611
Most users will want something more like "bzr revert" or "bzr update"
612
unless the state file has become corrupted.
614
By default this attempts to recover the current state by looking at the
615
headers of the state file. If the state file is too corrupted to even do
616
that, you can supply --revision to force the state of the tree.
619
takes_options = ['revision', 'directory',
621
help='Reset the tree even if it doesn\'t appear to be'
626
def run(self, revision=None, directory='.', force=False):
627
tree, _ = WorkingTree.open_containing(directory)
628
self.add_cleanup(tree.lock_tree_write().unlock)
632
except errors.BzrError:
633
pass # There seems to be a real error here, so we'll reset
636
raise errors.BzrCommandError(gettext(
637
'The tree does not appear to be corrupt. You probably'
638
' want "bzr revert" instead. Use "--force" if you are'
639
' sure you want to reset the working tree.'))
643
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
645
tree.reset_state(revision_ids)
646
except errors.BzrError, e:
647
if revision_ids is None:
648
extra = (gettext(', the header appears corrupt, try passing -r -1'
649
' to set the state to the last commit'))
652
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
655
class cmd_revno(Command):
515
656
__doc__ = """Show current revision number.
520
661
_see_also = ['info']
521
662
takes_args = ['location?']
522
663
takes_options = [
523
Option('tree', help='Show revno of working tree'),
664
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
669
def run(self, tree=False, location=u'.', revision=None):
670
if revision is not None and tree:
671
raise errors.BzrCommandError(gettext("--tree and --revision can "
672
"not be used together"))
530
676
wt = WorkingTree.open_containing(location)[0]
677
self.add_cleanup(wt.lock_read().unlock)
532
678
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
679
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
681
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
683
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
684
self.add_cleanup(b.lock_read().unlock)
686
if len(revision) != 1:
687
raise errors.BzrCommandError(gettext(
688
"Tags can only be placed on a single revision, "
690
revid = revision[0].as_revision_id(b)
692
revid = b.last_revision()
694
revno_t = b.revision_id_to_dotted_revno(revid)
695
except errors.NoSuchRevision:
697
revno = ".".join(str(n) for n in revno_t)
546
698
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
699
self.outf.write(revno + '\n')
550
702
class cmd_revision_info(Command):
704
859
takes_args = ['dir+']
863
help='No error if existing, make parent directories as needed.',
705
867
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)
870
def add_file_with_parents(cls, wt, relpath):
871
if wt.path2id(relpath) is not None:
873
cls.add_file_with_parents(wt, osutils.dirname(relpath))
877
def add_file_single(cls, wt, relpath):
880
def run(self, dir_list, parents=False):
882
add_file = self.add_file_with_parents
884
add_file = self.add_file_single
886
wt, relpath = WorkingTree.open_containing(dir)
891
if e.errno != errno.EEXIST:
717
raise errors.NotVersionedError(path=base)
895
add_file(wt, relpath)
897
self.outf.write(gettext('added %s\n') % dir)
720
900
class cmd_relpath(Command):
757
937
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
938
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
939
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
941
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)
942
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
943
self.add_cleanup(work_tree.lock_read().unlock)
765
944
if revision is not None:
766
945
tree = revision.as_tree(work_tree.branch)
768
947
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
948
self.add_cleanup(tree.lock_read().unlock)
953
self.add_cleanup(tree.lock_read().unlock)
775
954
if file_list is not None:
776
955
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
956
require_versioned=True)
778
957
# find_ids_across_trees may include some paths that don't
779
958
# 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)
959
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
783
entries = tree.inventory.entries()
961
entries = tree.iter_entries_by_dir()
786
for path, entry in entries:
963
for path, entry in sorted(entries):
787
964
if kind and kind != entry.kind:
790
969
self.outf.write('%-50s %s\n' % (path, entry.file_id))
828
1007
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
1009
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
1010
if names_list is None:
833
1012
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)
1013
raise errors.BzrCommandError(gettext("missing file argument"))
1014
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1015
for file_name in rel_names[0:-1]:
1017
raise errors.BzrCommandError(gettext("can not move root of branch"))
1018
self.add_cleanup(tree.lock_tree_write().unlock)
838
1019
self._run(tree, names_list, rel_names, after)
840
1021
def run_auto(self, names_list, after, dry_run):
841
1022
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
1023
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)
1026
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1028
work_tree, file_list = WorkingTree.open_containing_paths(
1029
names_list, default_directory='.')
1030
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
1031
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
1033
def _run(self, tree, names_list, rel_names, after):
960
1144
takes_options = ['remember', 'overwrite', 'revision',
961
1145
custom_help('verbose',
962
1146
help='Show logs of pulled revisions.'),
1147
custom_help('directory',
964
1148
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1149
'rather than the one containing the working directory.'),
970
1151
help="Perform a local pull in a bound "
971
1152
"branch. Local pulls are not applied to "
972
1153
"the master branch."
1156
help="Show base revision text in conflicts.")
975
1158
takes_args = ['location?']
976
1159
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1161
def run(self, location=None, remember=None, overwrite=False,
979
1162
revision=None, verbose=False,
980
directory=None, local=False):
1163
directory=None, local=False,
981
1165
# FIXME: too much stuff is in the command class
982
1166
revision_id = None
983
1167
mergeable = None
1110
1302
Option('strict',
1111
1303
help='Refuse to push if there are uncommitted changes in'
1112
1304
' the working tree, --no-strict disables the check.'),
1306
help="Don't populate the working tree, even for protocols"
1307
" that support it."),
1114
1309
takes_args = ['location?']
1115
1310
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1312
def run(self, location=None, remember=None, overwrite=False,
1118
1313
create_prefix=False, verbose=False, revision=None,
1119
1314
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1315
stacked=False, strict=None, no_tree=False):
1121
1316
from bzrlib.push import _show_push_branch
1123
1318
if directory is None:
1124
1319
directory = '.'
1125
1320
# Get the source branch
1126
1321
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1322
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1323
# Get the tip's revision_id
1129
1324
revision = _get_one_revision('push', revision)
1130
1325
if revision is not None:
1151
1346
# error by the feedback given to them. RBC 20080227.
1152
1347
stacked_on = parent_url
1153
1348
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1349
raise errors.BzrCommandError(gettext(
1350
"Could not determine branch to refer to."))
1157
1352
# Get the destination location
1158
1353
if location is None:
1159
1354
stored_loc = br_from.get_push_location()
1160
1355
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1356
parent_loc = br_from.get_parent()
1358
raise errors.BzrCommandError(gettext(
1359
"No push location known or specified. To push to the "
1360
"parent branch (at %s), use 'bzr push :parent'." %
1361
urlutils.unescape_for_display(parent_loc,
1362
self.outf.encoding)))
1364
raise errors.BzrCommandError(gettext(
1365
"No push location known or specified."))
1164
1367
display_url = urlutils.unescape_for_display(stored_loc,
1165
1368
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1369
note(gettext("Using saved push location: %s") % display_url)
1167
1370
location = stored_loc
1169
1372
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1373
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1374
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1375
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1378
class cmd_branch(Command):
1214
1421
def run(self, from_location, to_location=None, revision=None,
1215
1422
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1423
use_existing_dir=False, switch=False, bind=False,
1217
1425
from bzrlib import switch as _mod_switch
1218
1426
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1427
if self.invoked_as in ['get', 'clone']:
1428
ui.ui_factory.show_user_warning(
1429
'deprecated_command',
1430
deprecated_name=self.invoked_as,
1431
recommended_name='branch',
1432
deprecated_in_version='2.4')
1433
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1435
if not (hardlink or files_from):
1436
# accelerator_tree is usually slower because you have to read N
1437
# files (no readahead, lots of seeks, etc), but allow the user to
1438
# explicitly request it
1439
accelerator_tree = None
1440
if files_from is not None and files_from != from_location:
1441
accelerator_tree = WorkingTree.open(files_from)
1221
1442
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1443
self.add_cleanup(br_from.lock_read().unlock)
1224
1444
if revision is not None:
1225
1445
revision_id = revision.as_revision_id(br_from)
1230
1450
revision_id = br_from.last_revision()
1231
1451
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1452
to_location = getattr(br_from, "name", None)
1454
to_location = urlutils.derive_to_location(from_location)
1233
1455
to_transport = transport.get_transport(to_location)
1235
1457
to_transport.mkdir('.')
1236
1458
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1460
to_dir = controldir.ControlDir.open_from_transport(
1462
except errors.NotBranchError:
1463
if not use_existing_dir:
1464
raise errors.BzrCommandError(gettext('Target directory "%s" '
1465
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1470
to_dir.open_branch()
1243
1471
except errors.NotBranchError:
1246
1474
raise errors.AlreadyBranchError(to_location)
1247
1475
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1476
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)
1482
# preserve whatever source format we have.
1483
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1484
possible_transports=[to_transport],
1485
accelerator_tree=accelerator_tree,
1486
hardlink=hardlink, stacked=stacked,
1487
force_new_repo=standalone,
1488
create_tree_if_local=not no_tree,
1489
source_branch=br_from)
1490
branch = to_dir.open_branch(
1491
possible_transports=[
1492
br_from.bzrdir.root_transport, to_transport])
1493
except errors.NoSuchRevision:
1494
to_transport.delete_tree('.')
1495
msg = gettext("The branch {0} has no revision {1}.").format(
1496
from_location, revision)
1497
raise errors.BzrCommandError(msg)
1500
to_repo = to_dir.open_repository()
1501
except errors.NoRepositoryPresent:
1502
to_repo = to_dir.create_repository()
1503
to_repo.fetch(br_from.repository, revision_id=revision_id)
1504
branch = br_from.sprout(to_dir, revision_id=revision_id)
1265
1505
_merge_tags_if_possible(br_from, branch)
1266
1506
# If the source branch is stacked, the new branch may
1267
1507
# be stacked whether we asked for that explicitly or not.
1268
1508
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1510
note(gettext('Created new stacked branch referring to %s.') %
1271
1511
branch.get_stacked_on_url())
1272
1512
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1513
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1514
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1516
# Bind to the parent
1277
1517
parent_branch = Branch.open(from_location)
1278
1518
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1519
note(gettext('New branch bound to %s') % from_location)
1281
1521
# Switch to the new branch
1282
1522
wt, _ = WorkingTree.open_containing('.')
1283
1523
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1524
note(gettext('Switched to branch: %s'),
1285
1525
urlutils.unescape_for_display(branch.base, 'utf-8'))
1528
class cmd_branches(Command):
1529
__doc__ = """List the branches available at the current location.
1531
This command will print the names of all the branches at the current
1535
takes_args = ['location?']
1537
Option('recursive', short_name='R',
1538
help='Recursively scan for branches rather than '
1539
'just looking in the specified location.')]
1541
def run(self, location=".", recursive=False):
1543
t = transport.get_transport(location)
1544
if not t.listable():
1545
raise errors.BzrCommandError(
1546
"Can't scan this type of location.")
1547
for b in controldir.ControlDir.find_branches(t):
1548
self.outf.write("%s\n" % urlutils.unescape_for_display(
1549
urlutils.relative_url(t.base, b.base),
1550
self.outf.encoding).rstrip("/"))
1552
dir = controldir.ControlDir.open_containing(location)[0]
1554
active_branch = dir.open_branch(name="")
1555
except errors.NotBranchError:
1556
active_branch = None
1558
for name, branch in iter_sibling_branches(dir):
1561
active = (active_branch is not None and
1562
active_branch.base == branch.base)
1563
names[name] = active
1564
# Only mention the current branch explicitly if it's not
1565
# one of the colocated branches
1566
if not any(names.values()) and active_branch is not None:
1567
self.outf.write("* %s\n" % gettext("(default)"))
1568
for name in sorted(names.keys()):
1569
active = names[name]
1574
self.outf.write("%s %s\n" % (
1575
prefix, name.encode(self.outf.encoding)))
1288
1578
class cmd_checkout(Command):
1289
1579
__doc__ = """Create a new checkout of an existing branch.
1389
1680
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
1681
__doc__ = """Update a working tree to a new revision.
1683
This will perform a merge of the destination revision (the tip of the
1684
branch, or the specified revision) into the working tree, and then make
1685
that revision the basis revision for the working tree.
1687
You can use this to visit an older revision, or to update a working tree
1688
that is out of date from its branch.
1690
If there are any uncommitted changes in the tree, they will be carried
1691
across and remain as uncommitted changes after the update. To discard
1692
these changes, use 'bzr revert'. The uncommitted changes may conflict
1693
with the changes brought in by the change in basis revision.
1695
If the tree's branch is bound to a master branch, bzr will also update
1400
1696
the branch from the master.
1698
You cannot update just a single file or directory, because each Bazaar
1699
working tree has just a single basis revision. If you want to restore a
1700
file that has been removed locally, use 'bzr revert' instead of 'bzr
1701
update'. If you want to restore a file to its state in a previous
1702
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1703
out the old content of that file to a new location.
1705
The 'dir' argument, if given, must be the location of the root of a
1706
working tree to update. By default, the working tree that contains the
1707
current working directory is used.
1403
1710
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1711
takes_args = ['dir?']
1405
takes_options = ['revision']
1712
takes_options = ['revision',
1714
help="Show base revision text in conflicts."),
1406
1716
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1718
def run(self, dir=None, revision=None, show_base=None):
1409
1719
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]
1720
raise errors.BzrCommandError(gettext(
1721
"bzr update --revision takes exactly one revision"))
1723
tree = WorkingTree.open_containing('.')[0]
1725
tree, relpath = WorkingTree.open_containing(dir)
1728
raise errors.BzrCommandError(gettext(
1729
"bzr update can only update a whole tree, "
1730
"not a file or subdirectory"))
1413
1731
branch = tree.branch
1414
1732
possible_transports = []
1415
1733
master = branch.get_master_branch(
1416
1734
possible_transports=possible_transports)
1417
1735
if master is not None:
1419
1736
branch_location = master.base
1739
branch_location = tree.branch.base
1421
1740
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1741
self.add_cleanup(tree.unlock)
1424
1742
# get rid of the final '/' and be ready for display
1425
1743
branch_location = urlutils.unescape_for_display(
1451
1769
change_reporter,
1452
1770
possible_transports=possible_transports,
1453
1771
revision=revision_id,
1773
show_base=show_base)
1455
1774
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1775
raise errors.BzrCommandError(gettext(
1457
1776
"branch has no revision %s\n"
1458
1777
"bzr update --revision only works"
1459
" for a revision in the branch history"
1778
" for a revision in the branch history")
1460
1779
% (e.revision))
1461
1780
revno = tree.branch.revision_id_to_dotted_revno(
1462
1781
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1782
note(gettext('Updated to revision {0} of branch {1}').format(
1783
'.'.join(map(str, revno)), branch_location))
1465
1784
parent_ids = tree.get_parent_ids()
1466
1785
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'.")
1786
note(gettext('Your local commits will now show as pending merges with '
1787
"'bzr status', and can be committed with 'bzr commit'."))
1469
1788
if conflicts != 0:
1530
1850
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1851
'The file deletion mode to be used.',
1532
1852
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1853
safe='Backup changed files (default).',
1535
1854
keep='Delete from bzr but leave the working copy.',
1855
no_backup='Don\'t backup changed files.',
1536
1856
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1857
'recovered and even if they are non-empty directories. '
1858
'(deprecated, use no-backup)')]
1538
1859
aliases = ['rm', 'del']
1539
1860
encoding_type = 'replace'
1541
1862
def run(self, file_list, verbose=False, new=False,
1542
1863
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1864
if file_deletion_strategy == 'force':
1865
note(gettext("(The --force option is deprecated, rather use --no-backup "
1867
file_deletion_strategy = 'no-backup'
1869
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1871
if file_list is not None:
1546
1872
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1874
self.add_cleanup(tree.lock_write().unlock)
1550
1875
# Heuristics should probably all move into tree.remove_smart or
1742
2083
to_transport.ensure_base()
1743
2084
except errors.NoSuchFile:
1744
2085
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
2086
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
2087
" does not exist."
1747
2088
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2089
" leading parent directories.")
1750
2091
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2094
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
2095
except errors.NotBranchError:
1755
2096
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2097
create_branch = controldir.ControlDir.create_branch_convenience
2099
force_new_tree = False
2101
force_new_tree = None
1757
2102
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
2103
possible_transports=[to_transport],
2104
force_new_tree=force_new_tree)
1759
2105
a_bzrdir = branch.bzrdir
1761
2107
from bzrlib.transport.local import LocalTransport
1837
2185
def run(self, location, format=None, no_trees=False):
1838
2186
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2187
format = controldir.format_registry.make_bzrdir('default')
1841
2189
if location is None:
1844
2192
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)
2194
(repo, newdir, require_stacking, repository_policy) = (
2195
format.initialize_on_transport_ex(to_transport,
2196
create_prefix=True, make_working_trees=not no_trees,
2197
shared_repo=True, force_new_repo=True,
2198
use_existing_dir=True,
2199
repo_format_name=format.repository_format.get_format_string()))
1850
2200
if not is_quiet():
1851
2201
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2202
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2205
class cmd_diff(Command):
1969
2336
elif ':' in prefix:
1970
2337
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2339
raise errors.BzrCommandError(gettext(
1973
2340
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2341
' (eg "old/:new/")'))
1976
2343
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2344
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2345
' one or two revision specifiers'))
1980
2347
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2348
raise errors.BzrCommandError(gettext(
2349
'{0} and {1} are mutually exclusive').format(
2350
'--using', '--format'))
1984
2352
(old_tree, new_tree,
1985
2353
old_branch, new_branch,
1986
2354
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2355
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2356
# GNU diff on Windows uses ANSI encoding for filenames
2357
path_encoding = osutils.get_diff_header_encoding()
1988
2358
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2359
specific_files=specific_files,
1990
2360
external_diff_options=diff_options,
1991
2361
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2362
extra_trees=extra_trees,
2363
path_encoding=path_encoding,
1993
2365
format_cls=format)
2053
2421
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2422
takes_options = ['directory', 'null']
2060
2424
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2425
def run(self, null=False, directory=u'.'):
2426
wt = WorkingTree.open_containing(directory)[0]
2427
self.add_cleanup(wt.lock_read().unlock)
2065
2428
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):
2429
self.add_cleanup(basis.lock_read().unlock)
2430
root_id = wt.get_root_id()
2431
for file_id in wt.all_file_ids():
2432
if basis.has_id(file_id):
2434
if root_id == file_id:
2436
path = wt.id2path(file_id)
2437
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2440
self.outf.write(path + '\0')
2297
2666
Option('show-diff',
2298
2667
short_name='p',
2299
2668
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2669
Option('include-merged',
2301
2670
help='Show merged revisions like --levels 0 does.'),
2671
Option('include-merges', hidden=True,
2672
help='Historical alias for --include-merged.'),
2673
Option('omit-merges',
2674
help='Do not report commits with more than one parent.'),
2302
2675
Option('exclude-common-ancestry',
2303
2676
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2677
' of both ancestries (require -rX..Y).'
2679
Option('signatures',
2680
help='Show digital signature validity.'),
2683
help='Show revisions whose properties match this '
2686
ListOption('match-message',
2687
help='Show revisions whose message matches this '
2690
ListOption('match-committer',
2691
help='Show revisions whose committer matches this '
2694
ListOption('match-author',
2695
help='Show revisions whose authors match this '
2698
ListOption('match-bugs',
2699
help='Show revisions whose bugs match this '
2307
2703
encoding_type = 'replace'
2327
2732
_get_info_for_log_files,
2329
2734
direction = (forward and 'forward') or 'reverse'
2735
if symbol_versioning.deprecated_passed(include_merges):
2736
ui.ui_factory.show_user_warning(
2737
'deprecated_command_option',
2738
deprecated_name='--include-merges',
2739
recommended_name='--include-merged',
2740
deprecated_in_version='2.5',
2741
command=self.invoked_as)
2742
if include_merged is None:
2743
include_merged = include_merges
2745
raise errors.BzrCommandError(gettext(
2746
'{0} and {1} are mutually exclusive').format(
2747
'--include-merges', '--include-merged'))
2748
if include_merged is None:
2749
include_merged = False
2330
2750
if (exclude_common_ancestry
2331
2751
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2752
raise errors.BzrCommandError(gettext(
2753
'--exclude-common-ancestry requires -r with two revisions'))
2335
2755
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2758
raise errors.BzrCommandError(gettext(
2759
'{0} and {1} are mutually exclusive').format(
2760
'--levels', '--include-merged'))
2341
2762
if change is not None:
2342
2763
if len(change) > 1:
2343
2764
raise errors.RangeInChangeOption()
2344
2765
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2766
raise errors.BzrCommandError(gettext(
2767
'{0} and {1} are mutually exclusive').format(
2768
'--revision', '--change'))
2348
2770
revision = change
2528
2968
help='Recurse into subdirectories.'),
2529
2969
Option('from-root',
2530
2970
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2971
Option('unknown', short_name='u',
2972
help='Print unknown files.'),
2532
2973
Option('versioned', help='Print versioned files.',
2533
2974
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.'),
2975
Option('ignored', short_name='i',
2976
help='Print ignored files.'),
2977
Option('kind', short_name='k',
2539
2978
help='List entries of a particular kind: file, directory, symlink.',
2543
2984
@display_command
2544
2985
def run(self, revision=None, verbose=False,
2545
2986
recursive=False, from_root=False,
2546
2987
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2988
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2990
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2991
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2993
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2994
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2995
all = not (unknown or versioned or ignored)
2556
2997
selection = {'I':ignored, '?':unknown, 'V':versioned}
2725
3176
self.outf.write("%s\n" % pattern)
2727
3178
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3179
raise errors.BzrCommandError(gettext("ignore requires at least one "
3180
"NAME_PATTERN or --default-rules."))
2730
3181
name_pattern_list = [globbing.normalize_pattern(p)
2731
3182
for p in name_pattern_list]
3184
bad_patterns_count = 0
3185
for p in name_pattern_list:
3186
if not globbing.Globster.is_pattern_valid(p):
3187
bad_patterns_count += 1
3188
bad_patterns += ('\n %s' % p)
3190
msg = (ngettext('Invalid ignore pattern found. %s',
3191
'Invalid ignore patterns found. %s',
3192
bad_patterns_count) % bad_patterns)
3193
ui.ui_factory.show_error(msg)
3194
raise errors.InvalidPattern('')
2732
3195
for name_pattern in name_pattern_list:
2733
3196
if (name_pattern[0] == '/' or
2734
3197
(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'.')
3198
raise errors.BzrCommandError(gettext(
3199
"NAME_PATTERN should not be an absolute path"))
3200
tree, relpath = WorkingTree.open_containing(directory)
2738
3201
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3202
ignored = globbing.Globster(name_pattern_list)
3204
self.add_cleanup(tree.lock_read().unlock)
2742
3205
for entry in tree.list_files():
2744
3207
if id is not None:
2745
3208
filename = entry[0]
2746
3209
if ignored.match(filename):
2747
3210
matches.append(filename)
2749
3211
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3212
self.outf.write(gettext("Warning: the following files are version "
3213
"controlled and match your ignore pattern:\n%s"
2752
3214
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3215
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3218
class cmd_ignored(Command):
2842
3306
Option('per-file-timestamps',
2843
3307
help='Set modification time of files to that of the last '
2844
3308
'revision in which it was changed.'),
3309
Option('uncommitted',
3310
help='Export the working tree contents rather than that of the '
2846
3313
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3314
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2848
3316
from bzrlib.export import export
2850
3318
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3319
branch_or_subdir = directory
3321
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3323
if tree is not None:
3324
self.add_cleanup(tree.lock_read().unlock)
3328
raise errors.BzrCommandError(
3329
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)
3332
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3334
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3335
per_file_timestamps=per_file_timestamps)
2862
3336
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3337
raise errors.BzrCommandError(
3338
gettext('Unsupported export format: %s') % e.format)
2866
3341
class cmd_cat(Command):
2900
3374
if tree is None:
2901
3375
tree = b.basis_tree()
2902
3376
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3377
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3379
old_file_id = rev_tree.path2id(relpath)
3381
# TODO: Split out this code to something that generically finds the
3382
# best id for a path across one or more trees; it's like
3383
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3385
if name_from_revision:
2909
3386
# Try in revision if requested
2910
3387
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3388
raise errors.BzrCommandError(gettext(
3389
"{0!r} is not present in revision {1}").format(
2913
3390
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3392
actual_file_id = old_file_id
2917
3394
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" % (
3395
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3396
actual_file_id = cur_file_id
3397
elif old_file_id is not None:
3398
actual_file_id = old_file_id
3400
raise errors.BzrCommandError(gettext(
3401
"{0!r} is not present in revision {1}").format(
2935
3402
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)
3404
from bzrlib.filter_tree import ContentFilterTree
3405
filter_tree = ContentFilterTree(rev_tree,
3406
rev_tree._content_filter_stack)
3407
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3409
content = rev_tree.get_file_text(actual_file_id)
3411
self.outf.write(content)
2952
3414
class cmd_local_time_offset(Command):
3013
3475
to trigger updates to external systems like bug trackers. The --fixes
3014
3476
option can be used to record the association between a revision and
3015
3477
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
3480
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3481
takes_args = ['selected*']
3076
3513
Option('show-diff', short_name='p',
3077
3514
help='When no message is supplied, show the diff along'
3078
3515
' with the status summary in the message editor.'),
3517
help='When committing to a foreign version control '
3518
'system do not push data that can not be natively '
3080
3521
aliases = ['ci', 'checkin']
3082
3523
def _iter_bug_fix_urls(self, fixes, branch):
3524
default_bugtracker = None
3083
3525
# Configure the properties for bug fixing attributes.
3084
3526
for fixed_bug in fixes:
3085
3527
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3528
if len(tokens) == 1:
3529
if default_bugtracker is None:
3530
branch_config = branch.get_config_stack()
3531
default_bugtracker = branch_config.get(
3533
if default_bugtracker is None:
3534
raise errors.BzrCommandError(gettext(
3535
"No tracker specified for bug %s. Use the form "
3536
"'tracker:id' or specify a default bug tracker "
3537
"using the `bugtracker` option.\nSee "
3538
"\"bzr help bugs\" for more information on this "
3539
"feature. Commit refused.") % fixed_bug)
3540
tag = default_bugtracker
3542
elif len(tokens) != 2:
3543
raise errors.BzrCommandError(gettext(
3088
3544
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3545
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3546
"feature.\nCommit refused.") % fixed_bug)
3548
tag, bug_id = tokens
3093
3550
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3551
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3552
raise errors.BzrCommandError(gettext(
3553
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3554
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3555
raise errors.BzrCommandError(gettext(
3556
"%s\nCommit refused.") % (str(e),))
3101
3558
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3559
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3560
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3562
from bzrlib.errors import (
3105
3563
PointlessCommit,
3106
3564
ConflictsInTree,
3184
3640
# make_commit_message_template_encoded returns user encoding.
3185
3641
# 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")
3643
my_message = set_commit_message(commit_obj)
3644
if my_message is None:
3645
start_message = generate_commit_message_template(commit_obj)
3646
my_message = edit_commit_message_encoded(text,
3647
start_message=start_message)
3648
if my_message is None:
3649
raise errors.BzrCommandError(gettext("please specify a commit"
3650
" message with either --message or --file"))
3651
if my_message == "":
3652
raise errors.BzrCommandError(gettext("Empty commit message specified."
3653
" Please specify a commit message with either"
3654
" --message or --file or leave a blank message"
3655
" with --message \"\"."))
3195
3656
return my_message
3197
3658
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3666
reporter=None, verbose=verbose, revprops=properties,
3206
3667
authors=author, timestamp=commit_stamp,
3207
3668
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3669
exclude=tree.safe_relpath_files(exclude),
3209
3671
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3672
raise errors.BzrCommandError(gettext("No changes to commit."
3673
" Please 'bzr add' the files you want to commit, or use"
3674
" --unchanged to force an empty commit."))
3212
3675
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3676
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3677
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3679
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3680
raise errors.BzrCommandError(gettext("Commit refused because there are"
3681
" unknown files in the working tree."))
3219
3682
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3683
e.extra_help = (gettext("\n"
3221
3684
'To commit to master branch, run update and then commit.\n'
3222
3685
'You can also pass --local to commit to continue working '
3297
3760
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.
3761
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3763
When the default format has changed after a major new release of
3764
Bazaar, you may be informed during certain operations that you
3765
should upgrade. Upgrading to a newer format may improve performance
3766
or make new features available. It may however limit interoperability
3767
with older repositories or with older versions of Bazaar.
3769
If you wish to upgrade to a particular format rather than the
3770
current default, that can be specified using the --format option.
3771
As a consequence, you can use the upgrade command this way to
3772
"downgrade" to an earlier format, though some conversions are
3773
a one way process (e.g. changing from the 1.x default to the
3774
2.x default) so downgrading is not always possible.
3776
A backup.bzr.~#~ directory is created at the start of the conversion
3777
process (where # is a number). By default, this is left there on
3778
completion. If the conversion fails, delete the new .bzr directory
3779
and rename this one back in its place. Use the --clean option to ask
3780
for the backup.bzr directory to be removed on successful conversion.
3781
Alternatively, you can delete it by hand if everything looks good
3784
If the location given is a shared repository, dependent branches
3785
are also converted provided the repository converts successfully.
3786
If the conversion of a branch fails, remaining branches are still
3789
For more information on upgrades, see the Bazaar Upgrade Guide,
3790
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3793
_see_also = ['check', 'reconcile', 'formats']
3306
3794
takes_args = ['url?']
3307
3795
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'),
3796
RegistryOption('format',
3797
help='Upgrade to a specific format. See "bzr help'
3798
' formats" for details.',
3799
lazy_registry=('bzrlib.controldir', 'format_registry'),
3800
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3801
value_switches=True, title='Branch format'),
3803
help='Remove the backup.bzr directory if successful.'),
3805
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3808
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3809
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3810
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3812
if len(exceptions) == 1:
3813
# Compatibility with historical behavior
3321
3819
class cmd_whoami(Command):
3340
3839
encoding_type = 'replace'
3342
3841
@display_command
3343
def run(self, email=False, branch=False, name=None):
3842
def run(self, email=False, branch=False, name=None, directory=None):
3344
3843
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()
3844
if directory is None:
3845
# use branch if we're inside one; otherwise global config
3847
c = Branch.open_containing(u'.')[0].get_config_stack()
3848
except errors.NotBranchError:
3849
c = _mod_config.GlobalStack()
3851
c = Branch.open(directory).get_config_stack()
3852
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3854
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3857
self.outf.write(identity + '\n')
3861
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3864
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3866
_mod_config.extract_email_address(name)
3359
3867
except errors.NoEmailInUsername, e:
3360
3868
warning('"%s" does not seem to contain an email address. '
3361
3869
'This is allowed, but not recommended.', name)
3363
3871
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3873
if directory is None:
3874
c = Branch.open_containing(u'.')[0].get_config_stack()
3876
b = Branch.open(directory)
3877
self.add_cleanup(b.lock_write().unlock)
3878
c = b.get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3880
c = _mod_config.GlobalStack()
3881
c.set('email', name)
3371
3884
class cmd_nick(Command):
3372
3885
__doc__ = """Print or set the branch nickname.
3374
If unset, the tree root directory name is used as the nickname.
3375
To print the current nickname, execute with no argument.
3887
If unset, the colocated branch name is used for colocated branches, and
3888
the branch directory name is used for other branches. To print the
3889
current nickname, execute with no argument.
3377
3891
Bound branches use the nickname of its master branch unless it is set
3586
4105
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4106
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4108
first=False, list_only=False,
3590
4109
randomize=None, exclude=None, strict=False,
3591
4110
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)
4111
parallel=None, lsprof_tests=False,
4114
# During selftest, disallow proxying, as it can cause severe
4115
# performance penalties and is only needed for thread
4116
# safety. The selftest command is assumed to not use threads
4117
# too heavily. The call should be as early as possible, as
4118
# error reporting for past duplicate imports won't have useful
4120
lazy_import.disallow_proxying()
4122
from bzrlib import tests
3602
4124
if testspecs_list is not None:
3603
4125
pattern = '|'.join(testspecs_list)
3608
4130
from bzrlib.tests import SubUnitBzrRunner
3609
4131
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4132
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4133
"needs to be installed to use --subunit."))
3612
4134
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
4135
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4136
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4137
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4138
# following code can be deleted when it's sufficiently deployed
4139
# -- vila/mgz 20100514
4140
if (sys.platform == "win32"
4141
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4143
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
4145
self.additional_selftest_args.setdefault(
3620
4146
'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)
4148
raise errors.BzrCommandError(gettext(
4149
"--benchmark is no longer supported from bzr 2.2; "
4150
"use bzr-usertest instead"))
4151
test_suite_factory = None
4153
exclude_pattern = None
3629
test_suite_factory = None
4155
exclude_pattern = '(' + '|'.join(exclude) + ')'
4157
self._disable_fsync()
3631
4158
selftest_kwargs = {"verbose": verbose,
3632
4159
"pattern": pattern,
3633
4160
"stop_on_failure": one,
3635
4162
"test_suite_factory": test_suite_factory,
3636
4163
"lsprof_timed": lsprof_timed,
3637
4164
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4165
"matching_tests_first": first,
3640
4166
"list_only": list_only,
3641
4167
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4168
"exclude_pattern": exclude_pattern,
3643
4169
"strict": strict,
3644
4170
"load_list": load_list,
3645
4171
"debug_flags": debugflag,
3646
4172
"starting_with": starting_with
3648
4174
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4176
# Make deprecation warnings visible, unless -Werror is set
4177
cleanup = symbol_versioning.activate_deprecation_warnings(
4180
result = tests.selftest(**selftest_kwargs)
3650
4183
return int(not result)
4185
def _disable_fsync(self):
4186
"""Change the 'os' functionality to not synchronize."""
4187
self._orig_fsync = getattr(os, 'fsync', None)
4188
if self._orig_fsync is not None:
4189
os.fsync = lambda filedes: None
4190
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4191
if self._orig_fdatasync is not None:
4192
os.fdatasync = lambda filedes: None
3653
4195
class cmd_version(Command):
3654
4196
__doc__ = """Show version of bzr."""
3709
4249
The source of the merge can be specified either in the form of a branch,
3710
4250
or in the form of a path to a file containing a merge directive generated
3711
4251
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.
4252
or the branch most recently merged using --remember. The source of the
4253
merge may also be specified in the form of a path to a file in another
4254
branch: in this case, only the modifications to that file are merged into
4255
the current working tree.
4257
When merging from a branch, by default bzr will try to merge in all new
4258
work from the other branch, automatically determining an appropriate base
4259
revision. If this fails, you may need to give an explicit base.
4261
To pick a different ending revision, pass "--revision OTHER". bzr will
4262
try to merge in all new work up to and including revision OTHER.
4264
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4265
through OTHER, excluding BASE but including OTHER, will be merged. If this
4266
causes some revisions to be skipped, i.e. if the destination branch does
4267
not already contain revision BASE, such a merge is commonly referred to as
4268
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4269
cherrypicks. The changes look like a normal commit, and the history of the
4270
changes from the other branch is not stored in the commit.
4272
Revision numbers are always relative to the source branch.
3725
4274
Merge will do its best to combine the changes in two branches, but there
3726
4275
are some kinds of problems only a human can fix. When it encounters those,
3727
4276
it will mark a conflict. A conflict means that you need to fix something,
3728
before you should commit.
4277
before you can commit.
3730
4279
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.
4281
If there is no default branch set, the first merge will set it (use
4282
--no-remember to avoid setting it). After that, you can omit the branch
4283
to use the default. To change the default, use --remember. The value will
4284
only be saved if the remote location can be accessed.
3737
4286
The results of the merge are placed into the destination working
3738
4287
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4288
committed to record the result of the merge.
3741
4290
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
4291
--force is given. If --force is given, then the changes from the source
4292
will be merged with the current working tree, including any uncommitted
4293
changes in the tree. The --force option can also be used to create a
3743
4294
merge revision which has more than two parents.
3745
4296
If one would like to merge changes from the working tree of the other
3873
4424
self.sanity_check_merger(merger)
3874
4425
if (merger.base_rev_id == merger.other_rev_id and
3875
4426
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4427
# check if location is a nonexistent file (and not a branch) to
4428
# disambiguate the 'Nothing to do'
4429
if merger.interesting_files:
4430
if not merger.other_tree.has_filename(
4431
merger.interesting_files[0]):
4432
note(gettext("merger: ") + str(merger))
4433
raise errors.PathsDoNotExist([location])
4434
note(gettext('Nothing to do.'))
4436
if pull and not preview:
3879
4437
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4438
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4439
if (merger.base_rev_id == tree.last_revision()):
3882
4440
result = tree.pull(merger.other_branch, False,
3883
4441
merger.other_rev_id)
3884
4442
result.report(self.outf)
3886
4444
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4445
raise errors.BzrCommandError(gettext(
3888
4446
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4447
" (perhaps you would prefer 'bzr pull')"))
3891
4449
return self._do_preview(merger)
3892
4450
elif interactive:
3988
4548
if other_revision_id is None:
3989
4549
other_revision_id = _mod_revision.ensure_null(
3990
4550
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):
4551
# Remember where we merge from. We need to remember if:
4552
# - user specify a location (and we don't merge from the parent
4554
# - user ask to remember or there is no previous location set to merge
4555
# from and user didn't ask to *not* remember
4556
if (user_location is not None
4558
or (remember is None
4559
and tree.branch.get_submit_branch() is None)))):
3994
4560
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4561
# Merge tags (but don't set them in the master branch yet, the user
4562
# might revert this merge). Commit will propagate them.
4563
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4564
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4565
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4566
if other_path != '':
4340
4911
theirs_only=False,
4341
4912
log_format=None, long=False, short=False, line=False,
4342
4913
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4914
include_merged=None, revision=None, my_revision=None,
4916
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4917
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4918
def message(s):
4346
4919
if not is_quiet():
4347
4920
self.outf.write(s)
4922
if symbol_versioning.deprecated_passed(include_merges):
4923
ui.ui_factory.show_user_warning(
4924
'deprecated_command_option',
4925
deprecated_name='--include-merges',
4926
recommended_name='--include-merged',
4927
deprecated_in_version='2.5',
4928
command=self.invoked_as)
4929
if include_merged is None:
4930
include_merged = include_merges
4932
raise errors.BzrCommandError(gettext(
4933
'{0} and {1} are mutually exclusive').format(
4934
'--include-merges', '--include-merged'))
4935
if include_merged is None:
4936
include_merged = False
4350
4938
mine_only = this
4430
5020
if mine_only and not local_extra:
4431
5021
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
5022
message(gettext('This branch has no new revisions.\n'))
4433
5023
elif theirs_only and not remote_extra:
4434
5024
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
5025
message(gettext('Other branch has no new revisions.\n'))
4436
5026
elif not (mine_only or theirs_only or local_extra or
4438
5028
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
5030
message(gettext("Branches are up to date.\n"))
4441
5031
self.cleanup_now()
4442
5032
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)
5033
self.add_cleanup(local_branch.lock_write().unlock)
4445
5034
# handle race conditions - a parent might be set while we run.
4446
5035
if local_branch.get_parent() is None:
4447
5036
local_branch.set_parent(remote_branch.base)
4578
5150
Option('long', help='Show commit date in annotations.'),
4582
5155
encoding_type = 'exact'
4584
5157
@display_command
4585
5158
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5159
show_ids=False, directory=None):
5160
from bzrlib.annotate import (
4588
5163
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5164
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5165
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5166
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5168
self.add_cleanup(branch.lock_read().unlock)
4596
5169
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5170
self.add_cleanup(tree.lock_read().unlock)
5171
if wt is not None and revision is None:
4600
5172
file_id = wt.path2id(relpath)
4602
5174
file_id = tree.path2id(relpath)
4603
5175
if file_id is None:
4604
5176
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5177
if wt is not None and revision is None:
4607
5178
# If there is a tree and we're not annotating historical
4608
5179
# versions, annotate the working tree's content.
4609
5180
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
5181
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5183
annotate_file_tree(tree, file_id, self.outf, long, all,
5184
show_ids=show_ids, branch=branch)
4616
5187
class cmd_re_sign(Command):
4620
5191
hidden = True # is this right ?
4621
5192
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5193
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5195
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5196
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')
5197
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5198
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)
5199
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5200
b = WorkingTree.open_containing(directory)[0].branch
5201
self.add_cleanup(b.lock_write().unlock)
4632
5202
return self._run(b, revision_id_list, revision)
4634
5204
def _run(self, b, revision_id_list, revision):
4635
5205
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5206
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5207
if revision_id_list is not None:
4638
5208
b.repository.start_write_group()
4694
5264
_see_also = ['checkouts', 'unbind']
4695
5265
takes_args = ['location?']
5266
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5268
def run(self, location=None, directory=u'.'):
5269
b, relpath = Branch.open_containing(directory)
4700
5270
if location is None:
4702
5272
location = b.get_old_bound_location()
4703
5273
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5274
raise errors.BzrCommandError(gettext('No location supplied. '
5275
'This format does not remember old locations.'))
4707
5277
if location is None:
4708
5278
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5279
raise errors.BzrCommandError(
5280
gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5282
raise errors.BzrCommandError(
5283
gettext('No location supplied'
5284
' and no previous location known'))
4713
5285
b_other = Branch.open(location)
4715
5287
b.bind(b_other)
4716
5288
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5289
raise errors.BzrCommandError(gettext('These branches have diverged.'
5290
' Try merging, and then bind again.'))
4719
5291
if b.get_config().has_explicit_nickname():
4720
5292
b.nick = b_other.nick
4784
5357
b = control.open_branch()
4786
5359
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5360
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)
5362
self.add_cleanup(b.lock_write().unlock)
5363
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5366
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5368
from bzrlib.log import log_formatter, show_log
4796
5369
from bzrlib.uncommit import uncommit
4827
5400
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5403
self.outf.write(gettext('Dry-run, pretending to remove'
5404
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5406
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')
5409
if not ui.ui_factory.confirm_action(
5410
gettext(u'Uncommit these revisions'),
5411
'bzrlib.builtins.uncommit',
5413
self.outf.write(gettext('Canceled\n'))
4840
5416
mutter('Uncommitting from {%s} to {%s}',
4841
5417
last_rev_id, rev_id)
4842
5418
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)
5419
revno=revno, local=local, keep_tags=keep_tags)
5420
self.outf.write(gettext('You can restore the old tip by running:\n'
5421
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5424
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5425
__doc__ = """Break a dead lock.
5427
This command breaks a lock on a repository, branch, working directory or
4851
5430
CAUTION: Locks should only be broken when you are sure that the process
4852
5431
holding the lock has been stopped.
4914
5509
'option leads to global uncontrolled write access to your '
5512
Option('client-timeout', type=float,
5513
help='Override the default idle client timeout (5min).'),
4919
def get_host_and_port(self, port):
4920
"""Return the host and port to run the smart server on.
4922
If 'port' is None, None will be returned for the host and port.
4924
If 'port' has a colon in it, the string before the colon will be
4925
interpreted as the host.
4927
:param port: A string of the port to run the server on.
4928
:return: A tuple of (host, port), where 'host' is a host name or IP,
4929
and port is an integer TCP/IP port.
4932
if port is not None:
4934
host, port = port.split(':')
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5516
def run(self, listen=None, port=None, inet=False, directory=None,
5517
allow_writes=False, protocol=None, client_timeout=None):
5518
from bzrlib import transport
4941
5519
if directory is None:
4942
5520
directory = os.getcwd()
4943
5521
if protocol is None:
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5522
protocol = transport.transport_server_registry.get()
5523
url = transport.location_to_url(directory)
4947
5524
if not allow_writes:
4948
5525
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5526
t = transport.get_transport_from_url(url)
5527
protocol(t, listen, port, inet, client_timeout)
4953
5530
class cmd_join(Command):
5081
5660
if submit_branch is None:
5082
5661
submit_branch = branch.get_parent()
5083
5662
if submit_branch is None:
5084
raise errors.BzrCommandError('No submit branch specified or known')
5663
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5086
5665
stored_public_branch = branch.get_public_branch()
5087
5666
if public_branch is None:
5088
5667
public_branch = stored_public_branch
5089
5668
elif stored_public_branch is None:
5669
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5090
5670
branch.set_public_branch(public_branch)
5091
5671
if not include_bundle and public_branch is None:
5092
raise errors.BzrCommandError('No public branch specified or'
5672
raise errors.BzrCommandError(gettext('No public branch specified or'
5094
5674
base_revision_id = None
5095
5675
if revision is not None:
5096
5676
if len(revision) > 2:
5097
raise errors.BzrCommandError('bzr merge-directive takes '
5098
'at most two one revision identifiers')
5677
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5678
'at most two one revision identifiers'))
5099
5679
revision_id = revision[-1].as_revision_id(branch)
5100
5680
if len(revision) == 2:
5101
5681
base_revision_id = revision[0].as_revision_id(branch)
5359
5942
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5943
self.add_cleanup(branch.lock_write().unlock)
5363
5945
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5946
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5947
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5948
note(gettext('Deleted tag %s.') % tag_name)
5369
5951
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5952
raise errors.BzrCommandError(gettext(
5371
5953
"Tags can only be placed on a single revision, "
5373
5955
revision_id = revision[0].as_revision_id(branch)
5375
5957
revision_id = branch.last_revision()
5376
5958
if tag_name is None:
5377
5959
tag_name = branch.automatic_tag_name(revision_id)
5378
5960
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):
5961
raise errors.BzrCommandError(gettext(
5962
"Please specify a tag name."))
5964
existing_target = branch.tags.lookup_tag(tag_name)
5965
except errors.NoSuchTag:
5966
existing_target = None
5967
if not force and existing_target not in (None, revision_id):
5382
5968
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5969
if existing_target == revision_id:
5970
note(gettext('Tag %s already exists for that revision.') % tag_name)
5972
branch.tags.set_tag(tag_name, revision_id)
5973
if existing_target is None:
5974
note(gettext('Created tag %s.') % tag_name)
5976
note(gettext('Updated tag %s.') % tag_name)
5387
5979
class cmd_tags(Command):
5393
5985
_see_also = ['tag']
5394
5986
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5987
custom_help('directory',
5988
help='Branch whose tags should be displayed.'),
5989
RegistryOption('sort',
5401
5990
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5991
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5997
@display_command
5998
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5999
from bzrlib.tag import tag_sort_methods
5416
6000
branch, relpath = Branch.open_containing(directory)
5418
6002
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
6006
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]])
6008
# Restrict to the specified range
6009
tags = self._tags_for_range(branch, revision)
6011
sort = tag_sort_methods.get()
5444
6013
if not show_ids:
5445
6014
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
6015
for index, (tag, revid) in enumerate(tags):
5457
6028
for tag, revspec in tags:
5458
6029
self.outf.write('%-20s %s\n' % (tag, revspec))
6031
def _tags_for_range(self, branch, revision):
6033
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6034
revid1, revid2 = rev1.rev_id, rev2.rev_id
6035
# _get_revision_range will always set revid2 if it's not specified.
6036
# If revid1 is None, it means we want to start from the branch
6037
# origin which is always a valid ancestor. If revid1 == revid2, the
6038
# ancestry check is useless.
6039
if revid1 and revid1 != revid2:
6040
# FIXME: We really want to use the same graph than
6041
# branch.iter_merge_sorted_revisions below, but this is not
6042
# easily available -- vila 2011-09-23
6043
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6044
# We don't want to output anything in this case...
6046
# only show revisions between revid1 and revid2 (inclusive)
6047
tagged_revids = branch.tags.get_reverse_tag_dict()
6049
for r in branch.iter_merge_sorted_revisions(
6050
start_revision_id=revid2, stop_revision_id=revid1,
6051
stop_rule='include'):
6052
revid_tags = tagged_revids.get(r[0], None)
6054
found.extend([(tag, r[0]) for tag in revid_tags])
5461
6058
class cmd_reconfigure(Command):
5462
6059
__doc__ = """Reconfigure the type of a bzr directory.
5476
6073
takes_args = ['location?']
5477
6074
takes_options = [
5478
6075
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6078
help='The relation between branch and tree.',
5482
6079
value_switches=True, enum_switch=False,
5483
6080
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6081
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6082
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6083
lightweight_checkout='Reconfigure to be a lightweight'
5487
6084
' checkout (with no local history).',
6086
RegistryOption.from_kwargs(
6088
title='Repository type',
6089
help='Location fo the repository.',
6090
value_switches=True, enum_switch=False,
5488
6091
standalone='Reconfigure to be a standalone branch '
5489
6092
'(i.e. stop using shared repository).',
5490
6093
use_shared='Reconfigure to use a shared repository.',
6095
RegistryOption.from_kwargs(
6097
title='Trees in Repository',
6098
help='Whether new branches in the repository have trees.',
6099
value_switches=True, enum_switch=False,
5491
6100
with_trees='Reconfigure repository to create '
5492
6101
'working trees on branches by default.',
5493
6102
with_no_trees='Reconfigure repository to not create '
5520
6129
# At the moment you can use --stacked-on and a different
5521
6130
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6132
if (tree_type is None and
6133
repository_type is None and
6134
repository_trees is None):
5524
6135
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6138
raise errors.BzrCommandError(gettext('No target configuration '
6140
reconfiguration = None
6141
if tree_type == 'branch':
5530
6142
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6143
elif tree_type == 'tree':
5532
6144
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6145
elif tree_type == 'checkout':
5534
6146
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6147
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6148
elif tree_type == 'lightweight-checkout':
5537
6149
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6150
directory, bind_to)
5539
elif target_type == 'use-shared':
6152
reconfiguration.apply(force)
6153
reconfiguration = None
6154
if repository_type == 'use-shared':
5540
6155
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6156
elif repository_type == 'standalone':
5542
6157
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6159
reconfiguration.apply(force)
6160
reconfiguration = None
6161
if repository_trees == 'with-trees':
5544
6162
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6163
directory, True)
5546
elif target_type == 'with-no-trees':
6164
elif repository_trees == 'with-no-trees':
5547
6165
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6166
directory, False)
5549
reconfiguration.apply(force)
6168
reconfiguration.apply(force)
6169
reconfiguration = None
5552
6172
class cmd_switch(Command):
5584
6205
def run(self, to_location=None, force=False, create_branch=False,
6206
revision=None, directory=u'.'):
5586
6207
from bzrlib import switch
6208
tree_location = directory
5588
6209
revision = _get_one_revision('switch', revision)
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6210
possible_transports = []
6211
control_dir = controldir.ControlDir.open_containing(tree_location,
6212
possible_transports=possible_transports)[0]
5590
6213
if to_location is None:
5591
6214
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6215
raise errors.BzrCommandError(gettext('You must supply either a'
6216
' revision or a location'))
6217
to_location = tree_location
5596
branch = control_dir.open_branch()
6219
branch = control_dir.open_branch(
6220
possible_transports=possible_transports)
5597
6221
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
6222
except errors.NotBranchError:
5600
6224
had_explicit_nick = False
5601
6225
if create_branch:
5602
6226
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)
6227
raise errors.BzrCommandError(
6228
gettext('cannot create branch without source branch'))
6229
to_location = lookup_new_sibling_branch(control_dir, to_location,
6230
possible_transports=possible_transports)
5611
6231
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6232
possible_transports=possible_transports,
6233
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
6236
to_branch = Branch.open(to_location,
6237
possible_transports=possible_transports)
5617
6238
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6239
to_branch = open_sibling_branch(control_dir, to_location,
6240
possible_transports=possible_transports)
5621
6241
if revision is not None:
5622
6242
revision = revision.as_revision_id(to_branch)
5623
6243
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
6244
if had_explicit_nick:
5625
6245
branch = control_dir.open_branch() #get the new branch!
5626
6246
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6247
note(gettext('Switched to branch: %s'),
5628
6248
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
6252
class cmd_view(Command):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6339
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6341
current_view, view_dict = tree.views.get_view_info()
5737
6342
if name is None:
5738
6343
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6346
raise errors.BzrCommandError(gettext(
6347
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6349
raise errors.BzrCommandError(gettext(
6350
"Both --delete and --switch specified"))
5747
6352
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6353
self.outf.write(gettext("Deleted all views.\n"))
5749
6354
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6355
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6357
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6358
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6361
raise errors.BzrCommandError(gettext(
6362
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6364
raise errors.BzrCommandError(gettext(
6365
"Both --switch and --all specified"))
5761
6366
elif switch == 'off':
5762
6367
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6368
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6369
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6370
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6372
tree.views.set_view_info(switch, view_dict)
5768
6373
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6374
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6377
self.outf.write(gettext('Views defined:\n'))
5773
6378
for view in sorted(view_dict):
5774
6379
if view == current_view:
5778
6383
view_str = views.view_display_str(view_dict[view])
5779
6384
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6386
self.outf.write(gettext('No views defined.\n'))
5782
6387
elif file_list:
5783
6388
if name is None:
5784
6389
# No name given and no current view set
5786
6391
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6392
raise errors.BzrCommandError(gettext(
6393
"Cannot change the 'off' pseudo view"))
5789
6394
tree.views.set_view(name, sorted(file_list))
5790
6395
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6396
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6398
# list the files
5794
6399
if name is None:
5795
6400
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6401
self.outf.write(gettext('No current view.\n'))
5798
6403
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6404
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6407
class cmd_hooks(Command):
5836
6441
takes_args = ["location?"]
6443
takes_options = ['directory',
6444
Option('force', help='Remove branch even if it is the active branch.')]
5838
6446
aliases = ["rmbranch"]
5840
def run(self, location=None):
5841
if location is None:
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
6448
def run(self, directory=None, location=None, force=False):
6449
br = open_nearby_branch(near=directory, location=location)
6450
if not force and br.bzrdir.has_workingtree():
6452
active_branch = br.bzrdir.open_branch(name="")
6453
except errors.NotBranchError:
6454
active_branch = None
6455
if (active_branch is not None and
6456
br.control_url == active_branch.control_url):
6457
raise errors.BzrCommandError(
6458
gettext("Branch is active. Use --force to remove it."))
6459
br.bzrdir.destroy_branch(br.name)
5847
6462
class cmd_shelve(Command):
5848
6463
__doc__ = """Temporarily set aside some changes from the current tree.
5883
6511
Option('destroy',
5884
6512
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6514
_see_also = ['unshelve', 'configuration']
5888
6516
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6517
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6519
return self.run_for_list(directory=directory)
5892
6520
from bzrlib.shelf_ui import Shelver
5893
6521
if writer is None:
5894
6522
writer = bzrlib.option.diff_writer_registry.get()
5896
6524
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6525
file_list, message, destroy=destroy, directory=directory)
6032
6663
self.outf.write('%s %s\n' % (path, location))
6666
class cmd_export_pot(Command):
6667
__doc__ = """Export command helps and error messages in po format."""
6670
takes_options = [Option('plugin',
6671
help='Export help text from named command '\
6672
'(defaults to all built in commands).',
6674
Option('include-duplicates',
6675
help='Output multiple copies of the same msgid '
6676
'string if it appears more than once.'),
6679
def run(self, plugin=None, include_duplicates=False):
6680
from bzrlib.export_pot import export_pot
6681
export_pot(self.outf, plugin, include_duplicates)
6035
6684
def _register_lazy_builtins():
6036
6685
# register lazy builtins from other modules; called at startup and should
6037
6686
# be only called once.
6038
6687
for (name, aliases, module_name) in [
6039
6688
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6689
('cmd_config', [], 'bzrlib.config'),
6040
6690
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6691
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6692
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6693
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6694
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6695
('cmd_verify_signatures', [], 'bzrlib.commit_signature_commands'),
6696
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6698
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
