80
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
81
def tree_files(file_list, default_branch=u'.', canonicalize=True,
83
return internal_tree_files(file_list, default_branch, canonicalize,
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("/")
87
223
def tree_files_for_add(file_list):
152
# XXX: Bad function name; should possibly also be a class method of
153
# WorkingTree rather than a function.
154
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
Deprecated: use WorkingTree.open_containing_paths instead.
161
This is typically used for command-line processors that take one or
162
more filenames, and infer the workingtree that contains them.
164
The filenames given are not required to exist.
166
:param file_list: Filenames to convert.
168
:param default_branch: Fallback tree path to use if file_list is empty or
171
:param apply_view: if True and a view is set, apply it or check that
172
specified files are within it
174
:return: workingtree, [relative_paths]
176
return WorkingTree.open_containing_paths(
177
file_list, default_directory='.',
182
288
def _get_view_info_for_change_reporter(tree):
183
289
"""Get the view information from a tree for change reporting."""
556
661
_see_also = ['info']
557
662
takes_args = ['location?']
558
663
takes_options = [
559
Option('tree', help='Show revno of working tree'),
664
Option('tree', help='Show revno of working tree.'),
563
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"))
566
676
wt = WorkingTree.open_containing(location)[0]
567
677
self.add_cleanup(wt.lock_read().unlock)
568
678
except (errors.NoWorkingTree, errors.NotLocalUrl):
569
679
raise errors.NoWorkingTree(location)
570
681
revid = wt.last_revision()
572
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
573
except errors.NoSuchRevision:
575
revno = ".".join(str(n) for n in revno_t)
577
683
b = Branch.open_containing(location)[0]
578
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)
580
698
self.cleanup_now()
581
self.outf.write(str(revno) + '\n')
699
self.outf.write(revno + '\n')
584
702
class cmd_revision_info(Command):
732
859
takes_args = ['dir+']
863
help='No error if existing, make parent directories as needed.',
733
867
encoding_type = 'replace'
735
def run(self, dir_list):
737
wt, dd = WorkingTree.open_containing(d)
738
base = os.path.dirname(dd)
739
id = wt.path2id(base)
743
self.outf.write('added %s\n' % d)
870
def add_file_with_parents(cls, wt, relpath):
871
if wt.path2id(relpath) is not None:
873
cls.add_file_with_parents(wt, osutils.dirname(relpath))
877
def add_file_single(cls, wt, relpath):
880
def run(self, dir_list, parents=False):
882
add_file = self.add_file_with_parents
884
add_file = self.add_file_single
886
wt, relpath = WorkingTree.open_containing(dir)
891
if e.errno != errno.EEXIST:
745
raise errors.NotVersionedError(path=base)
895
add_file(wt, relpath)
897
self.outf.write(gettext('added %s\n') % dir)
748
900
class cmd_relpath(Command):
855
1007
return self.run_auto(names_list, after, dry_run)
857
raise errors.BzrCommandError('--dry-run requires --auto.')
1009
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
858
1010
if names_list is None:
860
1012
if len(names_list) < 2:
861
raise errors.BzrCommandError("missing file argument")
1013
raise errors.BzrCommandError(gettext("missing file argument"))
862
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"))
863
1018
self.add_cleanup(tree.lock_tree_write().unlock)
864
1019
self._run(tree, names_list, rel_names, after)
866
1021
def run_auto(self, names_list, after, dry_run):
867
1022
if names_list is not None and len(names_list) > 1:
868
raise errors.BzrCommandError('Only one path may be specified to'
1023
raise errors.BzrCommandError(gettext('Only one path may be specified to'
871
raise errors.BzrCommandError('--after cannot be specified with'
1026
raise errors.BzrCommandError(gettext('--after cannot be specified with'
873
1028
work_tree, file_list = WorkingTree.open_containing_paths(
874
1029
names_list, default_directory='.')
875
1030
self.add_cleanup(work_tree.lock_tree_write().unlock)
1183
1364
# error by the feedback given to them. RBC 20080227.
1184
1365
stacked_on = parent_url
1185
1366
if not stacked_on:
1186
raise errors.BzrCommandError(
1187
"Could not determine branch to refer to.")
1367
raise errors.BzrCommandError(gettext(
1368
"Could not determine branch to refer to."))
1189
1370
# Get the destination location
1190
1371
if location is None:
1191
1372
stored_loc = br_from.get_push_location()
1192
1373
if stored_loc is None:
1193
raise errors.BzrCommandError(
1194
"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."))
1196
1385
display_url = urlutils.unescape_for_display(stored_loc,
1197
1386
self.outf.encoding)
1198
self.outf.write("Using saved push location: %s\n" % display_url)
1387
note(gettext("Using saved push location: %s") % display_url)
1199
1388
location = stored_loc
1201
1390
_show_push_branch(br_from, revision_id, location, self.outf,
1279
1468
revision_id = br_from.last_revision()
1280
1469
if to_location is None:
1281
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)
1282
1473
to_transport = transport.get_transport(to_location)
1284
1475
to_transport.mkdir('.')
1285
1476
except errors.FileExists:
1286
if not use_existing_dir:
1287
raise errors.BzrCommandError('Target directory "%s" '
1288
'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)
1291
bzrdir.BzrDir.open_from_transport(to_transport)
1488
to_dir.open_branch()
1292
1489
except errors.NotBranchError:
1295
1492
raise errors.AlreadyBranchError(to_location)
1296
1493
except errors.NoSuchFile:
1297
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1494
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1300
# preserve whatever source format we have.
1301
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1302
possible_transports=[to_transport],
1303
accelerator_tree=accelerator_tree,
1304
hardlink=hardlink, stacked=stacked,
1305
force_new_repo=standalone,
1306
create_tree_if_local=not no_tree,
1307
source_branch=br_from)
1308
branch = dir.open_branch()
1309
except errors.NoSuchRevision:
1310
to_transport.delete_tree('.')
1311
msg = "The branch %s has no revision %s." % (from_location,
1313
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)
1314
1523
_merge_tags_if_possible(br_from, branch)
1315
1524
# If the source branch is stacked, the new branch may
1316
1525
# be stacked whether we asked for that explicitly or not.
1317
1526
# We therefore need a try/except here and not just 'if stacked:'
1319
note('Created new stacked branch referring to %s.' %
1528
note(gettext('Created new stacked branch referring to %s.') %
1320
1529
branch.get_stacked_on_url())
1321
1530
except (errors.NotStacked, errors.UnstackableBranchFormat,
1322
1531
errors.UnstackableRepositoryFormat), e:
1323
note('Branched %d revision(s).' % branch.revno())
1532
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1325
1534
# Bind to the parent
1326
1535
parent_branch = Branch.open(from_location)
1327
1536
branch.bind(parent_branch)
1328
note('New branch bound to %s' % from_location)
1537
note(gettext('New branch bound to %s') % from_location)
1330
1539
# Switch to the new branch
1331
1540
wt, _ = WorkingTree.open_containing('.')
1332
1541
_mod_switch.switch(wt.bzrdir, branch)
1333
note('Switched to branch: %s',
1542
note(gettext('Switched to branch: %s'),
1334
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)))
1337
1596
class cmd_checkout(Command):
1338
1597
__doc__ = """Create a new checkout of an existing branch.
1441
1698
class cmd_update(Command):
1442
__doc__ = """Update a tree to have the latest code committed to its branch.
1444
This will perform a merge into the working tree, and may generate
1445
conflicts. If you have any local changes, you will still
1446
need to commit them after the update for the update to be complete.
1448
If you want to discard your local changes, you can just do a
1449
'bzr revert' instead of 'bzr commit' after the update.
1451
If you want to restore a file that has been removed locally, use
1452
'bzr revert' instead of 'bzr update'.
1454
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
1455
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.
1458
1728
_see_also = ['pull', 'working-trees', 'status-flags']
1512
1790
old_tip=old_tip,
1513
1791
show_base=show_base)
1514
1792
except errors.NoSuchRevision, e:
1515
raise errors.BzrCommandError(
1793
raise errors.BzrCommandError(gettext(
1516
1794
"branch has no revision %s\n"
1517
1795
"bzr update --revision only works"
1518
" for a revision in the branch history"
1796
" for a revision in the branch history")
1519
1797
% (e.revision))
1520
1798
revno = tree.branch.revision_id_to_dotted_revno(
1521
1799
_mod_revision.ensure_null(tree.last_revision()))
1522
note('Updated to revision %s of branch %s' %
1523
('.'.join(map(str, revno)), branch_location))
1800
note(gettext('Updated to revision {0} of branch {1}').format(
1801
'.'.join(map(str, revno)), branch_location))
1524
1802
parent_ids = tree.get_parent_ids()
1525
1803
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1526
note('Your local commits will now show as pending merges with '
1527
"'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'."))
1528
1806
if conflicts != 0:
1592
1870
title='Deletion Strategy', value_switches=True, enum_switch=False,
1593
1871
safe='Backup changed files (default).',
1594
1872
keep='Delete from bzr but leave the working copy.',
1595
no_backup='Don\'t backup changed files.',
1596
force='Delete all the specified files, even if they can not be '
1597
'recovered and even if they are non-empty directories. '
1598
'(deprecated, use no-backup)')]
1873
no_backup='Don\'t backup changed files.'),
1599
1875
aliases = ['rm', 'del']
1600
1876
encoding_type = 'replace'
1602
1878
def run(self, file_list, verbose=False, new=False,
1603
1879
file_deletion_strategy='safe'):
1604
if file_deletion_strategy == 'force':
1605
note("(The --force option is deprecated, rather use --no-backup "
1607
file_deletion_strategy = 'no-backup'
1609
1881
tree, file_list = WorkingTree.open_containing_paths(file_list)
1920
2197
def run(self, location, format=None, no_trees=False):
1921
2198
if format is None:
1922
format = bzrdir.format_registry.make_bzrdir('default')
2199
format = controldir.format_registry.make_bzrdir('default')
1924
2201
if location is None:
1927
2204
to_transport = transport.get_transport(location)
1928
to_transport.ensure_base()
1930
newdir = format.initialize_on_transport(to_transport)
1931
repo = newdir.create_repository(shared=True)
1932
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()))
1933
2212
if not is_quiet():
1934
2213
from bzrlib.info import show_bzrdir_info
1935
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2214
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1938
2217
class cmd_diff(Command):
2396
2683
Option('show-diff',
2397
2684
short_name='p',
2398
2685
help='Show changes made in each revision as a patch.'),
2399
Option('include-merges',
2686
Option('include-merged',
2400
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.'),
2401
2692
Option('exclude-common-ancestry',
2402
2693
help='Display only the revisions that are not part'
2403
' of both ancestries (require -rX..Y)'
2694
' of both ancestries (require -rX..Y).'
2405
2696
Option('signatures',
2406
help='Show digital signature validity'),
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 '
2408
2720
encoding_type = 'replace'
2430
2749
_get_info_for_log_files,
2432
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
2433
2767
if (exclude_common_ancestry
2434
2768
and (revision is None or len(revision) != 2)):
2435
raise errors.BzrCommandError(
2436
'--exclude-common-ancestry requires -r with two revisions')
2769
raise errors.BzrCommandError(gettext(
2770
'--exclude-common-ancestry requires -r with two revisions'))
2438
2772
if levels is None:
2441
raise errors.BzrCommandError(
2442
'--levels and --include-merges are mutually exclusive')
2775
raise errors.BzrCommandError(gettext(
2776
'{0} and {1} are mutually exclusive').format(
2777
'--levels', '--include-merged'))
2444
2779
if change is not None:
2445
2780
if len(change) > 1:
2446
2781
raise errors.RangeInChangeOption()
2447
2782
if revision is not None:
2448
raise errors.BzrCommandError(
2449
'--revision and --change are mutually exclusive')
2783
raise errors.BzrCommandError(gettext(
2784
'{0} and {1} are mutually exclusive').format(
2785
'--revision', '--change'))
2451
2787
revision = change
2845
3193
self.outf.write("%s\n" % pattern)
2847
3195
if not name_pattern_list:
2848
raise errors.BzrCommandError("ignore requires at least one "
2849
"NAME_PATTERN or --default-rules.")
3196
raise errors.BzrCommandError(gettext("ignore requires at least one "
3197
"NAME_PATTERN or --default-rules."))
2850
3198
name_pattern_list = [globbing.normalize_pattern(p)
2851
3199
for p in name_pattern_list]
2852
3200
bad_patterns = ''
3201
bad_patterns_count = 0
2853
3202
for p in name_pattern_list:
2854
3203
if not globbing.Globster.is_pattern_valid(p):
3204
bad_patterns_count += 1
2855
3205
bad_patterns += ('\n %s' % p)
2856
3206
if bad_patterns:
2857
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
3207
msg = (ngettext('Invalid ignore pattern found. %s',
3208
'Invalid ignore patterns found. %s',
3209
bad_patterns_count) % bad_patterns)
2858
3210
ui.ui_factory.show_error(msg)
2859
3211
raise errors.InvalidPattern('')
2860
3212
for name_pattern in name_pattern_list:
2861
3213
if (name_pattern[0] == '/' or
2862
3214
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2863
raise errors.BzrCommandError(
2864
"NAME_PATTERN should not be an absolute path")
3215
raise errors.BzrCommandError(gettext(
3216
"NAME_PATTERN should not be an absolute path"))
2865
3217
tree, relpath = WorkingTree.open_containing(directory)
2866
3218
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2867
3219
ignored = globbing.Globster(name_pattern_list)
2971
3323
Option('per-file-timestamps',
2972
3324
help='Set modification time of files to that of the last '
2973
3325
'revision in which it was changed.'),
3326
Option('uncommitted',
3327
help='Export the working tree contents rather than that of the '
2975
3330
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2976
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
3331
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2977
3333
from bzrlib.export import export
2979
3335
if branch_or_subdir is None:
2980
tree = WorkingTree.open_containing(directory)[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"))
2984
b, subdir = Branch.open_containing(branch_or_subdir)
2987
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)
2989
export(rev_tree, dest, format, root, subdir, filtered=filters,
3351
export(export_tree, dest, format, root, subdir, filtered=filters,
2990
3352
per_file_timestamps=per_file_timestamps)
2991
3353
except errors.NoSuchExportFormat, e:
2992
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3354
raise errors.BzrCommandError(
3355
gettext('Unsupported export format: %s') % e.format)
2995
3358
class cmd_cat(Command):
3033
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
3035
3402
if name_from_revision:
3036
3403
# Try in revision if requested
3037
3404
if old_file_id is None:
3038
raise errors.BzrCommandError(
3039
"%r is not present in revision %s" % (
3405
raise errors.BzrCommandError(gettext(
3406
"{0!r} is not present in revision {1}").format(
3040
3407
filename, rev_tree.get_revision_id()))
3042
content = rev_tree.get_file_text(old_file_id)
3409
actual_file_id = old_file_id
3044
3411
cur_file_id = tree.path2id(relpath)
3046
if cur_file_id is not None:
3047
# Then try with the actual file id
3049
content = rev_tree.get_file_text(cur_file_id)
3051
except errors.NoSuchId:
3052
# The actual file id didn't exist at that time
3054
if not found and old_file_id is not None:
3055
# Finally try with the old file id
3056
content = rev_tree.get_file_text(old_file_id)
3059
# Can't be found anywhere
3060
raise errors.BzrCommandError(
3061
"%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(
3062
3419
filename, rev_tree.get_revision_id()))
3064
from bzrlib.filters import (
3065
ContentFilterContext,
3066
filtered_output_bytes,
3068
filters = rev_tree._content_filter_stack(relpath)
3069
chunks = content.splitlines(True)
3070
content = filtered_output_bytes(chunks, filters,
3071
ContentFilterContext(relpath, rev_tree))
3073
self.outf.writelines(content)
3421
from bzrlib.filter_tree import ContentFilterTree
3422
filter_tree = ContentFilterTree(rev_tree,
3423
rev_tree._content_filter_stack)
3424
content = filter_tree.get_file_text(actual_file_id)
3076
self.outf.write(content)
3426
content = rev_tree.get_file_text(actual_file_id)
3428
self.outf.write(content)
3079
3431
class cmd_local_time_offset(Command):
3186
3538
aliases = ['ci', 'checkin']
3188
3540
def _iter_bug_fix_urls(self, fixes, branch):
3541
default_bugtracker = None
3189
3542
# Configure the properties for bug fixing attributes.
3190
3543
for fixed_bug in fixes:
3191
3544
tokens = fixed_bug.split(':')
3192
if len(tokens) != 2:
3193
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(
3194
3561
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3195
3562
"See \"bzr help bugs\" for more information on this "
3196
"feature.\nCommit refused." % fixed_bug)
3197
tag, bug_id = tokens
3563
"feature.\nCommit refused.") % fixed_bug)
3565
tag, bug_id = tokens
3199
3567
yield bugtracker.get_bug_url(tag, branch, bug_id)
3200
3568
except errors.UnknownBugTrackerAbbreviation:
3201
raise errors.BzrCommandError(
3202
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3569
raise errors.BzrCommandError(gettext(
3570
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3203
3571
except errors.MalformedBugIdentifier, e:
3204
raise errors.BzrCommandError(
3205
"%s\nCommit refused." % (str(e),))
3572
raise errors.BzrCommandError(gettext(
3573
"%s\nCommit refused.") % (str(e),))
3207
3575
def run(self, message=None, file=None, verbose=False, selected_list=None,
3208
3576
unchanged=False, strict=False, local=False, fixes=None,
3315
3686
exclude=tree.safe_relpath_files(exclude),
3317
3688
except PointlessCommit:
3318
raise errors.BzrCommandError("No changes to commit."
3689
raise errors.BzrCommandError(gettext("No changes to commit."
3319
3690
" Please 'bzr add' the files you want to commit, or use"
3320
" --unchanged to force an empty commit.")
3691
" --unchanged to force an empty commit."))
3321
3692
except ConflictsInTree:
3322
raise errors.BzrCommandError('Conflicts detected in working '
3693
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3323
3694
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3325
3696
except StrictCommitFailed:
3326
raise errors.BzrCommandError("Commit refused because there are"
3327
" unknown files in the working tree.")
3697
raise errors.BzrCommandError(gettext("Commit refused because there are"
3698
" unknown files in the working tree."))
3328
3699
except errors.BoundBranchOutOfDate, e:
3329
e.extra_help = ("\n"
3700
e.extra_help = (gettext("\n"
3330
3701
'To commit to master branch, run update and then commit.\n'
3331
3702
'You can also pass --local to commit to continue working '
4346
4747
class cmd_revert(Command):
4347
__doc__ = """Revert files to a previous revision.
4749
Set files in the working tree back to the contents of a previous revision.
4349
4751
Giving a list of files will revert only those files. Otherwise, all files
4350
4752
will be reverted. If the revision is not specified with '--revision', the
4351
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.
4353
4757
To remove only some changes, without reverting to a prior version, use
4354
4758
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4355
4759
will remove the changes introduced by the second last commit (-2), without
4356
4760
affecting the changes introduced by the last commit (-1). To remove
4357
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
4359
By default, any files that have been manually changed will be backed up
4360
first. (Files changed only by merge are not backed up.) Backup files have
4361
'.~#~' 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.
4363
4771
When you provide files, you can use their current pathname or the pathname
4364
4772
from the target revision. So you can use revert to "undelete" a file by
4525
4935
theirs_only=False,
4526
4936
log_format=None, long=False, short=False, line=False,
4527
4937
show_ids=False, verbose=False, this=False, other=False,
4528
include_merges=False, revision=None, my_revision=None,
4938
include_merged=None, revision=None, my_revision=None,
4940
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4530
4941
from bzrlib.missing import find_unmerged, iter_log_revisions
4531
4942
def message(s):
4532
4943
if not is_quiet():
4533
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
4536
4962
mine_only = this
4603
5035
if remote_extra and not mine_only:
4604
5036
if printed_local is True:
4605
5037
message("\n\n\n")
4606
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)) %
4607
5041
len(remote_extra))
5042
if remote_branch.supports_tags():
5043
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4608
5044
for revision in iter_log_revisions(remote_extra,
4609
5045
remote_branch.repository,
4611
5048
lf.log_revision(revision)
4612
5049
status_code = 1
4614
5051
if mine_only and not local_extra:
4615
5052
# We checked local, and found nothing extra
4616
message('This branch is up to date.\n')
5053
message(gettext('This branch has no new revisions.\n'))
4617
5054
elif theirs_only and not remote_extra:
4618
5055
# We checked remote, and found nothing extra
4619
message('Other branch is up to date.\n')
5056
message(gettext('Other branch has no new revisions.\n'))
4620
5057
elif not (mine_only or theirs_only or local_extra or
4622
5059
# We checked both branches, and neither one had extra
4624
message("Branches are up to date.\n")
5061
message(gettext("Branches are up to date.\n"))
4625
5062
self.cleanup_now()
4626
5063
if not status_code and parent is None and other_branch is not None:
4627
5064
self.add_cleanup(local_branch.lock_write().unlock)
4866
5304
location = b.get_old_bound_location()
4867
5305
except errors.UpgradeRequired:
4868
raise errors.BzrCommandError('No location supplied. '
4869
'This format does not remember old locations.')
5306
raise errors.BzrCommandError(gettext('No location supplied. '
5307
'This format does not remember old locations.'))
4871
5309
if location is None:
4872
5310
if b.get_bound_location() is not None:
4873
raise errors.BzrCommandError('Branch is already bound')
5311
raise errors.BzrCommandError(
5312
gettext('Branch is already bound'))
4875
raise errors.BzrCommandError('No location supplied '
4876
'and no previous location known')
5314
raise errors.BzrCommandError(
5315
gettext('No location supplied'
5316
' and no previous location known'))
4877
5317
b_other = Branch.open(location)
4879
5319
b.bind(b_other)
4880
5320
except errors.DivergedBranches:
4881
raise errors.BzrCommandError('These branches have diverged.'
4882
' Try merging, and then bind again.')
5321
raise errors.BzrCommandError(gettext('These branches have diverged.'
5322
' Try merging, and then bind again.'))
4883
5323
if b.get_config().has_explicit_nickname():
4884
5324
b.nick = b_other.nick
4989
5432
end_revision=last_revno)
4992
self.outf.write('Dry-run, pretending to remove'
4993
' the above revisions.\n')
5435
self.outf.write(gettext('Dry-run, pretending to remove'
5436
' the above revisions.\n'))
4995
self.outf.write('The above revision(s) will be removed.\n')
5438
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4998
5441
if not ui.ui_factory.confirm_action(
4999
u'Uncommit these revisions',
5442
gettext(u'Uncommit these revisions'),
5000
5443
'bzrlib.builtins.uncommit',
5002
self.outf.write('Canceled\n')
5445
self.outf.write(gettext('Canceled\n'))
5005
5448
mutter('Uncommitting from {%s} to {%s}',
5006
5449
last_rev_id, rev_id)
5007
5450
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5008
revno=revno, local=local)
5009
self.outf.write('You can restore the old tip by running:\n'
5010
' 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)
5013
5456
class cmd_break_lock(Command):
5097
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).'),
5102
def get_host_and_port(self, port):
5103
"""Return the host and port to run the smart server on.
5105
If 'port' is None, None will be returned for the host and port.
5107
If 'port' has a colon in it, the string before the colon will be
5108
interpreted as the host.
5110
:param port: A string of the port to run the server on.
5111
:return: A tuple of (host, port), where 'host' is a host name or IP,
5112
and port is an integer TCP/IP port.
5115
if port is not None:
5117
host, port = port.split(':')
5121
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5548
def run(self, listen=None, port=None, inet=False, directory=None,
5549
allow_writes=False, protocol=None, client_timeout=None):
5123
5550
from bzrlib import transport
5124
5551
if directory is None:
5125
5552
directory = os.getcwd()
5126
5553
if protocol is None:
5127
5554
protocol = transport.transport_server_registry.get()
5128
host, port = self.get_host_and_port(port)
5129
url = urlutils.local_path_to_url(directory)
5555
url = transport.location_to_url(directory)
5130
5556
if not allow_writes:
5131
5557
url = 'readonly+' + url
5132
t = transport.get_transport(url)
5133
protocol(t, host, port, inet)
5558
t = transport.get_transport_from_url(url)
5559
protocol(t, listen, port, inet, client_timeout)
5136
5562
class cmd_join(Command):
5266
5692
if submit_branch is None:
5267
5693
submit_branch = branch.get_parent()
5268
5694
if submit_branch is None:
5269
raise errors.BzrCommandError('No submit branch specified or known')
5695
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5271
5697
stored_public_branch = branch.get_public_branch()
5272
5698
if public_branch is None:
5273
5699
public_branch = stored_public_branch
5274
5700
elif stored_public_branch is None:
5701
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5275
5702
branch.set_public_branch(public_branch)
5276
5703
if not include_bundle and public_branch is None:
5277
raise errors.BzrCommandError('No public branch specified or'
5704
raise errors.BzrCommandError(gettext('No public branch specified or'
5279
5706
base_revision_id = None
5280
5707
if revision is not None:
5281
5708
if len(revision) > 2:
5282
raise errors.BzrCommandError('bzr merge-directive takes '
5283
'at most two one revision identifiers')
5709
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5710
'at most two one revision identifiers'))
5284
5711
revision_id = revision[-1].as_revision_id(branch)
5285
5712
if len(revision) == 2:
5286
5713
base_revision_id = revision[0].as_revision_id(branch)
5548
5975
self.add_cleanup(branch.lock_write().unlock)
5550
5977
if tag_name is None:
5551
raise errors.BzrCommandError("No tag specified to delete.")
5978
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5552
5979
branch.tags.delete_tag(tag_name)
5553
note('Deleted tag %s.' % tag_name)
5980
note(gettext('Deleted tag %s.') % tag_name)
5556
5983
if len(revision) != 1:
5557
raise errors.BzrCommandError(
5984
raise errors.BzrCommandError(gettext(
5558
5985
"Tags can only be placed on a single revision, "
5560
5987
revision_id = revision[0].as_revision_id(branch)
5562
5989
revision_id = branch.last_revision()
5563
5990
if tag_name is None:
5564
5991
tag_name = branch.automatic_tag_name(revision_id)
5565
5992
if tag_name is None:
5566
raise errors.BzrCommandError(
5567
"Please specify a tag name.")
5568
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):
5569
6000
raise errors.TagAlreadyExists(tag_name)
5570
branch.tags.set_tag(tag_name, revision_id)
5571
note('Created tag %s.' % 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)
5574
6011
class cmd_tags(Command):
5625
6060
for tag, revspec in tags:
5626
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])
5629
6090
class cmd_reconfigure(Command):
5630
6091
__doc__ = """Reconfigure the type of a bzr directory.
5644
6105
takes_args = ['location?']
5645
6106
takes_options = [
5646
6107
RegistryOption.from_kwargs(
5648
title='Target type',
5649
help='The type to reconfigure the directory to.',
6110
help='The relation between branch and tree.',
5650
6111
value_switches=True, enum_switch=False,
5651
6112
branch='Reconfigure to be an unbound branch with no working tree.',
5652
6113
tree='Reconfigure to be an unbound branch with a working tree.',
5653
6114
checkout='Reconfigure to be a bound branch with a working tree.',
5654
6115
lightweight_checkout='Reconfigure to be a lightweight'
5655
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,
5656
6123
standalone='Reconfigure to be a standalone branch '
5657
6124
'(i.e. stop using shared repository).',
5658
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,
5659
6132
with_trees='Reconfigure repository to create '
5660
6133
'working trees on branches by default.',
5661
6134
with_no_trees='Reconfigure repository to not create '
5688
6161
# At the moment you can use --stacked-on and a different
5689
6162
# reconfiguration shape at the same time; there seems no good reason
5691
if target_type is None:
6164
if (tree_type is None and
6165
repository_type is None and
6166
repository_trees is None):
5692
6167
if stacked_on or unstacked:
5695
raise errors.BzrCommandError('No target configuration '
5697
elif target_type == 'branch':
6170
raise errors.BzrCommandError(gettext('No target configuration '
6172
reconfiguration = None
6173
if tree_type == 'branch':
5698
6174
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5699
elif target_type == 'tree':
6175
elif tree_type == 'tree':
5700
6176
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5701
elif target_type == 'checkout':
6177
elif tree_type == 'checkout':
5702
6178
reconfiguration = reconfigure.Reconfigure.to_checkout(
5703
6179
directory, bind_to)
5704
elif target_type == 'lightweight-checkout':
6180
elif tree_type == 'lightweight-checkout':
5705
6181
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5706
6182
directory, bind_to)
5707
elif target_type == 'use-shared':
6184
reconfiguration.apply(force)
6185
reconfiguration = None
6186
if repository_type == 'use-shared':
5708
6187
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5709
elif target_type == 'standalone':
6188
elif repository_type == 'standalone':
5710
6189
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5711
elif target_type == 'with-trees':
6191
reconfiguration.apply(force)
6192
reconfiguration = None
6193
if repository_trees == 'with-trees':
5712
6194
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5713
6195
directory, True)
5714
elif target_type == 'with-no-trees':
6196
elif repository_trees == 'with-no-trees':
5715
6197
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5716
6198
directory, False)
5717
reconfiguration.apply(force)
6200
reconfiguration.apply(force)
6201
reconfiguration = None
5720
6204
class cmd_switch(Command):
5748
6232
Option('create-branch', short_name='b',
5749
6233
help='Create the target branch from this one before'
5750
6234
' switching to it.'),
6236
help='Store and restore uncommitted changes in the'
5753
6240
def run(self, to_location=None, force=False, create_branch=False,
5754
revision=None, directory=u'.'):
6241
revision=None, directory=u'.', store=False):
5755
6242
from bzrlib import switch
5756
6243
tree_location = directory
5757
6244
revision = _get_one_revision('switch', revision)
5758
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]
5759
6248
if to_location is None:
5760
6249
if revision is None:
5761
raise errors.BzrCommandError('You must supply either a'
5762
' revision or a location')
6250
raise errors.BzrCommandError(gettext('You must supply either a'
6251
' revision or a location'))
5763
6252
to_location = tree_location
5765
branch = control_dir.open_branch()
6254
branch = control_dir.open_branch(
6255
possible_transports=possible_transports)
5766
6256
had_explicit_nick = branch.get_config().has_explicit_nickname()
5767
6257
except errors.NotBranchError:
5769
6259
had_explicit_nick = False
5770
6260
if create_branch:
5771
6261
if branch is None:
5772
raise errors.BzrCommandError('cannot create branch without'
5774
to_location = directory_service.directories.dereference(
5776
if '/' not in to_location and '\\' not in to_location:
5777
# This path is meant to be relative to the existing branch
5778
this_url = self._get_branch_location(control_dir)
5779
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)
5780
6266
to_branch = branch.bzrdir.sprout(to_location,
5781
possible_transports=[branch.bzrdir.root_transport],
5782
source_branch=branch).open_branch()
6267
possible_transports=possible_transports,
6268
source_branch=branch).open_branch()
5785
to_branch = Branch.open(to_location)
6271
to_branch = Branch.open(to_location,
6272
possible_transports=possible_transports)
5786
6273
except errors.NotBranchError:
5787
this_url = self._get_branch_location(control_dir)
5788
to_branch = Branch.open(
5789
urlutils.join(this_url, '..', to_location))
6274
to_branch = open_sibling_branch(control_dir, to_location,
6275
possible_transports=possible_transports)
5790
6276
if revision is not None:
5791
6277
revision = revision.as_revision_id(to_branch)
5792
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)
5793
6280
if had_explicit_nick:
5794
6281
branch = control_dir.open_branch() #get the new branch!
5795
6282
branch.nick = to_branch.nick
5796
note('Switched to branch: %s',
6283
note(gettext('Switched to branch: %s'),
5797
6284
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5799
def _get_branch_location(self, control_dir):
5800
"""Return location of branch for this control dir."""
5802
this_branch = control_dir.open_branch()
5803
# This may be a heavy checkout, where we want the master branch
5804
master_location = this_branch.get_bound_location()
5805
if master_location is not None:
5806
return master_location
5807
# If not, use a local sibling
5808
return this_branch.base
5809
except errors.NotBranchError:
5810
format = control_dir.find_branch_format()
5811
if getattr(format, 'get_reference', None) is not None:
5812
return format.get_reference(control_dir)
5814
return control_dir.root_transport.base
5817
6288
class cmd_view(Command):
5908
6379
name = current_view
5911
raise errors.BzrCommandError(
5912
"Both --delete and a file list specified")
6382
raise errors.BzrCommandError(gettext(
6383
"Both --delete and a file list specified"))
5914
raise errors.BzrCommandError(
5915
"Both --delete and --switch specified")
6385
raise errors.BzrCommandError(gettext(
6386
"Both --delete and --switch specified"))
5917
6388
tree.views.set_view_info(None, {})
5918
self.outf.write("Deleted all views.\n")
6389
self.outf.write(gettext("Deleted all views.\n"))
5919
6390
elif name is None:
5920
raise errors.BzrCommandError("No current view to delete")
6391
raise errors.BzrCommandError(gettext("No current view to delete"))
5922
6393
tree.views.delete_view(name)
5923
self.outf.write("Deleted '%s' view.\n" % name)
6394
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5926
raise errors.BzrCommandError(
5927
"Both --switch and a file list specified")
6397
raise errors.BzrCommandError(gettext(
6398
"Both --switch and a file list specified"))
5929
raise errors.BzrCommandError(
5930
"Both --switch and --all specified")
6400
raise errors.BzrCommandError(gettext(
6401
"Both --switch and --all specified"))
5931
6402
elif switch == 'off':
5932
6403
if current_view is None:
5933
raise errors.BzrCommandError("No current view to disable")
6404
raise errors.BzrCommandError(gettext("No current view to disable"))
5934
6405
tree.views.set_view_info(None, view_dict)
5935
self.outf.write("Disabled '%s' view.\n" % (current_view))
6406
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5937
6408
tree.views.set_view_info(switch, view_dict)
5938
6409
view_str = views.view_display_str(tree.views.lookup_view())
5939
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))
5942
self.outf.write('Views defined:\n')
6413
self.outf.write(gettext('Views defined:\n'))
5943
6414
for view in sorted(view_dict):
5944
6415
if view == current_view:
5948
6419
view_str = views.view_display_str(view_dict[view])
5949
6420
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5951
self.outf.write('No views defined.\n')
6422
self.outf.write(gettext('No views defined.\n'))
5952
6423
elif file_list:
5953
6424
if name is None:
5954
6425
# No name given and no current view set
5956
6427
elif name == 'off':
5957
raise errors.BzrCommandError(
5958
"Cannot change the 'off' pseudo view")
6428
raise errors.BzrCommandError(gettext(
6429
"Cannot change the 'off' pseudo view"))
5959
6430
tree.views.set_view(name, sorted(file_list))
5960
6431
view_str = views.view_display_str(tree.views.lookup_view())
5961
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))
5963
6434
# list the files
5964
6435
if name is None:
5965
6436
# No name given and no current view set
5966
self.outf.write('No current view.\n')
6437
self.outf.write(gettext('No current view.\n'))
5968
6439
view_str = views.view_display_str(tree.views.lookup_view(name))
5969
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))
5972
6443
class cmd_hooks(Command):
6238
6727
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6239
6728
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6240
6729
('cmd_conflicts', [], 'bzrlib.conflicts'),
6730
('cmd_ping', [], 'bzrlib.smart.ping'),
6241
6731
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6242
('cmd_verify_signatures', [],
6243
'bzrlib.commit_signature_commands'),
6732
('cmd_verify_signatures', [], 'bzrlib.commit_signature_commands'),
6244
6733
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6246
6735
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
