78
73
_parse_revision_str,
80
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
86
def _get_branch_location(control_dir, possible_transports=None):
87
"""Return location of branch for this control dir."""
89
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("/")
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]))
223
88
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)
288
223
def _get_view_info_for_change_reporter(tree):
289
224
"""Get the view information from a tree for change reporting."""
436
353
self.outf.write(revtext.decode('utf-8'))
439
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
440
357
if revision_id is not None and revision is not None:
441
raise errors.BzrCommandError(gettext('You can only supply one of'
442
' revision_id or --revision'))
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
443
360
if revision_id is None and revision is None:
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]
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
449
365
revisions = b.repository.revisions
450
366
if revisions is None:
451
raise errors.BzrCommandError(gettext('Repository %r does not support '
452
'access to raw revision texts'))
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
454
370
b.repository.lock_read()
578
491
location_list=['.']
580
493
for location in location_list:
581
d = controldir.ControlDir.open(location)
494
d = bzrdir.BzrDir.open(location)
584
497
working = d.open_workingtree()
585
498
except errors.NoWorkingTree:
586
raise errors.BzrCommandError(gettext("No working tree to remove"))
499
raise errors.BzrCommandError("No working tree to remove")
587
500
except errors.NotLocalUrl:
588
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
589
" of a remote path"))
501
raise errors.BzrCommandError("You cannot remove the working tree"
591
504
if (working.has_changes()):
592
505
raise errors.UncommittedChanges(working)
593
if working.get_shelf_manager().last_shelf() is not None:
594
raise errors.ShelvedChanges(working)
596
507
if working.user_url != working.branch.user_url:
597
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
598
" from a lightweight checkout"))
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
600
511
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))
655
514
class cmd_revno(Command):
656
515
__doc__ = """Show current revision number.
661
520
_see_also = ['info']
662
521
takes_args = ['location?']
663
522
takes_options = [
664
Option('tree', help='Show revno of working tree.'),
523
Option('tree', help='Show revno of working tree'),
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"))
527
def run(self, tree=False, location=u'.'):
676
530
wt = WorkingTree.open_containing(location)[0]
677
self.add_cleanup(wt.lock_read().unlock)
678
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
679
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
681
535
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
683
542
b = Branch.open_containing(location)[0]
684
self.add_cleanup(b.lock_read().unlock)
686
if len(revision) != 1:
687
raise errors.BzrCommandError(gettext(
688
"Revision numbers only make sense for single "
689
"revisions, not ranges"))
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)
544
self.add_cleanup(b.unlock)
698
546
self.cleanup_now()
699
self.outf.write(revno + '\n')
547
self.outf.write(str(revno) + '\n')
702
550
class cmd_revision_info(Command):
859
704
takes_args = ['dir+']
863
help='No error if existing, make parent directories as needed.',
867
705
encoding_type = 'replace'
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:
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)
895
add_file(wt, relpath)
897
self.outf.write(gettext('added %s\n') % dir)
717
raise errors.NotVersionedError(path=base)
900
720
class cmd_relpath(Command):
937
757
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
938
758
if kind and kind not in ['file', 'directory', 'symlink']:
939
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
941
761
revision = _get_one_revision('inventory', revision)
942
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
943
self.add_cleanup(work_tree.lock_read().unlock)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
944
765
if revision is not None:
945
766
tree = revision.as_tree(work_tree.branch)
947
768
extra_trees = [work_tree]
948
self.add_cleanup(tree.lock_read().unlock)
770
self.add_cleanup(tree.unlock)
953
self.add_cleanup(tree.lock_read().unlock)
954
775
if file_list is not None:
955
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
956
777
require_versioned=True)
957
778
# find_ids_across_trees may include some paths that don't
958
779
# exist in 'tree'.
959
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
961
entries = tree.iter_entries_by_dir()
783
entries = tree.inventory.entries()
963
for path, entry in sorted(entries):
786
for path, entry in entries:
964
787
if kind and kind != entry.kind:
969
790
self.outf.write('%-50s %s\n' % (path, entry.file_id))
1007
828
return self.run_auto(names_list, after, dry_run)
1009
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
830
raise errors.BzrCommandError('--dry-run requires --auto.')
1010
831
if names_list is None:
1012
833
if len(names_list) < 2:
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)
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)
1019
838
self._run(tree, names_list, rel_names, after)
1021
840
def run_auto(self, names_list, after, dry_run):
1022
841
if names_list is not None and len(names_list) > 1:
1023
raise errors.BzrCommandError(gettext('Only one path may be specified to'
842
raise errors.BzrCommandError('Only one path may be specified to'
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)
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
1031
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
1033
852
def _run(self, tree, names_list, rel_names, after):
1144
960
takes_options = ['remember', 'overwrite', 'revision',
1145
961
custom_help('verbose',
1146
962
help='Show logs of pulled revisions.'),
1147
custom_help('directory',
1148
964
help='Branch to pull into, '
1149
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
1151
970
help="Perform a local pull in a bound "
1152
971
"branch. Local pulls are not applied to "
1153
972
"the master branch."
1156
help="Show base revision text in conflicts."),
1157
Option('overwrite-tags',
1158
help="Overwrite tags only."),
1160
975
takes_args = ['location?']
1161
976
encoding_type = 'replace'
1163
def run(self, location=None, remember=None, overwrite=False,
978
def run(self, location=None, remember=False, overwrite=False,
1164
979
revision=None, verbose=False,
1165
directory=None, local=False,
1166
show_base=False, overwrite_tags=False):
1169
overwrite = ["history", "tags"]
1170
elif overwrite_tags:
1171
overwrite = ["tags"]
980
directory=None, local=False):
1174
981
# FIXME: too much stuff is in the command class
1175
982
revision_id = None
1176
983
mergeable = None
1310
1110
Option('strict',
1311
1111
help='Refuse to push if there are uncommitted changes in'
1312
1112
' the working tree, --no-strict disables the check.'),
1314
help="Don't populate the working tree, even for protocols"
1315
" that support it."),
1316
Option('overwrite-tags',
1317
help="Overwrite tags only."),
1319
1114
takes_args = ['location?']
1320
1115
encoding_type = 'replace'
1322
def run(self, location=None, remember=None, overwrite=False,
1117
def run(self, location=None, remember=False, overwrite=False,
1323
1118
create_prefix=False, verbose=False, revision=None,
1324
1119
use_existing_dir=False, directory=None, stacked_on=None,
1325
stacked=False, strict=None, no_tree=False,
1326
overwrite_tags=False):
1120
stacked=False, strict=None):
1327
1121
from bzrlib.push import _show_push_branch
1330
overwrite = ["history", "tags"]
1331
elif overwrite_tags:
1332
overwrite = ["tags"]
1336
1123
if directory is None:
1337
1124
directory = '.'
1338
1125
# Get the source branch
1339
1126
(tree, br_from,
1340
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1341
1128
# Get the tip's revision_id
1342
1129
revision = _get_one_revision('push', revision)
1343
1130
if revision is not None:
1364
1151
# error by the feedback given to them. RBC 20080227.
1365
1152
stacked_on = parent_url
1366
1153
if not stacked_on:
1367
raise errors.BzrCommandError(gettext(
1368
"Could not determine branch to refer to."))
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1370
1157
# Get the destination location
1371
1158
if location is None:
1372
1159
stored_loc = br_from.get_push_location()
1373
1160
if stored_loc is None:
1374
parent_loc = br_from.get_parent()
1376
raise errors.BzrCommandError(gettext(
1377
"No push location known or specified. To push to the "
1378
"parent branch (at %s), use 'bzr push :parent'." %
1379
urlutils.unescape_for_display(parent_loc,
1380
self.outf.encoding)))
1382
raise errors.BzrCommandError(gettext(
1383
"No push location known or specified."))
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1385
1164
display_url = urlutils.unescape_for_display(stored_loc,
1386
1165
self.outf.encoding)
1387
note(gettext("Using saved push location: %s") % display_url)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1388
1167
location = stored_loc
1390
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1391
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1392
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1393
use_existing_dir=use_existing_dir, no_tree=no_tree)
1172
use_existing_dir=use_existing_dir)
1396
1175
class cmd_branch(Command):
1439
1214
def run(self, from_location, to_location=None, revision=None,
1440
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1441
use_existing_dir=False, switch=False, bind=False,
1216
use_existing_dir=False, switch=False, bind=False):
1443
1217
from bzrlib import switch as _mod_switch
1444
1218
from bzrlib.tag import _merge_tags_if_possible
1445
if self.invoked_as in ['get', 'clone']:
1446
ui.ui_factory.show_user_warning(
1447
'deprecated_command',
1448
deprecated_name=self.invoked_as,
1449
recommended_name='branch',
1450
deprecated_in_version='2.4')
1451
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1453
if not (hardlink or files_from):
1454
# accelerator_tree is usually slower because you have to read N
1455
# files (no readahead, lots of seeks, etc), but allow the user to
1456
# explicitly request it
1457
accelerator_tree = None
1458
if files_from is not None and files_from != from_location:
1459
accelerator_tree = WorkingTree.open(files_from)
1460
1221
revision = _get_one_revision('branch', revision)
1461
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1462
1224
if revision is not None:
1463
1225
revision_id = revision.as_revision_id(br_from)
1468
1230
revision_id = br_from.last_revision()
1469
1231
if to_location is None:
1470
to_location = getattr(br_from, "name", None)
1472
to_location = urlutils.derive_to_location(from_location)
1232
to_location = urlutils.derive_to_location(from_location)
1473
1233
to_transport = transport.get_transport(to_location)
1475
1235
to_transport.mkdir('.')
1476
1236
except errors.FileExists:
1478
to_dir = controldir.ControlDir.open_from_transport(
1480
except errors.NotBranchError:
1481
if not use_existing_dir:
1482
raise errors.BzrCommandError(gettext('Target directory "%s" '
1483
'already exists.') % to_location)
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1488
to_dir.open_branch()
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1489
1243
except errors.NotBranchError:
1492
1246
raise errors.AlreadyBranchError(to_location)
1493
1247
except errors.NoSuchFile:
1494
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1500
# preserve whatever source format we have.
1501
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1502
possible_transports=[to_transport],
1503
accelerator_tree=accelerator_tree,
1504
hardlink=hardlink, stacked=stacked,
1505
force_new_repo=standalone,
1506
create_tree_if_local=not no_tree,
1507
source_branch=br_from)
1508
branch = to_dir.open_branch(
1509
possible_transports=[
1510
br_from.bzrdir.root_transport, to_transport])
1511
except errors.NoSuchRevision:
1512
to_transport.delete_tree('.')
1513
msg = gettext("The branch {0} has no revision {1}.").format(
1514
from_location, revision)
1515
raise errors.BzrCommandError(msg)
1518
to_repo = to_dir.open_repository()
1519
except errors.NoRepositoryPresent:
1520
to_repo = to_dir.create_repository()
1521
to_repo.fetch(br_from.repository, revision_id=revision_id)
1522
branch = br_from.sprout(to_dir, revision_id=revision_id)
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1523
1265
_merge_tags_if_possible(br_from, branch)
1524
1266
# If the source branch is stacked, the new branch may
1525
1267
# be stacked whether we asked for that explicitly or not.
1526
1268
# We therefore need a try/except here and not just 'if stacked:'
1528
note(gettext('Created new stacked branch referring to %s.') %
1270
note('Created new stacked branch referring to %s.' %
1529
1271
branch.get_stacked_on_url())
1530
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1531
1273
errors.UnstackableRepositoryFormat), e:
1532
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1274
note('Branched %d revision(s).' % branch.revno())
1534
1276
# Bind to the parent
1535
1277
parent_branch = Branch.open(from_location)
1536
1278
branch.bind(parent_branch)
1537
note(gettext('New branch bound to %s') % from_location)
1279
note('New branch bound to %s' % from_location)
1539
1281
# Switch to the new branch
1540
1282
wt, _ = WorkingTree.open_containing('.')
1541
1283
_mod_switch.switch(wt.bzrdir, branch)
1542
note(gettext('Switched to branch: %s'),
1284
note('Switched to branch: %s',
1543
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1546
class cmd_branches(Command):
1547
__doc__ = """List the branches available at the current location.
1549
This command will print the names of all the branches at the current
1553
takes_args = ['location?']
1555
Option('recursive', short_name='R',
1556
help='Recursively scan for branches rather than '
1557
'just looking in the specified location.')]
1559
def run(self, location=".", recursive=False):
1561
t = transport.get_transport(location)
1562
if not t.listable():
1563
raise errors.BzrCommandError(
1564
"Can't scan this type of location.")
1565
for b in controldir.ControlDir.find_branches(t):
1566
self.outf.write("%s\n" % urlutils.unescape_for_display(
1567
urlutils.relative_url(t.base, b.base),
1568
self.outf.encoding).rstrip("/"))
1570
dir = controldir.ControlDir.open_containing(location)[0]
1572
active_branch = dir.open_branch(name="")
1573
except errors.NotBranchError:
1574
active_branch = None
1576
for name, branch in iter_sibling_branches(dir):
1579
active = (active_branch is not None and
1580
active_branch.base == branch.base)
1581
names[name] = active
1582
# Only mention the current branch explicitly if it's not
1583
# one of the colocated branches
1584
if not any(names.values()) and active_branch is not None:
1585
self.outf.write("* %s\n" % gettext("(default)"))
1586
for name in sorted(names.keys()):
1587
active = names[name]
1592
self.outf.write("%s %s\n" % (
1593
prefix, name.encode(self.outf.encoding)))
1596
1288
class cmd_checkout(Command):
1597
1289
__doc__ = """Create a new checkout of an existing branch.
1698
1389
class cmd_update(Command):
1699
__doc__ = """Update a working tree to a new revision.
1701
This will perform a merge of the destination revision (the tip of the
1702
branch, or the specified revision) into the working tree, and then make
1703
that revision the basis revision for the working tree.
1705
You can use this to visit an older revision, or to update a working tree
1706
that is out of date from its branch.
1708
If there are any uncommitted changes in the tree, they will be carried
1709
across and remain as uncommitted changes after the update. To discard
1710
these changes, use 'bzr revert'. The uncommitted changes may conflict
1711
with the changes brought in by the change in basis revision.
1713
If the tree's branch is bound to a master branch, bzr will also update
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1714
1400
the branch from the master.
1716
You cannot update just a single file or directory, because each Bazaar
1717
working tree has just a single basis revision. If you want to restore a
1718
file that has been removed locally, use 'bzr revert' instead of 'bzr
1719
update'. If you want to restore a file to its state in a previous
1720
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1721
out the old content of that file to a new location.
1723
The 'dir' argument, if given, must be the location of the root of a
1724
working tree to update. By default, the working tree that contains the
1725
current working directory is used.
1728
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1729
1404
takes_args = ['dir?']
1730
takes_options = ['revision',
1732
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1734
1406
aliases = ['up']
1736
def run(self, dir=None, revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1737
1409
if revision is not None and len(revision) != 1:
1738
raise errors.BzrCommandError(gettext(
1739
"bzr update --revision takes exactly one revision"))
1741
tree = WorkingTree.open_containing('.')[0]
1743
tree, relpath = WorkingTree.open_containing(dir)
1746
raise errors.BzrCommandError(gettext(
1747
"bzr update can only update a whole tree, "
1748
"not a file or subdirectory"))
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1749
1413
branch = tree.branch
1750
1414
possible_transports = []
1751
1415
master = branch.get_master_branch(
1752
1416
possible_transports=possible_transports)
1753
1417
if master is not None:
1754
1419
branch_location = master.base
1421
tree.lock_tree_write()
1757
1422
branch_location = tree.branch.base
1758
tree.lock_tree_write()
1759
1423
self.add_cleanup(tree.unlock)
1760
1424
# get rid of the final '/' and be ready for display
1761
1425
branch_location = urlutils.unescape_for_display(
1787
1451
change_reporter,
1788
1452
possible_transports=possible_transports,
1789
1453
revision=revision_id,
1791
show_base=show_base)
1792
1455
except errors.NoSuchRevision, e:
1793
raise errors.BzrCommandError(gettext(
1456
raise errors.BzrCommandError(
1794
1457
"branch has no revision %s\n"
1795
1458
"bzr update --revision only works"
1796
" for a revision in the branch history")
1459
" for a revision in the branch history"
1797
1460
% (e.revision))
1798
1461
revno = tree.branch.revision_id_to_dotted_revno(
1799
1462
_mod_revision.ensure_null(tree.last_revision()))
1800
note(gettext('Updated to revision {0} of branch {1}').format(
1801
'.'.join(map(str, revno)), branch_location))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1802
1465
parent_ids = tree.get_parent_ids()
1803
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1804
note(gettext('Your local commits will now show as pending merges with '
1805
"'bzr status', and can be committed with 'bzr commit'."))
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1806
1469
if conflicts != 0:
1868
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1869
1531
'The file deletion mode to be used.',
1870
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1871
safe='Backup changed files (default).',
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1872
1535
keep='Delete from bzr but leave the working copy.',
1873
no_backup='Don\'t backup changed files.'),
1536
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1875
1538
aliases = ['rm', 'del']
1876
1539
encoding_type = 'replace'
1878
1541
def run(self, file_list, verbose=False, new=False,
1879
1542
file_deletion_strategy='safe'):
1881
tree, file_list = WorkingTree.open_containing_paths(file_list)
1543
tree, file_list = tree_files(file_list)
1883
1545
if file_list is not None:
1884
1546
file_list = [f for f in file_list]
1886
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1887
1550
# Heuristics should probably all move into tree.remove_smart or
2095
1742
to_transport.ensure_base()
2096
1743
except errors.NoSuchFile:
2097
1744
if not create_prefix:
2098
raise errors.BzrCommandError(gettext("Parent directory of %s"
1745
raise errors.BzrCommandError("Parent directory of %s"
2099
1746
" does not exist."
2100
1747
"\nYou may supply --create-prefix to create all"
2101
" leading parent directories.")
1748
" leading parent directories."
2103
1750
to_transport.create_prefix()
2106
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2107
1754
except errors.NotBranchError:
2108
1755
# really a NotBzrDir error...
2109
create_branch = controldir.ControlDir.create_branch_convenience
2111
force_new_tree = False
2113
force_new_tree = None
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2114
1757
branch = create_branch(to_transport.base, format=format,
2115
possible_transports=[to_transport],
2116
force_new_tree=force_new_tree)
1758
possible_transports=[to_transport])
2117
1759
a_bzrdir = branch.bzrdir
2119
1761
from bzrlib.transport.local import LocalTransport
2197
1837
def run(self, location, format=None, no_trees=False):
2198
1838
if format is None:
2199
format = controldir.format_registry.make_bzrdir('default')
1839
format = bzrdir.format_registry.make_bzrdir('default')
2201
1841
if location is None:
2204
1844
to_transport = transport.get_transport(location)
1845
to_transport.ensure_base()
2206
(repo, newdir, require_stacking, repository_policy) = (
2207
format.initialize_on_transport_ex(to_transport,
2208
create_prefix=True, make_working_trees=not no_trees,
2209
shared_repo=True, force_new_repo=True,
2210
use_existing_dir=True,
2211
repo_format_name=format.repository_format.get_format_string()))
1847
newdir = format.initialize_on_transport(to_transport)
1848
repo = newdir.create_repository(shared=True)
1849
repo.set_make_working_trees(not no_trees)
2212
1850
if not is_quiet():
2213
1851
from bzrlib.info import show_bzrdir_info
2214
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2217
1855
class cmd_diff(Command):
2353
1969
elif ':' in prefix:
2354
1970
old_label, new_label = prefix.split(":")
2356
raise errors.BzrCommandError(gettext(
1972
raise errors.BzrCommandError(
2357
1973
'--prefix expects two values separated by a colon'
2358
' (eg "old/:new/")'))
1974
' (eg "old/:new/")')
2360
1976
if revision and len(revision) > 2:
2361
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2362
' one or two revision specifiers'))
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2364
1980
if using is not None and format is not None:
2365
raise errors.BzrCommandError(gettext(
2366
'{0} and {1} are mutually exclusive').format(
2367
'--using', '--format'))
1981
raise errors.BzrCommandError('--using and --format are mutually '
2369
1984
(old_tree, new_tree,
2370
1985
old_branch, new_branch,
2371
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2372
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2373
# GNU diff on Windows uses ANSI encoding for filenames
2374
path_encoding = osutils.get_diff_header_encoding()
2375
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2376
1989
specific_files=specific_files,
2377
1990
external_diff_options=diff_options,
2378
1991
old_label=old_label, new_label=new_label,
2379
extra_trees=extra_trees,
2380
path_encoding=path_encoding,
2381
using=using, context=context,
1992
extra_trees=extra_trees, using=using,
2382
1993
format_cls=format)
2438
2053
_see_also = ['status', 'ls']
2439
takes_options = ['directory', 'null']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2441
2060
@display_command
2442
def run(self, null=False, directory=u'.'):
2443
wt = WorkingTree.open_containing(directory)[0]
2444
self.add_cleanup(wt.lock_read().unlock)
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2445
2065
basis = wt.basis_tree()
2446
self.add_cleanup(basis.lock_read().unlock)
2447
root_id = wt.get_root_id()
2448
for file_id in wt.all_file_ids():
2449
if basis.has_id(file_id):
2451
if root_id == file_id:
2453
path = wt.id2path(file_id)
2454
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
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):
2457
2079
self.outf.write(path + '\0')
2683
2297
Option('show-diff',
2684
2298
short_name='p',
2685
2299
help='Show changes made in each revision as a patch.'),
2686
Option('include-merged',
2300
Option('include-merges',
2687
2301
help='Show merged revisions like --levels 0 does.'),
2688
Option('include-merges', hidden=True,
2689
help='Historical alias for --include-merged.'),
2690
Option('omit-merges',
2691
help='Do not report commits with more than one parent.'),
2692
2302
Option('exclude-common-ancestry',
2693
2303
help='Display only the revisions that are not part'
2694
' of both ancestries (require -rX..Y).'
2696
Option('signatures',
2697
help='Show digital signature validity.'),
2700
help='Show revisions whose properties match this '
2703
ListOption('match-message',
2704
help='Show revisions whose message matches this '
2707
ListOption('match-committer',
2708
help='Show revisions whose committer matches this '
2711
ListOption('match-author',
2712
help='Show revisions whose authors match this '
2715
ListOption('match-bugs',
2716
help='Show revisions whose bugs match this '
2304
' of both ancestries (require -rX..Y)'
2720
2307
encoding_type = 'replace'
2749
2327
_get_info_for_log_files,
2751
2329
direction = (forward and 'forward') or 'reverse'
2752
if symbol_versioning.deprecated_passed(include_merges):
2753
ui.ui_factory.show_user_warning(
2754
'deprecated_command_option',
2755
deprecated_name='--include-merges',
2756
recommended_name='--include-merged',
2757
deprecated_in_version='2.5',
2758
command=self.invoked_as)
2759
if include_merged is None:
2760
include_merged = include_merges
2762
raise errors.BzrCommandError(gettext(
2763
'{0} and {1} are mutually exclusive').format(
2764
'--include-merges', '--include-merged'))
2765
if include_merged is None:
2766
include_merged = False
2767
2330
if (exclude_common_ancestry
2768
2331
and (revision is None or len(revision) != 2)):
2769
raise errors.BzrCommandError(gettext(
2770
'--exclude-common-ancestry requires -r with two revisions'))
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2772
2335
if levels is None:
2775
raise errors.BzrCommandError(gettext(
2776
'{0} and {1} are mutually exclusive').format(
2777
'--levels', '--include-merged'))
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2779
2341
if change is not None:
2780
2342
if len(change) > 1:
2781
2343
raise errors.RangeInChangeOption()
2782
2344
if revision is not None:
2783
raise errors.BzrCommandError(gettext(
2784
'{0} and {1} are mutually exclusive').format(
2785
'--revision', '--change'))
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2787
2348
revision = change
2985
2528
help='Recurse into subdirectories.'),
2986
2529
Option('from-root',
2987
2530
help='Print paths relative to the root of the branch.'),
2988
Option('unknown', short_name='u',
2989
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2990
2532
Option('versioned', help='Print versioned files.',
2991
2533
short_name='V'),
2992
Option('ignored', short_name='i',
2993
help='Print ignored files.'),
2994
Option('kind', short_name='k',
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2995
2539
help='List entries of a particular kind: file, directory, symlink.',
3001
2543
@display_command
3002
2544
def run(self, revision=None, verbose=False,
3003
2545
recursive=False, from_root=False,
3004
2546
unknown=False, versioned=False, ignored=False,
3005
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
3007
2549
if kind and kind not in ('file', 'directory', 'symlink'):
3008
raise errors.BzrCommandError(gettext('invalid kind specified'))
2550
raise errors.BzrCommandError('invalid kind specified')
3010
2552
if verbose and null:
3011
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3012
2554
all = not (unknown or versioned or ignored)
3014
2556
selection = {'I':ignored, '?':unknown, 'V':versioned}
3193
2725
self.outf.write("%s\n" % pattern)
3195
2727
if not name_pattern_list:
3196
raise errors.BzrCommandError(gettext("ignore requires at least one "
3197
"NAME_PATTERN or --default-rules."))
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3198
2730
name_pattern_list = [globbing.normalize_pattern(p)
3199
2731
for p in name_pattern_list]
3201
bad_patterns_count = 0
3202
for p in name_pattern_list:
3203
if not globbing.Globster.is_pattern_valid(p):
3204
bad_patterns_count += 1
3205
bad_patterns += ('\n %s' % p)
3207
msg = (ngettext('Invalid ignore pattern found. %s',
3208
'Invalid ignore patterns found. %s',
3209
bad_patterns_count) % bad_patterns)
3210
ui.ui_factory.show_error(msg)
3211
raise errors.InvalidPattern('')
3212
2732
for name_pattern in name_pattern_list:
3213
2733
if (name_pattern[0] == '/' or
3214
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
3215
raise errors.BzrCommandError(gettext(
3216
"NAME_PATTERN should not be an absolute path"))
3217
tree, relpath = WorkingTree.open_containing(directory)
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3218
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
3219
2739
ignored = globbing.Globster(name_pattern_list)
3221
self.add_cleanup(tree.lock_read().unlock)
3222
2742
for entry in tree.list_files():
3224
2744
if id is not None:
3225
2745
filename = entry[0]
3226
2746
if ignored.match(filename):
3227
2747
matches.append(filename)
3228
2749
if len(matches) > 0:
3229
self.outf.write(gettext("Warning: the following files are version "
3230
"controlled and match your ignore pattern:\n%s"
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3231
2752
"\nThese files will continue to be version controlled"
3232
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3235
2756
class cmd_ignored(Command):
3323
2842
Option('per-file-timestamps',
3324
2843
help='Set modification time of files to that of the last '
3325
2844
'revision in which it was changed.'),
3326
Option('uncommitted',
3327
help='Export the working tree contents rather than that of the '
3330
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3331
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2847
root=None, filters=False, per_file_timestamps=False):
3333
2848
from bzrlib.export import export
3335
2850
if branch_or_subdir is None:
3336
branch_or_subdir = directory
3338
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3340
if tree is not None:
3341
self.add_cleanup(tree.lock_read().unlock)
3345
raise errors.BzrCommandError(
3346
gettext("--uncommitted requires a working tree"))
2851
tree = WorkingTree.open_containing(u'.')[0]
3349
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3351
export(export_tree, dest, format, root, subdir, filtered=filters,
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3352
2861
per_file_timestamps=per_file_timestamps)
3353
2862
except errors.NoSuchExportFormat, e:
3354
raise errors.BzrCommandError(
3355
gettext('Unsupported export format: %s') % e.format)
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3358
2866
class cmd_cat(Command):
3391
2900
if tree is None:
3392
2901
tree = b.basis_tree()
3393
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3394
self.add_cleanup(rev_tree.lock_read().unlock)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3396
2906
old_file_id = rev_tree.path2id(relpath)
3398
# TODO: Split out this code to something that generically finds the
3399
# best id for a path across one or more trees; it's like
3400
# find_ids_across_trees but restricted to find just one. -- mbp
3402
2908
if name_from_revision:
3403
2909
# Try in revision if requested
3404
2910
if old_file_id is None:
3405
raise errors.BzrCommandError(gettext(
3406
"{0!r} is not present in revision {1}").format(
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3407
2913
filename, rev_tree.get_revision_id()))
3409
actual_file_id = old_file_id
2915
content = rev_tree.get_file_text(old_file_id)
3411
2917
cur_file_id = tree.path2id(relpath)
3412
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3413
actual_file_id = cur_file_id
3414
elif old_file_id is not None:
3415
actual_file_id = old_file_id
3417
raise errors.BzrCommandError(gettext(
3418
"{0!r} is not present in revision {1}").format(
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
3419
2935
filename, rev_tree.get_revision_id()))
3421
from bzrlib.filter_tree import ContentFilterTree
3422
filter_tree = ContentFilterTree(rev_tree,
3423
rev_tree._content_filter_stack)
3424
content = filter_tree.get_file_text(actual_file_id)
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
3426
content = rev_tree.get_file_text(actual_file_id)
3428
self.outf.write(content)
2949
self.outf.write(content)
3431
2952
class cmd_local_time_offset(Command):
3492
3013
to trigger updates to external systems like bug trackers. The --fixes
3493
3014
option can be used to record the association between a revision and
3494
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3497
3043
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3498
3044
takes_args = ['selected*']
3530
3076
Option('show-diff', short_name='p',
3531
3077
help='When no message is supplied, show the diff along'
3532
3078
' with the status summary in the message editor.'),
3534
help='When committing to a foreign version control '
3535
'system do not push data that can not be natively '
3538
3080
aliases = ['ci', 'checkin']
3540
3082
def _iter_bug_fix_urls(self, fixes, branch):
3541
default_bugtracker = None
3542
3083
# Configure the properties for bug fixing attributes.
3543
3084
for fixed_bug in fixes:
3544
3085
tokens = fixed_bug.split(':')
3545
if len(tokens) == 1:
3546
if default_bugtracker is None:
3547
branch_config = branch.get_config_stack()
3548
default_bugtracker = branch_config.get(
3550
if default_bugtracker is None:
3551
raise errors.BzrCommandError(gettext(
3552
"No tracker specified for bug %s. Use the form "
3553
"'tracker:id' or specify a default bug tracker "
3554
"using the `bugtracker` option.\nSee "
3555
"\"bzr help bugs\" for more information on this "
3556
"feature. Commit refused.") % fixed_bug)
3557
tag = default_bugtracker
3559
elif len(tokens) != 2:
3560
raise errors.BzrCommandError(gettext(
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3561
3088
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3562
3089
"See \"bzr help bugs\" for more information on this "
3563
"feature.\nCommit refused.") % fixed_bug)
3565
tag, bug_id = tokens
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3567
3093
yield bugtracker.get_bug_url(tag, branch, bug_id)
3568
3094
except errors.UnknownBugTrackerAbbreviation:
3569
raise errors.BzrCommandError(gettext(
3570
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3571
3097
except errors.MalformedBugIdentifier, e:
3572
raise errors.BzrCommandError(gettext(
3573
"%s\nCommit refused.") % (str(e),))
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3575
3101
def run(self, message=None, file=None, verbose=False, selected_list=None,
3576
3102
unchanged=False, strict=False, local=False, fixes=None,
3577
author=None, show_diff=False, exclude=None, commit_time=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3579
3104
from bzrlib.errors import (
3580
3105
PointlessCommit,
3581
3106
ConflictsInTree,
3657
3184
# make_commit_message_template_encoded returns user encoding.
3658
3185
# We probably want to be using edit_commit_message instead to
3660
my_message = set_commit_message(commit_obj)
3661
if my_message is None:
3662
start_message = generate_commit_message_template(commit_obj)
3663
my_message = edit_commit_message_encoded(text,
3664
start_message=start_message)
3665
if my_message is None:
3666
raise errors.BzrCommandError(gettext("please specify a commit"
3667
" message with either --message or --file"))
3668
if my_message == "":
3669
raise errors.BzrCommandError(gettext("Empty commit message specified."
3670
" Please specify a commit message with either"
3671
" --message or --file or leave a blank message"
3672
" with --message \"\"."))
3187
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3189
start_message=start_message)
3190
if my_message is None:
3191
raise errors.BzrCommandError("please specify a commit"
3192
" message with either --message or --file")
3193
if my_message == "":
3194
raise errors.BzrCommandError("empty commit message specified")
3673
3195
return my_message
3675
3197
# The API permits a commit with a filter of [] to mean 'select nothing'
3683
3205
reporter=None, verbose=verbose, revprops=properties,
3684
3206
authors=author, timestamp=commit_stamp,
3685
3207
timezone=offset,
3686
exclude=tree.safe_relpath_files(exclude),
3208
exclude=safe_relpath_files(tree, exclude))
3688
3209
except PointlessCommit:
3689
raise errors.BzrCommandError(gettext("No changes to commit."
3690
" Please 'bzr add' the files you want to commit, or use"
3691
" --unchanged to force an empty commit."))
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3692
3212
except ConflictsInTree:
3693
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3213
raise errors.BzrCommandError('Conflicts detected in working '
3694
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3696
3216
except StrictCommitFailed:
3697
raise errors.BzrCommandError(gettext("Commit refused because there are"
3698
" unknown files in the working tree."))
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3699
3219
except errors.BoundBranchOutOfDate, e:
3700
e.extra_help = (gettext("\n"
3220
e.extra_help = ("\n"
3701
3221
'To commit to master branch, run update and then commit.\n'
3702
3222
'You can also pass --local to commit to continue working '
3777
3297
class cmd_upgrade(Command):
3778
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3780
When the default format has changed after a major new release of
3781
Bazaar, you may be informed during certain operations that you
3782
should upgrade. Upgrading to a newer format may improve performance
3783
or make new features available. It may however limit interoperability
3784
with older repositories or with older versions of Bazaar.
3786
If you wish to upgrade to a particular format rather than the
3787
current default, that can be specified using the --format option.
3788
As a consequence, you can use the upgrade command this way to
3789
"downgrade" to an earlier format, though some conversions are
3790
a one way process (e.g. changing from the 1.x default to the
3791
2.x default) so downgrading is not always possible.
3793
A backup.bzr.~#~ directory is created at the start of the conversion
3794
process (where # is a number). By default, this is left there on
3795
completion. If the conversion fails, delete the new .bzr directory
3796
and rename this one back in its place. Use the --clean option to ask
3797
for the backup.bzr directory to be removed on successful conversion.
3798
Alternatively, you can delete it by hand if everything looks good
3801
If the location given is a shared repository, dependent branches
3802
are also converted provided the repository converts successfully.
3803
If the conversion of a branch fails, remaining branches are still
3806
For more information on upgrades, see the Bazaar Upgrade Guide,
3807
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3810
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3811
3306
takes_args = ['url?']
3812
3307
takes_options = [
3813
RegistryOption('format',
3814
help='Upgrade to a specific format. See "bzr help'
3815
' formats" for details.',
3816
lazy_registry=('bzrlib.controldir', 'format_registry'),
3817
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3818
value_switches=True, title='Branch format'),
3820
help='Remove the backup.bzr directory if successful.'),
3822
help="Show what would be done, but don't actually do anything."),
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3825
def run(self, url='.', format=None, clean=False, dry_run=False):
3316
def run(self, url='.', format=None):
3826
3317
from bzrlib.upgrade import upgrade
3827
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3829
if len(exceptions) == 1:
3830
# Compatibility with historical behavior
3318
upgrade(url, format)
3836
3321
class cmd_whoami(Command):
3856
3340
encoding_type = 'replace'
3858
3342
@display_command
3859
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3860
3344
if name is None:
3861
if directory is None:
3862
# use branch if we're inside one; otherwise global config
3864
c = Branch.open_containing(u'.')[0].get_config_stack()
3865
except errors.NotBranchError:
3866
c = _mod_config.GlobalStack()
3868
c = Branch.open(directory).get_config_stack()
3869
identity = c.get('email')
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3871
self.outf.write(_mod_config.extract_email_address(identity)
3351
self.outf.write(c.user_email() + '\n')
3874
self.outf.write(identity + '\n')
3353
self.outf.write(c.username() + '\n')
3878
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3881
3356
# display a warning if an email address isn't included in the given name.
3883
_mod_config.extract_email_address(name)
3358
config.extract_email_address(name)
3884
3359
except errors.NoEmailInUsername, e:
3885
3360
warning('"%s" does not seem to contain an email address. '
3886
3361
'This is allowed, but not recommended.', name)
3888
3363
# use global config unless --branch given
3890
if directory is None:
3891
c = Branch.open_containing(u'.')[0].get_config_stack()
3893
b = Branch.open(directory)
3894
self.add_cleanup(b.lock_write().unlock)
3895
c = b.get_config_stack()
3365
c = Branch.open_containing('.')[0].get_config()
3897
c = _mod_config.GlobalStack()
3898
c.set('email', name)
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3901
3371
class cmd_nick(Command):
3902
3372
__doc__ = """Print or set the branch nickname.
3904
If unset, the colocated branch name is used for colocated branches, and
3905
the branch directory name is used for other branches. To print the
3906
current nickname, execute with no argument.
3374
If unset, the tree root directory name is used as the nickname.
3375
To print the current nickname, execute with no argument.
3908
3377
Bound branches use the nickname of its master branch unless it is set
4122
3586
def run(self, testspecs_list=None, verbose=False, one=False,
4123
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
4125
3589
first=False, list_only=False,
4126
3590
randomize=None, exclude=None, strict=False,
4127
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
4128
parallel=None, lsprof_tests=False,
4131
# During selftest, disallow proxying, as it can cause severe
4132
# performance penalties and is only needed for thread
4133
# safety. The selftest command is assumed to not use threads
4134
# too heavily. The call should be as early as possible, as
4135
# error reporting for past duplicate imports won't have useful
4137
lazy_import.disallow_proxying()
4139
from bzrlib import tests
3592
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4141
3602
if testspecs_list is not None:
4142
3603
pattern = '|'.join(testspecs_list)
4147
3608
from bzrlib.tests import SubUnitBzrRunner
4148
3609
except ImportError:
4149
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4150
"needs to be installed to use --subunit."))
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4151
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4152
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
4153
3614
# stdout, which would corrupt the subunit stream.
4154
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4155
# following code can be deleted when it's sufficiently deployed
4156
# -- vila/mgz 20100514
4157
if (sys.platform == "win32"
4158
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4160
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4162
3619
self.additional_selftest_args.setdefault(
4163
3620
'suite_decorators', []).append(parallel)
4165
raise errors.BzrCommandError(gettext(
4166
"--benchmark is no longer supported from bzr 2.2; "
4167
"use bzr-usertest instead"))
4168
test_suite_factory = None
4170
exclude_pattern = None
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
4172
exclude_pattern = '(' + '|'.join(exclude) + ')'
4174
self._disable_fsync()
3629
test_suite_factory = None
4175
3631
selftest_kwargs = {"verbose": verbose,
4176
3632
"pattern": pattern,
4177
3633
"stop_on_failure": one,
4179
3635
"test_suite_factory": test_suite_factory,
4180
3636
"lsprof_timed": lsprof_timed,
4181
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
4182
3639
"matching_tests_first": first,
4183
3640
"list_only": list_only,
4184
3641
"random_seed": randomize,
4185
"exclude_pattern": exclude_pattern,
3642
"exclude_pattern": exclude,
4186
3643
"strict": strict,
4187
3644
"load_list": load_list,
4188
3645
"debug_flags": debugflag,
4189
3646
"starting_with": starting_with
4191
3648
selftest_kwargs.update(self.additional_selftest_args)
4193
# Make deprecation warnings visible, unless -Werror is set
4194
cleanup = symbol_versioning.activate_deprecation_warnings(
4197
result = tests.selftest(**selftest_kwargs)
3649
result = selftest(**selftest_kwargs)
4200
3650
return int(not result)
4202
def _disable_fsync(self):
4203
"""Change the 'os' functionality to not synchronize."""
4204
self._orig_fsync = getattr(os, 'fsync', None)
4205
if self._orig_fsync is not None:
4206
os.fsync = lambda filedes: None
4207
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4208
if self._orig_fdatasync is not None:
4209
os.fdatasync = lambda filedes: None
4212
3653
class cmd_version(Command):
4213
3654
__doc__ = """Show version of bzr."""
4266
3709
The source of the merge can be specified either in the form of a branch,
4267
3710
or in the form of a path to a file containing a merge directive generated
4268
3711
with bzr send. If neither is specified, the default is the upstream branch
4269
or the branch most recently merged using --remember. The source of the
4270
merge may also be specified in the form of a path to a file in another
4271
branch: in this case, only the modifications to that file are merged into
4272
the current working tree.
4274
When merging from a branch, by default bzr will try to merge in all new
4275
work from the other branch, automatically determining an appropriate base
4276
revision. If this fails, you may need to give an explicit base.
4278
To pick a different ending revision, pass "--revision OTHER". bzr will
4279
try to merge in all new work up to and including revision OTHER.
4281
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4282
through OTHER, excluding BASE but including OTHER, will be merged. If this
4283
causes some revisions to be skipped, i.e. if the destination branch does
4284
not already contain revision BASE, such a merge is commonly referred to as
4285
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4286
cherrypicks. The changes look like a normal commit, and the history of the
4287
changes from the other branch is not stored in the commit.
4289
Revision numbers are always relative to the source branch.
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
4291
3725
Merge will do its best to combine the changes in two branches, but there
4292
3726
are some kinds of problems only a human can fix. When it encounters those,
4293
3727
it will mark a conflict. A conflict means that you need to fix something,
4294
before you can commit.
3728
before you should commit.
4296
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
4298
If there is no default branch set, the first merge will set it (use
4299
--no-remember to avoid setting it). After that, you can omit the branch
4300
to use the default. To change the default, use --remember. The value will
4301
only be saved if the remote location can be accessed.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4303
3737
The results of the merge are placed into the destination working
4304
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4305
3739
committed to record the result of the merge.
4307
3741
merge refuses to run if there are any uncommitted changes, unless
4308
--force is given. If --force is given, then the changes from the source
4309
will be merged with the current working tree, including any uncommitted
4310
changes in the tree. The --force option can also be used to create a
3742
--force is given. The --force option can also be used to create a
4311
3743
merge revision which has more than two parents.
4313
3745
If one would like to merge changes from the working tree of the other
4441
3873
self.sanity_check_merger(merger)
4442
3874
if (merger.base_rev_id == merger.other_rev_id and
4443
3875
merger.other_rev_id is not None):
4444
# check if location is a nonexistent file (and not a branch) to
4445
# disambiguate the 'Nothing to do'
4446
if merger.interesting_files:
4447
if not merger.other_tree.has_filename(
4448
merger.interesting_files[0]):
4449
note(gettext("merger: ") + str(merger))
4450
raise errors.PathsDoNotExist([location])
4451
note(gettext('Nothing to do.'))
3876
note('Nothing to do.')
4453
if pull and not preview:
4454
3879
if merger.interesting_files is not None:
4455
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3880
raise errors.BzrCommandError('Cannot pull individual files')
4456
3881
if (merger.base_rev_id == tree.last_revision()):
4457
3882
result = tree.pull(merger.other_branch, False,
4458
3883
merger.other_rev_id)
4459
3884
result.report(self.outf)
4461
3886
if merger.this_basis is None:
4462
raise errors.BzrCommandError(gettext(
3887
raise errors.BzrCommandError(
4463
3888
"This branch has no commits."
4464
" (perhaps you would prefer 'bzr pull')"))
3889
" (perhaps you would prefer 'bzr pull')")
4466
3891
return self._do_preview(merger)
4467
3892
elif interactive:
4565
3988
if other_revision_id is None:
4566
3989
other_revision_id = _mod_revision.ensure_null(
4567
3990
other_branch.last_revision())
4568
# Remember where we merge from. We need to remember if:
4569
# - user specify a location (and we don't merge from the parent
4571
# - user ask to remember or there is no previous location set to merge
4572
# from and user didn't ask to *not* remember
4573
if (user_location is not None
4575
or (remember is None
4576
and tree.branch.get_submit_branch() is None)))):
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4577
3994
tree.branch.set_submit_branch(other_branch.base)
4578
# Merge tags (but don't set them in the master branch yet, the user
4579
# might revert this merge). Commit will propagate them.
4580
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4581
3996
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4582
3997
other_revision_id, base_revision_id, other_branch, base_branch)
4583
3998
if other_path != '':
4747
4162
class cmd_revert(Command):
4749
Set files in the working tree back to the contents of a previous revision.
4163
__doc__ = """Revert files to a previous revision.
4751
4165
Giving a list of files will revert only those files. Otherwise, all files
4752
4166
will be reverted. If the revision is not specified with '--revision', the
4753
working tree basis revision is used. A revert operation affects only the
4754
working tree, not any revision history like the branch and repository or
4755
the working tree basis revision.
4167
last committed revision is used.
4757
4169
To remove only some changes, without reverting to a prior version, use
4758
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4759
will remove the changes introduced by the second last commit (-2), without
4760
affecting the changes introduced by the last commit (-1). To remove
4761
certain changes on a hunk-by-hunk basis, see the shelve command.
4762
To update the branch to a specific revision or the latest revision and
4763
update the working tree accordingly while preserving local changes, see the
4170
merge instead. For example, "merge . --revision -2..-3" will remove the
4171
changes introduced by -2, without affecting the changes introduced by -1.
4172
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4766
Uncommitted changes to files that are reverted will be discarded.
4767
Howver, by default, any files that have been manually changed will be
4768
backed up first. (Files changed only by merge are not backed up.) Backup
4769
files have '.~#~' appended to their name, where # is a number.
4174
By default, any files that have been manually changed will be backed up
4175
first. (Files changed only by merge are not backed up.) Backup files have
4176
'.~#~' appended to their name, where # is a number.
4771
4178
When you provide files, you can use their current pathname or the pathname
4772
4179
from the target revision. So you can use revert to "undelete" a file by
4935
4340
theirs_only=False,
4936
4341
log_format=None, long=False, short=False, line=False,
4937
4342
show_ids=False, verbose=False, this=False, other=False,
4938
include_merged=None, revision=None, my_revision=None,
4940
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4343
include_merges=False, revision=None, my_revision=None):
4941
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4942
4345
def message(s):
4943
4346
if not is_quiet():
4944
4347
self.outf.write(s)
4946
if symbol_versioning.deprecated_passed(include_merges):
4947
ui.ui_factory.show_user_warning(
4948
'deprecated_command_option',
4949
deprecated_name='--include-merges',
4950
recommended_name='--include-merged',
4951
deprecated_in_version='2.5',
4952
command=self.invoked_as)
4953
if include_merged is None:
4954
include_merged = include_merges
4956
raise errors.BzrCommandError(gettext(
4957
'{0} and {1} are mutually exclusive').format(
4958
'--include-merges', '--include-merged'))
4959
if include_merged is None:
4960
include_merged = False
4962
4350
mine_only = this
5035
4419
if remote_extra and not mine_only:
5036
4420
if printed_local is True:
5037
4421
message("\n\n\n")
5038
message(ngettext("You are missing %d revision:\n",
5039
"You are missing %d revisions:\n",
5040
len(remote_extra)) %
4422
message("You are missing %d revision(s):\n" %
5041
4423
len(remote_extra))
5042
if remote_branch.supports_tags():
5043
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
5044
4424
for revision in iter_log_revisions(remote_extra,
5045
4425
remote_branch.repository,
5048
4427
lf.log_revision(revision)
5049
4428
status_code = 1
5051
4430
if mine_only and not local_extra:
5052
4431
# We checked local, and found nothing extra
5053
message(gettext('This branch has no new revisions.\n'))
4432
message('This branch is up to date.\n')
5054
4433
elif theirs_only and not remote_extra:
5055
4434
# We checked remote, and found nothing extra
5056
message(gettext('Other branch has no new revisions.\n'))
4435
message('Other branch is up to date.\n')
5057
4436
elif not (mine_only or theirs_only or local_extra or
5059
4438
# We checked both branches, and neither one had extra
5061
message(gettext("Branches are up to date.\n"))
4440
message("Branches are up to date.\n")
5062
4441
self.cleanup_now()
5063
4442
if not status_code and parent is None and other_branch is not None:
5064
self.add_cleanup(local_branch.lock_write().unlock)
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
5065
4445
# handle race conditions - a parent might be set while we run.
5066
4446
if local_branch.get_parent() is None:
5067
4447
local_branch.set_parent(remote_branch.base)
5182
4578
Option('long', help='Show commit date in annotations.'),
5187
4582
encoding_type = 'exact'
5189
4584
@display_command
5190
4585
def run(self, filename, all=False, long=False, revision=None,
5191
show_ids=False, directory=None):
5192
from bzrlib.annotate import (
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5195
4588
wt, branch, relpath = \
5196
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5197
4590
if wt is not None:
5198
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
5200
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5201
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
5202
self.add_cleanup(tree.lock_read().unlock)
5203
if wt is not None and revision is None:
4598
self.add_cleanup(tree.unlock)
5204
4600
file_id = wt.path2id(relpath)
5206
4602
file_id = tree.path2id(relpath)
5207
4603
if file_id is None:
5208
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
5209
4606
if wt is not None and revision is None:
5210
4607
# If there is a tree and we're not annotating historical
5211
4608
# versions, annotate the working tree's content.
5212
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
5213
4610
show_ids=show_ids)
5215
annotate_file_tree(tree, file_id, self.outf, long, all,
5216
show_ids=show_ids, branch=branch)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5219
4616
class cmd_re_sign(Command):
5223
4620
hidden = True # is this right ?
5224
4621
takes_args = ['revision_id*']
5225
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
5227
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
5228
4625
if revision_id_list is not None and revision is not None:
5229
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5230
4627
if revision_id_list is None and revision is None:
5231
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5232
b = WorkingTree.open_containing(directory)[0].branch
5233
self.add_cleanup(b.lock_write().unlock)
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
5234
4632
return self._run(b, revision_id_list, revision)
5236
4634
def _run(self, b, revision_id_list, revision):
5237
4635
import bzrlib.gpg as gpg
5238
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5239
4637
if revision_id_list is not None:
5240
4638
b.repository.start_write_group()
5296
4694
_see_also = ['checkouts', 'unbind']
5297
4695
takes_args = ['location?']
5298
takes_options = ['directory']
5300
def run(self, location=None, directory=u'.'):
5301
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5302
4700
if location is None:
5304
4702
location = b.get_old_bound_location()
5305
4703
except errors.UpgradeRequired:
5306
raise errors.BzrCommandError(gettext('No location supplied. '
5307
'This format does not remember old locations.'))
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5309
4707
if location is None:
5310
4708
if b.get_bound_location() is not None:
5311
raise errors.BzrCommandError(
5312
gettext('Branch is already bound'))
4709
raise errors.BzrCommandError('Branch is already bound')
5314
raise errors.BzrCommandError(
5315
gettext('No location supplied'
5316
' and no previous location known'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5317
4713
b_other = Branch.open(location)
5319
4715
b.bind(b_other)
5320
4716
except errors.DivergedBranches:
5321
raise errors.BzrCommandError(gettext('These branches have diverged.'
5322
' Try merging, and then bind again.'))
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5323
4719
if b.get_config().has_explicit_nickname():
5324
4720
b.nick = b_other.nick
5389
4784
b = control.open_branch()
5391
4786
if tree is not None:
5392
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
5394
self.add_cleanup(b.lock_write().unlock)
5395
return self._run(b, tree, dry_run, verbose, revision, force,
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5398
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5400
4795
from bzrlib.log import log_formatter, show_log
5401
4796
from bzrlib.uncommit import uncommit
5432
4827
end_revision=last_revno)
5435
self.outf.write(gettext('Dry-run, pretending to remove'
5436
' the above revisions.\n'))
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5438
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5441
if not ui.ui_factory.confirm_action(
5442
gettext(u'Uncommit these revisions'),
5443
'bzrlib.builtins.uncommit',
5445
self.outf.write(gettext('Canceled\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5448
4840
mutter('Uncommitting from {%s} to {%s}',
5449
4841
last_rev_id, rev_id)
5450
4842
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5451
revno=revno, local=local, keep_tags=keep_tags)
5452
self.outf.write(gettext('You can restore the old tip by running:\n'
5453
' bzr pull . -r revid:%s\n') % last_rev_id)
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5456
4848
class cmd_break_lock(Command):
5457
__doc__ = """Break a dead lock.
5459
This command breaks a lock on a repository, branch, working directory or
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5462
4851
CAUTION: Locks should only be broken when you are sure that the process
5463
4852
holding the lock has been stopped.
5541
4914
'option leads to global uncontrolled write access to your '
5544
Option('client-timeout', type=float,
5545
help='Override the default idle client timeout (5min).'),
5548
def run(self, listen=None, port=None, inet=False, directory=None,
5549
allow_writes=False, protocol=None, client_timeout=None):
5550
from bzrlib import transport
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
5551
4941
if directory is None:
5552
4942
directory = os.getcwd()
5553
4943
if protocol is None:
5554
protocol = transport.transport_server_registry.get()
5555
url = transport.location_to_url(directory)
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5556
4947
if not allow_writes:
5557
4948
url = 'readonly+' + url
5558
t = transport.get_transport_from_url(url)
5559
protocol(t, listen, port, inet, client_timeout)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5562
4953
class cmd_join(Command):
5692
5081
if submit_branch is None:
5693
5082
submit_branch = branch.get_parent()
5694
5083
if submit_branch is None:
5695
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5084
raise errors.BzrCommandError('No submit branch specified or known')
5697
5086
stored_public_branch = branch.get_public_branch()
5698
5087
if public_branch is None:
5699
5088
public_branch = stored_public_branch
5700
5089
elif stored_public_branch is None:
5701
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5702
5090
branch.set_public_branch(public_branch)
5703
5091
if not include_bundle and public_branch is None:
5704
raise errors.BzrCommandError(gettext('No public branch specified or'
5092
raise errors.BzrCommandError('No public branch specified or'
5706
5094
base_revision_id = None
5707
5095
if revision is not None:
5708
5096
if len(revision) > 2:
5709
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5710
'at most two one revision identifiers'))
5097
raise errors.BzrCommandError('bzr merge-directive takes '
5098
'at most two one revision identifiers')
5711
5099
revision_id = revision[-1].as_revision_id(branch)
5712
5100
if len(revision) == 2:
5713
5101
base_revision_id = revision[0].as_revision_id(branch)
5974
5359
branch, relpath = Branch.open_containing(directory)
5975
self.add_cleanup(branch.lock_write().unlock)
5361
self.add_cleanup(branch.unlock)
5977
5363
if tag_name is None:
5978
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5364
raise errors.BzrCommandError("No tag specified to delete.")
5979
5365
branch.tags.delete_tag(tag_name)
5980
note(gettext('Deleted tag %s.') % tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5983
5369
if len(revision) != 1:
5984
raise errors.BzrCommandError(gettext(
5370
raise errors.BzrCommandError(
5985
5371
"Tags can only be placed on a single revision, "
5987
5373
revision_id = revision[0].as_revision_id(branch)
5989
5375
revision_id = branch.last_revision()
5990
5376
if tag_name is None:
5991
5377
tag_name = branch.automatic_tag_name(revision_id)
5992
5378
if tag_name is None:
5993
raise errors.BzrCommandError(gettext(
5994
"Please specify a tag name."))
5996
existing_target = branch.tags.lookup_tag(tag_name)
5997
except errors.NoSuchTag:
5998
existing_target = None
5999
if not force and existing_target not in (None, revision_id):
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
6000
5382
raise errors.TagAlreadyExists(tag_name)
6001
if existing_target == revision_id:
6002
note(gettext('Tag %s already exists for that revision.') % tag_name)
6004
branch.tags.set_tag(tag_name, revision_id)
6005
if existing_target is None:
6006
note(gettext('Created tag %s.') % tag_name)
6008
note(gettext('Updated tag %s.') % tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
6011
5387
class cmd_tags(Command):
6017
5393
_see_also = ['tag']
6018
5394
takes_options = [
6019
custom_help('directory',
6020
help='Branch whose tags should be displayed.'),
6021
RegistryOption('sort',
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
6022
5401
'Sort tags by different criteria.', title='Sorting',
6023
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
6029
5409
@display_command
6030
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6031
from bzrlib.tag import tag_sort_methods
6032
5416
branch, relpath = Branch.open_containing(directory)
6034
5418
tags = branch.tags.get_tag_dict().items()
6038
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
6040
# Restrict to the specified range
6041
tags = self._tags_for_range(branch, revision)
6043
sort = tag_sort_methods.get()
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
6045
5444
if not show_ids:
6046
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
6047
5446
for index, (tag, revid) in enumerate(tags):
6060
5457
for tag, revspec in tags:
6061
5458
self.outf.write('%-20s %s\n' % (tag, revspec))
6063
def _tags_for_range(self, branch, revision):
6065
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6066
revid1, revid2 = rev1.rev_id, rev2.rev_id
6067
# _get_revision_range will always set revid2 if it's not specified.
6068
# If revid1 is None, it means we want to start from the branch
6069
# origin which is always a valid ancestor. If revid1 == revid2, the
6070
# ancestry check is useless.
6071
if revid1 and revid1 != revid2:
6072
# FIXME: We really want to use the same graph than
6073
# branch.iter_merge_sorted_revisions below, but this is not
6074
# easily available -- vila 2011-09-23
6075
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6076
# We don't want to output anything in this case...
6078
# only show revisions between revid1 and revid2 (inclusive)
6079
tagged_revids = branch.tags.get_reverse_tag_dict()
6081
for r in branch.iter_merge_sorted_revisions(
6082
start_revision_id=revid2, stop_revision_id=revid1,
6083
stop_rule='include'):
6084
revid_tags = tagged_revids.get(r[0], None)
6086
found.extend([(tag, r[0]) for tag in revid_tags])
6090
5461
class cmd_reconfigure(Command):
6091
5462
__doc__ = """Reconfigure the type of a bzr directory.
6105
5476
takes_args = ['location?']
6106
5477
takes_options = [
6107
5478
RegistryOption.from_kwargs(
6110
help='The relation between branch and tree.',
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6111
5482
value_switches=True, enum_switch=False,
6112
5483
branch='Reconfigure to be an unbound branch with no working tree.',
6113
5484
tree='Reconfigure to be an unbound branch with a working tree.',
6114
5485
checkout='Reconfigure to be a bound branch with a working tree.',
6115
5486
lightweight_checkout='Reconfigure to be a lightweight'
6116
5487
' checkout (with no local history).',
6118
RegistryOption.from_kwargs(
6120
title='Repository type',
6121
help='Location fo the repository.',
6122
value_switches=True, enum_switch=False,
6123
5488
standalone='Reconfigure to be a standalone branch '
6124
5489
'(i.e. stop using shared repository).',
6125
5490
use_shared='Reconfigure to use a shared repository.',
6127
RegistryOption.from_kwargs(
6129
title='Trees in Repository',
6130
help='Whether new branches in the repository have trees.',
6131
value_switches=True, enum_switch=False,
6132
5491
with_trees='Reconfigure repository to create '
6133
5492
'working trees on branches by default.',
6134
5493
with_no_trees='Reconfigure repository to not create '
6161
5520
# At the moment you can use --stacked-on and a different
6162
5521
# reconfiguration shape at the same time; there seems no good reason
6164
if (tree_type is None and
6165
repository_type is None and
6166
repository_trees is None):
5523
if target_type is None:
6167
5524
if stacked_on or unstacked:
6170
raise errors.BzrCommandError(gettext('No target configuration '
6172
reconfiguration = None
6173
if tree_type == 'branch':
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6174
5530
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
6175
elif tree_type == 'tree':
5531
elif target_type == 'tree':
6176
5532
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
6177
elif tree_type == 'checkout':
5533
elif target_type == 'checkout':
6178
5534
reconfiguration = reconfigure.Reconfigure.to_checkout(
6179
5535
directory, bind_to)
6180
elif tree_type == 'lightweight-checkout':
5536
elif target_type == 'lightweight-checkout':
6181
5537
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
6182
5538
directory, bind_to)
6184
reconfiguration.apply(force)
6185
reconfiguration = None
6186
if repository_type == 'use-shared':
5539
elif target_type == 'use-shared':
6187
5540
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
6188
elif repository_type == 'standalone':
5541
elif target_type == 'standalone':
6189
5542
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
6191
reconfiguration.apply(force)
6192
reconfiguration = None
6193
if repository_trees == 'with-trees':
5543
elif target_type == 'with-trees':
6194
5544
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6195
5545
directory, True)
6196
elif repository_trees == 'with-no-trees':
5546
elif target_type == 'with-no-trees':
6197
5547
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6198
5548
directory, False)
6200
reconfiguration.apply(force)
6201
reconfiguration = None
5549
reconfiguration.apply(force)
6204
5552
class cmd_switch(Command):
6227
5575
takes_args = ['to_location?']
6228
takes_options = ['directory',
5576
takes_options = [Option('force',
6230
5577
help='Switch even if local commits will be lost.'),
6232
5579
Option('create-branch', short_name='b',
6233
5580
help='Create the target branch from this one before'
6234
5581
' switching to it.'),
6236
help='Store and restore uncommitted changes in the'
6240
5584
def run(self, to_location=None, force=False, create_branch=False,
6241
revision=None, directory=u'.', store=False):
6242
5586
from bzrlib import switch
6243
tree_location = directory
6244
5588
revision = _get_one_revision('switch', revision)
6245
possible_transports = []
6246
control_dir = controldir.ControlDir.open_containing(tree_location,
6247
possible_transports=possible_transports)[0]
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6248
5590
if to_location is None:
6249
5591
if revision is None:
6250
raise errors.BzrCommandError(gettext('You must supply either a'
6251
' revision or a location'))
6252
to_location = tree_location
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6254
branch = control_dir.open_branch(
6255
possible_transports=possible_transports)
5596
branch = control_dir.open_branch()
6256
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
6257
5598
except errors.NotBranchError:
6259
5600
had_explicit_nick = False
6260
5601
if create_branch:
6261
5602
if branch is None:
6262
raise errors.BzrCommandError(
6263
gettext('cannot create branch without source branch'))
6264
to_location = lookup_new_sibling_branch(control_dir, to_location,
6265
possible_transports=possible_transports)
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
6266
5611
to_branch = branch.bzrdir.sprout(to_location,
6267
possible_transports=possible_transports,
6268
source_branch=branch).open_branch()
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6271
to_branch = Branch.open(to_location,
6272
possible_transports=possible_transports)
5616
to_branch = Branch.open(to_location)
6273
5617
except errors.NotBranchError:
6274
to_branch = open_sibling_branch(control_dir, to_location,
6275
possible_transports=possible_transports)
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6276
5621
if revision is not None:
6277
5622
revision = revision.as_revision_id(to_branch)
6278
switch.switch(control_dir, to_branch, force, revision_id=revision,
6279
store_uncommitted=store)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6280
5624
if had_explicit_nick:
6281
5625
branch = control_dir.open_branch() #get the new branch!
6282
5626
branch.nick = to_branch.nick
6283
note(gettext('Switched to branch: %s'),
5627
note('Switched to branch: %s',
6284
5628
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5645
return control_dir.root_transport.base
6288
5648
class cmd_view(Command):
6375
tree, file_list = WorkingTree.open_containing_paths(file_list,
5735
tree, file_list = tree_files(file_list, apply_view=False)
6377
5736
current_view, view_dict = tree.views.get_view_info()
6378
5737
if name is None:
6379
5738
name = current_view
6382
raise errors.BzrCommandError(gettext(
6383
"Both --delete and a file list specified"))
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6385
raise errors.BzrCommandError(gettext(
6386
"Both --delete and --switch specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6388
5747
tree.views.set_view_info(None, {})
6389
self.outf.write(gettext("Deleted all views.\n"))
5748
self.outf.write("Deleted all views.\n")
6390
5749
elif name is None:
6391
raise errors.BzrCommandError(gettext("No current view to delete"))
5750
raise errors.BzrCommandError("No current view to delete")
6393
5752
tree.views.delete_view(name)
6394
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6397
raise errors.BzrCommandError(gettext(
6398
"Both --switch and a file list specified"))
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6400
raise errors.BzrCommandError(gettext(
6401
"Both --switch and --all specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6402
5761
elif switch == 'off':
6403
5762
if current_view is None:
6404
raise errors.BzrCommandError(gettext("No current view to disable"))
5763
raise errors.BzrCommandError("No current view to disable")
6405
5764
tree.views.set_view_info(None, view_dict)
6406
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6408
5767
tree.views.set_view_info(switch, view_dict)
6409
5768
view_str = views.view_display_str(tree.views.lookup_view())
6410
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6413
self.outf.write(gettext('Views defined:\n'))
5772
self.outf.write('Views defined:\n')
6414
5773
for view in sorted(view_dict):
6415
5774
if view == current_view:
6419
5778
view_str = views.view_display_str(view_dict[view])
6420
5779
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
6422
self.outf.write(gettext('No views defined.\n'))
5781
self.outf.write('No views defined.\n')
6423
5782
elif file_list:
6424
5783
if name is None:
6425
5784
# No name given and no current view set
6427
5786
elif name == 'off':
6428
raise errors.BzrCommandError(gettext(
6429
"Cannot change the 'off' pseudo view"))
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6430
5789
tree.views.set_view(name, sorted(file_list))
6431
5790
view_str = views.view_display_str(tree.views.lookup_view())
6432
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6434
5793
# list the files
6435
5794
if name is None:
6436
5795
# No name given and no current view set
6437
self.outf.write(gettext('No current view.\n'))
5796
self.outf.write('No current view.\n')
6439
5798
view_str = views.view_display_str(tree.views.lookup_view(name))
6440
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6443
5802
class cmd_hooks(Command):
6477
5836
takes_args = ["location?"]
6479
takes_options = ['directory',
6480
Option('force', help='Remove branch even if it is the active branch.')]
6482
5838
aliases = ["rmbranch"]
6484
def run(self, directory=None, location=None, force=False):
6485
br = open_nearby_branch(near=directory, location=location)
6486
if not force and br.bzrdir.has_workingtree():
6488
active_branch = br.bzrdir.open_branch(name="")
6489
except errors.NotBranchError:
6490
active_branch = None
6491
if (active_branch is not None and
6492
br.control_url == active_branch.control_url):
6493
raise errors.BzrCommandError(
6494
gettext("Branch is active. Use --force to remove it."))
6495
br.bzrdir.destroy_branch(br.name)
5840
def run(self, location=None):
5841
if location is None:
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
6498
5847
class cmd_shelve(Command):
6499
5848
__doc__ = """Temporarily set aside some changes from the current tree.
6547
5883
Option('destroy',
6548
5884
help='Destroy removed changes instead of shelving them.'),
6550
_see_also = ['unshelve', 'configuration']
5886
_see_also = ['unshelve']
6552
5888
def run(self, revision=None, all=False, file_list=None, message=None,
6553
writer=None, list=False, destroy=False, directory=None):
5889
writer=None, list=False, destroy=False):
6555
return self.run_for_list(directory=directory)
5891
return self.run_for_list()
6556
5892
from bzrlib.shelf_ui import Shelver
6557
5893
if writer is None:
6558
5894
writer = bzrlib.option.diff_writer_registry.get()
6560
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6561
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
6699
6032
self.outf.write('%s %s\n' % (path, location))
6702
class cmd_export_pot(Command):
6703
__doc__ = """Export command helps and error messages in po format."""
6706
takes_options = [Option('plugin',
6707
help='Export help text from named command '\
6708
'(defaults to all built in commands).',
6710
Option('include-duplicates',
6711
help='Output multiple copies of the same msgid '
6712
'string if it appears more than once.'),
6715
def run(self, plugin=None, include_duplicates=False):
6716
from bzrlib.export_pot import export_pot
6717
export_pot(self.outf, plugin, include_duplicates)
6720
6035
def _register_lazy_builtins():
6721
6036
# register lazy builtins from other modules; called at startup and should
6722
6037
# be only called once.
6723
6038
for (name, aliases, module_name) in [
6724
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6725
('cmd_config', [], 'bzrlib.config'),
6726
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6727
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6728
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6729
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6730
('cmd_ping', [], 'bzrlib.smart.ping'),
6731
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6732
('cmd_verify_signatures', [], 'bzrlib.commit_signature_commands'),
6733
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6735
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
