78
74
_parse_revision_str,
80
76
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
86
def _get_branch_location(control_dir, possible_transports=None):
87
"""Return location of branch for this control dir."""
89
target = control_dir.get_branch_reference()
90
except errors.NotBranchError:
91
return control_dir.root_transport.base
92
if target is not None:
94
this_branch = control_dir.open_branch(
95
possible_transports=possible_transports)
96
# This may be a heavy checkout, where we want the master branch
97
master_location = this_branch.get_bound_location()
98
if master_location is not None:
99
return master_location
100
# If not, use a local sibling
101
return this_branch.base
104
def _is_colocated(control_dir, possible_transports=None):
105
"""Check if the branch in control_dir is colocated.
107
:param control_dir: Control directory
108
:return: Tuple with boolean indicating whether the branch is colocated
109
and the full URL to the actual branch
111
# This path is meant to be relative to the existing branch
112
this_url = _get_branch_location(control_dir,
113
possible_transports=possible_transports)
114
# Perhaps the target control dir supports colocated branches?
116
root = controldir.ControlDir.open(this_url,
117
possible_transports=possible_transports)
118
except errors.NotBranchError:
119
return (False, this_url)
122
wt = control_dir.open_workingtree()
123
except (errors.NoWorkingTree, errors.NotLocalUrl):
124
return (False, this_url)
127
root._format.colocated_branches and
128
control_dir.control_url == root.control_url,
132
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
133
"""Lookup the location for a new sibling branch.
135
:param control_dir: Control directory to find sibling branches from
136
:param location: Name of the new branch
137
:return: Full location to the new branch
139
location = directory_service.directories.dereference(location)
140
if '/' not in location and '\\' not in location:
141
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
144
return urlutils.join_segment_parameters(this_url,
145
{"branch": urlutils.escape(location)})
147
return urlutils.join(this_url, '..', urlutils.escape(location))
151
def open_sibling_branch(control_dir, location, possible_transports=None):
152
"""Open a branch, possibly a sibling of another.
154
:param control_dir: Control directory relative to which to lookup the
156
:param location: Location to look up
157
:return: branch to open
160
# Perhaps it's a colocated branch?
161
return control_dir.open_branch(location,
162
possible_transports=possible_transports)
163
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
164
this_url = _get_branch_location(control_dir)
167
this_url, '..', urlutils.escape(location)))
170
def open_nearby_branch(near=None, location=None, possible_transports=None):
171
"""Open a nearby branch.
173
:param near: Optional location of container from which to open branch
174
:param location: Location of the branch
175
:return: Branch instance
181
return Branch.open(location,
182
possible_transports=possible_transports)
183
except errors.NotBranchError:
185
cdir = controldir.ControlDir.open(near,
186
possible_transports=possible_transports)
187
return open_sibling_branch(cdir, location,
188
possible_transports=possible_transports)
191
def iter_sibling_branches(control_dir, possible_transports=None):
192
"""Iterate over the siblings of a branch.
194
:param control_dir: Control directory for which to look up the siblings
195
:return: Iterator over tuples with branch name and branch object
199
reference = control_dir.get_branch_reference()
200
except errors.NotBranchError:
201
# There is no active branch, just return the colocated branches.
202
for name, branch in control_dir.get_branches().iteritems():
205
if reference is not None:
206
ref_branch = Branch.open(reference,
207
possible_transports=possible_transports)
210
if ref_branch is None or ref_branch.name:
211
if ref_branch is not None:
212
control_dir = ref_branch.bzrdir
213
for name, branch in control_dir.get_branches().iteritems():
216
repo = ref_branch.bzrdir.find_repository()
217
for branch in repo.find_branches(using=True):
218
name = urlutils.relative_url(repo.user_url,
219
branch.user_url).rstrip("/")
79
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
80
def tree_files(file_list, default_branch=u'.', canonicalize=True,
82
return internal_tree_files(file_list, default_branch, canonicalize,
223
86
def tree_files_for_add(file_list):
151
# XXX: Bad function name; should possibly also be a class method of
152
# WorkingTree rather than a function.
153
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
154
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
"""Convert command-line paths to a WorkingTree and relative paths.
158
Deprecated: use WorkingTree.open_containing_paths instead.
160
This is typically used for command-line processors that take one or
161
more filenames, and infer the workingtree that contains them.
163
The filenames given are not required to exist.
165
:param file_list: Filenames to convert.
167
:param default_branch: Fallback tree path to use if file_list is empty or
170
:param apply_view: if True and a view is set, apply it or check that
171
specified files are within it
173
:return: workingtree, [relative_paths]
175
return WorkingTree.open_containing_paths(
176
file_list, default_directory='.',
288
181
def _get_view_info_for_change_reporter(tree):
289
182
"""Get the view information from a tree for change reporting."""
594
477
raise errors.ShelvedChanges(working)
596
479
if working.user_url != working.branch.user_url:
597
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
598
" from a lightweight checkout"))
480
raise errors.BzrCommandError("You cannot remove the working tree"
481
" from a lightweight checkout")
600
483
d.destroy_workingtree()
603
class cmd_repair_workingtree(Command):
604
__doc__ = """Reset the working tree state file.
606
This is not meant to be used normally, but more as a way to recover from
607
filesystem corruption, etc. This rebuilds the working inventory back to a
608
'known good' state. Any new modifications (adding a file, renaming, etc)
609
will be lost, though modified files will still be detected as such.
611
Most users will want something more like "bzr revert" or "bzr update"
612
unless the state file has become corrupted.
614
By default this attempts to recover the current state by looking at the
615
headers of the state file. If the state file is too corrupted to even do
616
that, you can supply --revision to force the state of the tree.
619
takes_options = ['revision', 'directory',
621
help='Reset the tree even if it doesn\'t appear to be'
626
def run(self, revision=None, directory='.', force=False):
627
tree, _ = WorkingTree.open_containing(directory)
628
self.add_cleanup(tree.lock_tree_write().unlock)
632
except errors.BzrError:
633
pass # There seems to be a real error here, so we'll reset
636
raise errors.BzrCommandError(gettext(
637
'The tree does not appear to be corrupt. You probably'
638
' want "bzr revert" instead. Use "--force" if you are'
639
' sure you want to reset the working tree.'))
643
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
645
tree.reset_state(revision_ids)
646
except errors.BzrError, e:
647
if revision_ids is None:
648
extra = (gettext(', the header appears corrupt, try passing -r -1'
649
' to set the state to the last commit'))
652
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
655
486
class cmd_revno(Command):
656
487
__doc__ = """Show current revision number.
661
492
_see_also = ['info']
662
493
takes_args = ['location?']
663
494
takes_options = [
664
Option('tree', help='Show revno of working tree.'),
495
Option('tree', help='Show revno of working tree'),
669
def run(self, tree=False, location=u'.', revision=None):
670
if revision is not None and tree:
671
raise errors.BzrCommandError(gettext("--tree and --revision can "
672
"not be used together"))
499
def run(self, tree=False, location=u'.'):
676
502
wt = WorkingTree.open_containing(location)[0]
677
503
self.add_cleanup(wt.lock_read().unlock)
678
504
except (errors.NoWorkingTree, errors.NotLocalUrl):
679
505
raise errors.NoWorkingTree(location)
681
506
revid = wt.last_revision()
508
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
509
except errors.NoSuchRevision:
511
revno = ".".join(str(n) for n in revno_t)
683
513
b = Branch.open_containing(location)[0]
684
514
self.add_cleanup(b.lock_read().unlock)
686
if len(revision) != 1:
687
raise errors.BzrCommandError(gettext(
688
"Tags can only be placed on a single revision, "
690
revid = revision[0].as_revision_id(b)
692
revid = b.last_revision()
694
revno_t = b.revision_id_to_dotted_revno(revid)
695
except errors.NoSuchRevision:
697
revno = ".".join(str(n) for n in revno_t)
698
516
self.cleanup_now()
699
self.outf.write(revno + '\n')
517
self.outf.write(str(revno) + '\n')
702
520
class cmd_revision_info(Command):
859
668
takes_args = ['dir+']
863
help='No error if existing, make parent directories as needed.',
867
669
encoding_type = 'replace'
870
def add_file_with_parents(cls, wt, relpath):
871
if wt.path2id(relpath) is not None:
873
cls.add_file_with_parents(wt, osutils.dirname(relpath))
877
def add_file_single(cls, wt, relpath):
880
def run(self, dir_list, parents=False):
882
add_file = self.add_file_with_parents
884
add_file = self.add_file_single
886
wt, relpath = WorkingTree.open_containing(dir)
891
if e.errno != errno.EEXIST:
671
def run(self, dir_list):
673
wt, dd = WorkingTree.open_containing(d)
674
base = os.path.dirname(dd)
675
id = wt.path2id(base)
679
self.outf.write('added %s\n' % d)
895
add_file(wt, relpath)
897
self.outf.write(gettext('added %s\n') % dir)
681
raise errors.NotVersionedError(path=base)
900
684
class cmd_relpath(Command):
1007
790
return self.run_auto(names_list, after, dry_run)
1009
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
792
raise errors.BzrCommandError('--dry-run requires --auto.')
1010
793
if names_list is None:
1012
795
if len(names_list) < 2:
1013
raise errors.BzrCommandError(gettext("missing file argument"))
796
raise errors.BzrCommandError("missing file argument")
1014
797
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1015
for file_name in rel_names[0:-1]:
1017
raise errors.BzrCommandError(gettext("can not move root of branch"))
1018
798
self.add_cleanup(tree.lock_tree_write().unlock)
1019
799
self._run(tree, names_list, rel_names, after)
1021
801
def run_auto(self, names_list, after, dry_run):
1022
802
if names_list is not None and len(names_list) > 1:
1023
raise errors.BzrCommandError(gettext('Only one path may be specified to'
803
raise errors.BzrCommandError('Only one path may be specified to'
1026
raise errors.BzrCommandError(gettext('--after cannot be specified with'
806
raise errors.BzrCommandError('--after cannot be specified with'
1028
808
work_tree, file_list = WorkingTree.open_containing_paths(
1029
809
names_list, default_directory='.')
1030
810
self.add_cleanup(work_tree.lock_tree_write().unlock)
1314
1072
Option('no-tree',
1315
1073
help="Don't populate the working tree, even for protocols"
1316
1074
" that support it."),
1317
Option('overwrite-tags',
1318
help="Overwrite tags only."),
1320
1076
takes_args = ['location?']
1321
1077
encoding_type = 'replace'
1323
def run(self, location=None, remember=None, overwrite=False,
1079
def run(self, location=None, remember=False, overwrite=False,
1324
1080
create_prefix=False, verbose=False, revision=None,
1325
1081
use_existing_dir=False, directory=None, stacked_on=None,
1326
stacked=False, strict=None, no_tree=False,
1327
overwrite_tags=False):
1082
stacked=False, strict=None, no_tree=False):
1328
1083
from bzrlib.push import _show_push_branch
1331
overwrite = ["history", "tags"]
1332
elif overwrite_tags:
1333
overwrite = ["tags"]
1337
1085
if directory is None:
1338
1086
directory = '.'
1339
1087
# Get the source branch
1340
1088
(tree, br_from,
1341
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1089
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1342
1090
# Get the tip's revision_id
1343
1091
revision = _get_one_revision('push', revision)
1344
1092
if revision is not None:
1365
1113
# error by the feedback given to them. RBC 20080227.
1366
1114
stacked_on = parent_url
1367
1115
if not stacked_on:
1368
raise errors.BzrCommandError(gettext(
1369
"Could not determine branch to refer to."))
1116
raise errors.BzrCommandError(
1117
"Could not determine branch to refer to.")
1371
1119
# Get the destination location
1372
1120
if location is None:
1373
1121
stored_loc = br_from.get_push_location()
1374
1122
if stored_loc is None:
1375
parent_loc = br_from.get_parent()
1377
raise errors.BzrCommandError(gettext(
1378
"No push location known or specified. To push to the "
1379
"parent branch (at %s), use 'bzr push :parent'." %
1380
urlutils.unescape_for_display(parent_loc,
1381
self.outf.encoding)))
1383
raise errors.BzrCommandError(gettext(
1384
"No push location known or specified."))
1123
raise errors.BzrCommandError(
1124
"No push location known or specified.")
1386
1126
display_url = urlutils.unescape_for_display(stored_loc,
1387
1127
self.outf.encoding)
1388
note(gettext("Using saved push location: %s") % display_url)
1128
self.outf.write("Using saved push location: %s\n" % display_url)
1389
1129
location = stored_loc
1391
1131
_show_push_branch(br_from, revision_id, location, self.outf,
1469
1201
revision_id = br_from.last_revision()
1470
1202
if to_location is None:
1471
to_location = getattr(br_from, "name", None)
1473
to_location = urlutils.derive_to_location(from_location)
1203
to_location = urlutils.derive_to_location(from_location)
1474
1204
to_transport = transport.get_transport(to_location)
1476
1206
to_transport.mkdir('.')
1477
1207
except errors.FileExists:
1479
to_dir = controldir.ControlDir.open_from_transport(
1481
except errors.NotBranchError:
1482
if not use_existing_dir:
1483
raise errors.BzrCommandError(gettext('Target directory "%s" '
1484
'already exists.') % to_location)
1208
if not use_existing_dir:
1209
raise errors.BzrCommandError('Target directory "%s" '
1210
'already exists.' % to_location)
1489
to_dir.open_branch()
1213
bzrdir.BzrDir.open_from_transport(to_transport)
1490
1214
except errors.NotBranchError:
1493
1217
raise errors.AlreadyBranchError(to_location)
1494
1218
except errors.NoSuchFile:
1495
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1219
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1501
# preserve whatever source format we have.
1502
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1503
possible_transports=[to_transport],
1504
accelerator_tree=accelerator_tree,
1505
hardlink=hardlink, stacked=stacked,
1506
force_new_repo=standalone,
1507
create_tree_if_local=not no_tree,
1508
source_branch=br_from)
1509
branch = to_dir.open_branch(
1510
possible_transports=[
1511
br_from.bzrdir.root_transport, to_transport])
1512
except errors.NoSuchRevision:
1513
to_transport.delete_tree('.')
1514
msg = gettext("The branch {0} has no revision {1}.").format(
1515
from_location, revision)
1516
raise errors.BzrCommandError(msg)
1519
to_repo = to_dir.open_repository()
1520
except errors.NoRepositoryPresent:
1521
to_repo = to_dir.create_repository()
1522
to_repo.fetch(br_from.repository, revision_id=revision_id)
1523
branch = br_from.sprout(to_dir, revision_id=revision_id)
1222
# preserve whatever source format we have.
1223
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1224
possible_transports=[to_transport],
1225
accelerator_tree=accelerator_tree,
1226
hardlink=hardlink, stacked=stacked,
1227
force_new_repo=standalone,
1228
create_tree_if_local=not no_tree,
1229
source_branch=br_from)
1230
branch = dir.open_branch()
1231
except errors.NoSuchRevision:
1232
to_transport.delete_tree('.')
1233
msg = "The branch %s has no revision %s." % (from_location,
1235
raise errors.BzrCommandError(msg)
1524
1236
_merge_tags_if_possible(br_from, branch)
1525
1237
# If the source branch is stacked, the new branch may
1526
1238
# be stacked whether we asked for that explicitly or not.
1527
1239
# We therefore need a try/except here and not just 'if stacked:'
1529
note(gettext('Created new stacked branch referring to %s.') %
1241
note('Created new stacked branch referring to %s.' %
1530
1242
branch.get_stacked_on_url())
1531
1243
except (errors.NotStacked, errors.UnstackableBranchFormat,
1532
1244
errors.UnstackableRepositoryFormat), e:
1533
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1245
note('Branched %d revision(s).' % branch.revno())
1535
1247
# Bind to the parent
1536
1248
parent_branch = Branch.open(from_location)
1537
1249
branch.bind(parent_branch)
1538
note(gettext('New branch bound to %s') % from_location)
1250
note('New branch bound to %s' % from_location)
1540
1252
# Switch to the new branch
1541
1253
wt, _ = WorkingTree.open_containing('.')
1542
1254
_mod_switch.switch(wt.bzrdir, branch)
1543
note(gettext('Switched to branch: %s'),
1255
note('Switched to branch: %s',
1544
1256
urlutils.unescape_for_display(branch.base, 'utf-8'))
1547
class cmd_branches(Command):
1548
__doc__ = """List the branches available at the current location.
1550
This command will print the names of all the branches at the current
1554
takes_args = ['location?']
1556
Option('recursive', short_name='R',
1557
help='Recursively scan for branches rather than '
1558
'just looking in the specified location.')]
1560
def run(self, location=".", recursive=False):
1562
t = transport.get_transport(location)
1563
if not t.listable():
1564
raise errors.BzrCommandError(
1565
"Can't scan this type of location.")
1566
for b in controldir.ControlDir.find_branches(t):
1567
self.outf.write("%s\n" % urlutils.unescape_for_display(
1568
urlutils.relative_url(t.base, b.base),
1569
self.outf.encoding).rstrip("/"))
1571
dir = controldir.ControlDir.open_containing(location)[0]
1573
active_branch = dir.open_branch(name="")
1574
except errors.NotBranchError:
1575
active_branch = None
1577
for name, branch in iter_sibling_branches(dir):
1580
active = (active_branch is not None and
1581
active_branch.base == branch.base)
1582
names[name] = active
1583
# Only mention the current branch explicitly if it's not
1584
# one of the colocated branches
1585
if not any(names.values()) and active_branch is not None:
1586
self.outf.write("* %s\n" % gettext("(default)"))
1587
for name in sorted(names.keys()):
1588
active = names[name]
1593
self.outf.write("%s %s\n" % (
1594
prefix, name.encode(self.outf.encoding)))
1597
1259
class cmd_checkout(Command):
1598
1260
__doc__ = """Create a new checkout of an existing branch.
1699
1363
class cmd_update(Command):
1700
__doc__ = """Update a working tree to a new revision.
1702
This will perform a merge of the destination revision (the tip of the
1703
branch, or the specified revision) into the working tree, and then make
1704
that revision the basis revision for the working tree.
1706
You can use this to visit an older revision, or to update a working tree
1707
that is out of date from its branch.
1709
If there are any uncommitted changes in the tree, they will be carried
1710
across and remain as uncommitted changes after the update. To discard
1711
these changes, use 'bzr revert'. The uncommitted changes may conflict
1712
with the changes brought in by the change in basis revision.
1714
If the tree's branch is bound to a master branch, bzr will also update
1364
__doc__ = """Update a tree to have the latest code committed to its branch.
1366
This will perform a merge into the working tree, and may generate
1367
conflicts. If you have any local changes, you will still
1368
need to commit them after the update for the update to be complete.
1370
If you want to discard your local changes, you can just do a
1371
'bzr revert' instead of 'bzr commit' after the update.
1373
If you want to restore a file that has been removed locally, use
1374
'bzr revert' instead of 'bzr update'.
1376
If the tree's branch is bound to a master branch, it will also update
1715
1377
the branch from the master.
1717
You cannot update just a single file or directory, because each Bazaar
1718
working tree has just a single basis revision. If you want to restore a
1719
file that has been removed locally, use 'bzr revert' instead of 'bzr
1720
update'. If you want to restore a file to its state in a previous
1721
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1722
out the old content of that file to a new location.
1724
The 'dir' argument, if given, must be the location of the root of a
1725
working tree to update. By default, the working tree that contains the
1726
current working directory is used.
1729
1380
_see_also = ['pull', 'working-trees', 'status-flags']
1791
1434
old_tip=old_tip,
1792
1435
show_base=show_base)
1793
1436
except errors.NoSuchRevision, e:
1794
raise errors.BzrCommandError(gettext(
1437
raise errors.BzrCommandError(
1795
1438
"branch has no revision %s\n"
1796
1439
"bzr update --revision only works"
1797
" for a revision in the branch history")
1440
" for a revision in the branch history"
1798
1441
% (e.revision))
1799
1442
revno = tree.branch.revision_id_to_dotted_revno(
1800
1443
_mod_revision.ensure_null(tree.last_revision()))
1801
note(gettext('Updated to revision {0} of branch {1}').format(
1802
'.'.join(map(str, revno)), branch_location))
1444
note('Updated to revision %s of branch %s' %
1445
('.'.join(map(str, revno)), branch_location))
1803
1446
parent_ids = tree.get_parent_ids()
1804
1447
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1805
note(gettext('Your local commits will now show as pending merges with '
1806
"'bzr status', and can be committed with 'bzr commit'."))
1448
note('Your local commits will now show as pending merges with '
1449
"'bzr status', and can be committed with 'bzr commit'.")
1807
1450
if conflicts != 0:
2204
1838
def run(self, location, format=None, no_trees=False):
2205
1839
if format is None:
2206
format = controldir.format_registry.make_bzrdir('default')
1840
format = bzrdir.format_registry.make_bzrdir('default')
2208
1842
if location is None:
2211
1845
to_transport = transport.get_transport(location)
1846
to_transport.ensure_base()
2213
(repo, newdir, require_stacking, repository_policy) = (
2214
format.initialize_on_transport_ex(to_transport,
2215
create_prefix=True, make_working_trees=not no_trees,
2216
shared_repo=True, force_new_repo=True,
2217
use_existing_dir=True,
2218
repo_format_name=format.repository_format.get_format_string()))
1848
newdir = format.initialize_on_transport(to_transport)
1849
repo = newdir.create_repository(shared=True)
1850
repo.set_make_working_trees(not no_trees)
2219
1851
if not is_quiet():
2220
1852
from bzrlib.info import show_bzrdir_info
2221
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1853
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2224
1856
class cmd_diff(Command):
2685
2311
Option('show-diff',
2686
2312
short_name='p',
2687
2313
help='Show changes made in each revision as a patch.'),
2688
Option('include-merged',
2314
Option('include-merges',
2689
2315
help='Show merged revisions like --levels 0 does.'),
2690
Option('include-merges', hidden=True,
2691
help='Historical alias for --include-merged.'),
2692
Option('omit-merges',
2693
help='Do not report commits with more than one parent.'),
2694
2316
Option('exclude-common-ancestry',
2695
2317
help='Display only the revisions that are not part'
2696
' of both ancestries (require -rX..Y).'
2698
Option('signatures',
2699
help='Show digital signature validity.'),
2702
help='Show revisions whose properties match this '
2705
ListOption('match-message',
2706
help='Show revisions whose message matches this '
2709
ListOption('match-committer',
2710
help='Show revisions whose committer matches this '
2713
ListOption('match-author',
2714
help='Show revisions whose authors match this '
2717
ListOption('match-bugs',
2718
help='Show revisions whose bugs match this '
2318
' of both ancestries (require -rX..Y)'
2722
2321
encoding_type = 'replace'
2751
2342
_get_info_for_log_files,
2753
2344
direction = (forward and 'forward') or 'reverse'
2754
if symbol_versioning.deprecated_passed(include_merges):
2755
ui.ui_factory.show_user_warning(
2756
'deprecated_command_option',
2757
deprecated_name='--include-merges',
2758
recommended_name='--include-merged',
2759
deprecated_in_version='2.5',
2760
command=self.invoked_as)
2761
if include_merged is None:
2762
include_merged = include_merges
2764
raise errors.BzrCommandError(gettext(
2765
'{0} and {1} are mutually exclusive').format(
2766
'--include-merges', '--include-merged'))
2767
if include_merged is None:
2768
include_merged = False
2769
2345
if (exclude_common_ancestry
2770
2346
and (revision is None or len(revision) != 2)):
2771
raise errors.BzrCommandError(gettext(
2772
'--exclude-common-ancestry requires -r with two revisions'))
2347
raise errors.BzrCommandError(
2348
'--exclude-common-ancestry requires -r with two revisions')
2774
2350
if levels is None:
2777
raise errors.BzrCommandError(gettext(
2778
'{0} and {1} are mutually exclusive').format(
2779
'--levels', '--include-merged'))
2353
raise errors.BzrCommandError(
2354
'--levels and --include-merges are mutually exclusive')
2781
2356
if change is not None:
2782
2357
if len(change) > 1:
2783
2358
raise errors.RangeInChangeOption()
2784
2359
if revision is not None:
2785
raise errors.BzrCommandError(gettext(
2786
'{0} and {1} are mutually exclusive').format(
2787
'--revision', '--change'))
2360
raise errors.BzrCommandError(
2361
'--revision and --change are mutually exclusive')
2789
2363
revision = change
3195
2749
self.outf.write("%s\n" % pattern)
3197
2751
if not name_pattern_list:
3198
raise errors.BzrCommandError(gettext("ignore requires at least one "
3199
"NAME_PATTERN or --default-rules."))
2752
raise errors.BzrCommandError("ignore requires at least one "
2753
"NAME_PATTERN or --default-rules.")
3200
2754
name_pattern_list = [globbing.normalize_pattern(p)
3201
2755
for p in name_pattern_list]
3202
2756
bad_patterns = ''
3203
bad_patterns_count = 0
3204
2757
for p in name_pattern_list:
3205
2758
if not globbing.Globster.is_pattern_valid(p):
3206
bad_patterns_count += 1
3207
2759
bad_patterns += ('\n %s' % p)
3208
2760
if bad_patterns:
3209
msg = (ngettext('Invalid ignore pattern found. %s',
3210
'Invalid ignore patterns found. %s',
3211
bad_patterns_count) % bad_patterns)
2761
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
3212
2762
ui.ui_factory.show_error(msg)
3213
2763
raise errors.InvalidPattern('')
3214
2764
for name_pattern in name_pattern_list:
3215
2765
if (name_pattern[0] == '/' or
3216
2766
(len(name_pattern) > 1 and name_pattern[1] == ':')):
3217
raise errors.BzrCommandError(gettext(
3218
"NAME_PATTERN should not be an absolute path"))
2767
raise errors.BzrCommandError(
2768
"NAME_PATTERN should not be an absolute path")
3219
2769
tree, relpath = WorkingTree.open_containing(directory)
3220
2770
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
3221
2771
ignored = globbing.Globster(name_pattern_list)
3325
2874
Option('per-file-timestamps',
3326
2875
help='Set modification time of files to that of the last '
3327
2876
'revision in which it was changed.'),
3328
Option('uncommitted',
3329
help='Export the working tree contents rather than that of the '
3332
2878
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3333
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2879
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
3335
2880
from bzrlib.export import export
3337
2882
if branch_or_subdir is None:
3338
branch_or_subdir = directory
3340
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3342
if tree is not None:
3343
self.add_cleanup(tree.lock_read().unlock)
3347
raise errors.BzrCommandError(
3348
gettext("--uncommitted requires a working tree"))
2883
tree = WorkingTree.open_containing(directory)[0]
3351
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2887
b, subdir = Branch.open_containing(branch_or_subdir)
2890
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3353
export(export_tree, dest, format, root, subdir, filtered=filters,
2892
export(rev_tree, dest, format, root, subdir, filtered=filters,
3354
2893
per_file_timestamps=per_file_timestamps)
3355
2894
except errors.NoSuchExportFormat, e:
3356
raise errors.BzrCommandError(
3357
gettext('Unsupported export format: %s') % e.format)
2895
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3360
2898
class cmd_cat(Command):
3398
2936
old_file_id = rev_tree.path2id(relpath)
3400
# TODO: Split out this code to something that generically finds the
3401
# best id for a path across one or more trees; it's like
3402
# find_ids_across_trees but restricted to find just one. -- mbp
3404
2938
if name_from_revision:
3405
2939
# Try in revision if requested
3406
2940
if old_file_id is None:
3407
raise errors.BzrCommandError(gettext(
3408
"{0!r} is not present in revision {1}").format(
2941
raise errors.BzrCommandError(
2942
"%r is not present in revision %s" % (
3409
2943
filename, rev_tree.get_revision_id()))
3411
actual_file_id = old_file_id
2945
content = rev_tree.get_file_text(old_file_id)
3413
2947
cur_file_id = tree.path2id(relpath)
3414
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3415
actual_file_id = cur_file_id
3416
elif old_file_id is not None:
3417
actual_file_id = old_file_id
3419
raise errors.BzrCommandError(gettext(
3420
"{0!r} is not present in revision {1}").format(
2949
if cur_file_id is not None:
2950
# Then try with the actual file id
2952
content = rev_tree.get_file_text(cur_file_id)
2954
except errors.NoSuchId:
2955
# The actual file id didn't exist at that time
2957
if not found and old_file_id is not None:
2958
# Finally try with the old file id
2959
content = rev_tree.get_file_text(old_file_id)
2962
# Can't be found anywhere
2963
raise errors.BzrCommandError(
2964
"%r is not present in revision %s" % (
3421
2965
filename, rev_tree.get_revision_id()))
3423
from bzrlib.filter_tree import ContentFilterTree
3424
filter_tree = ContentFilterTree(rev_tree,
3425
rev_tree._content_filter_stack)
3426
content = filter_tree.get_file_text(actual_file_id)
2967
from bzrlib.filters import (
2968
ContentFilterContext,
2969
filtered_output_bytes,
2971
filters = rev_tree._content_filter_stack(relpath)
2972
chunks = content.splitlines(True)
2973
content = filtered_output_bytes(chunks, filters,
2974
ContentFilterContext(relpath, rev_tree))
2976
self.outf.writelines(content)
3428
content = rev_tree.get_file_text(actual_file_id)
3430
self.outf.write(content)
2979
self.outf.write(content)
3433
2982
class cmd_local_time_offset(Command):
3494
3043
to trigger updates to external systems like bug trackers. The --fixes
3495
3044
option can be used to record the association between a revision and
3496
3045
one or more bugs. See ``bzr help bugs`` for details.
3047
A selective commit may fail in some cases where the committed
3048
tree would be invalid. Consider::
3053
bzr commit foo -m "committing foo"
3054
bzr mv foo/bar foo/baz
3057
bzr commit foo/bar -m "committing bar but not baz"
3059
In the example above, the last commit will fail by design. This gives
3060
the user the opportunity to decide whether they want to commit the
3061
rename at the same time, separately first, or not at all. (As a general
3062
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3064
# TODO: Run hooks on tree to-be-committed, and after commit.
3066
# TODO: Strict commit that fails if there are deleted files.
3067
# (what does "deleted files" mean ??)
3069
# TODO: Give better message for -s, --summary, used by tla people
3071
# XXX: verbose currently does nothing
3499
3073
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3500
3074
takes_args = ['selected*']
3532
3106
Option('show-diff', short_name='p',
3533
3107
help='When no message is supplied, show the diff along'
3534
3108
' with the status summary in the message editor.'),
3536
help='When committing to a foreign version control '
3537
'system do not push data that can not be natively '
3540
3110
aliases = ['ci', 'checkin']
3542
3112
def _iter_bug_fix_urls(self, fixes, branch):
3543
default_bugtracker = None
3544
3113
# Configure the properties for bug fixing attributes.
3545
3114
for fixed_bug in fixes:
3546
3115
tokens = fixed_bug.split(':')
3547
if len(tokens) == 1:
3548
if default_bugtracker is None:
3549
branch_config = branch.get_config_stack()
3550
default_bugtracker = branch_config.get(
3552
if default_bugtracker is None:
3553
raise errors.BzrCommandError(gettext(
3554
"No tracker specified for bug %s. Use the form "
3555
"'tracker:id' or specify a default bug tracker "
3556
"using the `bugtracker` option.\nSee "
3557
"\"bzr help bugs\" for more information on this "
3558
"feature. Commit refused.") % fixed_bug)
3559
tag = default_bugtracker
3561
elif len(tokens) != 2:
3562
raise errors.BzrCommandError(gettext(
3116
if len(tokens) != 2:
3117
raise errors.BzrCommandError(
3563
3118
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3564
3119
"See \"bzr help bugs\" for more information on this "
3565
"feature.\nCommit refused.") % fixed_bug)
3567
tag, bug_id = tokens
3120
"feature.\nCommit refused." % fixed_bug)
3121
tag, bug_id = tokens
3569
3123
yield bugtracker.get_bug_url(tag, branch, bug_id)
3570
3124
except errors.UnknownBugTrackerAbbreviation:
3571
raise errors.BzrCommandError(gettext(
3572
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3125
raise errors.BzrCommandError(
3126
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3573
3127
except errors.MalformedBugIdentifier, e:
3574
raise errors.BzrCommandError(gettext(
3575
"%s\nCommit refused.") % (str(e),))
3128
raise errors.BzrCommandError(
3129
"%s\nCommit refused." % (str(e),))
3577
3131
def run(self, message=None, file=None, verbose=False, selected_list=None,
3578
3132
unchanged=False, strict=False, local=False, fixes=None,
3579
author=None, show_diff=False, exclude=None, commit_time=None,
3133
author=None, show_diff=False, exclude=None, commit_time=None):
3581
3134
from bzrlib.errors import (
3582
3135
PointlessCommit,
3583
3136
ConflictsInTree,
3659
3217
# make_commit_message_template_encoded returns user encoding.
3660
3218
# We probably want to be using edit_commit_message instead to
3662
my_message = set_commit_message(commit_obj)
3663
if my_message is None:
3664
start_message = generate_commit_message_template(commit_obj)
3665
my_message = edit_commit_message_encoded(text,
3666
start_message=start_message)
3667
if my_message is None:
3668
raise errors.BzrCommandError(gettext("please specify a commit"
3669
" message with either --message or --file"))
3670
if my_message == "":
3671
raise errors.BzrCommandError(gettext("Empty commit message specified."
3672
" Please specify a commit message with either"
3673
" --message or --file or leave a blank message"
3674
" with --message \"\"."))
3220
start_message = generate_commit_message_template(commit_obj)
3221
my_message = edit_commit_message_encoded(text,
3222
start_message=start_message)
3223
if my_message is None:
3224
raise errors.BzrCommandError("please specify a commit"
3225
" message with either --message or --file")
3226
if my_message == "":
3227
raise errors.BzrCommandError("empty commit message specified")
3675
3228
return my_message
3677
3230
# The API permits a commit with a filter of [] to mean 'select nothing'
3685
3238
reporter=None, verbose=verbose, revprops=properties,
3686
3239
authors=author, timestamp=commit_stamp,
3687
3240
timezone=offset,
3688
exclude=tree.safe_relpath_files(exclude),
3241
exclude=tree.safe_relpath_files(exclude))
3690
3242
except PointlessCommit:
3691
raise errors.BzrCommandError(gettext("No changes to commit."
3692
" Please 'bzr add' the files you want to commit, or use"
3693
" --unchanged to force an empty commit."))
3243
raise errors.BzrCommandError("No changes to commit."
3244
" Use --unchanged to commit anyhow.")
3694
3245
except ConflictsInTree:
3695
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3246
raise errors.BzrCommandError('Conflicts detected in working '
3696
3247
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3698
3249
except StrictCommitFailed:
3699
raise errors.BzrCommandError(gettext("Commit refused because there are"
3700
" unknown files in the working tree."))
3250
raise errors.BzrCommandError("Commit refused because there are"
3251
" unknown files in the working tree.")
3701
3252
except errors.BoundBranchOutOfDate, e:
3702
e.extra_help = (gettext("\n"
3253
e.extra_help = ("\n"
3703
3254
'To commit to master branch, run update and then commit.\n'
3704
3255
'You can also pass --local to commit to continue working '
3792
3343
a one way process (e.g. changing from the 1.x default to the
3793
3344
2.x default) so downgrading is not always possible.
3795
A backup.bzr.~#~ directory is created at the start of the conversion
3796
process (where # is a number). By default, this is left there on
3797
completion. If the conversion fails, delete the new .bzr directory
3798
and rename this one back in its place. Use the --clean option to ask
3799
for the backup.bzr directory to be removed on successful conversion.
3800
Alternatively, you can delete it by hand if everything looks good
3346
A backup.bzr directory is created at the start of the conversion
3347
process. By default, this is left there on completion. If the
3348
conversion fails, delete the new .bzr directory and rename this
3349
one back in its place. Use the --clean option to ask for the
3350
backup.bzr directory to be removed on successful conversion.
3351
Alternatively, you can delete it by hand if everything looks
3803
3354
If the location given is a shared repository, dependent branches
3804
3355
are also converted provided the repository converts successfully.
3805
3356
If the conversion of a branch fails, remaining branches are still
3808
For more information on upgrades, see the Bazaar Upgrade Guide,
3359
For more information on upgrades, see the Bazaar 2.0 Upgrade Guide,
3809
3360
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
4284
3795
through OTHER, excluding BASE but including OTHER, will be merged. If this
4285
3796
causes some revisions to be skipped, i.e. if the destination branch does
4286
3797
not already contain revision BASE, such a merge is commonly referred to as
4287
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4288
cherrypicks. The changes look like a normal commit, and the history of the
4289
changes from the other branch is not stored in the commit.
4291
3800
Revision numbers are always relative to the source branch.
4293
3802
Merge will do its best to combine the changes in two branches, but there
4294
3803
are some kinds of problems only a human can fix. When it encounters those,
4295
3804
it will mark a conflict. A conflict means that you need to fix something,
4296
before you can commit.
3805
before you should commit.
4298
3807
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
4300
If there is no default branch set, the first merge will set it (use
4301
--no-remember to avoid setting it). After that, you can omit the branch
4302
to use the default. To change the default, use --remember. The value will
4303
only be saved if the remote location can be accessed.
3809
If there is no default branch set, the first merge will set it. After
3810
that, you can omit the branch to use the default. To change the
3811
default, use --remember. The value will only be saved if the remote
3812
location can be accessed.
4305
3814
The results of the merge are placed into the destination working
4306
3815
directory, where they can be reviewed (with bzr diff), tested, and then
4307
3816
committed to record the result of the merge.
4309
3818
merge refuses to run if there are any uncommitted changes, unless
4310
--force is given. If --force is given, then the changes from the source
4311
will be merged with the current working tree, including any uncommitted
4312
changes in the tree. The --force option can also be used to create a
3819
--force is given. The --force option can also be used to create a
4313
3820
merge revision which has more than two parents.
4315
3822
If one would like to merge changes from the working tree of the other
4443
3946
self.sanity_check_merger(merger)
4444
3947
if (merger.base_rev_id == merger.other_rev_id and
4445
3948
merger.other_rev_id is not None):
4446
# check if location is a nonexistent file (and not a branch) to
4447
# disambiguate the 'Nothing to do'
4448
if merger.interesting_files:
4449
if not merger.other_tree.has_filename(
4450
merger.interesting_files[0]):
4451
note(gettext("merger: ") + str(merger))
4452
raise errors.PathsDoNotExist([location])
4453
note(gettext('Nothing to do.'))
3949
note('Nothing to do.')
4455
if pull and not preview:
4456
3952
if merger.interesting_files is not None:
4457
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3953
raise errors.BzrCommandError('Cannot pull individual files')
4458
3954
if (merger.base_rev_id == tree.last_revision()):
4459
3955
result = tree.pull(merger.other_branch, False,
4460
3956
merger.other_rev_id)
4461
3957
result.report(self.outf)
4463
3959
if merger.this_basis is None:
4464
raise errors.BzrCommandError(gettext(
3960
raise errors.BzrCommandError(
4465
3961
"This branch has no commits."
4466
" (perhaps you would prefer 'bzr pull')"))
3962
" (perhaps you would prefer 'bzr pull')")
4468
3964
return self._do_preview(merger)
4469
3965
elif interactive:
4749
4238
class cmd_revert(Command):
4751
Set files in the working tree back to the contents of a previous revision.
4239
__doc__ = """Revert files to a previous revision.
4753
4241
Giving a list of files will revert only those files. Otherwise, all files
4754
4242
will be reverted. If the revision is not specified with '--revision', the
4755
working tree basis revision is used. A revert operation affects only the
4756
working tree, not any revision history like the branch and repository or
4757
the working tree basis revision.
4243
last committed revision is used.
4759
4245
To remove only some changes, without reverting to a prior version, use
4760
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4761
will remove the changes introduced by the second last commit (-2), without
4762
affecting the changes introduced by the last commit (-1). To remove
4763
certain changes on a hunk-by-hunk basis, see the shelve command.
4764
To update the branch to a specific revision or the latest revision and
4765
update the working tree accordingly while preserving local changes, see the
4246
merge instead. For example, "merge . --revision -2..-3" will remove the
4247
changes introduced by -2, without affecting the changes introduced by -1.
4248
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4768
Uncommitted changes to files that are reverted will be discarded.
4769
Howver, by default, any files that have been manually changed will be
4770
backed up first. (Files changed only by merge are not backed up.) Backup
4771
files have '.~#~' appended to their name, where # is a number.
4250
By default, any files that have been manually changed will be backed up
4251
first. (Files changed only by merge are not backed up.) Backup files have
4252
'.~#~' appended to their name, where # is a number.
4773
4254
When you provide files, you can use their current pathname or the pathname
4774
4255
from the target revision. So you can use revert to "undelete" a file by
4937
4416
theirs_only=False,
4938
4417
log_format=None, long=False, short=False, line=False,
4939
4418
show_ids=False, verbose=False, this=False, other=False,
4940
include_merged=None, revision=None, my_revision=None,
4942
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4419
include_merges=False, revision=None, my_revision=None,
4943
4421
from bzrlib.missing import find_unmerged, iter_log_revisions
4944
4422
def message(s):
4945
4423
if not is_quiet():
4946
4424
self.outf.write(s)
4948
if symbol_versioning.deprecated_passed(include_merges):
4949
ui.ui_factory.show_user_warning(
4950
'deprecated_command_option',
4951
deprecated_name='--include-merges',
4952
recommended_name='--include-merged',
4953
deprecated_in_version='2.5',
4954
command=self.invoked_as)
4955
if include_merged is None:
4956
include_merged = include_merges
4958
raise errors.BzrCommandError(gettext(
4959
'{0} and {1} are mutually exclusive').format(
4960
'--include-merges', '--include-merged'))
4961
if include_merged is None:
4962
include_merged = False
4964
4427
mine_only = this
5037
4494
if remote_extra and not mine_only:
5038
4495
if printed_local is True:
5039
4496
message("\n\n\n")
5040
message(ngettext("You are missing %d revision:\n",
5041
"You are missing %d revisions:\n",
5042
len(remote_extra)) %
4497
message("You are missing %d revision(s):\n" %
5043
4498
len(remote_extra))
5044
if remote_branch.supports_tags():
5045
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
5046
4499
for revision in iter_log_revisions(remote_extra,
5047
4500
remote_branch.repository,
5050
4502
lf.log_revision(revision)
5051
4503
status_code = 1
5053
4505
if mine_only and not local_extra:
5054
4506
# We checked local, and found nothing extra
5055
message(gettext('This branch has no new revisions.\n'))
4507
message('This branch is up to date.\n')
5056
4508
elif theirs_only and not remote_extra:
5057
4509
# We checked remote, and found nothing extra
5058
message(gettext('Other branch has no new revisions.\n'))
4510
message('Other branch is up to date.\n')
5059
4511
elif not (mine_only or theirs_only or local_extra or
5061
4513
# We checked both branches, and neither one had extra
5063
message(gettext("Branches are up to date.\n"))
4515
message("Branches are up to date.\n")
5064
4516
self.cleanup_now()
5065
4517
if not status_code and parent is None and other_branch is not None:
5066
4518
self.add_cleanup(local_branch.lock_write().unlock)
5201
4667
self.add_cleanup(branch.lock_read().unlock)
5202
4668
tree = _get_one_revision_tree('annotate', revision, branch=branch)
5203
4669
self.add_cleanup(tree.lock_read().unlock)
5204
if wt is not None and revision is None:
5205
4671
file_id = wt.path2id(relpath)
5207
4673
file_id = tree.path2id(relpath)
5208
4674
if file_id is None:
5209
4675
raise errors.NotVersionedError(filename)
4676
file_version = tree.inventory[file_id].revision
5210
4677
if wt is not None and revision is None:
5211
4678
# If there is a tree and we're not annotating historical
5212
4679
# versions, annotate the working tree's content.
5213
4680
annotate_file_tree(wt, file_id, self.outf, long, all,
5214
4681
show_ids=show_ids)
5216
annotate_file_tree(tree, file_id, self.outf, long, all,
5217
show_ids=show_ids, branch=branch)
4683
annotate_file(branch, file_version, file_id, long, all, self.outf,
5220
4687
class cmd_re_sign(Command):
5305
4772
location = b.get_old_bound_location()
5306
4773
except errors.UpgradeRequired:
5307
raise errors.BzrCommandError(gettext('No location supplied. '
5308
'This format does not remember old locations.'))
4774
raise errors.BzrCommandError('No location supplied. '
4775
'This format does not remember old locations.')
5310
4777
if location is None:
5311
4778
if b.get_bound_location() is not None:
5312
raise errors.BzrCommandError(
5313
gettext('Branch is already bound'))
4779
raise errors.BzrCommandError('Branch is already bound')
5315
raise errors.BzrCommandError(
5316
gettext('No location supplied'
5317
' and no previous location known'))
4781
raise errors.BzrCommandError('No location supplied '
4782
'and no previous location known')
5318
4783
b_other = Branch.open(location)
5320
4785
b.bind(b_other)
5321
4786
except errors.DivergedBranches:
5322
raise errors.BzrCommandError(gettext('These branches have diverged.'
5323
' Try merging, and then bind again.'))
4787
raise errors.BzrCommandError('These branches have diverged.'
4788
' Try merging, and then bind again.')
5324
4789
if b.get_config().has_explicit_nickname():
5325
4790
b.nick = b_other.nick
5433
4895
end_revision=last_revno)
5436
self.outf.write(gettext('Dry-run, pretending to remove'
5437
' the above revisions.\n'))
4898
self.outf.write('Dry-run, pretending to remove'
4899
' the above revisions.\n')
5439
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4901
self.outf.write('The above revision(s) will be removed.\n')
5442
4904
if not ui.ui_factory.confirm_action(
5443
gettext(u'Uncommit these revisions'),
4905
'Uncommit these revisions',
5444
4906
'bzrlib.builtins.uncommit',
5446
self.outf.write(gettext('Canceled\n'))
4908
self.outf.write('Canceled\n')
5449
4911
mutter('Uncommitting from {%s} to {%s}',
5450
4912
last_rev_id, rev_id)
5451
4913
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5452
revno=revno, local=local, keep_tags=keep_tags)
5453
self.outf.write(gettext('You can restore the old tip by running:\n'
5454
' bzr pull . -r revid:%s\n') % last_rev_id)
4914
revno=revno, local=local)
4915
self.outf.write('You can restore the old tip by running:\n'
4916
' bzr pull . -r revid:%s\n' % last_rev_id)
5457
4919
class cmd_break_lock(Command):
5542
5003
'option leads to global uncontrolled write access to your '
5545
Option('client-timeout', type=float,
5546
help='Override the default idle client timeout (5min).'),
5549
def run(self, listen=None, port=None, inet=False, directory=None,
5550
allow_writes=False, protocol=None, client_timeout=None):
5008
def get_host_and_port(self, port):
5009
"""Return the host and port to run the smart server on.
5011
If 'port' is None, None will be returned for the host and port.
5013
If 'port' has a colon in it, the string before the colon will be
5014
interpreted as the host.
5016
:param port: A string of the port to run the server on.
5017
:return: A tuple of (host, port), where 'host' is a host name or IP,
5018
and port is an integer TCP/IP port.
5021
if port is not None:
5023
host, port = port.split(':')
5027
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5551
5029
from bzrlib import transport
5552
5030
if directory is None:
5553
5031
directory = os.getcwd()
5554
5032
if protocol is None:
5555
5033
protocol = transport.transport_server_registry.get()
5556
url = transport.location_to_url(directory)
5034
host, port = self.get_host_and_port(port)
5035
url = urlutils.local_path_to_url(directory)
5557
5036
if not allow_writes:
5558
5037
url = 'readonly+' + url
5559
t = transport.get_transport_from_url(url)
5560
protocol(t, listen, port, inet, client_timeout)
5038
t = transport.get_transport(url)
5039
protocol(t, host, port, inet)
5563
5042
class cmd_join(Command):
5693
5172
if submit_branch is None:
5694
5173
submit_branch = branch.get_parent()
5695
5174
if submit_branch is None:
5696
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5175
raise errors.BzrCommandError('No submit branch specified or known')
5698
5177
stored_public_branch = branch.get_public_branch()
5699
5178
if public_branch is None:
5700
5179
public_branch = stored_public_branch
5701
5180
elif stored_public_branch is None:
5702
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5703
5181
branch.set_public_branch(public_branch)
5704
5182
if not include_bundle and public_branch is None:
5705
raise errors.BzrCommandError(gettext('No public branch specified or'
5183
raise errors.BzrCommandError('No public branch specified or'
5707
5185
base_revision_id = None
5708
5186
if revision is not None:
5709
5187
if len(revision) > 2:
5710
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5711
'at most two one revision identifiers'))
5188
raise errors.BzrCommandError('bzr merge-directive takes '
5189
'at most two one revision identifiers')
5712
5190
revision_id = revision[-1].as_revision_id(branch)
5713
5191
if len(revision) == 2:
5714
5192
base_revision_id = revision[0].as_revision_id(branch)
5976
5448
self.add_cleanup(branch.lock_write().unlock)
5978
5450
if tag_name is None:
5979
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5451
raise errors.BzrCommandError("No tag specified to delete.")
5980
5452
branch.tags.delete_tag(tag_name)
5981
note(gettext('Deleted tag %s.') % tag_name)
5453
note('Deleted tag %s.' % tag_name)
5984
5456
if len(revision) != 1:
5985
raise errors.BzrCommandError(gettext(
5457
raise errors.BzrCommandError(
5986
5458
"Tags can only be placed on a single revision, "
5988
5460
revision_id = revision[0].as_revision_id(branch)
5990
5462
revision_id = branch.last_revision()
5991
5463
if tag_name is None:
5992
5464
tag_name = branch.automatic_tag_name(revision_id)
5993
5465
if tag_name is None:
5994
raise errors.BzrCommandError(gettext(
5995
"Please specify a tag name."))
5997
existing_target = branch.tags.lookup_tag(tag_name)
5998
except errors.NoSuchTag:
5999
existing_target = None
6000
if not force and existing_target not in (None, revision_id):
5466
raise errors.BzrCommandError(
5467
"Please specify a tag name.")
5468
if (not force) and branch.tags.has_tag(tag_name):
6001
5469
raise errors.TagAlreadyExists(tag_name)
6002
if existing_target == revision_id:
6003
note(gettext('Tag %s already exists for that revision.') % tag_name)
6005
branch.tags.set_tag(tag_name, revision_id)
6006
if existing_target is None:
6007
note(gettext('Created tag %s.') % tag_name)
6009
note(gettext('Updated tag %s.') % tag_name)
5470
branch.tags.set_tag(tag_name, revision_id)
5471
note('Created tag %s.' % tag_name)
6012
5474
class cmd_tags(Command):
6039
5508
self.add_cleanup(branch.lock_read().unlock)
6041
# Restrict to the specified range
6042
tags = self._tags_for_range(branch, revision)
6044
sort = tag_sort_methods.get()
5510
graph = branch.repository.get_graph()
5511
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5512
revid1, revid2 = rev1.rev_id, rev2.rev_id
5513
# only show revisions between revid1 and revid2 (inclusive)
5514
tags = [(tag, revid) for tag, revid in tags if
5515
graph.is_between(revid, revid1, revid2)]
5516
if sort == 'natural':
5517
def natural_sort_key(tag):
5518
return [f(s) for f,s in
5519
zip(itertools.cycle((unicode.lower,int)),
5520
re.split('([0-9]+)', tag[0]))]
5521
tags.sort(key=natural_sort_key)
5522
elif sort == 'alpha':
5524
elif sort == 'time':
5526
for tag, revid in tags:
5528
revobj = branch.repository.get_revision(revid)
5529
except errors.NoSuchRevision:
5530
timestamp = sys.maxint # place them at the end
5532
timestamp = revobj.timestamp
5533
timestamps[revid] = timestamp
5534
tags.sort(key=lambda x: timestamps[x[1]])
6046
5535
if not show_ids:
6047
5536
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
6048
5537
for index, (tag, revid) in enumerate(tags):
6061
5548
for tag, revspec in tags:
6062
5549
self.outf.write('%-20s %s\n' % (tag, revspec))
6064
def _tags_for_range(self, branch, revision):
6066
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6067
revid1, revid2 = rev1.rev_id, rev2.rev_id
6068
# _get_revision_range will always set revid2 if it's not specified.
6069
# If revid1 is None, it means we want to start from the branch
6070
# origin which is always a valid ancestor. If revid1 == revid2, the
6071
# ancestry check is useless.
6072
if revid1 and revid1 != revid2:
6073
# FIXME: We really want to use the same graph than
6074
# branch.iter_merge_sorted_revisions below, but this is not
6075
# easily available -- vila 2011-09-23
6076
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6077
# We don't want to output anything in this case...
6079
# only show revisions between revid1 and revid2 (inclusive)
6080
tagged_revids = branch.tags.get_reverse_tag_dict()
6082
for r in branch.iter_merge_sorted_revisions(
6083
start_revision_id=revid2, stop_revision_id=revid1,
6084
stop_rule='include'):
6085
revid_tags = tagged_revids.get(r[0], None)
6087
found.extend([(tag, r[0]) for tag in revid_tags])
6091
5552
class cmd_reconfigure(Command):
6092
5553
__doc__ = """Reconfigure the type of a bzr directory.
6106
5567
takes_args = ['location?']
6107
5568
takes_options = [
6108
5569
RegistryOption.from_kwargs(
6111
help='The relation between branch and tree.',
5571
title='Target type',
5572
help='The type to reconfigure the directory to.',
6112
5573
value_switches=True, enum_switch=False,
6113
5574
branch='Reconfigure to be an unbound branch with no working tree.',
6114
5575
tree='Reconfigure to be an unbound branch with a working tree.',
6115
5576
checkout='Reconfigure to be a bound branch with a working tree.',
6116
5577
lightweight_checkout='Reconfigure to be a lightweight'
6117
5578
' checkout (with no local history).',
6119
RegistryOption.from_kwargs(
6121
title='Repository type',
6122
help='Location fo the repository.',
6123
value_switches=True, enum_switch=False,
6124
5579
standalone='Reconfigure to be a standalone branch '
6125
5580
'(i.e. stop using shared repository).',
6126
5581
use_shared='Reconfigure to use a shared repository.',
6128
RegistryOption.from_kwargs(
6130
title='Trees in Repository',
6131
help='Whether new branches in the repository have trees.',
6132
value_switches=True, enum_switch=False,
6133
5582
with_trees='Reconfigure repository to create '
6134
5583
'working trees on branches by default.',
6135
5584
with_no_trees='Reconfigure repository to not create '
6162
5611
# At the moment you can use --stacked-on and a different
6163
5612
# reconfiguration shape at the same time; there seems no good reason
6165
if (tree_type is None and
6166
repository_type is None and
6167
repository_trees is None):
5614
if target_type is None:
6168
5615
if stacked_on or unstacked:
6171
raise errors.BzrCommandError(gettext('No target configuration '
6173
reconfiguration = None
6174
if tree_type == 'branch':
5618
raise errors.BzrCommandError('No target configuration '
5620
elif target_type == 'branch':
6175
5621
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
6176
elif tree_type == 'tree':
5622
elif target_type == 'tree':
6177
5623
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
6178
elif tree_type == 'checkout':
5624
elif target_type == 'checkout':
6179
5625
reconfiguration = reconfigure.Reconfigure.to_checkout(
6180
5626
directory, bind_to)
6181
elif tree_type == 'lightweight-checkout':
5627
elif target_type == 'lightweight-checkout':
6182
5628
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
6183
5629
directory, bind_to)
6185
reconfiguration.apply(force)
6186
reconfiguration = None
6187
if repository_type == 'use-shared':
5630
elif target_type == 'use-shared':
6188
5631
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
6189
elif repository_type == 'standalone':
5632
elif target_type == 'standalone':
6190
5633
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
6192
reconfiguration.apply(force)
6193
reconfiguration = None
6194
if repository_trees == 'with-trees':
5634
elif target_type == 'with-trees':
6195
5635
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6196
5636
directory, True)
6197
elif repository_trees == 'with-no-trees':
5637
elif target_type == 'with-no-trees':
6198
5638
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6199
5639
directory, False)
6201
reconfiguration.apply(force)
6202
reconfiguration = None
5640
reconfiguration.apply(force)
6205
5643
class cmd_switch(Command):
6240
5678
from bzrlib import switch
6241
5679
tree_location = directory
6242
5680
revision = _get_one_revision('switch', revision)
6243
possible_transports = []
6244
control_dir = controldir.ControlDir.open_containing(tree_location,
6245
possible_transports=possible_transports)[0]
5681
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6246
5682
if to_location is None:
6247
5683
if revision is None:
6248
raise errors.BzrCommandError(gettext('You must supply either a'
6249
' revision or a location'))
5684
raise errors.BzrCommandError('You must supply either a'
5685
' revision or a location')
6250
5686
to_location = tree_location
6252
branch = control_dir.open_branch(
6253
possible_transports=possible_transports)
5688
branch = control_dir.open_branch()
6254
5689
had_explicit_nick = branch.get_config().has_explicit_nickname()
6255
5690
except errors.NotBranchError:
6257
5692
had_explicit_nick = False
6258
5693
if create_branch:
6259
5694
if branch is None:
6260
raise errors.BzrCommandError(
6261
gettext('cannot create branch without source branch'))
6262
to_location = lookup_new_sibling_branch(control_dir, to_location,
6263
possible_transports=possible_transports)
5695
raise errors.BzrCommandError('cannot create branch without'
5697
to_location = directory_service.directories.dereference(
5699
if '/' not in to_location and '\\' not in to_location:
5700
# This path is meant to be relative to the existing branch
5701
this_url = self._get_branch_location(control_dir)
5702
to_location = urlutils.join(this_url, '..', to_location)
6264
5703
to_branch = branch.bzrdir.sprout(to_location,
6265
possible_transports=possible_transports,
6266
source_branch=branch).open_branch()
5704
possible_transports=[branch.bzrdir.root_transport],
5705
source_branch=branch).open_branch()
6269
to_branch = Branch.open(to_location,
6270
possible_transports=possible_transports)
5708
to_branch = Branch.open(to_location)
6271
5709
except errors.NotBranchError:
6272
to_branch = open_sibling_branch(control_dir, to_location,
6273
possible_transports=possible_transports)
5710
this_url = self._get_branch_location(control_dir)
5711
to_branch = Branch.open(
5712
urlutils.join(this_url, '..', to_location))
6274
5713
if revision is not None:
6275
5714
revision = revision.as_revision_id(to_branch)
6276
5715
switch.switch(control_dir, to_branch, force, revision_id=revision)
6277
5716
if had_explicit_nick:
6278
5717
branch = control_dir.open_branch() #get the new branch!
6279
5718
branch.nick = to_branch.nick
6280
note(gettext('Switched to branch: %s'),
5719
note('Switched to branch: %s',
6281
5720
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5722
def _get_branch_location(self, control_dir):
5723
"""Return location of branch for this control dir."""
5725
this_branch = control_dir.open_branch()
5726
# This may be a heavy checkout, where we want the master branch
5727
master_location = this_branch.get_bound_location()
5728
if master_location is not None:
5729
return master_location
5730
# If not, use a local sibling
5731
return this_branch.base
5732
except errors.NotBranchError:
5733
format = control_dir.find_branch_format()
5734
if getattr(format, 'get_reference', None) is not None:
5735
return format.get_reference(control_dir)
5737
return control_dir.root_transport.base
6285
5740
class cmd_view(Command):
6376
5831
name = current_view
6379
raise errors.BzrCommandError(gettext(
6380
"Both --delete and a file list specified"))
5834
raise errors.BzrCommandError(
5835
"Both --delete and a file list specified")
6382
raise errors.BzrCommandError(gettext(
6383
"Both --delete and --switch specified"))
5837
raise errors.BzrCommandError(
5838
"Both --delete and --switch specified")
6385
5840
tree.views.set_view_info(None, {})
6386
self.outf.write(gettext("Deleted all views.\n"))
5841
self.outf.write("Deleted all views.\n")
6387
5842
elif name is None:
6388
raise errors.BzrCommandError(gettext("No current view to delete"))
5843
raise errors.BzrCommandError("No current view to delete")
6390
5845
tree.views.delete_view(name)
6391
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5846
self.outf.write("Deleted '%s' view.\n" % name)
6394
raise errors.BzrCommandError(gettext(
6395
"Both --switch and a file list specified"))
5849
raise errors.BzrCommandError(
5850
"Both --switch and a file list specified")
6397
raise errors.BzrCommandError(gettext(
6398
"Both --switch and --all specified"))
5852
raise errors.BzrCommandError(
5853
"Both --switch and --all specified")
6399
5854
elif switch == 'off':
6400
5855
if current_view is None:
6401
raise errors.BzrCommandError(gettext("No current view to disable"))
5856
raise errors.BzrCommandError("No current view to disable")
6402
5857
tree.views.set_view_info(None, view_dict)
6403
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5858
self.outf.write("Disabled '%s' view.\n" % (current_view))
6405
5860
tree.views.set_view_info(switch, view_dict)
6406
5861
view_str = views.view_display_str(tree.views.lookup_view())
6407
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5862
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6410
self.outf.write(gettext('Views defined:\n'))
5865
self.outf.write('Views defined:\n')
6411
5866
for view in sorted(view_dict):
6412
5867
if view == current_view:
6416
5871
view_str = views.view_display_str(view_dict[view])
6417
5872
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
6419
self.outf.write(gettext('No views defined.\n'))
5874
self.outf.write('No views defined.\n')
6420
5875
elif file_list:
6421
5876
if name is None:
6422
5877
# No name given and no current view set
6424
5879
elif name == 'off':
6425
raise errors.BzrCommandError(gettext(
6426
"Cannot change the 'off' pseudo view"))
5880
raise errors.BzrCommandError(
5881
"Cannot change the 'off' pseudo view")
6427
5882
tree.views.set_view(name, sorted(file_list))
6428
5883
view_str = views.view_display_str(tree.views.lookup_view())
6429
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5884
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6431
5886
# list the files
6432
5887
if name is None:
6433
5888
# No name given and no current view set
6434
self.outf.write(gettext('No current view.\n'))
5889
self.outf.write('No current view.\n')
6436
5891
view_str = views.view_display_str(tree.views.lookup_view(name))
6437
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5892
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6440
5895
class cmd_hooks(Command):
added
removed
bzrlib/builtins.py
