46
50
revision as _mod_revision,
55
from bzrlib.branch import Branch
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
from bzrlib.smtp_connection import SMTPConnection
60
from bzrlib.workingtree import WorkingTree
59
from brzlib.branch import Branch
60
from brzlib.conflicts import ConflictList
61
from brzlib.transport import memory
62
from brzlib.revisionspec import RevisionSpec, RevisionInfo
63
from brzlib.smtp_connection import SMTPConnection
64
from brzlib.workingtree import WorkingTree
65
from brzlib.i18n import gettext, ngettext
63
from bzrlib.commands import (
68
from brzlib.commands import (
65
70
builtin_command_registry,
68
from bzrlib.option import (
73
from brzlib.option import (
73
78
_parse_revision_str,
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
80
from brzlib.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("/")
88
223
def tree_files_for_add(file_list):
153
# XXX: Bad function name; should possibly also be a class method of
154
# WorkingTree rather than a function.
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
This is typically used for command-line processors that take one or
160
more filenames, and infer the workingtree that contains them.
162
The filenames given are not required to exist.
164
:param file_list: Filenames to convert.
166
:param default_branch: Fallback tree path to use if file_list is empty or
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
172
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
223
288
def _get_view_info_for_change_reporter(tree):
224
289
"""Get the view information from a tree for change reporting."""
353
436
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
439
def run(self, revision_id=None, revision=None, directory=u'.'):
357
440
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
441
raise errors.BzrCommandError(gettext('You can only supply one of'
442
' revision_id or --revision'))
360
443
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
444
raise errors.BzrCommandError(gettext('You must supply either'
445
' --revision or a revision_id'))
447
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
449
revisions = b.repository.revisions
366
450
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
451
raise errors.BzrCommandError(gettext('Repository %r does not support '
452
'access to raw revision texts'))
370
454
b.repository.lock_read()
491
578
location_list=['.']
493
580
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
581
d = controldir.ControlDir.open(location)
497
584
working = d.open_workingtree()
498
585
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
586
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
587
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
588
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
589
" of a remote path"))
504
591
if (working.has_changes()):
505
592
raise errors.UncommittedChanges(working)
593
if working.get_shelf_manager().last_shelf() is not None:
594
raise errors.ShelvedChanges(working)
507
596
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
597
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
598
" from a lightweight checkout"))
511
600
d.destroy_workingtree()
603
class cmd_repair_workingtree(Command):
604
__doc__ = """Reset the working tree state file.
606
This is not meant to be used normally, but more as a way to recover from
607
filesystem corruption, etc. This rebuilds the working inventory back to a
608
'known good' state. Any new modifications (adding a file, renaming, etc)
609
will be lost, though modified files will still be detected as such.
611
Most users will want something more like "bzr revert" or "bzr update"
612
unless the state file has become corrupted.
614
By default this attempts to recover the current state by looking at the
615
headers of the state file. If the state file is too corrupted to even do
616
that, you can supply --revision to force the state of the tree.
619
takes_options = ['revision', 'directory',
621
help='Reset the tree even if it doesn\'t appear to be'
626
def run(self, revision=None, directory='.', force=False):
627
tree, _ = WorkingTree.open_containing(directory)
628
self.add_cleanup(tree.lock_tree_write().unlock)
632
except errors.BzrError:
633
pass # There seems to be a real error here, so we'll reset
636
raise errors.BzrCommandError(gettext(
637
'The tree does not appear to be corrupt. You probably'
638
' want "bzr revert" instead. Use "--force" if you are'
639
' sure you want to reset the working tree.'))
643
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
645
tree.reset_state(revision_ids)
646
except errors.BzrError, e:
647
if revision_ids is None:
648
extra = (gettext(', the header appears corrupt, try passing -r -1'
649
' to set the state to the last commit'))
652
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
655
class cmd_revno(Command):
515
656
__doc__ = """Show current revision number.
520
661
_see_also = ['info']
521
662
takes_args = ['location?']
522
663
takes_options = [
523
Option('tree', help='Show revno of working tree'),
664
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
669
def run(self, tree=False, location=u'.', revision=None):
670
if revision is not None and tree:
671
raise errors.BzrCommandError(gettext("--tree and --revision can "
672
"not be used together"))
530
676
wt = WorkingTree.open_containing(location)[0]
531
677
self.add_cleanup(wt.lock_read().unlock)
532
678
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
679
raise errors.NoWorkingTree(location)
534
681
revid = wt.last_revision()
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
539
revno = ".".join(str(n) for n in revno_t)
541
683
b = Branch.open_containing(location)[0]
542
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
698
self.cleanup_now()
545
self.outf.write(str(revno) + '\n')
699
self.outf.write(revno + '\n')
548
702
class cmd_revision_info(Command):
821
1007
return self.run_auto(names_list, after, dry_run)
823
raise errors.BzrCommandError('--dry-run requires --auto.')
1009
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
824
1010
if names_list is None:
826
1012
if len(names_list) < 2:
827
raise errors.BzrCommandError("missing file argument")
828
tree, rel_names = tree_files(names_list, canonicalize=False)
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"))
829
1018
self.add_cleanup(tree.lock_tree_write().unlock)
830
1019
self._run(tree, names_list, rel_names, after)
832
1021
def run_auto(self, names_list, after, dry_run):
833
1022
if names_list is not None and len(names_list) > 1:
834
raise errors.BzrCommandError('Only one path may be specified to'
1023
raise errors.BzrCommandError(gettext('Only one path may be specified to'
837
raise errors.BzrCommandError('--after cannot be specified with'
839
work_tree, file_list = tree_files(names_list, default_branch='.')
1026
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1028
work_tree, file_list = WorkingTree.open_containing_paths(
1029
names_list, default_directory='.')
840
1030
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
1031
rename_map.RenameMap.guess_renames(work_tree, dry_run)
951
1144
takes_options = ['remember', 'overwrite', 'revision',
952
1145
custom_help('verbose',
953
1146
help='Show logs of pulled revisions.'),
1147
custom_help('directory',
955
1148
help='Branch to pull into, '
956
'rather than the one containing the working directory.',
1149
'rather than the one containing the working directory.'),
961
1151
help="Perform a local pull in a bound "
962
1152
"branch. Local pulls are not applied to "
963
1153
"the master branch."
1156
help="Show base revision text in conflicts."),
1157
Option('overwrite-tags',
1158
help="Overwrite tags only."),
966
1160
takes_args = ['location?']
967
1161
encoding_type = 'replace'
969
def run(self, location=None, remember=False, overwrite=False,
1163
def run(self, location=None, remember=None, overwrite=False,
970
1164
revision=None, verbose=False,
971
directory=None, local=False):
1165
directory=None, local=False,
1166
show_base=False, overwrite_tags=False):
1169
overwrite = ["history", "tags"]
1170
elif overwrite_tags:
1171
overwrite = ["tags"]
972
1174
# FIXME: too much stuff is in the command class
973
1175
revision_id = None
974
1176
mergeable = None
1098
1310
Option('strict',
1099
1311
help='Refuse to push if there are uncommitted changes in'
1100
1312
' 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."),
1102
1319
takes_args = ['location?']
1103
1320
encoding_type = 'replace'
1105
def run(self, location=None, remember=False, overwrite=False,
1322
def run(self, location=None, remember=None, overwrite=False,
1106
1323
create_prefix=False, verbose=False, revision=None,
1107
1324
use_existing_dir=False, directory=None, stacked_on=None,
1108
stacked=False, strict=None):
1109
from bzrlib.push import _show_push_branch
1325
stacked=False, strict=None, no_tree=False,
1326
overwrite_tags=False):
1327
from brzlib.push import _show_push_branch
1330
overwrite = ["history", "tags"]
1331
elif overwrite_tags:
1332
overwrite = ["tags"]
1111
1336
if directory is None:
1112
1337
directory = '.'
1113
1338
# Get the source branch
1114
1339
(tree, br_from,
1115
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1340
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1116
1341
# Get the tip's revision_id
1117
1342
revision = _get_one_revision('push', revision)
1118
1343
if revision is not None:
1139
1364
# error by the feedback given to them. RBC 20080227.
1140
1365
stacked_on = parent_url
1141
1366
if not stacked_on:
1142
raise errors.BzrCommandError(
1143
"Could not determine branch to refer to.")
1367
raise errors.BzrCommandError(gettext(
1368
"Could not determine branch to refer to."))
1145
1370
# Get the destination location
1146
1371
if location is None:
1147
1372
stored_loc = br_from.get_push_location()
1148
1373
if stored_loc is None:
1149
raise errors.BzrCommandError(
1150
"No push location known or specified.")
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."))
1152
1385
display_url = urlutils.unescape_for_display(stored_loc,
1153
1386
self.outf.encoding)
1154
self.outf.write("Using saved push location: %s\n" % display_url)
1387
note(gettext("Using saved push location: %s") % display_url)
1155
1388
location = stored_loc
1157
1390
_show_push_branch(br_from, revision_id, location, self.outf,
1158
1391
verbose=verbose, overwrite=overwrite, remember=remember,
1159
1392
stacked_on=stacked_on, create_prefix=create_prefix,
1160
use_existing_dir=use_existing_dir)
1393
use_existing_dir=use_existing_dir, no_tree=no_tree)
1163
1396
class cmd_branch(Command):
1202
1439
def run(self, from_location, to_location=None, revision=None,
1203
1440
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1205
from bzrlib import switch as _mod_switch
1206
from bzrlib.tag import _merge_tags_if_possible
1207
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1441
use_existing_dir=False, switch=False, bind=False,
1443
from brzlib import switch as _mod_switch
1444
from brzlib.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(
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)
1209
1460
revision = _get_one_revision('branch', revision)
1210
1461
self.add_cleanup(br_from.lock_read().unlock)
1211
1462
if revision is not None:
1217
1468
revision_id = br_from.last_revision()
1218
1469
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1470
to_location = getattr(br_from, "name", None)
1472
to_location = urlutils.derive_to_location(from_location)
1220
1473
to_transport = transport.get_transport(to_location)
1222
1475
to_transport.mkdir('.')
1223
1476
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
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)
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1488
to_dir.open_branch()
1230
1489
except errors.NotBranchError:
1233
1492
raise errors.AlreadyBranchError(to_location)
1234
1493
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1494
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1251
raise errors.BzrCommandError(msg)
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)
1252
1523
_merge_tags_if_possible(br_from, branch)
1253
1524
# If the source branch is stacked, the new branch may
1254
1525
# be stacked whether we asked for that explicitly or not.
1255
1526
# We therefore need a try/except here and not just 'if stacked:'
1257
note('Created new stacked branch referring to %s.' %
1528
note(gettext('Created new stacked branch referring to %s.') %
1258
1529
branch.get_stacked_on_url())
1259
1530
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
1531
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1532
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1263
1534
# Bind to the parent
1264
1535
parent_branch = Branch.open(from_location)
1265
1536
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1537
note(gettext('New branch bound to %s') % from_location)
1268
1539
# Switch to the new branch
1269
1540
wt, _ = WorkingTree.open_containing('.')
1270
1541
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1542
note(gettext('Switched to branch: %s'),
1272
1543
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)))
1275
1596
class cmd_checkout(Command):
1276
1597
__doc__ = """Create a new checkout of an existing branch.
1374
1698
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1377
This will perform a merge into the working tree, and may generate
1378
conflicts. If you have any local changes, you will still
1379
need to commit them after the update for the update to be complete.
1381
If you want to discard your local changes, you can just do a
1382
'bzr revert' instead of 'bzr commit' after the update.
1384
If the tree's branch is bound to a master branch, it will also update
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
1385
1714
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.
1388
1728
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1729
takes_args = ['dir?']
1390
takes_options = ['revision']
1730
takes_options = ['revision',
1732
help="Show base revision text in conflicts."),
1391
1734
aliases = ['up']
1393
def run(self, dir='.', revision=None):
1736
def run(self, dir=None, revision=None, show_base=None):
1394
1737
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1397
tree = WorkingTree.open_containing(dir)[0]
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"))
1398
1749
branch = tree.branch
1399
1750
possible_transports = []
1400
1751
master = branch.get_master_branch(
1436
1787
change_reporter,
1437
1788
possible_transports=possible_transports,
1438
1789
revision=revision_id,
1791
show_base=show_base)
1440
1792
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1793
raise errors.BzrCommandError(gettext(
1442
1794
"branch has no revision %s\n"
1443
1795
"bzr update --revision only works"
1444
" for a revision in the branch history"
1796
" for a revision in the branch history")
1445
1797
% (e.revision))
1446
1798
revno = tree.branch.revision_id_to_dotted_revno(
1447
1799
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1800
note(gettext('Updated to revision {0} of branch {1}').format(
1801
'.'.join(map(str, revno)), branch_location))
1450
1802
parent_ids = tree.get_parent_ids()
1451
1803
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1804
note(gettext('Your local commits will now show as pending merges with '
1805
"'bzr status', and can be committed with 'bzr commit'."))
1454
1806
if conflicts != 0:
1515
1868
RegistryOption.from_kwargs('file-deletion-strategy',
1516
1869
'The file deletion mode to be used.',
1517
1870
title='Deletion Strategy', value_switches=True, enum_switch=False,
1518
safe='Only delete files if they can be'
1519
' safely recovered (default).',
1871
safe='Backup changed files (default).',
1520
1872
keep='Delete from bzr but leave the working copy.',
1521
force='Delete all the specified files, even if they can not be '
1522
'recovered and even if they are non-empty directories.')]
1873
no_backup='Don\'t backup changed files.'),
1523
1875
aliases = ['rm', 'del']
1524
1876
encoding_type = 'replace'
1526
1878
def run(self, file_list, verbose=False, new=False,
1527
1879
file_deletion_strategy='safe'):
1528
tree, file_list = tree_files(file_list)
1881
tree, file_list = WorkingTree.open_containing_paths(file_list)
1530
1883
if file_list is not None:
1531
1884
file_list = [f for f in file_list]
1726
2095
to_transport.ensure_base()
1727
2096
except errors.NoSuchFile:
1728
2097
if not create_prefix:
1729
raise errors.BzrCommandError("Parent directory of %s"
2098
raise errors.BzrCommandError(gettext("Parent directory of %s"
1730
2099
" does not exist."
1731
2100
"\nYou may supply --create-prefix to create all"
1732
" leading parent directories."
2101
" leading parent directories.")
1734
2103
to_transport.create_prefix()
1737
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2106
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1738
2107
except errors.NotBranchError:
1739
2108
# really a NotBzrDir error...
1740
create_branch = bzrdir.BzrDir.create_branch_convenience
2109
create_branch = controldir.ControlDir.create_branch_convenience
2111
force_new_tree = False
2113
force_new_tree = None
1741
2114
branch = create_branch(to_transport.base, format=format,
1742
possible_transports=[to_transport])
2115
possible_transports=[to_transport],
2116
force_new_tree=force_new_tree)
1743
2117
a_bzrdir = branch.bzrdir
1745
from bzrlib.transport.local import LocalTransport
2119
from brzlib.transport.local import LocalTransport
1746
2120
if a_bzrdir.has_branch():
1747
2121
if (isinstance(to_transport, LocalTransport)
1748
2122
and not a_bzrdir.has_workingtree()):
1749
2123
raise errors.BranchExistsWithoutWorkingTree(location)
1750
2124
raise errors.AlreadyBranchError(location)
1751
2125
branch = a_bzrdir.create_branch()
1752
a_bzrdir.create_workingtree()
2126
if not no_tree and not a_bzrdir.has_workingtree():
2127
a_bzrdir.create_workingtree()
1753
2128
if append_revisions_only:
1755
2130
branch.set_append_revisions_only(True)
1756
2131
except errors.UpgradeRequired:
1757
raise errors.BzrCommandError('This branch format cannot be set'
1758
' to append-revisions-only. Try --default.')
2132
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2133
' to append-revisions-only. Try --default.'))
1759
2134
if not is_quiet():
1760
from bzrlib.info import describe_layout, describe_format
2135
from brzlib.info import describe_layout, describe_format
1762
2137
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
1763
2138
except (errors.NoWorkingTree, errors.NotLocalUrl):
1821
2197
def run(self, location, format=None, no_trees=False):
1822
2198
if format is None:
1823
format = bzrdir.format_registry.make_bzrdir('default')
2199
format = controldir.format_registry.make_bzrdir('default')
1825
2201
if location is None:
1828
2204
to_transport = transport.get_transport(location)
1829
to_transport.ensure_base()
1831
newdir = format.initialize_on_transport(to_transport)
1832
repo = newdir.create_repository(shared=True)
1833
repo.set_make_working_trees(not no_trees)
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()))
1834
2212
if not is_quiet():
1835
from bzrlib.info import show_bzrdir_info
1836
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2213
from brzlib.info import show_bzrdir_info
2214
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1839
2217
class cmd_diff(Command):
1953
2353
elif ':' in prefix:
1954
2354
old_label, new_label = prefix.split(":")
1956
raise errors.BzrCommandError(
2356
raise errors.BzrCommandError(gettext(
1957
2357
'--prefix expects two values separated by a colon'
1958
' (eg "old/:new/")')
2358
' (eg "old/:new/")'))
1960
2360
if revision and len(revision) > 2:
1961
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
' one or two revision specifiers')
2361
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2362
' one or two revision specifiers'))
1964
2364
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
2365
raise errors.BzrCommandError(gettext(
2366
'{0} and {1} are mutually exclusive').format(
2367
'--using', '--format'))
1968
2369
(old_tree, new_tree,
1969
2370
old_branch, new_branch,
1970
2371
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
2372
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()
1972
2375
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
2376
specific_files=specific_files,
1974
2377
external_diff_options=diff_options,
1975
2378
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
2379
extra_trees=extra_trees,
2380
path_encoding=path_encoding,
2381
using=using, context=context,
1977
2382
format_cls=format)
2035
2438
_see_also = ['status', 'ls']
2038
help='Write an ascii NUL (\\0) separator '
2039
'between files rather than a newline.')
2439
takes_options = ['directory', 'null']
2042
2441
@display_command
2043
def run(self, null=False):
2044
wt = WorkingTree.open_containing(u'.')[0]
2442
def run(self, null=False, directory=u'.'):
2443
wt = WorkingTree.open_containing(directory)[0]
2045
2444
self.add_cleanup(wt.lock_read().unlock)
2046
2445
basis = wt.basis_tree()
2047
2446
self.add_cleanup(basis.lock_read().unlock)
2048
basis_inv = basis.inventory
2051
if file_id in basis_inv:
2053
if inv.is_root(file_id) and len(basis_inv) == 0:
2055
path = inv.id2path(file_id)
2056
if not os.access(osutils.abspath(path), os.F_OK):
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):
2059
2457
self.outf.write(path + '\0')
2277
2683
Option('show-diff',
2278
2684
short_name='p',
2279
2685
help='Show changes made in each revision as a patch.'),
2280
Option('include-merges',
2686
Option('include-merged',
2281
2687
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.'),
2282
2692
Option('exclude-common-ancestry',
2283
2693
help='Display only the revisions that are not part'
2284
' of both ancestries (require -rX..Y)'
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 '
2287
2720
encoding_type = 'replace'
2300
2733
show_diff=False,
2301
include_merges=False,
2734
include_merged=None,
2302
2736
exclude_common_ancestry=False,
2740
match_committer=None,
2744
include_merges=symbol_versioning.DEPRECATED_PARAMETER,
2304
from bzrlib.log import (
2746
from brzlib.log import (
2306
2748
make_log_request_dict,
2307
2749
_get_info_for_log_files,
2309
2751
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
2310
2767
if (exclude_common_ancestry
2311
2768
and (revision is None or len(revision) != 2)):
2312
raise errors.BzrCommandError(
2313
'--exclude-common-ancestry requires -r with two revisions')
2769
raise errors.BzrCommandError(gettext(
2770
'--exclude-common-ancestry requires -r with two revisions'))
2315
2772
if levels is None:
2318
raise errors.BzrCommandError(
2319
'--levels and --include-merges are mutually exclusive')
2775
raise errors.BzrCommandError(gettext(
2776
'{0} and {1} are mutually exclusive').format(
2777
'--levels', '--include-merged'))
2321
2779
if change is not None:
2322
2780
if len(change) > 1:
2323
2781
raise errors.RangeInChangeOption()
2324
2782
if revision is not None:
2325
raise errors.BzrCommandError(
2326
'--revision and --change are mutually exclusive')
2783
raise errors.BzrCommandError(gettext(
2784
'{0} and {1} are mutually exclusive').format(
2785
'--revision', '--change'))
2328
2787
revision = change
2505
2985
help='Recurse into subdirectories.'),
2506
2986
Option('from-root',
2507
2987
help='Print paths relative to the root of the branch.'),
2508
Option('unknown', help='Print unknown files.'),
2988
Option('unknown', short_name='u',
2989
help='Print unknown files.'),
2509
2990
Option('versioned', help='Print versioned files.',
2510
2991
short_name='V'),
2511
Option('ignored', help='Print ignored files.'),
2513
help='Write an ascii NUL (\\0) separator '
2514
'between files rather than a newline.'),
2992
Option('ignored', short_name='i',
2993
help='Print ignored files.'),
2994
Option('kind', short_name='k',
2516
2995
help='List entries of a particular kind: file, directory, symlink.',
2520
3001
@display_command
2521
3002
def run(self, revision=None, verbose=False,
2522
3003
recursive=False, from_root=False,
2523
3004
unknown=False, versioned=False, ignored=False,
2524
null=False, kind=None, show_ids=False, path=None):
3005
null=False, kind=None, show_ids=False, path=None, directory=None):
2526
3007
if kind and kind not in ('file', 'directory', 'symlink'):
2527
raise errors.BzrCommandError('invalid kind specified')
3008
raise errors.BzrCommandError(gettext('invalid kind specified'))
2529
3010
if verbose and null:
2530
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3011
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2531
3012
all = not (unknown or versioned or ignored)
2533
3014
selection = {'I':ignored, '?':unknown, 'V':versioned}
2689
3180
_see_also = ['status', 'ignored', 'patterns']
2690
3181
takes_args = ['name_pattern*']
3182
takes_options = ['directory',
2692
3183
Option('default-rules',
2693
3184
help='Display the default ignore rules that bzr uses.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2697
from bzrlib import ignores
3187
def run(self, name_pattern_list=None, default_rules=None,
3189
from brzlib import ignores
2698
3190
if default_rules is not None:
2699
3191
# dump the default rules and exit
2700
3192
for pattern in ignores.USER_DEFAULTS:
2701
3193
self.outf.write("%s\n" % pattern)
2703
3195
if not name_pattern_list:
2704
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
3196
raise errors.BzrCommandError(gettext("ignore requires at least one "
3197
"NAME_PATTERN or --default-rules."))
2706
3198
name_pattern_list = [globbing.normalize_pattern(p)
2707
3199
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('')
2708
3212
for name_pattern in name_pattern_list:
2709
3213
if (name_pattern[0] == '/' or
2710
3214
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
raise errors.BzrCommandError(
2712
"NAME_PATTERN should not be an absolute path")
2713
tree, relpath = WorkingTree.open_containing(u'.')
3215
raise errors.BzrCommandError(gettext(
3216
"NAME_PATTERN should not be an absolute path"))
3217
tree, relpath = WorkingTree.open_containing(directory)
2714
3218
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
3219
ignored = globbing.Globster(name_pattern_list)
3221
self.add_cleanup(tree.lock_read().unlock)
2718
3222
for entry in tree.list_files():
2720
3224
if id is not None:
2721
3225
filename = entry[0]
2722
3226
if ignored.match(filename):
2723
3227
matches.append(filename)
2725
3228
if len(matches) > 0:
2726
self.outf.write("Warning: the following files are version controlled and"
2727
" match your ignore pattern:\n%s"
3229
self.outf.write(gettext("Warning: the following files are version "
3230
"controlled and match your ignore pattern:\n%s"
2728
3231
"\nThese files will continue to be version controlled"
2729
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3232
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2732
3235
class cmd_ignored(Command):
2817
3323
Option('per-file-timestamps',
2818
3324
help='Set modification time of files to that of the last '
2819
3325
'revision in which it was changed.'),
3326
Option('uncommitted',
3327
help='Export the working tree contents rather than that of the '
2821
3330
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2823
from bzrlib.export import export
3331
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3333
from brzlib.export import export
2825
3335
if branch_or_subdir is None:
2826
tree = WorkingTree.open_containing(u'.')[0]
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"))
2830
b, subdir = Branch.open_containing(branch_or_subdir)
2833
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3349
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
3351
export(export_tree, dest, format, root, subdir, filtered=filters,
2836
3352
per_file_timestamps=per_file_timestamps)
2837
3353
except errors.NoSuchExportFormat, e:
2838
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3354
raise errors.BzrCommandError(
3355
gettext('Unsupported export format: %s') % e.format)
2841
3358
class cmd_cat(Command):
2879
3396
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
2881
3402
if name_from_revision:
2882
3403
# Try in revision if requested
2883
3404
if old_file_id is None:
2884
raise errors.BzrCommandError(
2885
"%r is not present in revision %s" % (
3405
raise errors.BzrCommandError(gettext(
3406
"{0!r} is not present in revision {1}").format(
2886
3407
filename, rev_tree.get_revision_id()))
2888
content = rev_tree.get_file_text(old_file_id)
3409
actual_file_id = old_file_id
2890
3411
cur_file_id = tree.path2id(relpath)
2892
if cur_file_id is not None:
2893
# Then try with the actual file id
2895
content = rev_tree.get_file_text(cur_file_id)
2897
except errors.NoSuchId:
2898
# The actual file id didn't exist at that time
2900
if not found and old_file_id is not None:
2901
# Finally try with the old file id
2902
content = rev_tree.get_file_text(old_file_id)
2905
# Can't be found anywhere
2906
raise errors.BzrCommandError(
2907
"%r is not present in revision %s" % (
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(
2908
3419
filename, rev_tree.get_revision_id()))
2910
from bzrlib.filters import (
2911
ContentFilterContext,
2912
filtered_output_bytes,
2914
filters = rev_tree._content_filter_stack(relpath)
2915
chunks = content.splitlines(True)
2916
content = filtered_output_bytes(chunks, filters,
2917
ContentFilterContext(relpath, rev_tree))
2919
self.outf.writelines(content)
3421
from brzlib.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)
2922
self.outf.write(content)
3426
content = rev_tree.get_file_text(actual_file_id)
3428
self.outf.write(content)
2925
3431
class cmd_local_time_offset(Command):
2986
3492
to trigger updates to external systems like bug trackers. The --fixes
2987
3493
option can be used to record the association between a revision and
2988
3494
one or more bugs. See ``bzr help bugs`` for details.
2990
A selective commit may fail in some cases where the committed
2991
tree would be invalid. Consider::
2996
bzr commit foo -m "committing foo"
2997
bzr mv foo/bar foo/baz
3000
bzr commit foo/bar -m "committing bar but not baz"
3002
In the example above, the last commit will fail by design. This gives
3003
the user the opportunity to decide whether they want to commit the
3004
rename at the same time, separately first, or not at all. (As a general
3005
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3007
# TODO: Run hooks on tree to-be-committed, and after commit.
3009
# TODO: Strict commit that fails if there are deleted files.
3010
# (what does "deleted files" mean ??)
3012
# TODO: Give better message for -s, --summary, used by tla people
3014
# XXX: verbose currently does nothing
3016
3497
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3017
3498
takes_args = ['selected*']
3049
3530
Option('show-diff', short_name='p',
3050
3531
help='When no message is supplied, show the diff along'
3051
3532
' 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 '
3053
3538
aliases = ['ci', 'checkin']
3055
3540
def _iter_bug_fix_urls(self, fixes, branch):
3541
default_bugtracker = None
3056
3542
# Configure the properties for bug fixing attributes.
3057
3543
for fixed_bug in fixes:
3058
3544
tokens = fixed_bug.split(':')
3059
if len(tokens) != 2:
3060
raise errors.BzrCommandError(
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(
3061
3561
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3062
3562
"See \"bzr help bugs\" for more information on this "
3063
"feature.\nCommit refused." % fixed_bug)
3064
tag, bug_id = tokens
3563
"feature.\nCommit refused.") % fixed_bug)
3565
tag, bug_id = tokens
3066
3567
yield bugtracker.get_bug_url(tag, branch, bug_id)
3067
3568
except errors.UnknownBugTrackerAbbreviation:
3068
raise errors.BzrCommandError(
3069
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3569
raise errors.BzrCommandError(gettext(
3570
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3070
3571
except errors.MalformedBugIdentifier, e:
3071
raise errors.BzrCommandError(
3072
"%s\nCommit refused." % (str(e),))
3572
raise errors.BzrCommandError(gettext(
3573
"%s\nCommit refused.") % (str(e),))
3074
3575
def run(self, message=None, file=None, verbose=False, selected_list=None,
3075
3576
unchanged=False, strict=False, local=False, fixes=None,
3076
author=None, show_diff=False, exclude=None, commit_time=None):
3077
from bzrlib.errors import (
3577
author=None, show_diff=False, exclude=None, commit_time=None,
3579
from brzlib.errors import (
3078
3580
PointlessCommit,
3079
3581
ConflictsInTree,
3080
3582
StrictCommitFailed
3082
from bzrlib.msgeditor import (
3584
from brzlib.msgeditor import (
3083
3585
edit_commit_message_encoded,
3084
3586
generate_commit_message_template,
3085
make_commit_message_template_encoded
3587
make_commit_message_template_encoded,
3088
3591
commit_stamp = offset = None
3178
3683
reporter=None, verbose=verbose, revprops=properties,
3179
3684
authors=author, timestamp=commit_stamp,
3180
3685
timezone=offset,
3181
exclude=safe_relpath_files(tree, exclude))
3686
exclude=tree.safe_relpath_files(exclude),
3182
3688
except PointlessCommit:
3183
raise errors.BzrCommandError("No changes to commit."
3184
" Use --unchanged to commit anyhow.")
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."))
3185
3692
except ConflictsInTree:
3186
raise errors.BzrCommandError('Conflicts detected in working '
3693
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3187
3694
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3189
3696
except StrictCommitFailed:
3190
raise errors.BzrCommandError("Commit refused because there are"
3191
" unknown files in the working tree.")
3697
raise errors.BzrCommandError(gettext("Commit refused because there are"
3698
" unknown files in the working tree."))
3192
3699
except errors.BoundBranchOutOfDate, e:
3193
e.extra_help = ("\n"
3700
e.extra_help = (gettext("\n"
3194
3701
'To commit to master branch, run update and then commit.\n'
3195
3702
'You can also pass --local to commit to continue working '
3270
3777
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3273
The check command or bzr developers may sometimes advise you to run
3274
this command. When the default format has changed you may also be warned
3275
during other operations to upgrade.
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/.
3278
_see_also = ['check']
3810
_see_also = ['check', 'reconcile', 'formats']
3279
3811
takes_args = ['url?']
3280
3812
takes_options = [
3281
RegistryOption('format',
3282
help='Upgrade to a specific format. See "bzr help'
3283
' formats" for details.',
3284
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3285
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3286
value_switches=True, title='Branch format'),
3813
RegistryOption('format',
3814
help='Upgrade to a specific format. See "bzr help'
3815
' formats" for details.',
3816
lazy_registry=('brzlib.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."),
3289
def run(self, url='.', format=None):
3290
from bzrlib.upgrade import upgrade
3291
upgrade(url, format)
3825
def run(self, url='.', format=None, clean=False, dry_run=False):
3826
from brzlib.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
3294
3836
class cmd_whoami(Command):
3313
3856
encoding_type = 'replace'
3315
3858
@display_command
3316
def run(self, email=False, branch=False, name=None):
3859
def run(self, email=False, branch=False, name=None, directory=None):
3317
3860
if name is None:
3318
# use branch if we're inside one; otherwise global config
3320
c = Branch.open_containing('.')[0].get_config()
3321
except errors.NotBranchError:
3322
c = config.GlobalConfig()
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')
3324
self.outf.write(c.user_email() + '\n')
3871
self.outf.write(_mod_config.extract_email_address(identity)
3326
self.outf.write(c.username() + '\n')
3874
self.outf.write(identity + '\n')
3878
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3329
3881
# display a warning if an email address isn't included in the given name.
3331
config.extract_email_address(name)
3883
_mod_config.extract_email_address(name)
3332
3884
except errors.NoEmailInUsername, e:
3333
3885
warning('"%s" does not seem to contain an email address. '
3334
3886
'This is allowed, but not recommended.', name)
3336
3888
# use global config unless --branch given
3338
c = Branch.open_containing('.')[0].get_config()
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()
3340
c = config.GlobalConfig()
3341
c.set_user_option('email', name)
3897
c = _mod_config.GlobalStack()
3898
c.set('email', name)
3344
3901
class cmd_nick(Command):
3345
3902
__doc__ = """Print or set the branch nickname.
3347
If unset, the tree root directory name is used as the nickname.
3348
To print the current nickname, execute with no argument.
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.
3350
3908
Bound branches use the nickname of its master branch unless it is set
3559
4122
def run(self, testspecs_list=None, verbose=False, one=False,
3560
4123
transport=None, benchmark=None,
3561
lsprof_timed=None, cache_dir=None,
3562
4125
first=False, list_only=False,
3563
4126
randomize=None, exclude=None, strict=False,
3564
4127
load_list=None, debugflag=None, starting_with=None, subunit=False,
3565
parallel=None, lsprof_tests=False):
3566
from bzrlib.tests import selftest
3567
import bzrlib.benchmarks as benchmarks
3568
from bzrlib.benchmarks import tree_creator
3570
# Make deprecation warnings visible, unless -Werror is set
3571
symbol_versioning.activate_deprecation_warnings(override=False)
3573
if cache_dir is not None:
3574
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
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 brzlib import tests
3575
4141
if testspecs_list is not None:
3576
4142
pattern = '|'.join(testspecs_list)
3581
from bzrlib.tests import SubUnitBzrRunner
4147
from brzlib.tests import SubUnitBzrRunner
3582
4148
except ImportError:
3583
raise errors.BzrCommandError("subunit not available. subunit "
3584
"needs to be installed to use --subunit.")
4149
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4150
"needs to be installed to use --subunit."))
3585
4151
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
4152
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
4153
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
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):
3590
4160
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3592
4162
self.additional_selftest_args.setdefault(
3593
4163
'suite_decorators', []).append(parallel)
3595
test_suite_factory = benchmarks.test_suite
3596
# Unless user explicitly asks for quiet, be verbose in benchmarks
3597
verbose = not is_quiet()
3598
# TODO: should possibly lock the history file...
3599
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
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
3602
test_suite_factory = None
4172
exclude_pattern = '(' + '|'.join(exclude) + ')'
4174
self._disable_fsync()
3604
4175
selftest_kwargs = {"verbose": verbose,
3605
4176
"pattern": pattern,
3606
4177
"stop_on_failure": one,
3608
4179
"test_suite_factory": test_suite_factory,
3609
4180
"lsprof_timed": lsprof_timed,
3610
4181
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
4182
"matching_tests_first": first,
3613
4183
"list_only": list_only,
3614
4184
"random_seed": randomize,
3615
"exclude_pattern": exclude,
4185
"exclude_pattern": exclude_pattern,
3616
4186
"strict": strict,
3617
4187
"load_list": load_list,
3618
4188
"debug_flags": debugflag,
3619
4189
"starting_with": starting_with
3621
4191
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
4193
# Make deprecation warnings visible, unless -Werror is set
4194
cleanup = symbol_versioning.activate_deprecation_warnings(
4197
result = tests.selftest(**selftest_kwargs)
3623
4200
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
3626
4212
class cmd_version(Command):
3627
4213
__doc__ = """Show version of bzr."""
3680
4266
The source of the merge can be specified either in the form of a branch,
3681
4267
or in the form of a path to a file containing a merge directive generated
3682
4268
with bzr send. If neither is specified, the default is the upstream branch
3683
or the branch most recently merged using --remember.
3685
When merging a branch, by default the tip will be merged. To pick a different
3686
revision, pass --revision. If you specify two values, the first will be used as
3687
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3688
available revisions, like this is commonly referred to as "cherrypicking".
3690
Revision numbers are always relative to the branch being merged.
3692
By default, bzr will try to merge in all new work from the other
3693
branch, automatically determining an appropriate base. If this
3694
fails, you may need to give an explicit base.
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.
3696
4291
Merge will do its best to combine the changes in two branches, but there
3697
4292
are some kinds of problems only a human can fix. When it encounters those,
3698
4293
it will mark a conflict. A conflict means that you need to fix something,
3699
before you should commit.
4294
before you can commit.
3701
4296
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3703
If there is no default branch set, the first merge will set it. After
3704
that, you can omit the branch to use the default. To change the
3705
default, use --remember. The value will only be saved if the remote
3706
location can be accessed.
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.
3708
4303
The results of the merge are placed into the destination working
3709
4304
directory, where they can be reviewed (with bzr diff), tested, and then
3710
4305
committed to record the result of the merge.
3712
4307
merge refuses to run if there are any uncommitted changes, unless
3713
--force is given. The --force option can also be used to create a
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
3714
4311
merge revision which has more than two parents.
3716
4313
If one would like to merge changes from the working tree of the other
3843
4441
self.sanity_check_merger(merger)
3844
4442
if (merger.base_rev_id == merger.other_rev_id and
3845
4443
merger.other_rev_id is not None):
3846
note('Nothing to do.')
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.'))
4453
if pull and not preview:
3849
4454
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
4455
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3851
4456
if (merger.base_rev_id == tree.last_revision()):
3852
4457
result = tree.pull(merger.other_branch, False,
3853
4458
merger.other_rev_id)
3854
4459
result.report(self.outf)
3856
4461
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
4462
raise errors.BzrCommandError(gettext(
3858
4463
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
4464
" (perhaps you would prefer 'bzr pull')"))
3861
4466
return self._do_preview(merger)
3862
4467
elif interactive:
3958
4565
if other_revision_id is None:
3959
4566
other_revision_id = _mod_revision.ensure_null(
3960
4567
other_branch.last_revision())
3961
# Remember where we merge from
3962
if ((remember or tree.branch.get_submit_branch() is None) and
3963
user_location is not None):
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)))):
3964
4577
tree.branch.set_submit_branch(other_branch.base)
3965
_merge_tags_if_possible(other_branch, tree.branch)
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)
3966
4581
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3967
4582
other_revision_id, base_revision_id, other_branch, base_branch)
3968
4583
if other_path != '':
4131
4747
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4749
Set files in the working tree back to the contents of a previous revision.
4134
4751
Giving a list of files will revert only those files. Otherwise, all files
4135
4752
will be reverted. If the revision is not specified with '--revision', the
4136
last committed revision is used.
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.
4138
4757
To remove only some changes, without reverting to a prior version, use
4139
merge instead. For example, "merge . --revision -2..-3" will remove the
4140
changes introduced by -2, without affecting the changes introduced by -1.
4141
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
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
4143
By default, any files that have been manually changed will be backed up
4144
first. (Files changed only by merge are not backed up.) Backup files have
4145
'.~#~' appended to their name, where # is a number.
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.
4147
4771
When you provide files, you can use their current pathname or the pathname
4148
4772
from the target revision. So you can use revert to "undelete" a file by
4308
4935
theirs_only=False,
4309
4936
log_format=None, long=False, short=False, line=False,
4310
4937
show_ids=False, verbose=False, this=False, other=False,
4311
include_merges=False, revision=None, my_revision=None):
4312
from bzrlib.missing import find_unmerged, iter_log_revisions
4938
include_merged=None, revision=None, my_revision=None,
4940
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4941
from brzlib.missing import find_unmerged, iter_log_revisions
4313
4942
def message(s):
4314
4943
if not is_quiet():
4315
4944
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
4318
4962
mine_only = this
4385
5035
if remote_extra and not mine_only:
4386
5036
if printed_local is True:
4387
5037
message("\n\n\n")
4388
message("You are missing %d revision(s):\n" %
5038
message(ngettext("You are missing %d revision:\n",
5039
"You are missing %d revisions:\n",
5040
len(remote_extra)) %
4389
5041
len(remote_extra))
5042
if remote_branch.supports_tags():
5043
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4390
5044
for revision in iter_log_revisions(remote_extra,
4391
5045
remote_branch.repository,
4393
5048
lf.log_revision(revision)
4394
5049
status_code = 1
4396
5051
if mine_only and not local_extra:
4397
5052
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
5053
message(gettext('This branch has no new revisions.\n'))
4399
5054
elif theirs_only and not remote_extra:
4400
5055
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
5056
message(gettext('Other branch has no new revisions.\n'))
4402
5057
elif not (mine_only or theirs_only or local_extra or
4404
5059
# We checked both branches, and neither one had extra
4406
message("Branches are up to date.\n")
5061
message(gettext("Branches are up to date.\n"))
4407
5062
self.cleanup_now()
4408
5063
if not status_code and parent is None and other_branch is not None:
4409
5064
self.add_cleanup(local_branch.lock_write().unlock)
4542
5182
Option('long', help='Show commit date in annotations.'),
4546
5187
encoding_type = 'exact'
4548
5189
@display_command
4549
5190
def run(self, filename, all=False, long=False, revision=None,
4551
from bzrlib.annotate import annotate_file, annotate_file_tree
5191
show_ids=False, directory=None):
5192
from brzlib.annotate import (
4552
5195
wt, branch, relpath = \
4553
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5196
_open_directory_or_containing_tree_or_branch(filename, directory)
4554
5197
if wt is not None:
4555
5198
self.add_cleanup(wt.lock_read().unlock)
4557
5200
self.add_cleanup(branch.lock_read().unlock)
4558
5201
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
5202
self.add_cleanup(tree.lock_read().unlock)
5203
if wt is not None and revision is None:
4561
5204
file_id = wt.path2id(relpath)
4563
5206
file_id = tree.path2id(relpath)
4564
5207
if file_id is None:
4565
5208
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
5209
if wt is not None and revision is None:
4568
5210
# If there is a tree and we're not annotating historical
4569
5211
# versions, annotate the working tree's content.
4570
5212
annotate_file_tree(wt, file_id, self.outf, long, all,
4571
5213
show_ids=show_ids)
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
5215
annotate_file_tree(tree, file_id, self.outf, long, all,
5216
show_ids=show_ids, branch=branch)
4577
5219
class cmd_re_sign(Command):
4581
5223
hidden = True # is this right ?
4582
5224
takes_args = ['revision_id*']
4583
takes_options = ['revision']
5225
takes_options = ['directory', 'revision']
4585
def run(self, revision_id_list=None, revision=None):
5227
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4586
5228
if revision_id_list is not None and revision is not None:
4587
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5229
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4588
5230
if revision_id_list is None and revision is None:
4589
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
b = WorkingTree.open_containing(u'.')[0].branch
5231
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5232
b = WorkingTree.open_containing(directory)[0].branch
4591
5233
self.add_cleanup(b.lock_write().unlock)
4592
5234
return self._run(b, revision_id_list, revision)
4594
5236
def _run(self, b, revision_id_list, revision):
4595
import bzrlib.gpg as gpg
4596
gpg_strategy = gpg.GPGStrategy(b.get_config())
5237
import brzlib.gpg as gpg
5238
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4597
5239
if revision_id_list is not None:
4598
5240
b.repository.start_write_group()
4654
5296
_see_also = ['checkouts', 'unbind']
4655
5297
takes_args = ['location?']
5298
takes_options = ['directory']
4658
def run(self, location=None):
4659
b, relpath = Branch.open_containing(u'.')
5300
def run(self, location=None, directory=u'.'):
5301
b, relpath = Branch.open_containing(directory)
4660
5302
if location is None:
4662
5304
location = b.get_old_bound_location()
4663
5305
except errors.UpgradeRequired:
4664
raise errors.BzrCommandError('No location supplied. '
4665
'This format does not remember old locations.')
5306
raise errors.BzrCommandError(gettext('No location supplied. '
5307
'This format does not remember old locations.'))
4667
5309
if location is None:
4668
5310
if b.get_bound_location() is not None:
4669
raise errors.BzrCommandError('Branch is already bound')
5311
raise errors.BzrCommandError(
5312
gettext('Branch is already bound'))
4671
raise errors.BzrCommandError('No location supplied '
4672
'and no previous location known')
5314
raise errors.BzrCommandError(
5315
gettext('No location supplied'
5316
' and no previous location known'))
4673
5317
b_other = Branch.open(location)
4675
5319
b.bind(b_other)
4676
5320
except errors.DivergedBranches:
4677
raise errors.BzrCommandError('These branches have diverged.'
4678
' Try merging, and then bind again.')
5321
raise errors.BzrCommandError(gettext('These branches have diverged.'
5322
' Try merging, and then bind again.'))
4679
5323
if b.get_config().has_explicit_nickname():
4680
5324
b.nick = b_other.nick
4747
5392
self.add_cleanup(tree.lock_write().unlock)
4749
5394
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5395
return self._run(b, tree, dry_run, verbose, revision, force,
4752
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
from bzrlib.log import log_formatter, show_log
4754
from bzrlib.uncommit import uncommit
5398
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5400
from brzlib.log import log_formatter, show_log
5401
from brzlib.uncommit import uncommit
4756
5403
last_revno, last_rev_id = b.last_revision_info()
4785
5432
end_revision=last_revno)
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
5435
self.outf.write(gettext('Dry-run, pretending to remove'
5436
' the above revisions.\n'))
4791
self.outf.write('The above revision(s) will be removed.\n')
5438
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
5441
if not ui.ui_factory.confirm_action(
5442
gettext(u'Uncommit these revisions'),
5443
'brzlib.builtins.uncommit',
5445
self.outf.write(gettext('Canceled\n'))
4798
5448
mutter('Uncommitting from {%s} to {%s}',
4799
5449
last_rev_id, rev_id)
4800
5450
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
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)
4806
5456
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
5457
__doc__ = """Break a dead lock.
5459
This command breaks a lock on a repository, branch, working directory or
4809
5462
CAUTION: Locks should only be broken when you are sure that the process
4810
5463
holding the lock has been stopped.
4852
5521
help='Serve on stdin/out for use from inetd or sshd.'),
4853
5522
RegistryOption('protocol',
4854
5523
help="Protocol to serve.",
4855
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5524
lazy_registry=('brzlib.transport', 'transport_server_registry'),
4856
5525
value_switches=True),
5527
help='Listen for connections on nominated address.', type=str),
4858
help='Listen for connections on nominated port of the form '
4859
'[hostname:]portnumber. Passing 0 as the port number will '
4860
'result in a dynamically allocated port. The default port '
4861
'depends on the protocol.',
4864
help='Serve contents of this directory.',
5529
help='Listen for connections on nominated port. Passing 0 as '
5530
'the port number will result in a dynamically allocated '
5531
'port. The default port depends on the protocol.',
5533
custom_help('directory',
5534
help='Serve contents of this directory.'),
4866
5535
Option('allow-writes',
4867
5536
help='By default the server is a readonly server. Supplying '
4868
5537
'--allow-writes enables write access to the contents of '
4872
5541
'option leads to global uncontrolled write access to your '
5544
Option('client-timeout', type=float,
5545
help='Override the default idle client timeout (5min).'),
4877
def get_host_and_port(self, port):
4878
"""Return the host and port to run the smart server on.
4880
If 'port' is None, None will be returned for the host and port.
4882
If 'port' has a colon in it, the string before the colon will be
4883
interpreted as the host.
4885
:param port: A string of the port to run the server on.
4886
:return: A tuple of (host, port), where 'host' is a host name or IP,
4887
and port is an integer TCP/IP port.
4890
if port is not None:
4892
host, port = port.split(':')
4896
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4898
from bzrlib.transport import get_transport, transport_server_registry
5548
def run(self, listen=None, port=None, inet=False, directory=None,
5549
allow_writes=False, protocol=None, client_timeout=None):
5550
from brzlib import transport
4899
5551
if directory is None:
4900
5552
directory = os.getcwd()
4901
5553
if protocol is None:
4902
protocol = transport_server_registry.get()
4903
host, port = self.get_host_and_port(port)
4904
url = urlutils.local_path_to_url(directory)
5554
protocol = transport.transport_server_registry.get()
5555
url = transport.location_to_url(directory)
4905
5556
if not allow_writes:
4906
5557
url = 'readonly+' + url
4907
transport = get_transport(url)
4908
protocol(transport, host, port, inet)
5558
t = transport.get_transport_from_url(url)
5559
protocol(t, listen, port, inet, client_timeout)
4911
5562
class cmd_join(Command):
5181
5841
Option('body', help='Body for the email.', type=unicode),
5182
5842
RegistryOption('format',
5183
5843
help='Use the specified output format.',
5184
lazy_registry=('bzrlib.send', 'format_registry')),
5844
lazy_registry=('brzlib.send', 'format_registry')),
5187
5847
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5188
no_patch=False, revision=None, remember=False, output=None,
5848
no_patch=False, revision=None, remember=None, output=None,
5189
5849
format=None, mail_to=None, message=None, body=None,
5190
5850
strict=None, **kwargs):
5191
from bzrlib.send import send
5851
from brzlib.send import send
5192
5852
return send(submit_branch, revision, public_branch, remember,
5193
5853
format, no_bundle, no_patch, output,
5194
5854
kwargs.get('from', '.'), mail_to, message, body,
5318
5975
self.add_cleanup(branch.lock_write().unlock)
5320
5977
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5978
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5322
5979
branch.tags.delete_tag(tag_name)
5323
self.outf.write('Deleted tag %s.\n' % tag_name)
5980
note(gettext('Deleted tag %s.') % tag_name)
5326
5983
if len(revision) != 1:
5327
raise errors.BzrCommandError(
5984
raise errors.BzrCommandError(gettext(
5328
5985
"Tags can only be placed on a single revision, "
5330
5987
revision_id = revision[0].as_revision_id(branch)
5332
5989
revision_id = branch.last_revision()
5333
5990
if tag_name is None:
5334
5991
tag_name = branch.automatic_tag_name(revision_id)
5335
5992
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
if (not force) and branch.tags.has_tag(tag_name):
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):
5339
6000
raise errors.TagAlreadyExists(tag_name)
5340
branch.tags.set_tag(tag_name, revision_id)
5341
self.outf.write('Created tag %s.\n' % 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)
5344
6011
class cmd_tags(Command):
5379
6038
self.add_cleanup(branch.lock_read().unlock)
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5389
elif sort == 'time':
5391
for tag, revid in tags:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
6040
# Restrict to the specified range
6041
tags = self._tags_for_range(branch, revision)
6043
sort = tag_sort_methods.get()
5400
6045
if not show_ids:
5401
6046
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
6047
for index, (tag, revid) in enumerate(tags):
5413
6060
for tag, revspec in tags:
5414
6061
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])
5417
6090
class cmd_reconfigure(Command):
5418
6091
__doc__ = """Reconfigure the type of a bzr directory.
5432
6105
takes_args = ['location?']
5433
6106
takes_options = [
5434
6107
RegistryOption.from_kwargs(
5436
title='Target type',
5437
help='The type to reconfigure the directory to.',
6110
help='The relation between branch and tree.',
5438
6111
value_switches=True, enum_switch=False,
5439
6112
branch='Reconfigure to be an unbound branch with no working tree.',
5440
6113
tree='Reconfigure to be an unbound branch with a working tree.',
5441
6114
checkout='Reconfigure to be a bound branch with a working tree.',
5442
6115
lightweight_checkout='Reconfigure to be a lightweight'
5443
6116
' 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,
5444
6123
standalone='Reconfigure to be a standalone branch '
5445
6124
'(i.e. stop using shared repository).',
5446
6125
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,
5447
6132
with_trees='Reconfigure repository to create '
5448
6133
'working trees on branches by default.',
5449
6134
with_no_trees='Reconfigure repository to not create '
5476
6161
# At the moment you can use --stacked-on and a different
5477
6162
# reconfiguration shape at the same time; there seems no good reason
5479
if target_type is None:
6164
if (tree_type is None and
6165
repository_type is None and
6166
repository_trees is None):
5480
6167
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5485
elif target_type == 'branch':
6170
raise errors.BzrCommandError(gettext('No target configuration '
6172
reconfiguration = None
6173
if tree_type == 'branch':
5486
6174
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
elif target_type == 'tree':
6175
elif tree_type == 'tree':
5488
6176
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5489
elif target_type == 'checkout':
6177
elif tree_type == 'checkout':
5490
6178
reconfiguration = reconfigure.Reconfigure.to_checkout(
5491
6179
directory, bind_to)
5492
elif target_type == 'lightweight-checkout':
6180
elif tree_type == 'lightweight-checkout':
5493
6181
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5494
6182
directory, bind_to)
5495
elif target_type == 'use-shared':
6184
reconfiguration.apply(force)
6185
reconfiguration = None
6186
if repository_type == 'use-shared':
5496
6187
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5497
elif target_type == 'standalone':
6188
elif repository_type == 'standalone':
5498
6189
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5499
elif target_type == 'with-trees':
6191
reconfiguration.apply(force)
6192
reconfiguration = None
6193
if repository_trees == 'with-trees':
5500
6194
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5501
6195
directory, True)
5502
elif target_type == 'with-no-trees':
6196
elif repository_trees == 'with-no-trees':
5503
6197
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5504
6198
directory, False)
5505
reconfiguration.apply(force)
6200
reconfiguration.apply(force)
6201
reconfiguration = None
5508
6204
class cmd_switch(Command):
5531
6227
takes_args = ['to_location?']
5532
takes_options = [Option('force',
6228
takes_options = ['directory',
5533
6230
help='Switch even if local commits will be lost.'),
5535
6232
Option('create-branch', short_name='b',
5536
6233
help='Create the target branch from this one before'
5537
6234
' switching to it.'),
6236
help='Store and restore uncommitted changes in the'
5540
6240
def run(self, to_location=None, force=False, create_branch=False,
5542
from bzrlib import switch
6241
revision=None, directory=u'.', store=False):
6242
from brzlib import switch
6243
tree_location = directory
5544
6244
revision = _get_one_revision('switch', revision)
5545
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6245
possible_transports = []
6246
control_dir = controldir.ControlDir.open_containing(tree_location,
6247
possible_transports=possible_transports)[0]
5546
6248
if to_location is None:
5547
6249
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
6250
raise errors.BzrCommandError(gettext('You must supply either a'
6251
' revision or a location'))
6252
to_location = tree_location
5552
branch = control_dir.open_branch()
6254
branch = control_dir.open_branch(
6255
possible_transports=possible_transports)
5553
6256
had_explicit_nick = branch.get_config().has_explicit_nickname()
5554
6257
except errors.NotBranchError:
5556
6259
had_explicit_nick = False
5557
6260
if create_branch:
5558
6261
if branch is None:
5559
raise errors.BzrCommandError('cannot create branch without'
5561
to_location = directory_service.directories.dereference(
5563
if '/' not in to_location and '\\' not in to_location:
5564
# This path is meant to be relative to the existing branch
5565
this_url = self._get_branch_location(control_dir)
5566
to_location = urlutils.join(this_url, '..', to_location)
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)
5567
6266
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
6267
possible_transports=possible_transports,
6268
source_branch=branch).open_branch()
5572
to_branch = Branch.open(to_location)
6271
to_branch = Branch.open(to_location,
6272
possible_transports=possible_transports)
5573
6273
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
6274
to_branch = open_sibling_branch(control_dir, to_location,
6275
possible_transports=possible_transports)
5577
6276
if revision is not None:
5578
6277
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
6278
switch.switch(control_dir, to_branch, force, revision_id=revision,
6279
store_uncommitted=store)
5580
6280
if had_explicit_nick:
5581
6281
branch = control_dir.open_branch() #get the new branch!
5582
6282
branch.nick = to_branch.nick
5583
note('Switched to branch: %s',
6283
note(gettext('Switched to branch: %s'),
5584
6284
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5586
def _get_branch_location(self, control_dir):
5587
"""Return location of branch for this control dir."""
5589
this_branch = control_dir.open_branch()
5590
# This may be a heavy checkout, where we want the master branch
5591
master_location = this_branch.get_bound_location()
5592
if master_location is not None:
5593
return master_location
5594
# If not, use a local sibling
5595
return this_branch.base
5596
except errors.NotBranchError:
5597
format = control_dir.find_branch_format()
5598
if getattr(format, 'get_reference', None) is not None:
5599
return format.get_reference(control_dir)
5601
return control_dir.root_transport.base
5604
6288
class cmd_view(Command):
5691
tree, file_list = tree_files(file_list, apply_view=False)
6375
tree, file_list = WorkingTree.open_containing_paths(file_list,
5692
6377
current_view, view_dict = tree.views.get_view_info()
5693
6378
if name is None:
5694
6379
name = current_view
5697
raise errors.BzrCommandError(
5698
"Both --delete and a file list specified")
6382
raise errors.BzrCommandError(gettext(
6383
"Both --delete and a file list specified"))
5700
raise errors.BzrCommandError(
5701
"Both --delete and --switch specified")
6385
raise errors.BzrCommandError(gettext(
6386
"Both --delete and --switch specified"))
5703
6388
tree.views.set_view_info(None, {})
5704
self.outf.write("Deleted all views.\n")
6389
self.outf.write(gettext("Deleted all views.\n"))
5705
6390
elif name is None:
5706
raise errors.BzrCommandError("No current view to delete")
6391
raise errors.BzrCommandError(gettext("No current view to delete"))
5708
6393
tree.views.delete_view(name)
5709
self.outf.write("Deleted '%s' view.\n" % name)
6394
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5712
raise errors.BzrCommandError(
5713
"Both --switch and a file list specified")
6397
raise errors.BzrCommandError(gettext(
6398
"Both --switch and a file list specified"))
5715
raise errors.BzrCommandError(
5716
"Both --switch and --all specified")
6400
raise errors.BzrCommandError(gettext(
6401
"Both --switch and --all specified"))
5717
6402
elif switch == 'off':
5718
6403
if current_view is None:
5719
raise errors.BzrCommandError("No current view to disable")
6404
raise errors.BzrCommandError(gettext("No current view to disable"))
5720
6405
tree.views.set_view_info(None, view_dict)
5721
self.outf.write("Disabled '%s' view.\n" % (current_view))
6406
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5723
6408
tree.views.set_view_info(switch, view_dict)
5724
6409
view_str = views.view_display_str(tree.views.lookup_view())
5725
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6410
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5728
self.outf.write('Views defined:\n')
6413
self.outf.write(gettext('Views defined:\n'))
5729
6414
for view in sorted(view_dict):
5730
6415
if view == current_view:
5734
6419
view_str = views.view_display_str(view_dict[view])
5735
6420
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5737
self.outf.write('No views defined.\n')
6422
self.outf.write(gettext('No views defined.\n'))
5738
6423
elif file_list:
5739
6424
if name is None:
5740
6425
# No name given and no current view set
5742
6427
elif name == 'off':
5743
raise errors.BzrCommandError(
5744
"Cannot change the 'off' pseudo view")
6428
raise errors.BzrCommandError(gettext(
6429
"Cannot change the 'off' pseudo view"))
5745
6430
tree.views.set_view(name, sorted(file_list))
5746
6431
view_str = views.view_display_str(tree.views.lookup_view())
5747
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6432
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5749
6434
# list the files
5750
6435
if name is None:
5751
6436
# No name given and no current view set
5752
self.outf.write('No current view.\n')
6437
self.outf.write(gettext('No current view.\n'))
5754
6439
view_str = views.view_display_str(tree.views.lookup_view(name))
5755
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6440
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5758
6443
class cmd_hooks(Command):
5824
6519
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
6520
restore the most recently shelved changes.
6522
For complicated changes, it is possible to edit the changes in a separate
6523
editor program to decide what the file remaining in the working copy
6524
should look like. To do this, add the configuration option
6526
change_editor = PROGRAM @new_path @old_path
6528
where @new_path is replaced with the path of the new version of the
6529
file and @old_path is replaced with the path of the old version of
6530
the file. The PROGRAM should save the new file with the desired
6531
contents of the file in the working tree.
5828
6535
takes_args = ['file*']
5830
6537
takes_options = [
5832
6540
Option('all', help='Shelve all changes.'),
5834
6542
RegistryOption('writer', 'Method to use for writing diffs.',
5835
bzrlib.option.diff_writer_registry,
6543
brzlib.option.diff_writer_registry,
5836
6544
value_switches=True, enum_switch=False),
5838
6546
Option('list', help='List shelved changes.'),
5839
6547
Option('destroy',
5840
6548
help='Destroy removed changes instead of shelving them.'),
5842
_see_also = ['unshelve']
6550
_see_also = ['unshelve', 'configuration']
5844
6552
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
6553
writer=None, list=False, destroy=False, directory=None):
5847
return self.run_for_list()
5848
from bzrlib.shelf_ui import Shelver
6555
return self.run_for_list(directory=directory)
6556
from brzlib.shelf_ui import Shelver
5849
6557
if writer is None:
5850
writer = bzrlib.option.diff_writer_registry.get()
6558
writer = brzlib.option.diff_writer_registry.get()
5852
6560
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
6561
file_list, message, destroy=destroy, directory=directory)
5987
6699
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 brzlib.export_pot import export_pot
6717
export_pot(self.outf, plugin, include_duplicates)
5990
6720
def _register_lazy_builtins():
5991
6721
# register lazy builtins from other modules; called at startup and should
5992
6722
# be only called once.
5993
6723
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6724
('cmd_bundle_info', [], 'brzlib.bundle.commands'),
6725
('cmd_config', [], 'brzlib.config'),
6726
('cmd_dpush', [], 'brzlib.foreign'),
6727
('cmd_version_info', [], 'brzlib.cmd_version_info'),
6728
('cmd_resolve', ['resolved'], 'brzlib.conflicts'),
6729
('cmd_conflicts', [], 'brzlib.conflicts'),
6730
('cmd_ping', [], 'brzlib.smart.ping'),
6731
('cmd_sign_my_commits', [], 'brzlib.commit_signature_commands'),
6732
('cmd_verify_signatures', [], 'brzlib.commit_signature_commands'),
6733
('cmd_test_script', [], 'brzlib.cmd_test_script'),
6001
6735
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
brzlib/builtins.py
