« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 6027.1.15
- compare with another revision
- download diff
- download tarball
- view history from revision 6027.1.15
- Committer: Vincent Ladeuil
- Date: 2012-03-14 10:17:12 UTC
- mto: This revision was merged to the branch mainline in revision 6501.
- Revision ID: v.ladeuil+lp@free.fr-20120314101712-8m19vlkis5yr0xtp
Yet more deprecated code removals
- files added:
- bzrlib/estimate_compressed_size.py
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- tools/build_mo.py => bzrlib/bzr_distutils.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- Makefile
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2011 Canonical Ltd
1
# Copyright (C) 2005-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
17
17
"""builtin bzr commands"""
18
18
19
from __future__ import absolute_import
20
19
21
import os
20
22
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
23
import bzrlib.bzrdir
24
25
from bzrlib import lazy_import
26
lazy_import.lazy_import(globals(), """
23
27
import cStringIO
28
import errno
24
29
import sys
25
30
import time
26
31
29
34
bugtracker,
30
35
bundle,
31
36
btree_index,
32
bzrdir,
37
controldir,
33
38
directory_service,
34
39
delta,
35
40
config as _mod_config,
57
62
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
58
63
from bzrlib.smtp_connection import SMTPConnection
59
64
from bzrlib.workingtree import WorkingTree
65
from bzrlib.i18n import gettext, ngettext
60
66
""")
61
67
62
68
from bzrlib.commands import (
77
83
)
78
84
79
85
80
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
81
def tree_files(file_list, default_branch=u'.', canonicalize=True,
82
apply_view=True):
83
return internal_tree_files(file_list, default_branch, canonicalize,
84
apply_view)
86
def _get_branch_location(control_dir, possible_transports=None):
87
"""Return location of branch for this control dir."""
88
try:
89
target = control_dir.get_branch_reference()
90
except errors.NotBranchError:
91
return control_dir.root_transport.base
92
if target is not None:
93
return target
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
102
103
104
def _is_colocated(control_dir, possible_transports=None):
105
"""Check if the branch in control_dir is colocated.
106
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
110
"""
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?
115
try:
116
root = controldir.ControlDir.open(this_url,
117
possible_transports=possible_transports)
118
except errors.NotBranchError:
119
return (False, this_url)
120
else:
121
try:
122
wt = control_dir.open_workingtree()
123
except (errors.NoWorkingTree, errors.NotLocalUrl):
124
return (False, this_url)
125
else:
126
return (
127
root._format.colocated_branches and
128
control_dir.control_url == root.control_url,
129
this_url)
130
131
132
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
133
"""Lookup the location for a new sibling branch.
134
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
138
"""
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)
142
143
if colocated:
144
return urlutils.join_segment_parameters(this_url,
145
{"branch": urlutils.escape(location)})
146
else:
147
return urlutils.join(this_url, '..', urlutils.escape(location))
148
return location
149
150
151
def open_sibling_branch(control_dir, location, possible_transports=None):
152
"""Open a branch, possibly a sibling of another.
153
154
:param control_dir: Control directory relative to which to lookup the
155
location.
156
:param location: Location to look up
157
:return: branch to open
158
"""
159
try:
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)
165
return Branch.open(
166
urlutils.join(
167
this_url, '..', urlutils.escape(location)))
168
169
170
def open_nearby_branch(near=None, location=None, possible_transports=None):
171
"""Open a nearby branch.
172
173
:param near: Optional location of container from which to open branch
174
:param location: Location of the branch
175
:return: Branch instance
176
"""
177
if near is None:
178
if location is None:
179
location = "."
180
try:
181
return Branch.open(location,
182
possible_transports=possible_transports)
183
except errors.NotBranchError:
184
near = "."
185
cdir = controldir.ControlDir.open(near,
186
possible_transports=possible_transports)
187
return open_sibling_branch(cdir, location,
188
possible_transports=possible_transports)
189
190
191
def iter_sibling_branches(control_dir, possible_transports=None):
192
"""Iterate over the siblings of a branch.
193
194
:param control_dir: Control directory for which to look up the siblings
195
:return: Iterator over tuples with branch name and branch object
196
"""
197
seen_urls = set()
198
try:
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():
203
yield name, branch
204
return
205
if reference is not None:
206
ref_branch = Branch.open(reference,
207
possible_transports=possible_transports)
208
else:
209
ref_branch = None
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():
214
yield name, branch
215
else:
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("/")
220
yield name, branch
85
221
86
222
87
223
def tree_files_for_add(file_list):
112
248
if view_files:
113
249
file_list = view_files
114
250
view_str = views.view_display_str(view_files)
115
note("Ignoring files outside view. View is %s" % view_str)
251
note(gettext("Ignoring files outside view. View is %s") % view_str)
116
252
return tree, file_list
117
253
118
254
120
256
if revisions is None:
121
257
return None
122
258
if len(revisions) != 1:
123
raise errors.BzrCommandError(
124
'bzr %s --revision takes exactly one revision identifier' % (
259
raise errors.BzrCommandError(gettext(
260
'bzr %s --revision takes exactly one revision identifier') % (
125
261
command_name,))
126
262
return revisions[0]
127
263
149
285
return rev_tree
150
286
151
287
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,
156
apply_view=True):
157
"""Convert command-line paths to a WorkingTree and relative paths.
158
159
Deprecated: use WorkingTree.open_containing_paths instead.
160
161
This is typically used for command-line processors that take one or
162
more filenames, and infer the workingtree that contains them.
163
164
The filenames given are not required to exist.
165
166
:param file_list: Filenames to convert.
167
168
:param default_branch: Fallback tree path to use if file_list is empty or
169
None.
170
171
:param apply_view: if True and a view is set, apply it or check that
172
specified files are within it
173
174
:return: workingtree, [relative_paths]
175
"""
176
return WorkingTree.open_containing_paths(
177
file_list, default_directory='.',
178
canonicalize=True,
179
apply_view=True)
180
181
182
288
def _get_view_info_for_change_reporter(tree):
183
289
"""Get the view information from a tree for change reporting."""
184
290
view_info = None
196
302
the --directory option is used to specify a different branch."""
197
303
if directory is not None:
198
304
return (None, Branch.open(directory), filename)
199
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
305
return controldir.ControlDir.open_containing_tree_or_branch(filename)
200
306
201
307
202
308
# TODO: Make sure no commands unconditionally use the working directory as a
232
338
unknown
233
339
Not versioned and not matching an ignore pattern.
234
340
235
Additionally for directories, symlinks and files with an executable
236
bit, Bazaar indicates their type using a trailing character: '/', '@'
237
or '*' respectively.
341
Additionally for directories, symlinks and files with a changed
342
executable bit, Bazaar indicates their type using a trailing
343
character: '/', '@' or '*' respectively. These decorations can be
344
disabled using the '--no-classify' option.
238
345
239
346
To see ignored files use 'bzr ignored'. For details on the
240
347
changes to file texts, use 'bzr diff'.
261
368
This will produce the same results as calling 'bzr diff --summarize'.
262
369
"""
263
370
264
# TODO: --no-recurse, --recurse options
371
# TODO: --no-recurse/-N, --recurse options
265
372
266
373
takes_args = ['file*']
267
374
takes_options = ['show-ids', 'revision', 'change', 'verbose',
271
378
short_name='V'),
272
379
Option('no-pending', help='Don\'t show pending merges.',
273
380
),
381
Option('no-classify',
382
help='Do not mark object type using indicator.',
383
),
274
384
]
275
385
aliases = ['st', 'stat']
276
386
279
389
280
390
@display_command
281
391
def run(self, show_ids=False, file_list=None, revision=None, short=False,
282
versioned=False, no_pending=False, verbose=False):
392
versioned=False, no_pending=False, verbose=False,
393
no_classify=False):
283
394
from bzrlib.status import show_tree_status
284
395
285
396
if revision and len(revision) > 2:
286
raise errors.BzrCommandError('bzr status --revision takes exactly'
287
' one or two revision specifiers')
397
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
398
' one or two revision specifiers'))
288
399
289
400
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
290
401
# Avoid asking for specific files when that is not needed.
299
410
show_tree_status(tree, show_ids=show_ids,
300
411
specific_files=relfile_list, revision=revision,
301
412
to_file=self.outf, short=short, versioned=versioned,
302
show_pending=(not no_pending), verbose=verbose)
413
show_pending=(not no_pending), verbose=verbose,
414
classify=not no_classify)
303
415
304
416
305
417
class cmd_cat_revision(Command):
326
438
@display_command
327
439
def run(self, revision_id=None, revision=None, directory=u'.'):
328
440
if revision_id is not None and revision is not None:
329
raise errors.BzrCommandError('You can only supply one of'
330
' revision_id or --revision')
441
raise errors.BzrCommandError(gettext('You can only supply one of'
442
' revision_id or --revision'))
331
443
if revision_id is None and revision is None:
332
raise errors.BzrCommandError('You must supply either'
333
' --revision or a revision_id')
444
raise errors.BzrCommandError(gettext('You must supply either'
445
' --revision or a revision_id'))
334
446
335
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
447
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
336
448
337
449
revisions = b.repository.revisions
338
450
if revisions is None:
339
raise errors.BzrCommandError('Repository %r does not support '
340
'access to raw revision texts')
451
raise errors.BzrCommandError(gettext('Repository %r does not support '
452
'access to raw revision texts'))
341
453
342
454
b.repository.lock_read()
343
455
try:
347
459
try:
348
460
self.print_revision(revisions, revision_id)
349
461
except errors.NoSuchRevision:
350
msg = "The repository %s contains no revision %s." % (
462
msg = gettext("The repository {0} contains no revision {1}.").format(
351
463
b.repository.base, revision_id)
352
464
raise errors.BzrCommandError(msg)
353
465
elif revision is not None:
354
466
for rev in revision:
355
467
if rev is None:
356
468
raise errors.BzrCommandError(
357
'You cannot specify a NULL revision.')
469
gettext('You cannot specify a NULL revision.'))
358
470
rev_id = rev.as_revision_id(b)
359
471
self.print_revision(revisions, rev_id)
360
472
finally:
466
578
location_list=['.']
467
579
468
580
for location in location_list:
469
d = bzrdir.BzrDir.open(location)
470
581
d = controldir.ControlDir.open(location)
582
471
583
try:
472
584
working = d.open_workingtree()
473
585
except errors.NoWorkingTree:
474
raise errors.BzrCommandError("No working tree to remove")
586
raise errors.BzrCommandError(gettext("No working tree to remove"))
475
587
except errors.NotLocalUrl:
476
raise errors.BzrCommandError("You cannot remove the working tree"
477
" of a remote path")
588
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
589
" of a remote path"))
478
590
if not force:
479
591
if (working.has_changes()):
480
592
raise errors.UncommittedChanges(working)
482
594
raise errors.ShelvedChanges(working)
483
595
484
596
if working.user_url != working.branch.user_url:
485
raise errors.BzrCommandError("You cannot remove the working tree"
486
" from a lightweight checkout")
597
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
598
" from a lightweight checkout"))
487
599
488
600
d.destroy_workingtree()
489
601
521
633
pass # There seems to be a real error here, so we'll reset
522
634
else:
523
635
# Refuse
524
raise errors.BzrCommandError(
636
raise errors.BzrCommandError(gettext(
525
637
'The tree does not appear to be corrupt. You probably'
526
638
' want "bzr revert" instead. Use "--force" if you are'
527
' sure you want to reset the working tree.')
639
' sure you want to reset the working tree.'))
528
640
if revision is None:
529
641
revision_ids = None
530
642
else:
533
645
tree.reset_state(revision_ids)
534
646
except errors.BzrError, e:
535
647
if revision_ids is None:
536
extra = (', the header appears corrupt, try passing -r -1'
537
' to set the state to the last commit')
648
extra = (gettext(', the header appears corrupt, try passing -r -1'
649
' to set the state to the last commit'))
538
650
else:
539
651
extra = ''
540
raise errors.BzrCommandError('failed to reset the tree state'
541
+ extra)
652
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
542
653
543
654
544
655
class cmd_revno(Command):
550
661
_see_also = ['info']
551
662
takes_args = ['location?']
552
663
takes_options = [
553
Option('tree', help='Show revno of working tree'),
664
Option('tree', help='Show revno of working tree.'),
665
'revision',
554
666
]
555
667
556
668
@display_command
557
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"))
673
558
674
if tree:
559
675
try:
560
676
wt = WorkingTree.open_containing(location)[0]
561
677
self.add_cleanup(wt.lock_read().unlock)
562
678
except (errors.NoWorkingTree, errors.NotLocalUrl):
563
679
raise errors.NoWorkingTree(location)
680
b = wt.branch
564
681
revid = wt.last_revision()
565
try:
566
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
567
except errors.NoSuchRevision:
568
revno_t = ('???',)
569
revno = ".".join(str(n) for n in revno_t)
570
682
else:
571
683
b = Branch.open_containing(location)[0]
572
684
self.add_cleanup(b.lock_read().unlock)
573
revno = b.revno()
685
if revision:
686
if len(revision) != 1:
687
raise errors.BzrCommandError(gettext(
688
"Tags can only be placed on a single revision, "
689
"not on a range"))
690
revid = revision[0].as_revision_id(b)
691
else:
692
revid = b.last_revision()
693
try:
694
revno_t = b.revision_id_to_dotted_revno(revid)
695
except errors.NoSuchRevision:
696
revno_t = ('???',)
697
revno = ".".join(str(n) for n in revno_t)
574
698
self.cleanup_now()
575
self.outf.write(str(revno) + '\n')
699
self.outf.write(revno + '\n')
576
700
577
701
578
702
class cmd_revision_info(Command):
585
709
custom_help('directory',
586
710
help='Branch to examine, '
587
711
'rather than the one containing the working directory.'),
588
Option('tree', help='Show revno of working tree'),
712
Option('tree', help='Show revno of working tree.'),
589
713
]
590
714
591
715
@display_command
647
771
are added. This search proceeds recursively into versioned
648
772
directories. If no names are given '.' is assumed.
649
773
774
A warning will be printed when nested trees are encountered,
775
unless they are explicitly ignored.
776
650
777
Therefore simply saying 'bzr add' will version all files that
651
778
are currently unknown.
652
779
668
795
669
796
Any files matching patterns in the ignore list will not be added
670
797
unless they are explicitly mentioned.
798
799
In recursive mode, files larger than the configuration option
800
add.maximum_file_size will be skipped. Named items are never skipped due
801
to file size.
671
802
"""
672
803
takes_args = ['file*']
673
804
takes_options = [
674
805
Option('no-recurse',
675
help="Don't recursively add the contents of directories."),
806
help="Don't recursively add the contents of directories.",
807
short_name='N'),
676
808
Option('dry-run',
677
809
help="Show what would be done, but don't actually do anything."),
678
810
'verbose',
700
832
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
701
833
to_file=self.outf, should_print=(not is_quiet()))
702
834
else:
703
action = bzrlib.add.AddAction(to_file=self.outf,
835
action = bzrlib.add.AddWithSkipLargeAction(to_file=self.outf,
704
836
should_print=(not is_quiet()))
705
837
706
838
if base_tree:
713
845
if verbose:
714
846
for glob in sorted(ignored.keys()):
715
847
for path in ignored[glob]:
716
self.outf.write("ignored %s matching \"%s\"\n"
717
% (path, glob))
848
self.outf.write(
849
gettext("ignored {0} matching \"{1}\"\n").format(
850
path, glob))
718
851
719
852
720
853
class cmd_mkdir(Command):
724
857
"""
725
858
726
859
takes_args = ['dir+']
860
takes_options = [
861
Option(
862
'parents',
863
help='No error if existing, make parent directories as needed.',
864
short_name='p'
865
)
866
]
727
867
encoding_type = 'replace'
728
868
729
def run(self, dir_list):
730
for d in dir_list:
731
wt, dd = WorkingTree.open_containing(d)
732
base = os.path.dirname(dd)
733
id = wt.path2id(base)
734
if id != None:
735
os.mkdir(d)
736
wt.add([dd])
737
self.outf.write('added %s\n' % d)
869
@classmethod
870
def add_file_with_parents(cls, wt, relpath):
871
if wt.path2id(relpath) is not None:
872
return
873
cls.add_file_with_parents(wt, osutils.dirname(relpath))
874
wt.add([relpath])
875
876
@classmethod
877
def add_file_single(cls, wt, relpath):
878
wt.add([relpath])
879
880
def run(self, dir_list, parents=False):
881
if parents:
882
add_file = self.add_file_with_parents
883
else:
884
add_file = self.add_file_single
885
for dir in dir_list:
886
wt, relpath = WorkingTree.open_containing(dir)
887
if parents:
888
try:
889
os.makedirs(dir)
890
except OSError, e:
891
if e.errno != errno.EEXIST:
892
raise
738
893
else:
739
raise errors.NotVersionedError(path=base)
894
os.mkdir(dir)
895
add_file(wt, relpath)
896
if not is_quiet():
897
self.outf.write(gettext('added %s\n') % dir)
740
898
741
899
742
900
class cmd_relpath(Command):
778
936
@display_command
779
937
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
780
938
if kind and kind not in ['file', 'directory', 'symlink']:
781
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
939
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
782
940
783
941
revision = _get_one_revision('inventory', revision)
784
942
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
792
950
tree = work_tree
793
951
extra_trees = []
794
952
953
self.add_cleanup(tree.lock_read().unlock)
795
954
if file_list is not None:
796
955
file_ids = tree.paths2ids(file_list, trees=extra_trees,
797
956
require_versioned=True)
798
957
# find_ids_across_trees may include some paths that don't
799
958
# exist in 'tree'.
800
entries = sorted(
801
(tree.id2path(file_id), tree.inventory[file_id])
802
for file_id in file_ids if tree.has_id(file_id))
959
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
803
960
else:
804
entries = tree.inventory.entries()
961
entries = tree.iter_entries_by_dir()
805
962
806
self.cleanup_now()
807
for path, entry in entries:
963
for path, entry in sorted(entries):
808
964
if kind and kind != entry.kind:
809
965
continue
966
if path == "":
967
continue
810
968
if show_ids:
811
969
self.outf.write('%-50s %s\n' % (path, entry.file_id))
812
970
else:
848
1006
if auto:
849
1007
return self.run_auto(names_list, after, dry_run)
850
1008
elif dry_run:
851
raise errors.BzrCommandError('--dry-run requires --auto.')
1009
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
852
1010
if names_list is None:
853
1011
names_list = []
854
1012
if len(names_list) < 2:
855
raise errors.BzrCommandError("missing file argument")
1013
raise errors.BzrCommandError(gettext("missing file argument"))
856
1014
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1015
for file_name in rel_names[0:-1]:
1016
if file_name == '':
1017
raise errors.BzrCommandError(gettext("can not move root of branch"))
857
1018
self.add_cleanup(tree.lock_tree_write().unlock)
858
1019
self._run(tree, names_list, rel_names, after)
859
1020
860
1021
def run_auto(self, names_list, after, dry_run):
861
1022
if names_list is not None and len(names_list) > 1:
862
raise errors.BzrCommandError('Only one path may be specified to'
863
' --auto.')
1023
raise errors.BzrCommandError(gettext('Only one path may be specified to'
1024
' --auto.'))
864
1025
if after:
865
raise errors.BzrCommandError('--after cannot be specified with'
866
' --auto.')
1026
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1027
' --auto.'))
867
1028
work_tree, file_list = WorkingTree.open_containing_paths(
868
1029
names_list, default_directory='.')
869
1030
self.add_cleanup(work_tree.lock_tree_write().unlock)
881
1042
and rel_names[0].lower() == rel_names[1].lower()):
882
1043
into_existing = False
883
1044
else:
884
inv = tree.inventory
885
1045
# 'fix' the case of a potential 'from'
886
1046
from_id = tree.path2id(
887
1047
tree.get_canonical_inventory_path(rel_names[0]))
888
1048
if (not osutils.lexists(names_list[0]) and
889
from_id and inv.get_file_kind(from_id) == "directory"):
1049
from_id and tree.stored_kind(from_id) == "directory"):
890
1050
into_existing = False
891
1051
# move/rename
892
1052
if into_existing:
899
1059
self.outf.write("%s => %s\n" % (src, dest))
900
1060
else:
901
1061
if len(names_list) != 2:
902
raise errors.BzrCommandError('to mv multiple files the'
1062
raise errors.BzrCommandError(gettext('to mv multiple files the'
903
1063
' destination must be a versioned'
904
' directory')
1064
' directory'))
905
1065
906
1066
# for cicp file-systems: the src references an existing inventory
907
1067
# item:
967
1127
branches have diverged.
968
1128
969
1129
If there is no default location set, the first pull will set it (use
970
--no-remember to avoid settting it). After that, you can omit the
1130
--no-remember to avoid setting it). After that, you can omit the
971
1131
location to use the default. To change the default, use --remember. The
972
1132
value will only be saved if the remote location can be accessed.
973
1133
1134
The --verbose option will display the revisions pulled using the log_format
1135
configuration option. You can use a different format by overriding it with
1136
-Olog_format=<other_format>.
1137
974
1138
Note: The location can be specified either in the form of a branch,
975
1139
or in the form of a path to a file containing a merge directive generated
976
1140
with bzr send.
1013
1177
self.add_cleanup(branch_to.lock_write().unlock)
1014
1178
1015
1179
if tree_to is None and show_base:
1016
raise errors.BzrCommandError("Need working tree for --show-base.")
1180
raise errors.BzrCommandError(gettext("Need working tree for --show-base."))
1017
1181
1018
1182
if local and not branch_to.get_bound_location():
1019
1183
raise errors.LocalRequiresBoundBranch()
1029
1193
stored_loc = branch_to.get_parent()
1030
1194
if location is None:
1031
1195
if stored_loc is None:
1032
raise errors.BzrCommandError("No pull location known or"
1033
" specified.")
1196
raise errors.BzrCommandError(gettext("No pull location known or"
1197
" specified."))
1034
1198
else:
1035
1199
display_url = urlutils.unescape_for_display(stored_loc,
1036
1200
self.outf.encoding)
1037
1201
if not is_quiet():
1038
self.outf.write("Using saved parent location: %s\n" % display_url)
1202
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1039
1203
location = stored_loc
1040
1204
1041
1205
revision = _get_one_revision('pull', revision)
1042
1206
if mergeable is not None:
1043
1207
if revision is not None:
1044
raise errors.BzrCommandError(
1045
'Cannot use -r with merge directives or bundles')
1208
raise errors.BzrCommandError(gettext(
1209
'Cannot use -r with merge directives or bundles'))
1046
1210
mergeable.install_revisions(branch_to.repository)
1047
1211
base_revision_id, revision_id, verified = \
1048
1212
mergeable.get_merge_request(branch_to.repository)
1054
1218
# Remembers if asked explicitly or no previous location is set
1055
1219
if (remember
1056
1220
or (remember is None and branch_to.get_parent() is None)):
1221
# FIXME: This shouldn't be done before the pull
1222
# succeeds... -- vila 2012-01-02
1057
1223
branch_to.set_parent(branch_from.base)
1058
1224
1059
1225
if revision is not None:
1066
1232
view_info=view_info)
1067
1233
result = tree_to.pull(
1068
1234
branch_from, overwrite, revision_id, change_reporter,
1069
possible_transports=possible_transports, local=local,
1070
show_base=show_base)
1235
local=local, show_base=show_base)
1071
1236
else:
1072
1237
result = branch_to.pull(
1073
1238
branch_from, overwrite, revision_id, local=local)
1104
1269
After that you will be able to do a push without '--overwrite'.
1105
1270
1106
1271
If there is no default push location set, the first push will set it (use
1107
--no-remember to avoid settting it). After that, you can omit the
1272
--no-remember to avoid setting it). After that, you can omit the
1108
1273
location to use the default. To change the default, use --remember. The
1109
1274
value will only be saved if the remote location can be accessed.
1275
1276
The --verbose option will display the revisions pushed using the log_format
1277
configuration option. You can use a different format by overriding it with
1278
-Olog_format=<other_format>.
1110
1279
"""
1111
1280
1112
1281
_see_also = ['pull', 'update', 'working-trees']
1150
1319
directory = '.'
1151
1320
# Get the source branch
1152
1321
(tree, br_from,
1153
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1322
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1154
1323
# Get the tip's revision_id
1155
1324
revision = _get_one_revision('push', revision)
1156
1325
if revision is not None:
1177
1346
# error by the feedback given to them. RBC 20080227.
1178
1347
stacked_on = parent_url
1179
1348
if not stacked_on:
1180
raise errors.BzrCommandError(
1181
"Could not determine branch to refer to.")
1349
raise errors.BzrCommandError(gettext(
1350
"Could not determine branch to refer to."))
1182
1351
1183
1352
# Get the destination location
1184
1353
if location is None:
1185
1354
stored_loc = br_from.get_push_location()
1186
1355
if stored_loc is None:
1187
raise errors.BzrCommandError(
1188
"No push location known or specified.")
1356
parent_loc = br_from.get_parent()
1357
if parent_loc:
1358
raise errors.BzrCommandError(gettext(
1359
"No push location known or specified. To push to the "
1360
"parent branch (at %s), use 'bzr push :parent'." %
1361
urlutils.unescape_for_display(parent_loc,
1362
self.outf.encoding)))
1363
else:
1364
raise errors.BzrCommandError(gettext(
1365
"No push location known or specified."))
1189
1366
else:
1190
1367
display_url = urlutils.unescape_for_display(stored_loc,
1191
1368
self.outf.encoding)
1192
self.outf.write("Using saved push location: %s\n" % display_url)
1369
note(gettext("Using saved push location: %s") % display_url)
1193
1370
location = stored_loc
1194
1371
1195
1372
_show_push_branch(br_from, revision_id, location, self.outf,
1253
1430
deprecated_name=self.invoked_as,
1254
1431
recommended_name='branch',
1255
1432
deprecated_in_version='2.4')
1256
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1433
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1257
1434
from_location)
1258
1435
if not (hardlink or files_from):
1259
1436
# accelerator_tree is usually slower because you have to read N
1272
1449
# RBC 20060209
1273
1450
revision_id = br_from.last_revision()
1274
1451
if to_location is None:
1275
to_location = urlutils.derive_to_location(from_location)
1452
to_location = getattr(br_from, "name", None)
1453
if not to_location:
1454
to_location = urlutils.derive_to_location(from_location)
1276
1455
to_transport = transport.get_transport(to_location)
1277
1456
try:
1278
1457
to_transport.mkdir('.')
1279
1458
except errors.FileExists:
1280
if not use_existing_dir:
1281
raise errors.BzrCommandError('Target directory "%s" '
1282
'already exists.' % to_location)
1459
try:
1460
to_dir = controldir.ControlDir.open_from_transport(
1461
to_transport)
1462
except errors.NotBranchError:
1463
if not use_existing_dir:
1464
raise errors.BzrCommandError(gettext('Target directory "%s" '
1465
'already exists.') % to_location)
1466
else:
1467
to_dir = None
1283
1468
else:
1284
1469
try:
1285
bzrdir.BzrDir.open_from_transport(to_transport)
1470
to_dir.open_branch()
1286
1471
except errors.NotBranchError:
1287
1472
pass
1288
1473
else:
1289
1474
raise errors.AlreadyBranchError(to_location)
1290
1475
except errors.NoSuchFile:
1291
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1476
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1292
1477
% to_location)
1293
try:
1294
# preserve whatever source format we have.
1295
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1296
possible_transports=[to_transport],
1297
accelerator_tree=accelerator_tree,
1298
hardlink=hardlink, stacked=stacked,
1299
force_new_repo=standalone,
1300
create_tree_if_local=not no_tree,
1301
source_branch=br_from)
1302
branch = dir.open_branch()
1303
except errors.NoSuchRevision:
1304
to_transport.delete_tree('.')
1305
msg = "The branch %s has no revision %s." % (from_location,
1306
revision)
1307
raise errors.BzrCommandError(msg)
1478
else:
1479
to_dir = None
1480
if to_dir is None:
1481
try:
1482
# preserve whatever source format we have.
1483
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1484
possible_transports=[to_transport],
1485
accelerator_tree=accelerator_tree,
1486
hardlink=hardlink, stacked=stacked,
1487
force_new_repo=standalone,
1488
create_tree_if_local=not no_tree,
1489
source_branch=br_from)
1490
branch = to_dir.open_branch(
1491
possible_transports=[
1492
br_from.bzrdir.root_transport, to_transport])
1493
except errors.NoSuchRevision:
1494
to_transport.delete_tree('.')
1495
msg = gettext("The branch {0} has no revision {1}.").format(
1496
from_location, revision)
1497
raise errors.BzrCommandError(msg)
1498
else:
1499
try:
1500
to_repo = to_dir.open_repository()
1501
except errors.NoRepositoryPresent:
1502
to_repo = to_dir.create_repository()
1503
to_repo.fetch(br_from.repository, revision_id=revision_id)
1504
branch = br_from.sprout(to_dir, revision_id=revision_id)
1308
1505
_merge_tags_if_possible(br_from, branch)
1309
1506
# If the source branch is stacked, the new branch may
1310
1507
# be stacked whether we asked for that explicitly or not.
1311
1508
# We therefore need a try/except here and not just 'if stacked:'
1312
1509
try:
1313
note('Created new stacked branch referring to %s.' %
1510
note(gettext('Created new stacked branch referring to %s.') %
1314
1511
branch.get_stacked_on_url())
1315
1512
except (errors.NotStacked, errors.UnstackableBranchFormat,
1316
1513
errors.UnstackableRepositoryFormat), e:
1317
note('Branched %d revision(s).' % branch.revno())
1514
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1318
1515
if bind:
1319
1516
# Bind to the parent
1320
1517
parent_branch = Branch.open(from_location)
1321
1518
branch.bind(parent_branch)
1322
note('New branch bound to %s' % from_location)
1519
note(gettext('New branch bound to %s') % from_location)
1323
1520
if switch:
1324
1521
# Switch to the new branch
1325
1522
wt, _ = WorkingTree.open_containing('.')
1326
1523
_mod_switch.switch(wt.bzrdir, branch)
1327
note('Switched to branch: %s',
1524
note(gettext('Switched to branch: %s'),
1328
1525
urlutils.unescape_for_display(branch.base, 'utf-8'))
1329
1526
1330
1527
1528
class cmd_branches(Command):
1529
__doc__ = """List the branches available at the current location.
1530
1531
This command will print the names of all the branches at the current
1532
location.
1533
"""
1534
1535
takes_args = ['location?']
1536
takes_options = [
1537
Option('recursive', short_name='R',
1538
help='Recursively scan for branches rather than '
1539
'just looking in the specified location.')]
1540
1541
def run(self, location=".", recursive=False):
1542
if recursive:
1543
t = transport.get_transport(location)
1544
if not t.listable():
1545
raise errors.BzrCommandError(
1546
"Can't scan this type of location.")
1547
for b in controldir.ControlDir.find_branches(t):
1548
self.outf.write("%s\n" % urlutils.unescape_for_display(
1549
urlutils.relative_url(t.base, b.base),
1550
self.outf.encoding).rstrip("/"))
1551
else:
1552
dir = controldir.ControlDir.open_containing(location)[0]
1553
try:
1554
active_branch = dir.open_branch(name="")
1555
except errors.NotBranchError:
1556
active_branch = None
1557
names = {}
1558
for name, branch in iter_sibling_branches(dir):
1559
if name == "":
1560
continue
1561
active = (active_branch is not None and
1562
active_branch.base == branch.base)
1563
names[name] = active
1564
# Only mention the current branch explicitly if it's not
1565
# one of the colocated branches
1566
if not any(names.values()) and active_branch is not None:
1567
self.outf.write("* %s\n" % gettext("(default)"))
1568
for name in sorted(names.keys()):
1569
active = names[name]
1570
if active:
1571
prefix = "*"
1572
else:
1573
prefix = " "
1574
self.outf.write("%s %s\n" % (
1575
prefix, name.encode(self.outf.encoding)))
1576
1577
1331
1578
class cmd_checkout(Command):
1332
1579
__doc__ = """Create a new checkout of an existing branch.
1333
1580
1372
1619
if branch_location is None:
1373
1620
branch_location = osutils.getcwd()
1374
1621
to_location = branch_location
1375
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1622
accelerator_tree, source = controldir.ControlDir.open_tree_or_branch(
1376
1623
branch_location)
1377
1624
if not (hardlink or files_from):
1378
1625
# accelerator_tree is usually slower because you have to read N
1415
1662
def run(self, dir=u'.'):
1416
1663
tree = WorkingTree.open_containing(dir)[0]
1417
1664
self.add_cleanup(tree.lock_read().unlock)
1418
new_inv = tree.inventory
1419
1665
old_tree = tree.basis_tree()
1420
1666
self.add_cleanup(old_tree.lock_read().unlock)
1421
old_inv = old_tree.inventory
1422
1667
renames = []
1423
1668
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1424
1669
for f, paths, c, v, p, n, k, e in iterator:
1433
1678
1434
1679
1435
1680
class cmd_update(Command):
1436
__doc__ = """Update a tree to have the latest code committed to its branch.
1437
1438
This will perform a merge into the working tree, and may generate
1439
conflicts. If you have any local changes, you will still
1440
need to commit them after the update for the update to be complete.
1441
1442
If you want to discard your local changes, you can just do a
1443
'bzr revert' instead of 'bzr commit' after the update.
1444
1445
If you want to restore a file that has been removed locally, use
1446
'bzr revert' instead of 'bzr update'.
1447
1448
If the tree's branch is bound to a master branch, it will also update
1681
__doc__ = """Update a working tree to a new revision.
1682
1683
This will perform a merge of the destination revision (the tip of the
1684
branch, or the specified revision) into the working tree, and then make
1685
that revision the basis revision for the working tree.
1686
1687
You can use this to visit an older revision, or to update a working tree
1688
that is out of date from its branch.
1689
1690
If there are any uncommitted changes in the tree, they will be carried
1691
across and remain as uncommitted changes after the update. To discard
1692
these changes, use 'bzr revert'. The uncommitted changes may conflict
1693
with the changes brought in by the change in basis revision.
1694
1695
If the tree's branch is bound to a master branch, bzr will also update
1449
1696
the branch from the master.
1697
1698
You cannot update just a single file or directory, because each Bazaar
1699
working tree has just a single basis revision. If you want to restore a
1700
file that has been removed locally, use 'bzr revert' instead of 'bzr
1701
update'. If you want to restore a file to its state in a previous
1702
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1703
out the old content of that file to a new location.
1704
1705
The 'dir' argument, if given, must be the location of the root of a
1706
working tree to update. By default, the working tree that contains the
1707
current working directory is used.
1450
1708
"""
1451
1709
1452
1710
_see_also = ['pull', 'working-trees', 'status-flags']
1457
1715
]
1458
1716
aliases = ['up']
1459
1717
1460
def run(self, dir='.', revision=None, show_base=None):
1718
def run(self, dir=None, revision=None, show_base=None):
1461
1719
if revision is not None and len(revision) != 1:
1462
raise errors.BzrCommandError(
1463
"bzr update --revision takes exactly one revision")
1464
tree = WorkingTree.open_containing(dir)[0]
1720
raise errors.BzrCommandError(gettext(
1721
"bzr update --revision takes exactly one revision"))
1722
if dir is None:
1723
tree = WorkingTree.open_containing('.')[0]
1724
else:
1725
tree, relpath = WorkingTree.open_containing(dir)
1726
if relpath:
1727
# See bug 557886.
1728
raise errors.BzrCommandError(gettext(
1729
"bzr update can only update a whole tree, "
1730
"not a file or subdirectory"))
1465
1731
branch = tree.branch
1466
1732
possible_transports = []
1467
1733
master = branch.get_master_branch(
1491
1757
revision_id = branch.last_revision()
1492
1758
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1493
1759
revno = branch.revision_id_to_dotted_revno(revision_id)
1494
note("Tree is up to date at revision %s of branch %s" %
1495
('.'.join(map(str, revno)), branch_location))
1760
note(gettext("Tree is up to date at revision {0} of branch {1}"
1761
).format('.'.join(map(str, revno)), branch_location))
1496
1762
return 0
1497
1763
view_info = _get_view_info_for_change_reporter(tree)
1498
1764
change_reporter = delta._ChangeReporter(
1506
1772
old_tip=old_tip,
1507
1773
show_base=show_base)
1508
1774
except errors.NoSuchRevision, e:
1509
raise errors.BzrCommandError(
1775
raise errors.BzrCommandError(gettext(
1510
1776
"branch has no revision %s\n"
1511
1777
"bzr update --revision only works"
1512
" for a revision in the branch history"
1778
" for a revision in the branch history")
1513
1779
% (e.revision))
1514
1780
revno = tree.branch.revision_id_to_dotted_revno(
1515
1781
_mod_revision.ensure_null(tree.last_revision()))
1516
note('Updated to revision %s of branch %s' %
1517
('.'.join(map(str, revno)), branch_location))
1782
note(gettext('Updated to revision {0} of branch {1}').format(
1783
'.'.join(map(str, revno)), branch_location))
1518
1784
parent_ids = tree.get_parent_ids()
1519
1785
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1520
note('Your local commits will now show as pending merges with '
1521
"'bzr status', and can be committed with 'bzr commit'.")
1786
note(gettext('Your local commits will now show as pending merges with '
1787
"'bzr status', and can be committed with 'bzr commit'."))
1522
1788
if conflicts != 0:
1523
1789
return 1
1524
1790
else:
1565
1831
else:
1566
1832
noise_level = 0
1567
1833
from bzrlib.info import show_bzrdir_info
1568
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1834
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1569
1835
verbose=noise_level, outfile=self.outf)
1570
1836
1571
1837
1596
1862
def run(self, file_list, verbose=False, new=False,
1597
1863
file_deletion_strategy='safe'):
1598
1864
if file_deletion_strategy == 'force':
1599
note("(The --force option is deprecated, rather use --no-backup "
1600
"in future.)")
1865
note(gettext("(The --force option is deprecated, rather use --no-backup "
1866
"in future.)"))
1601
1867
file_deletion_strategy = 'no-backup'
1602
1868
1603
1869
tree, file_list = WorkingTree.open_containing_paths(file_list)
1613
1879
specific_files=file_list).added
1614
1880
file_list = sorted([f[0] for f in added], reverse=True)
1615
1881
if len(file_list) == 0:
1616
raise errors.BzrCommandError('No matching files.')
1882
raise errors.BzrCommandError(gettext('No matching files.'))
1617
1883
elif file_list is None:
1618
1884
# missing files show up in iter_changes(basis) as
1619
1885
# versioned-with-no-kind.
1703
1969
1704
1970
def run(self, branch=".", canonicalize_chks=False):
1705
1971
from bzrlib.reconcile import reconcile
1706
dir = bzrdir.BzrDir.open(branch)
1972
dir = controldir.ControlDir.open(branch)
1707
1973
reconcile(dir, canonicalize_chks=canonicalize_chks)
1708
1974
1709
1975
1718
1984
@display_command
1719
1985
def run(self, location="."):
1720
1986
branch = Branch.open_containing(location)[0]
1721
for revid in branch.revision_history():
1987
self.add_cleanup(branch.lock_read().unlock)
1988
graph = branch.repository.get_graph()
1989
history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
1990
[_mod_revision.NULL_REVISION]))
1991
for revid in reversed(history):
1722
1992
self.outf.write(revid)
1723
1993
self.outf.write('\n')
1724
1994
1784
2054
RegistryOption('format',
1785
2055
help='Specify a format for this branch. '
1786
2056
'See "help formats".',
1787
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1788
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2057
lazy_registry=('bzrlib.controldir', 'format_registry'),
2058
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1789
2059
value_switches=True,
1790
2060
title="Branch format",
1791
2061
),
1798
2068
def run(self, location=None, format=None, append_revisions_only=False,
1799
2069
create_prefix=False, no_tree=False):
1800
2070
if format is None:
1801
format = bzrdir.format_registry.make_bzrdir('default')
2071
format = controldir.format_registry.make_bzrdir('default')
1802
2072
if location is None:
1803
2073
location = u'.'
1804
2074
1813
2083
to_transport.ensure_base()
1814
2084
except errors.NoSuchFile:
1815
2085
if not create_prefix:
1816
raise errors.BzrCommandError("Parent directory of %s"
2086
raise errors.BzrCommandError(gettext("Parent directory of %s"
1817
2087
" does not exist."
1818
2088
"\nYou may supply --create-prefix to create all"
1819
" leading parent directories."
2089
" leading parent directories.")
1820
2090
% location)
1821
2091
to_transport.create_prefix()
1822
2092
1823
2093
try:
1824
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2094
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1825
2095
except errors.NotBranchError:
1826
2096
# really a NotBzrDir error...
1827
create_branch = bzrdir.BzrDir.create_branch_convenience
2097
create_branch = controldir.ControlDir.create_branch_convenience
1828
2098
if no_tree:
1829
2099
force_new_tree = False
1830
2100
else:
1841
2111
raise errors.BranchExistsWithoutWorkingTree(location)
1842
2112
raise errors.AlreadyBranchError(location)
1843
2113
branch = a_bzrdir.create_branch()
1844
if not no_tree:
2114
if not no_tree and not a_bzrdir.has_workingtree():
1845
2115
a_bzrdir.create_workingtree()
1846
2116
if append_revisions_only:
1847
2117
try:
1848
2118
branch.set_append_revisions_only(True)
1849
2119
except errors.UpgradeRequired:
1850
raise errors.BzrCommandError('This branch format cannot be set'
1851
' to append-revisions-only. Try --default.')
2120
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2121
' to append-revisions-only. Try --default.'))
1852
2122
if not is_quiet():
1853
2123
from bzrlib.info import describe_layout, describe_format
1854
2124
try:
1858
2128
repository = branch.repository
1859
2129
layout = describe_layout(repository, branch, tree).lower()
1860
2130
format = describe_format(a_bzrdir, repository, branch, tree)
1861
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2131
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
2132
layout, format))
1862
2133
if repository.is_shared():
1863
2134
#XXX: maybe this can be refactored into transport.path_or_url()
1864
2135
url = repository.bzrdir.root_transport.external_url()
1866
2137
url = urlutils.local_path_from_url(url)
1867
2138
except errors.InvalidURL:
1868
2139
pass
1869
self.outf.write("Using shared repository: %s\n" % url)
2140
self.outf.write(gettext("Using shared repository: %s\n") % url)
1870
2141
1871
2142
1872
2143
class cmd_init_repository(Command):
1902
2173
takes_options = [RegistryOption('format',
1903
2174
help='Specify a format for this repository. See'
1904
2175
' "bzr help formats" for details.',
1905
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1906
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2176
lazy_registry=('bzrlib.controldir', 'format_registry'),
2177
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1907
2178
value_switches=True, title='Repository format'),
1908
2179
Option('no-trees',
1909
2180
help='Branches in the repository will default to'
1913
2184
1914
2185
def run(self, location, format=None, no_trees=False):
1915
2186
if format is None:
1916
format = bzrdir.format_registry.make_bzrdir('default')
2187
format = controldir.format_registry.make_bzrdir('default')
1917
2188
1918
2189
if location is None:
1919
2190
location = '.'
1920
2191
1921
2192
to_transport = transport.get_transport(location)
1922
to_transport.ensure_base()
1923
2193
1924
newdir = format.initialize_on_transport(to_transport)
1925
repo = newdir.create_repository(shared=True)
1926
repo.set_make_working_trees(not no_trees)
2194
(repo, newdir, require_stacking, repository_policy) = (
2195
format.initialize_on_transport_ex(to_transport,
2196
create_prefix=True, make_working_trees=not no_trees,
2197
shared_repo=True, force_new_repo=True,
2198
use_existing_dir=True,
2199
repo_format_name=format.repository_format.get_format_string()))
1927
2200
if not is_quiet():
1928
2201
from bzrlib.info import show_bzrdir_info
1929
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2202
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1930
2203
1931
2204
1932
2205
class cmd_diff(Command):
2063
2336
elif ':' in prefix:
2064
2337
old_label, new_label = prefix.split(":")
2065
2338
else:
2066
raise errors.BzrCommandError(
2339
raise errors.BzrCommandError(gettext(
2067
2340
'--prefix expects two values separated by a colon'
2068
' (eg "old/:new/")')
2341
' (eg "old/:new/")'))
2069
2342
2070
2343
if revision and len(revision) > 2:
2071
raise errors.BzrCommandError('bzr diff --revision takes exactly'
2072
' one or two revision specifiers')
2344
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2345
' one or two revision specifiers'))
2073
2346
2074
2347
if using is not None and format is not None:
2075
raise errors.BzrCommandError('--using and --format are mutually '
2076
'exclusive.')
2348
raise errors.BzrCommandError(gettext(
2349
'{0} and {1} are mutually exclusive').format(
2350
'--using', '--format'))
2077
2351
2078
2352
(old_tree, new_tree,
2079
2353
old_branch, new_branch,
2109
2383
self.add_cleanup(tree.lock_read().unlock)
2110
2384
old = tree.basis_tree()
2111
2385
self.add_cleanup(old.lock_read().unlock)
2112
for path, ie in old.inventory.iter_entries():
2386
for path, ie in old.iter_entries_by_dir():
2113
2387
if not tree.has_id(ie.file_id):
2114
2388
self.outf.write(path)
2115
2389
if show_ids:
2153
2427
self.add_cleanup(wt.lock_read().unlock)
2154
2428
basis = wt.basis_tree()
2155
2429
self.add_cleanup(basis.lock_read().unlock)
2156
basis_inv = basis.inventory
2157
inv = wt.inventory
2158
for file_id in inv:
2159
if basis_inv.has_id(file_id):
2160
continue
2161
if inv.is_root(file_id) and len(basis_inv) == 0:
2162
continue
2163
path = inv.id2path(file_id)
2430
root_id = wt.get_root_id()
2431
for file_id in wt.all_file_ids():
2432
if basis.has_id(file_id):
2433
continue
2434
if root_id == file_id:
2435
continue
2436
path = wt.id2path(file_id)
2164
2437
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2165
2438
continue
2166
2439
if null:
2187
2460
try:
2188
2461
return int(limitstring)
2189
2462
except ValueError:
2190
msg = "The limit argument must be an integer."
2463
msg = gettext("The limit argument must be an integer.")
2191
2464
raise errors.BzrCommandError(msg)
2192
2465
2193
2466
2195
2468
try:
2196
2469
return int(s)
2197
2470
except ValueError:
2198
msg = "The levels argument must be an integer."
2471
msg = gettext("The levels argument must be an integer.")
2199
2472
raise errors.BzrCommandError(msg)
2200
2473
2201
2474
2311
2584
2312
2585
:Other filtering:
2313
2586
2314
The --message option can be used for finding revisions that match a
2315
regular expression in a commit message.
2587
The --match option can be used for finding revisions that match a
2588
regular expression in a commit message, committer, author or bug.
2589
Specifying the option several times will match any of the supplied
2590
expressions. --match-author, --match-bugs, --match-committer and
2591
--match-message can be used to only match a specific field.
2316
2592
2317
2593
:Tips & tricks:
2318
2594
2378
2654
argname='N',
2379
2655
type=_parse_levels),
2380
2656
Option('message',
2381
short_name='m',
2382
2657
help='Show revisions whose message matches this '
2383
2658
'regular expression.',
2384
type=str),
2659
type=str,
2660
hidden=True),
2385
2661
Option('limit',
2386
2662
short_name='l',
2387
2663
help='Limit the output to the first N revisions.',
2390
2666
Option('show-diff',
2391
2667
short_name='p',
2392
2668
help='Show changes made in each revision as a patch.'),
2393
Option('include-merges',
2669
Option('include-merged',
2394
2670
help='Show merged revisions like --levels 0 does.'),
2671
Option('include-merges', hidden=True,
2672
help='Historical alias for --include-merged.'),
2673
Option('omit-merges',
2674
help='Do not report commits with more than one parent.'),
2395
2675
Option('exclude-common-ancestry',
2396
2676
help='Display only the revisions that are not part'
2397
' of both ancestries (require -rX..Y)'
2677
' of both ancestries (require -rX..Y).'
2398
2678
),
2399
2679
Option('signatures',
2400
help='Show digital signature validity'),
2680
help='Show digital signature validity.'),
2681
ListOption('match',
2682
short_name='m',
2683
help='Show revisions whose properties match this '
2684
'expression.',
2685
type=str),
2686
ListOption('match-message',
2687
help='Show revisions whose message matches this '
2688
'expression.',
2689
type=str),
2690
ListOption('match-committer',
2691
help='Show revisions whose committer matches this '
2692
'expression.',
2693
type=str),
2694
ListOption('match-author',
2695
help='Show revisions whose authors match this '
2696
'expression.',
2697
type=str),
2698
ListOption('match-bugs',
2699
help='Show revisions whose bugs match this '
2700
'expression.',
2701
type=str)
2401
2702
]
2402
2703
encoding_type = 'replace'
2403
2704
2413
2714
message=None,
2414
2715
limit=None,
2415
2716
show_diff=False,
2416
include_merges=False,
2717
include_merged=None,
2417
2718
authors=None,
2418
2719
exclude_common_ancestry=False,
2419
2720
signatures=False,
2721
match=None,
2722
match_message=None,
2723
match_committer=None,
2724
match_author=None,
2725
match_bugs=None,
2726
omit_merges=False,
2727
include_merges=symbol_versioning.DEPRECATED_PARAMETER,
2420
2728
):
2421
2729
from bzrlib.log import (
2422
2730
Logger,
2424
2732
_get_info_for_log_files,
2425
2733
)
2426
2734
direction = (forward and 'forward') or 'reverse'
2735
if symbol_versioning.deprecated_passed(include_merges):
2736
ui.ui_factory.show_user_warning(
2737
'deprecated_command_option',
2738
deprecated_name='--include-merges',
2739
recommended_name='--include-merged',
2740
deprecated_in_version='2.5',
2741
command=self.invoked_as)
2742
if include_merged is None:
2743
include_merged = include_merges
2744
else:
2745
raise errors.BzrCommandError(gettext(
2746
'{0} and {1} are mutually exclusive').format(
2747
'--include-merges', '--include-merged'))
2748
if include_merged is None:
2749
include_merged = False
2427
2750
if (exclude_common_ancestry
2428
2751
and (revision is None or len(revision) != 2)):
2429
raise errors.BzrCommandError(
2430
'--exclude-common-ancestry requires -r with two revisions')
2431
if include_merges:
2752
raise errors.BzrCommandError(gettext(
2753
'--exclude-common-ancestry requires -r with two revisions'))
2754
if include_merged:
2432
2755
if levels is None:
2433
2756
levels = 0
2434
2757
else:
2435
raise errors.BzrCommandError(
2436
'--levels and --include-merges are mutually exclusive')
2758
raise errors.BzrCommandError(gettext(
2759
'{0} and {1} are mutually exclusive').format(
2760
'--levels', '--include-merged'))
2437
2761
2438
2762
if change is not None:
2439
2763
if len(change) > 1:
2440
2764
raise errors.RangeInChangeOption()
2441
2765
if revision is not None:
2442
raise errors.BzrCommandError(
2443
'--revision and --change are mutually exclusive')
2766
raise errors.BzrCommandError(gettext(
2767
'{0} and {1} are mutually exclusive').format(
2768
'--revision', '--change'))
2444
2769
else:
2445
2770
revision = change
2446
2771
2452
2777
revision, file_list, self.add_cleanup)
2453
2778
for relpath, file_id, kind in file_info_list:
2454
2779
if file_id is None:
2455
raise errors.BzrCommandError(
2456
"Path unknown at end or start of revision range: %s" %
2780
raise errors.BzrCommandError(gettext(
2781
"Path unknown at end or start of revision range: %s") %
2457
2782
relpath)
2458
2783
# If the relpath is the top of the tree, we log everything
2459
2784
if relpath == '':
2471
2796
location = revision[0].get_branch()
2472
2797
else:
2473
2798
location = '.'
2474
dir, relpath = bzrdir.BzrDir.open_containing(location)
2799
dir, relpath = controldir.ControlDir.open_containing(location)
2475
2800
b = dir.open_branch()
2476
2801
self.add_cleanup(b.lock_read().unlock)
2477
2802
rev1, rev2 = _get_revision_range(revision, b, self.name())
2478
2803
2479
if b.get_config().validate_signatures_in_log():
2804
if b.get_config_stack().get('validate_signatures_in_log'):
2480
2805
signatures = True
2481
2806
2482
2807
if signatures:
2525
2850
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2526
2851
or delta_type or partial_history)
2527
2852
2853
match_dict = {}
2854
if match:
2855
match_dict[''] = match
2856
if match_message:
2857
match_dict['message'] = match_message
2858
if match_committer:
2859
match_dict['committer'] = match_committer
2860
if match_author:
2861
match_dict['author'] = match_author
2862
if match_bugs:
2863
match_dict['bugs'] = match_bugs
2864
2528
2865
# Build the LogRequest and execute it
2529
2866
if len(file_ids) == 0:
2530
2867
file_ids = None
2533
2870
start_revision=rev1, end_revision=rev2, limit=limit,
2534
2871
message_search=message, delta_type=delta_type,
2535
2872
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2536
exclude_common_ancestry=exclude_common_ancestry,
2537
signature=signatures
2873
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2874
signature=signatures, omit_merges=omit_merges,
2538
2875
)
2539
2876
Logger(b, rqst).show(lf)
2540
2877
2557
2894
# b is taken from revision[0].get_branch(), and
2558
2895
# show_log will use its revision_history. Having
2559
2896
# different branches will lead to weird behaviors.
2560
raise errors.BzrCommandError(
2897
raise errors.BzrCommandError(gettext(
2561
2898
"bzr %s doesn't accept two revisions in different"
2562
" branches." % command_name)
2899
" branches.") % command_name)
2563
2900
if start_spec.spec is None:
2564
2901
# Avoid loading all the history.
2565
2902
rev1 = RevisionInfo(branch, None, None)
2573
2910
else:
2574
2911
rev2 = end_spec.in_history(branch)
2575
2912
else:
2576
raise errors.BzrCommandError(
2577
'bzr %s --revision takes one or two values.' % command_name)
2913
raise errors.BzrCommandError(gettext(
2914
'bzr %s --revision takes one or two values.') % command_name)
2578
2915
return rev1, rev2
2579
2916
2580
2917
2651
2988
null=False, kind=None, show_ids=False, path=None, directory=None):
2652
2989
2653
2990
if kind and kind not in ('file', 'directory', 'symlink'):
2654
raise errors.BzrCommandError('invalid kind specified')
2991
raise errors.BzrCommandError(gettext('invalid kind specified'))
2655
2992
2656
2993
if verbose and null:
2657
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2994
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2658
2995
all = not (unknown or versioned or ignored)
2659
2996
2660
2997
selection = {'I':ignored, '?':unknown, 'V':versioned}
2663
3000
fs_path = '.'
2664
3001
else:
2665
3002
if from_root:
2666
raise errors.BzrCommandError('cannot specify both --from-root'
2667
' and PATH')
3003
raise errors.BzrCommandError(gettext('cannot specify both --from-root'
3004
' and PATH'))
2668
3005
fs_path = path
2669
3006
tree, branch, relpath = \
2670
3007
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2686
3023
if view_files:
2687
3024
apply_view = True
2688
3025
view_str = views.view_display_str(view_files)
2689
note("Ignoring files outside view. View is %s" % view_str)
3026
note(gettext("Ignoring files outside view. View is %s") % view_str)
2690
3027
2691
3028
self.add_cleanup(tree.lock_read().unlock)
2692
3029
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2839
3176
self.outf.write("%s\n" % pattern)
2840
3177
return
2841
3178
if not name_pattern_list:
2842
raise errors.BzrCommandError("ignore requires at least one "
2843
"NAME_PATTERN or --default-rules.")
3179
raise errors.BzrCommandError(gettext("ignore requires at least one "
3180
"NAME_PATTERN or --default-rules."))
2844
3181
name_pattern_list = [globbing.normalize_pattern(p)
2845
3182
for p in name_pattern_list]
2846
3183
bad_patterns = ''
3184
bad_patterns_count = 0
2847
3185
for p in name_pattern_list:
2848
3186
if not globbing.Globster.is_pattern_valid(p):
3187
bad_patterns_count += 1
2849
3188
bad_patterns += ('\n %s' % p)
2850
3189
if bad_patterns:
2851
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
3190
msg = (ngettext('Invalid ignore pattern found. %s',
3191
'Invalid ignore patterns found. %s',
3192
bad_patterns_count) % bad_patterns)
2852
3193
ui.ui_factory.show_error(msg)
2853
3194
raise errors.InvalidPattern('')
2854
3195
for name_pattern in name_pattern_list:
2855
3196
if (name_pattern[0] == '/' or
2856
3197
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2857
raise errors.BzrCommandError(
2858
"NAME_PATTERN should not be an absolute path")
3198
raise errors.BzrCommandError(gettext(
3199
"NAME_PATTERN should not be an absolute path"))
2859
3200
tree, relpath = WorkingTree.open_containing(directory)
2860
3201
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2861
3202
ignored = globbing.Globster(name_pattern_list)
2868
3209
if ignored.match(filename):
2869
3210
matches.append(filename)
2870
3211
if len(matches) > 0:
2871
self.outf.write("Warning: the following files are version controlled and"
2872
" match your ignore pattern:\n%s"
3212
self.outf.write(gettext("Warning: the following files are version "
3213
"controlled and match your ignore pattern:\n%s"
2873
3214
"\nThese files will continue to be version controlled"
2874
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3215
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2875
3216
2876
3217
2877
3218
class cmd_ignored(Command):
2916
3257
try:
2917
3258
revno = int(revno)
2918
3259
except ValueError:
2919
raise errors.BzrCommandError("not a valid revision-number: %r"
3260
raise errors.BzrCommandError(gettext("not a valid revision-number: %r")
2920
3261
% revno)
2921
3262
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2922
3263
self.outf.write("%s\n" % revid)
2965
3306
Option('per-file-timestamps',
2966
3307
help='Set modification time of files to that of the last '
2967
3308
'revision in which it was changed.'),
3309
Option('uncommitted',
3310
help='Export the working tree contents rather than that of the '
3311
'last revision.'),
2968
3312
]
2969
3313
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2970
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
3314
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3315
directory=u'.'):
2971
3316
from bzrlib.export import export
2972
3317
2973
3318
if branch_or_subdir is None:
2974
tree = WorkingTree.open_containing(directory)[0]
2975
b = tree.branch
2976
subdir = None
3319
branch_or_subdir = directory
3320
3321
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3322
branch_or_subdir)
3323
if tree is not None:
3324
self.add_cleanup(tree.lock_read().unlock)
3325
3326
if uncommitted:
3327
if tree is None:
3328
raise errors.BzrCommandError(
3329
gettext("--uncommitted requires a working tree"))
3330
export_tree = tree
2977
3331
else:
2978
b, subdir = Branch.open_containing(branch_or_subdir)
2979
tree = None
2980
2981
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3332
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2982
3333
try:
2983
export(rev_tree, dest, format, root, subdir, filtered=filters,
3334
export(export_tree, dest, format, root, subdir, filtered=filters,
2984
3335
per_file_timestamps=per_file_timestamps)
2985
3336
except errors.NoSuchExportFormat, e:
2986
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3337
raise errors.BzrCommandError(
3338
gettext('Unsupported export format: %s') % e.format)
2987
3339
2988
3340
2989
3341
class cmd_cat(Command):
3009
3361
def run(self, filename, revision=None, name_from_revision=False,
3010
3362
filters=False, directory=None):
3011
3363
if revision is not None and len(revision) != 1:
3012
raise errors.BzrCommandError("bzr cat --revision takes exactly"
3013
" one revision specifier")
3364
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3365
" one revision specifier"))
3014
3366
tree, branch, relpath = \
3015
3367
_open_directory_or_containing_tree_or_branch(filename, directory)
3016
3368
self.add_cleanup(branch.lock_read().unlock)
3026
3378
3027
3379
old_file_id = rev_tree.path2id(relpath)
3028
3380
3381
# TODO: Split out this code to something that generically finds the
3382
# best id for a path across one or more trees; it's like
3383
# find_ids_across_trees but restricted to find just one. -- mbp
3384
# 20110705.
3029
3385
if name_from_revision:
3030
3386
# Try in revision if requested
3031
3387
if old_file_id is None:
3032
raise errors.BzrCommandError(
3033
"%r is not present in revision %s" % (
3388
raise errors.BzrCommandError(gettext(
3389
"{0!r} is not present in revision {1}").format(
3034
3390
filename, rev_tree.get_revision_id()))
3035
3391
else:
3036
content = rev_tree.get_file_text(old_file_id)
3392
actual_file_id = old_file_id
3037
3393
else:
3038
3394
cur_file_id = tree.path2id(relpath)
3039
found = False
3040
if cur_file_id is not None:
3041
# Then try with the actual file id
3042
try:
3043
content = rev_tree.get_file_text(cur_file_id)
3044
found = True
3045
except errors.NoSuchId:
3046
# The actual file id didn't exist at that time
3047
pass
3048
if not found and old_file_id is not None:
3049
# Finally try with the old file id
3050
content = rev_tree.get_file_text(old_file_id)
3051
found = True
3052
if not found:
3053
# Can't be found anywhere
3054
raise errors.BzrCommandError(
3055
"%r is not present in revision %s" % (
3395
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3396
actual_file_id = cur_file_id
3397
elif old_file_id is not None:
3398
actual_file_id = old_file_id
3399
else:
3400
raise errors.BzrCommandError(gettext(
3401
"{0!r} is not present in revision {1}").format(
3056
3402
filename, rev_tree.get_revision_id()))
3057
3403
if filtered:
3058
from bzrlib.filters import (
3059
ContentFilterContext,
3060
filtered_output_bytes,
3061
)
3062
filters = rev_tree._content_filter_stack(relpath)
3063
chunks = content.splitlines(True)
3064
content = filtered_output_bytes(chunks, filters,
3065
ContentFilterContext(relpath, rev_tree))
3066
self.cleanup_now()
3067
self.outf.writelines(content)
3404
from bzrlib.filter_tree import ContentFilterTree
3405
filter_tree = ContentFilterTree(rev_tree,
3406
rev_tree._content_filter_stack)
3407
content = filter_tree.get_file_text(actual_file_id)
3068
3408
else:
3069
self.cleanup_now()
3070
self.outf.write(content)
3409
content = rev_tree.get_file_text(actual_file_id)
3410
self.cleanup_now()
3411
self.outf.write(content)
3071
3412
3072
3413
3073
3414
class cmd_local_time_offset(Command):
3180
3521
aliases = ['ci', 'checkin']
3181
3522
3182
3523
def _iter_bug_fix_urls(self, fixes, branch):
3524
default_bugtracker = None
3183
3525
# Configure the properties for bug fixing attributes.
3184
3526
for fixed_bug in fixes:
3185
3527
tokens = fixed_bug.split(':')
3186
if len(tokens) != 2:
3187
raise errors.BzrCommandError(
3528
if len(tokens) == 1:
3529
if default_bugtracker is None:
3530
branch_config = branch.get_config_stack()
3531
default_bugtracker = branch_config.get(
3532
"bugtracker")
3533
if default_bugtracker is None:
3534
raise errors.BzrCommandError(gettext(
3535
"No tracker specified for bug %s. Use the form "
3536
"'tracker:id' or specify a default bug tracker "
3537
"using the `bugtracker` option.\nSee "
3538
"\"bzr help bugs\" for more information on this "
3539
"feature. Commit refused.") % fixed_bug)
3540
tag = default_bugtracker
3541
bug_id = tokens[0]
3542
elif len(tokens) != 2:
3543
raise errors.BzrCommandError(gettext(
3188
3544
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3189
3545
"See \"bzr help bugs\" for more information on this "
3190
"feature.\nCommit refused." % fixed_bug)
3191
tag, bug_id = tokens
3546
"feature.\nCommit refused.") % fixed_bug)
3547
else:
3548
tag, bug_id = tokens
3192
3549
try:
3193
3550
yield bugtracker.get_bug_url(tag, branch, bug_id)
3194
3551
except errors.UnknownBugTrackerAbbreviation:
3195
raise errors.BzrCommandError(
3196
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3552
raise errors.BzrCommandError(gettext(
3553
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3197
3554
except errors.MalformedBugIdentifier, e:
3198
raise errors.BzrCommandError(
3199
"%s\nCommit refused." % (str(e),))
3555
raise errors.BzrCommandError(gettext(
3556
"%s\nCommit refused.") % (str(e),))
3200
3557
3201
3558
def run(self, message=None, file=None, verbose=False, selected_list=None,
3202
3559
unchanged=False, strict=False, local=False, fixes=None,
3219
3576
try:
3220
3577
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3221
3578
except ValueError, e:
3222
raise errors.BzrCommandError(
3223
"Could not parse --commit-time: " + str(e))
3579
raise errors.BzrCommandError(gettext(
3580
"Could not parse --commit-time: " + str(e)))
3224
3581
3225
3582
properties = {}
3226
3583
3259
3616
message = message.replace('\r\n', '\n')
3260
3617
message = message.replace('\r', '\n')
3261
3618
if file:
3262
raise errors.BzrCommandError(
3263
"please specify either --message or --file")
3619
raise errors.BzrCommandError(gettext(
3620
"please specify either --message or --file"))
3264
3621
3265
3622
def get_message(commit_obj):
3266
3623
"""Callback to get commit message"""
3289
3646
my_message = edit_commit_message_encoded(text,
3290
3647
start_message=start_message)
3291
3648
if my_message is None:
3292
raise errors.BzrCommandError("please specify a commit"
3293
" message with either --message or --file")
3294
if my_message == "":
3295
raise errors.BzrCommandError("empty commit message specified")
3649
raise errors.BzrCommandError(gettext("please specify a commit"
3650
" message with either --message or --file"))
3651
if my_message == "":
3652
raise errors.BzrCommandError(gettext("Empty commit message specified."
3653
" Please specify a commit message with either"
3654
" --message or --file or leave a blank message"
3655
" with --message \"\"."))
3296
3656
return my_message
3297
3657
3298
3658
# The API permits a commit with a filter of [] to mean 'select nothing'
3309
3669
exclude=tree.safe_relpath_files(exclude),
3310
3670
lossy=lossy)
3311
3671
except PointlessCommit:
3312
raise errors.BzrCommandError("No changes to commit."
3672
raise errors.BzrCommandError(gettext("No changes to commit."
3313
3673
" Please 'bzr add' the files you want to commit, or use"
3314
" --unchanged to force an empty commit.")
3674
" --unchanged to force an empty commit."))
3315
3675
except ConflictsInTree:
3316
raise errors.BzrCommandError('Conflicts detected in working '
3676
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3317
3677
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3318
' resolve.')
3678
' resolve.'))
3319
3679
except StrictCommitFailed:
3320
raise errors.BzrCommandError("Commit refused because there are"
3321
" unknown files in the working tree.")
3680
raise errors.BzrCommandError(gettext("Commit refused because there are"
3681
" unknown files in the working tree."))
3322
3682
except errors.BoundBranchOutOfDate, e:
3323
e.extra_help = ("\n"
3683
e.extra_help = (gettext("\n"
3324
3684
'To commit to master branch, run update and then commit.\n'
3325
3685
'You can also pass --local to commit to continue working '
3326
'disconnected.')
3686
'disconnected.'))
3327
3687
raise
3328
3688
3329
3689
3436
3796
RegistryOption('format',
3437
3797
help='Upgrade to a specific format. See "bzr help'
3438
3798
' formats" for details.',
3439
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3440
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3799
lazy_registry=('bzrlib.controldir', 'format_registry'),
3800
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3441
3801
value_switches=True, title='Branch format'),
3442
3802
Option('clean',
3443
3803
help='Remove the backup.bzr directory if successful.'),
3484
3844
if directory is None:
3485
3845
# use branch if we're inside one; otherwise global config
3486
3846
try:
3487
c = Branch.open_containing(u'.')[0].get_config()
3847
c = Branch.open_containing(u'.')[0].get_config_stack()
3488
3848
except errors.NotBranchError:
3489
c = _mod_config.GlobalConfig()
3849
c = _mod_config.GlobalStack()
3490
3850
else:
3491
c = Branch.open(directory).get_config()
3851
c = Branch.open(directory).get_config_stack()
3852
identity = c.get('email')
3492
3853
if email:
3493
self.outf.write(c.user_email() + '\n')
3854
self.outf.write(_mod_config.extract_email_address(identity)
3855
+ '\n')
3494
3856
else:
3495
self.outf.write(c.username() + '\n')
3857
self.outf.write(identity + '\n')
3496
3858
return
3497
3859
3498
3860
if email:
3499
raise errors.BzrCommandError("--email can only be used to display existing "
3500
"identity")
3861
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3862
"identity"))
3501
3863
3502
3864
# display a warning if an email address isn't included in the given name.
3503
3865
try:
3509
3871
# use global config unless --branch given
3510
3872
if branch:
3511
3873
if directory is None:
3512
c = Branch.open_containing(u'.')[0].get_config()
3874
c = Branch.open_containing(u'.')[0].get_config_stack()
3513
3875
else:
3514
c = Branch.open(directory).get_config()
3876
b = Branch.open(directory)
3877
self.add_cleanup(b.lock_write().unlock)
3878
c = b.get_config_stack()
3515
3879
else:
3516
c = _mod_config.GlobalConfig()
3517
c.set_user_option('email', name)
3880
c = _mod_config.GlobalStack()
3881
c.set('email', name)
3518
3882
3519
3883
3520
3884
class cmd_nick(Command):
3521
3885
__doc__ = """Print or set the branch nickname.
3522
3886
3523
If unset, the tree root directory name is used as the nickname.
3524
To print the current nickname, execute with no argument.
3887
If unset, the colocated branch name is used for colocated branches, and
3888
the branch directory name is used for other branches. To print the
3889
current nickname, execute with no argument.
3525
3890
3526
3891
Bound branches use the nickname of its master branch unless it is set
3527
3892
locally.
3582
3947
3583
3948
def remove_alias(self, alias_name):
3584
3949
if alias_name is None:
3585
raise errors.BzrCommandError(
3586
'bzr alias --remove expects an alias to remove.')
3950
raise errors.BzrCommandError(gettext(
3951
'bzr alias --remove expects an alias to remove.'))
3587
3952
# If alias is not found, print something like:
3588
3953
# unalias: foo: not found
3589
3954
c = _mod_config.GlobalConfig()
3727
4092
param_name='starting_with', short_name='s',
3728
4093
help=
3729
4094
'Load only the tests starting with TESTID.'),
4095
Option('sync',
4096
help="By default we disable fsync and fdatasync"
4097
" while running the test suite.")
3730
4098
]
3731
4099
encoding_type = 'replace'
3732
4100
3740
4108
first=False, list_only=False,
3741
4109
randomize=None, exclude=None, strict=False,
3742
4110
load_list=None, debugflag=None, starting_with=None, subunit=False,
3743
parallel=None, lsprof_tests=False):
4111
parallel=None, lsprof_tests=False,
4112
sync=False):
4113
4114
# During selftest, disallow proxying, as it can cause severe
4115
# performance penalties and is only needed for thread
4116
# safety. The selftest command is assumed to not use threads
4117
# too heavily. The call should be as early as possible, as
4118
# error reporting for past duplicate imports won't have useful
4119
# backtraces.
4120
lazy_import.disallow_proxying()
4121
3744
4122
from bzrlib import tests
3745
4123
3746
4124
if testspecs_list is not None:
3751
4129
try:
3752
4130
from bzrlib.tests import SubUnitBzrRunner
3753
4131
except ImportError:
3754
raise errors.BzrCommandError("subunit not available. subunit "
3755
"needs to be installed to use --subunit.")
4132
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4133
"needs to be installed to use --subunit."))
3756
4134
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3757
4135
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3758
4136
# stdout, which would corrupt the subunit stream.
3767
4145
self.additional_selftest_args.setdefault(
3768
4146
'suite_decorators', []).append(parallel)
3769
4147
if benchmark:
3770
raise errors.BzrCommandError(
4148
raise errors.BzrCommandError(gettext(
3771
4149
"--benchmark is no longer supported from bzr 2.2; "
3772
"use bzr-usertest instead")
4150
"use bzr-usertest instead"))
3773
4151
test_suite_factory = None
3774
4152
if not exclude:
3775
4153
exclude_pattern = None
3776
4154
else:
3777
4155
exclude_pattern = '(' + '|'.join(exclude) + ')'
4156
if not sync:
4157
self._disable_fsync()
3778
4158
selftest_kwargs = {"verbose": verbose,
3779
4159
"pattern": pattern,
3780
4160
"stop_on_failure": one,
3802
4182
cleanup()
3803
4183
return int(not result)
3804
4184
4185
def _disable_fsync(self):
4186
"""Change the 'os' functionality to not synchronize."""
4187
self._orig_fsync = getattr(os, 'fsync', None)
4188
if self._orig_fsync is not None:
4189
os.fsync = lambda filedes: None
4190
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4191
if self._orig_fdatasync is not None:
4192
os.fdatasync = lambda filedes: None
4193
3805
4194
3806
4195
class cmd_version(Command):
3807
4196
__doc__ = """Show version of bzr."""
3827
4216
3828
4217
@display_command
3829
4218
def run(self):
3830
self.outf.write("It sure does!\n")
4219
self.outf.write(gettext("It sure does!\n"))
3831
4220
3832
4221
3833
4222
class cmd_find_merge_base(Command):
3851
4240
graph = branch1.repository.get_graph(branch2.repository)
3852
4241
base_rev_id = graph.find_unique_lca(last1, last2)
3853
4242
3854
self.outf.write('merge base is revision %s\n' % base_rev_id)
4243
self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
3855
4244
3856
4245
3857
4246
class cmd_merge(Command):
3885
4274
Merge will do its best to combine the changes in two branches, but there
3886
4275
are some kinds of problems only a human can fix. When it encounters those,
3887
4276
it will mark a conflict. A conflict means that you need to fix something,
3888
before you should commit.
4277
before you can commit.
3889
4278
3890
4279
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3891
4280
3892
4281
If there is no default branch set, the first merge will set it (use
3893
--no-remember to avoid settting it). After that, you can omit the branch
4282
--no-remember to avoid setting it). After that, you can omit the branch
3894
4283
to use the default. To change the default, use --remember. The value will
3895
4284
only be saved if the remote location can be accessed.
3896
4285
3982
4371
3983
4372
tree = WorkingTree.open_containing(directory)[0]
3984
4373
if tree.branch.revno() == 0:
3985
raise errors.BzrCommandError('Merging into empty branches not currently supported, '
3986
'https://bugs.launchpad.net/bzr/+bug/308562')
4374
raise errors.BzrCommandError(gettext('Merging into empty branches not currently supported, '
4375
'https://bugs.launchpad.net/bzr/+bug/308562'))
3987
4376
3988
4377
try:
3989
4378
basis_tree = tree.revision_tree(tree.last_revision())
4009
4398
mergeable = None
4010
4399
else:
4011
4400
if uncommitted:
4012
raise errors.BzrCommandError('Cannot use --uncommitted'
4013
' with bundles or merge directives.')
4401
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4402
' with bundles or merge directives.'))
4014
4403
4015
4404
if revision is not None:
4016
raise errors.BzrCommandError(
4017
'Cannot use -r with merge directives or bundles')
4405
raise errors.BzrCommandError(gettext(
4406
'Cannot use -r with merge directives or bundles'))
4018
4407
merger, verified = _mod_merge.Merger.from_mergeable(tree,
4019
4408
mergeable, None)
4020
4409
4021
4410
if merger is None and uncommitted:
4022
4411
if revision is not None and len(revision) > 0:
4023
raise errors.BzrCommandError('Cannot use --uncommitted and'
4024
' --revision at the same time.')
4412
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4413
' --revision at the same time.'))
4025
4414
merger = self.get_merger_from_uncommitted(tree, location, None)
4026
4415
allow_pending = False
4027
4416
4040
4429
if merger.interesting_files:
4041
4430
if not merger.other_tree.has_filename(
4042
4431
merger.interesting_files[0]):
4043
note("merger: " + str(merger))
4432
note(gettext("merger: ") + str(merger))
4044
4433
raise errors.PathsDoNotExist([location])
4045
note('Nothing to do.')
4434
note(gettext('Nothing to do.'))
4046
4435
return 0
4047
4436
if pull and not preview:
4048
4437
if merger.interesting_files is not None:
4049
raise errors.BzrCommandError('Cannot pull individual files')
4438
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
4050
4439
if (merger.base_rev_id == tree.last_revision()):
4051
4440
result = tree.pull(merger.other_branch, False,
4052
4441
merger.other_rev_id)
4053
4442
result.report(self.outf)
4054
4443
return 0
4055
4444
if merger.this_basis is None:
4056
raise errors.BzrCommandError(
4445
raise errors.BzrCommandError(gettext(
4057
4446
"This branch has no commits."
4058
" (perhaps you would prefer 'bzr pull')")
4447
" (perhaps you would prefer 'bzr pull')"))
4059
4448
if preview:
4060
4449
return self._do_preview(merger)
4061
4450
elif interactive:
4112
4501
def sanity_check_merger(self, merger):
4113
4502
if (merger.show_base and
4114
4503
not merger.merge_type is _mod_merge.Merge3Merger):
4115
raise errors.BzrCommandError("Show-base is not supported for this"
4116
" merge type. %s" % merger.merge_type)
4504
raise errors.BzrCommandError(gettext("Show-base is not supported for this"
4505
" merge type. %s") % merger.merge_type)
4117
4506
if merger.reprocess is None:
4118
4507
if merger.show_base:
4119
4508
merger.reprocess = False
4121
4510
# Use reprocess if the merger supports it
4122
4511
merger.reprocess = merger.merge_type.supports_reprocess
4123
4512
if merger.reprocess and not merger.merge_type.supports_reprocess:
4124
raise errors.BzrCommandError("Conflict reduction is not supported"
4125
" for merge type %s." %
4513
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4514
" for merge type %s.") %
4126
4515
merger.merge_type)
4127
4516
if merger.reprocess and merger.show_base:
4128
raise errors.BzrCommandError("Cannot do conflict reduction and"
4129
" show base.")
4517
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4518
" show base."))
4130
4519
4131
4520
def _get_merger_from_branch(self, tree, location, revision, remember,
4132
4521
possible_transports, pb):
4236
4625
stored_location_type = "parent"
4237
4626
mutter("%s", stored_location)
4238
4627
if stored_location is None:
4239
raise errors.BzrCommandError("No location specified or remembered")
4628
raise errors.BzrCommandError(gettext("No location specified or remembered"))
4240
4629
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
4241
note(u"%s remembered %s location %s", verb_string,
4242
stored_location_type, display_url)
4630
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4631
stored_location_type, display_url))
4243
4632
return stored_location
4244
4633
4245
4634
4282
4671
self.add_cleanup(tree.lock_write().unlock)
4283
4672
parents = tree.get_parent_ids()
4284
4673
if len(parents) != 2:
4285
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4674
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4286
4675
" merges. Not cherrypicking or"
4287
" multi-merges.")
4676
" multi-merges."))
4288
4677
repository = tree.branch.repository
4289
4678
interesting_ids = None
4290
4679
new_conflicts = []
4299
4688
if tree.kind(file_id) != "directory":
4300
4689
continue
4301
4690
4302
for name, ie in tree.inventory.iter_entries(file_id):
4691
# FIXME: Support nested trees
4692
for name, ie in tree.root_inventory.iter_entries(file_id):
4303
4693
interesting_ids.add(ie.file_id)
4304
4694
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4305
4695
else:
4449
4839
4450
4840
@display_command
4451
4841
def run(self, context=None):
4452
import shellcomplete
4842
from bzrlib import shellcomplete
4453
4843
shellcomplete.shellcomplete(context)
4454
4844
4455
4845
4509
4899
type=_parse_revision_str,
4510
4900
help='Filter on local branch revisions (inclusive). '
4511
4901
'See "help revisionspec" for details.'),
4512
Option('include-merges',
4902
Option('include-merged',
4513
4903
'Show all revisions in addition to the mainline ones.'),
4904
Option('include-merges', hidden=True,
4905
help='Historical alias for --include-merged.'),
4514
4906
]
4515
4907
encoding_type = 'replace'
4516
4908
4519
4911
theirs_only=False,
4520
4912
log_format=None, long=False, short=False, line=False,
4521
4913
show_ids=False, verbose=False, this=False, other=False,
4522
include_merges=False, revision=None, my_revision=None,
4523
directory=u'.'):
4914
include_merged=None, revision=None, my_revision=None,
4915
directory=u'.',
4916
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4524
4917
from bzrlib.missing import find_unmerged, iter_log_revisions
4525
4918
def message(s):
4526
4919
if not is_quiet():
4527
4920
self.outf.write(s)
4528
4921
4922
if symbol_versioning.deprecated_passed(include_merges):
4923
ui.ui_factory.show_user_warning(
4924
'deprecated_command_option',
4925
deprecated_name='--include-merges',
4926
recommended_name='--include-merged',
4927
deprecated_in_version='2.5',
4928
command=self.invoked_as)
4929
if include_merged is None:
4930
include_merged = include_merges
4931
else:
4932
raise errors.BzrCommandError(gettext(
4933
'{0} and {1} are mutually exclusive').format(
4934
'--include-merges', '--include-merged'))
4935
if include_merged is None:
4936
include_merged = False
4529
4937
if this:
4530
4938
mine_only = this
4531
4939
if other:
4546
4954
if other_branch is None:
4547
4955
other_branch = parent
4548
4956
if other_branch is None:
4549
raise errors.BzrCommandError("No peer location known"
4550
" or specified.")
4957
raise errors.BzrCommandError(gettext("No peer location known"
4958
" or specified."))
4551
4959
display_url = urlutils.unescape_for_display(parent,
4552
4960
self.outf.encoding)
4553
message("Using saved parent location: "
4554
+ display_url + "\n")
4961
message(gettext("Using saved parent location: {0}\n").format(
4962
display_url))
4555
4963
4556
4964
remote_branch = Branch.open(other_branch)
4557
4965
if remote_branch.base == local_branch.base:
4570
4978
local_extra, remote_extra = find_unmerged(
4571
4979
local_branch, remote_branch, restrict,
4572
4980
backward=not reverse,
4573
include_merges=include_merges,
4981
include_merged=include_merged,
4574
4982
local_revid_range=local_revid_range,
4575
4983
remote_revid_range=remote_revid_range)
4576
4984
4583
4991
4584
4992
status_code = 0
4585
4993
if local_extra and not theirs_only:
4586
message("You have %d extra revision(s):\n" %
4994
message(ngettext("You have %d extra revision:\n",
4995
"You have %d extra revisions:\n",
4996
len(local_extra)) %
4587
4997
len(local_extra))
4588
4998
for revision in iter_log_revisions(local_extra,
4589
4999
local_branch.repository,
4597
5007
if remote_extra and not mine_only:
4598
5008
if printed_local is True:
4599
5009
message("\n\n\n")
4600
message("You are missing %d revision(s):\n" %
5010
message(ngettext("You are missing %d revision:\n",
5011
"You are missing %d revisions:\n",
5012
len(remote_extra)) %
4601
5013
len(remote_extra))
4602
5014
for revision in iter_log_revisions(remote_extra,
4603
5015
remote_branch.repository,
4607
5019
4608
5020
if mine_only and not local_extra:
4609
5021
# We checked local, and found nothing extra
4610
message('This branch is up to date.\n')
5022
message(gettext('This branch has no new revisions.\n'))
4611
5023
elif theirs_only and not remote_extra:
4612
5024
# We checked remote, and found nothing extra
4613
message('Other branch is up to date.\n')
5025
message(gettext('Other branch has no new revisions.\n'))
4614
5026
elif not (mine_only or theirs_only or local_extra or
4615
5027
remote_extra):
4616
5028
# We checked both branches, and neither one had extra
4617
5029
# revisions
4618
message("Branches are up to date.\n")
5030
message(gettext("Branches are up to date.\n"))
4619
5031
self.cleanup_now()
4620
5032
if not status_code and parent is None and other_branch is not None:
4621
5033
self.add_cleanup(local_branch.lock_write().unlock)
4651
5063
]
4652
5064
4653
5065
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4654
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
5066
dir = controldir.ControlDir.open_containing(branch_or_repo)[0]
4655
5067
try:
4656
5068
branch = dir.open_branch()
4657
5069
repository = branch.repository
4782
5194
4783
5195
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4784
5196
if revision_id_list is not None and revision is not None:
4785
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5197
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4786
5198
if revision_id_list is None and revision is None:
4787
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
5199
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
4788
5200
b = WorkingTree.open_containing(directory)[0].branch
4789
5201
self.add_cleanup(b.lock_write().unlock)
4790
5202
return self._run(b, revision_id_list, revision)
4791
5203
4792
5204
def _run(self, b, revision_id_list, revision):
4793
5205
import bzrlib.gpg as gpg
4794
gpg_strategy = gpg.GPGStrategy(b.get_config())
5206
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4795
5207
if revision_id_list is not None:
4796
5208
b.repository.start_write_group()
4797
5209
try:
4822
5234
if to_revid is None:
4823
5235
to_revno = b.revno()
4824
5236
if from_revno is None or to_revno is None:
4825
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
5237
raise errors.BzrCommandError(gettext('Cannot sign a range of non-revision-history revisions'))
4826
5238
b.repository.start_write_group()
4827
5239
try:
4828
5240
for revno in range(from_revno, to_revno + 1):
4834
5246
else:
4835
5247
b.repository.commit_write_group()
4836
5248
else:
4837
raise errors.BzrCommandError('Please supply either one revision, or a range.')
5249
raise errors.BzrCommandError(gettext('Please supply either one revision, or a range.'))
4838
5250
4839
5251
4840
5252
class cmd_bind(Command):
4859
5271
try:
4860
5272
location = b.get_old_bound_location()
4861
5273
except errors.UpgradeRequired:
4862
raise errors.BzrCommandError('No location supplied. '
4863
'This format does not remember old locations.')
5274
raise errors.BzrCommandError(gettext('No location supplied. '
5275
'This format does not remember old locations.'))
4864
5276
else:
4865
5277
if location is None:
4866
5278
if b.get_bound_location() is not None:
4867
raise errors.BzrCommandError('Branch is already bound')
5279
raise errors.BzrCommandError(
5280
gettext('Branch is already bound'))
4868
5281
else:
4869
raise errors.BzrCommandError('No location supplied '
4870
'and no previous location known')
5282
raise errors.BzrCommandError(
5283
gettext('No location supplied'
5284
' and no previous location known'))
4871
5285
b_other = Branch.open(location)
4872
5286
try:
4873
5287
b.bind(b_other)
4874
5288
except errors.DivergedBranches:
4875
raise errors.BzrCommandError('These branches have diverged.'
4876
' Try merging, and then bind again.')
5289
raise errors.BzrCommandError(gettext('These branches have diverged.'
5290
' Try merging, and then bind again.'))
4877
5291
if b.get_config().has_explicit_nickname():
4878
5292
b.nick = b_other.nick
4879
5293
4892
5306
def run(self, directory=u'.'):
4893
5307
b, relpath = Branch.open_containing(directory)
4894
5308
if not b.unbind():
4895
raise errors.BzrCommandError('Local branch is not bound')
5309
raise errors.BzrCommandError(gettext('Local branch is not bound'))
4896
5310
4897
5311
4898
5312
class cmd_uncommit(Command):
4919
5333
takes_options = ['verbose', 'revision',
4920
5334
Option('dry-run', help='Don\'t actually make changes.'),
4921
5335
Option('force', help='Say yes to all questions.'),
5336
Option('keep-tags',
5337
help='Keep tags that point to removed revisions.'),
4922
5338
Option('local',
4923
5339
help="Only remove the commits from the local branch"
4924
5340
" when in a checkout."
4928
5344
aliases = []
4929
5345
encoding_type = 'replace'
4930
5346
4931
def run(self, location=None,
4932
dry_run=False, verbose=False,
4933
revision=None, force=False, local=False):
5347
def run(self, location=None, dry_run=False, verbose=False,
5348
revision=None, force=False, local=False, keep_tags=False):
4934
5349
if location is None:
4935
5350
location = u'.'
4936
control, relpath = bzrdir.BzrDir.open_containing(location)
5351
control, relpath = controldir.ControlDir.open_containing(location)
4937
5352
try:
4938
5353
tree = control.open_workingtree()
4939
5354
b = tree.branch
4945
5360
self.add_cleanup(tree.lock_write().unlock)
4946
5361
else:
4947
5362
self.add_cleanup(b.lock_write().unlock)
4948
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5363
return self._run(b, tree, dry_run, verbose, revision, force,
5364
local, keep_tags)
4949
5365
4950
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5366
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5367
keep_tags):
4951
5368
from bzrlib.log import log_formatter, show_log
4952
5369
from bzrlib.uncommit import uncommit
4953
5370
4968
5385
rev_id = b.get_rev_id(revno)
4969
5386
4970
5387
if rev_id is None or _mod_revision.is_null(rev_id):
4971
self.outf.write('No revisions to uncommit.\n')
5388
self.outf.write(gettext('No revisions to uncommit.\n'))
4972
5389
return 1
4973
5390
4974
5391
lf = log_formatter('short',
4983
5400
end_revision=last_revno)
4984
5401
4985
5402
if dry_run:
4986
self.outf.write('Dry-run, pretending to remove'
4987
' the above revisions.\n')
5403
self.outf.write(gettext('Dry-run, pretending to remove'
5404
' the above revisions.\n'))
4988
5405
else:
4989
self.outf.write('The above revision(s) will be removed.\n')
5406
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4990
5407
4991
5408
if not force:
4992
5409
if not ui.ui_factory.confirm_action(
4993
u'Uncommit these revisions',
5410
gettext(u'Uncommit these revisions'),
4994
5411
'bzrlib.builtins.uncommit',
4995
5412
{}):
4996
self.outf.write('Canceled\n')
5413
self.outf.write(gettext('Canceled\n'))
4997
5414
return 0
4998
5415
4999
5416
mutter('Uncommitting from {%s} to {%s}',
5000
5417
last_rev_id, rev_id)
5001
5418
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5002
revno=revno, local=local)
5003
self.outf.write('You can restore the old tip by running:\n'
5004
' bzr pull . -r revid:%s\n' % last_rev_id)
5419
revno=revno, local=local, keep_tags=keep_tags)
5420
self.outf.write(gettext('You can restore the old tip by running:\n'
5421
' bzr pull . -r revid:%s\n') % last_rev_id)
5005
5422
5006
5423
5007
5424
class cmd_break_lock(Command):
5041
5458
conf = _mod_config.LockableConfig(file_name=location)
5042
5459
conf.break_lock()
5043
5460
else:
5044
control, relpath = bzrdir.BzrDir.open_containing(location)
5461
control, relpath = controldir.ControlDir.open_containing(location)
5045
5462
try:
5046
5463
control.break_lock()
5047
5464
except NotImplementedError:
5074
5491
help="Protocol to serve.",
5075
5492
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5076
5493
value_switches=True),
5494
Option('listen',
5495
help='Listen for connections on nominated address.', type=str),
5077
5496
Option('port',
5078
help='Listen for connections on nominated port of the form '
5079
'[hostname:]portnumber. Passing 0 as the port number will '
5080
'result in a dynamically allocated port. The default port '
5081
'depends on the protocol.',
5082
type=str),
5497
help='Listen for connections on nominated port. Passing 0 as '
5498
'the port number will result in a dynamically allocated '
5499
'port. The default port depends on the protocol.',
5500
type=int),
5083
5501
custom_help('directory',
5084
5502
help='Serve contents of this directory.'),
5085
5503
Option('allow-writes',
5091
5509
'option leads to global uncontrolled write access to your '
5092
5510
'file system.'
5093
5511
),
5512
Option('client-timeout', type=float,
5513
help='Override the default idle client timeout (5min).'),
5094
5514
]
5095
5515
5096
def get_host_and_port(self, port):
5097
"""Return the host and port to run the smart server on.
5098
5099
If 'port' is None, None will be returned for the host and port.
5100
5101
If 'port' has a colon in it, the string before the colon will be
5102
interpreted as the host.
5103
5104
:param port: A string of the port to run the server on.
5105
:return: A tuple of (host, port), where 'host' is a host name or IP,
5106
and port is an integer TCP/IP port.
5107
"""
5108
host = None
5109
if port is not None:
5110
if ':' in port:
5111
host, port = port.split(':')
5112
port = int(port)
5113
return host, port
5114
5115
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5116
protocol=None):
5516
def run(self, listen=None, port=None, inet=False, directory=None,
5517
allow_writes=False, protocol=None, client_timeout=None):
5117
5518
from bzrlib import transport
5118
5519
if directory is None:
5119
5520
directory = os.getcwd()
5120
5521
if protocol is None:
5121
5522
protocol = transport.transport_server_registry.get()
5122
host, port = self.get_host_and_port(port)
5123
url = urlutils.local_path_to_url(directory)
5523
url = transport.location_to_url(directory)
5124
5524
if not allow_writes:
5125
5525
url = 'readonly+' + url
5126
t = transport.get_transport(url)
5127
protocol(t, host, port, inet)
5526
t = transport.get_transport_from_url(url)
5527
protocol(t, listen, port, inet, client_timeout)
5128
5528
5129
5529
5130
5530
class cmd_join(Command):
5153
5553
containing_tree = WorkingTree.open_containing(parent_dir)[0]
5154
5554
repo = containing_tree.branch.repository
5155
5555
if not repo.supports_rich_root():
5156
raise errors.BzrCommandError(
5556
raise errors.BzrCommandError(gettext(
5157
5557
"Can't join trees because %s doesn't support rich root data.\n"
5158
"You can use bzr upgrade on the repository."
5558
"You can use bzr upgrade on the repository.")
5159
5559
% (repo,))
5160
5560
if reference:
5161
5561
try:
5163
5563
except errors.BadReferenceTarget, e:
5164
5564
# XXX: Would be better to just raise a nicely printable
5165
5565
# exception from the real origin. Also below. mbp 20070306
5166
raise errors.BzrCommandError("Cannot join %s. %s" %
5167
(tree, e.reason))
5566
raise errors.BzrCommandError(
5567
gettext("Cannot join {0}. {1}").format(tree, e.reason))
5168
5568
else:
5169
5569
try:
5170
5570
containing_tree.subsume(sub_tree)
5171
5571
except errors.BadSubsumeSource, e:
5172
raise errors.BzrCommandError("Cannot join %s. %s" %
5173
(tree, e.reason))
5572
raise errors.BzrCommandError(
5573
gettext("Cannot join {0}. {1}").format(tree, e.reason))
5174
5574
5175
5575
5176
5576
class cmd_split(Command):
5260
5660
if submit_branch is None:
5261
5661
submit_branch = branch.get_parent()
5262
5662
if submit_branch is None:
5263
raise errors.BzrCommandError('No submit branch specified or known')
5663
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5264
5664
5265
5665
stored_public_branch = branch.get_public_branch()
5266
5666
if public_branch is None:
5267
5667
public_branch = stored_public_branch
5268
5668
elif stored_public_branch is None:
5669
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5269
5670
branch.set_public_branch(public_branch)
5270
5671
if not include_bundle and public_branch is None:
5271
raise errors.BzrCommandError('No public branch specified or'
5272
' known')
5672
raise errors.BzrCommandError(gettext('No public branch specified or'
5673
' known'))
5273
5674
base_revision_id = None
5274
5675
if revision is not None:
5275
5676
if len(revision) > 2:
5276
raise errors.BzrCommandError('bzr merge-directive takes '
5277
'at most two one revision identifiers')
5677
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5678
'at most two one revision identifiers'))
5278
5679
revision_id = revision[-1].as_revision_id(branch)
5279
5680
if len(revision) == 2:
5280
5681
base_revision_id = revision[0].as_revision_id(branch)
5282
5683
revision_id = branch.last_revision()
5283
5684
revision_id = ensure_null(revision_id)
5284
5685
if revision_id == NULL_REVISION:
5285
raise errors.BzrCommandError('No revisions to bundle.')
5686
raise errors.BzrCommandError(gettext('No revisions to bundle.'))
5286
5687
directive = merge_directive.MergeDirective2.from_objects(
5287
5688
branch.repository, revision_id, time.time(),
5288
5689
osutils.local_time_offset(), submit_branch,
5296
5697
self.outf.writelines(directive.to_lines())
5297
5698
else:
5298
5699
message = directive.to_email(mail_to, branch, sign)
5299
s = SMTPConnection(branch.get_config())
5700
s = SMTPConnection(branch.get_config_stack())
5300
5701
s.send_email(message)
5301
5702
5302
5703
5334
5735
5335
5736
Both the submit branch and the public branch follow the usual behavior with
5336
5737
respect to --remember: If there is no default location set, the first send
5337
will set it (use --no-remember to avoid settting it). After that, you can
5738
will set it (use --no-remember to avoid setting it). After that, you can
5338
5739
omit the location to use the default. To change the default, use
5339
5740
--remember. The value will only be saved if the location can be accessed.
5340
5741
5542
5943
self.add_cleanup(branch.lock_write().unlock)
5543
5944
if delete:
5544
5945
if tag_name is None:
5545
raise errors.BzrCommandError("No tag specified to delete.")
5946
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5546
5947
branch.tags.delete_tag(tag_name)
5547
note('Deleted tag %s.' % tag_name)
5948
note(gettext('Deleted tag %s.') % tag_name)
5548
5949
else:
5549
5950
if revision:
5550
5951
if len(revision) != 1:
5551
raise errors.BzrCommandError(
5952
raise errors.BzrCommandError(gettext(
5552
5953
"Tags can only be placed on a single revision, "
5553
"not on a range")
5954
"not on a range"))
5554
5955
revision_id = revision[0].as_revision_id(branch)
5555
5956
else:
5556
5957
revision_id = branch.last_revision()
5557
5958
if tag_name is None:
5558
5959
tag_name = branch.automatic_tag_name(revision_id)
5559
5960
if tag_name is None:
5560
raise errors.BzrCommandError(
5561
"Please specify a tag name.")
5562
if (not force) and branch.tags.has_tag(tag_name):
5961
raise errors.BzrCommandError(gettext(
5962
"Please specify a tag name."))
5963
try:
5964
existing_target = branch.tags.lookup_tag(tag_name)
5965
except errors.NoSuchTag:
5966
existing_target = None
5967
if not force and existing_target not in (None, revision_id):
5563
5968
raise errors.TagAlreadyExists(tag_name)
5564
branch.tags.set_tag(tag_name, revision_id)
5565
note('Created tag %s.' % tag_name)
5969
if existing_target == revision_id:
5970
note(gettext('Tag %s already exists for that revision.') % tag_name)
5971
else:
5972
branch.tags.set_tag(tag_name, revision_id)
5973
if existing_target is None:
5974
note(gettext('Created tag %s.') % tag_name)
5975
else:
5976
note(gettext('Updated tag %s.') % tag_name)
5566
5977
5567
5978
5568
5979
class cmd_tags(Command):
5594
6005
5595
6006
self.add_cleanup(branch.lock_read().unlock)
5596
6007
if revision:
5597
graph = branch.repository.get_graph()
5598
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5599
revid1, revid2 = rev1.rev_id, rev2.rev_id
5600
# only show revisions between revid1 and revid2 (inclusive)
5601
tags = [(tag, revid) for tag, revid in tags if
5602
graph.is_between(revid, revid1, revid2)]
6008
# Restrict to the specified range
6009
tags = self._tags_for_range(branch, revision)
5603
6010
if sort is None:
5604
6011
sort = tag_sort_methods.get()
5605
6012
sort(branch, tags)
5610
6017
revno = branch.revision_id_to_dotted_revno(revid)
5611
6018
if isinstance(revno, tuple):
5612
6019
revno = '.'.join(map(str, revno))
5613
except (errors.NoSuchRevision, errors.GhostRevisionsHaveNoRevno):
6020
except (errors.NoSuchRevision,
6021
errors.GhostRevisionsHaveNoRevno,
6022
errors.UnsupportedOperation):
5614
6023
# Bad tag data/merges can lead to tagged revisions
5615
6024
# which are not in this branch. Fail gracefully ...
5616
6025
revno = '?'
5619
6028
for tag, revspec in tags:
5620
6029
self.outf.write('%-20s %s\n' % (tag, revspec))
5621
6030
6031
def _tags_for_range(self, branch, revision):
6032
range_valid = True
6033
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6034
revid1, revid2 = rev1.rev_id, rev2.rev_id
6035
# _get_revision_range will always set revid2 if it's not specified.
6036
# If revid1 is None, it means we want to start from the branch
6037
# origin which is always a valid ancestor. If revid1 == revid2, the
6038
# ancestry check is useless.
6039
if revid1 and revid1 != revid2:
6040
# FIXME: We really want to use the same graph than
6041
# branch.iter_merge_sorted_revisions below, but this is not
6042
# easily available -- vila 2011-09-23
6043
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6044
# We don't want to output anything in this case...
6045
return []
6046
# only show revisions between revid1 and revid2 (inclusive)
6047
tagged_revids = branch.tags.get_reverse_tag_dict()
6048
found = []
6049
for r in branch.iter_merge_sorted_revisions(
6050
start_revision_id=revid2, stop_revision_id=revid1,
6051
stop_rule='include'):
6052
revid_tags = tagged_revids.get(r[0], None)
6053
if revid_tags:
6054
found.extend([(tag, r[0]) for tag in revid_tags])
6055
return found
6056
5622
6057
5623
6058
class cmd_reconfigure(Command):
5624
6059
__doc__ = """Reconfigure the type of a bzr directory.
5638
6073
takes_args = ['location?']
5639
6074
takes_options = [
5640
6075
RegistryOption.from_kwargs(
5641
'target_type',
5642
title='Target type',
5643
help='The type to reconfigure the directory to.',
6076
'tree_type',
6077
title='Tree type',
6078
help='The relation between branch and tree.',
5644
6079
value_switches=True, enum_switch=False,
5645
6080
branch='Reconfigure to be an unbound branch with no working tree.',
5646
6081
tree='Reconfigure to be an unbound branch with a working tree.',
5647
6082
checkout='Reconfigure to be a bound branch with a working tree.',
5648
6083
lightweight_checkout='Reconfigure to be a lightweight'
5649
6084
' checkout (with no local history).',
6085
),
6086
RegistryOption.from_kwargs(
6087
'repository_type',
6088
title='Repository type',
6089
help='Location fo the repository.',
6090
value_switches=True, enum_switch=False,
5650
6091
standalone='Reconfigure to be a standalone branch '
5651
6092
'(i.e. stop using shared repository).',
5652
6093
use_shared='Reconfigure to use a shared repository.',
6094
),
6095
RegistryOption.from_kwargs(
6096
'repository_trees',
6097
title='Trees in Repository',
6098
help='Whether new branches in the repository have trees.',
6099
value_switches=True, enum_switch=False,
5653
6100
with_trees='Reconfigure repository to create '
5654
6101
'working trees on branches by default.',
5655
6102
with_no_trees='Reconfigure repository to not create '
5669
6116
),
5670
6117
]
5671
6118
5672
def run(self, location=None, target_type=None, bind_to=None, force=False,
5673
stacked_on=None,
5674
unstacked=None):
5675
directory = bzrdir.BzrDir.open(location)
6119
def run(self, location=None, bind_to=None, force=False,
6120
tree_type=None, repository_type=None, repository_trees=None,
6121
stacked_on=None, unstacked=None):
6122
directory = controldir.ControlDir.open(location)
5676
6123
if stacked_on and unstacked:
5677
raise errors.BzrCommandError("Can't use both --stacked-on and --unstacked")
6124
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5678
6125
elif stacked_on is not None:
5679
6126
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5680
6127
elif unstacked:
5682
6129
# At the moment you can use --stacked-on and a different
5683
6130
# reconfiguration shape at the same time; there seems no good reason
5684
6131
# to ban it.
5685
if target_type is None:
6132
if (tree_type is None and
6133
repository_type is None and
6134
repository_trees is None):
5686
6135
if stacked_on or unstacked:
5687
6136
return
5688
6137
else:
5689
raise errors.BzrCommandError('No target configuration '
5690
'specified')
5691
elif target_type == 'branch':
6138
raise errors.BzrCommandError(gettext('No target configuration '
6139
'specified'))
6140
reconfiguration = None
6141
if tree_type == 'branch':
5692
6142
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5693
elif target_type == 'tree':
6143
elif tree_type == 'tree':
5694
6144
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5695
elif target_type == 'checkout':
6145
elif tree_type == 'checkout':
5696
6146
reconfiguration = reconfigure.Reconfigure.to_checkout(
5697
6147
directory, bind_to)
5698
elif target_type == 'lightweight-checkout':
6148
elif tree_type == 'lightweight-checkout':
5699
6149
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5700
6150
directory, bind_to)
5701
elif target_type == 'use-shared':
6151
if reconfiguration:
6152
reconfiguration.apply(force)
6153
reconfiguration = None
6154
if repository_type == 'use-shared':
5702
6155
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5703
elif target_type == 'standalone':
6156
elif repository_type == 'standalone':
5704
6157
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5705
elif target_type == 'with-trees':
6158
if reconfiguration:
6159
reconfiguration.apply(force)
6160
reconfiguration = None
6161
if repository_trees == 'with-trees':
5706
6162
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5707
6163
directory, True)
5708
elif target_type == 'with-no-trees':
6164
elif repository_trees == 'with-no-trees':
5709
6165
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5710
6166
directory, False)
5711
reconfiguration.apply(force)
6167
if reconfiguration:
6168
reconfiguration.apply(force)
6169
reconfiguration = None
5712
6170
5713
6171
5714
6172
class cmd_switch(Command):
5749
6207
from bzrlib import switch
5750
6208
tree_location = directory
5751
6209
revision = _get_one_revision('switch', revision)
5752
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6210
possible_transports = []
6211
control_dir = controldir.ControlDir.open_containing(tree_location,
6212
possible_transports=possible_transports)[0]
5753
6213
if to_location is None:
5754
6214
if revision is None:
5755
raise errors.BzrCommandError('You must supply either a'
5756
' revision or a location')
6215
raise errors.BzrCommandError(gettext('You must supply either a'
6216
' revision or a location'))
5757
6217
to_location = tree_location
5758
6218
try:
5759
branch = control_dir.open_branch()
6219
branch = control_dir.open_branch(
6220
possible_transports=possible_transports)
5760
6221
had_explicit_nick = branch.get_config().has_explicit_nickname()
5761
6222
except errors.NotBranchError:
5762
6223
branch = None
5763
6224
had_explicit_nick = False
5764
6225
if create_branch:
5765
6226
if branch is None:
5766
raise errors.BzrCommandError('cannot create branch without'
5767
' source branch')
5768
to_location = directory_service.directories.dereference(
5769
to_location)
5770
if '/' not in to_location and '\\' not in to_location:
5771
# This path is meant to be relative to the existing branch
5772
this_url = self._get_branch_location(control_dir)
5773
to_location = urlutils.join(this_url, '..', to_location)
6227
raise errors.BzrCommandError(
6228
gettext('cannot create branch without source branch'))
6229
to_location = lookup_new_sibling_branch(control_dir, to_location,
6230
possible_transports=possible_transports)
5774
6231
to_branch = branch.bzrdir.sprout(to_location,
5775
possible_transports=[branch.bzrdir.root_transport],
5776
source_branch=branch).open_branch()
6232
possible_transports=possible_transports,
6233
source_branch=branch).open_branch()
5777
6234
else:
5778
6235
try:
5779
to_branch = Branch.open(to_location)
6236
to_branch = Branch.open(to_location,
6237
possible_transports=possible_transports)
5780
6238
except errors.NotBranchError:
5781
this_url = self._get_branch_location(control_dir)
5782
to_branch = Branch.open(
5783
urlutils.join(this_url, '..', to_location))
6239
to_branch = open_sibling_branch(control_dir, to_location,
6240
possible_transports=possible_transports)
5784
6241
if revision is not None:
5785
6242
revision = revision.as_revision_id(to_branch)
5786
6243
switch.switch(control_dir, to_branch, force, revision_id=revision)
5787
6244
if had_explicit_nick:
5788
6245
branch = control_dir.open_branch() #get the new branch!
5789
6246
branch.nick = to_branch.nick
5790
note('Switched to branch: %s',
6247
note(gettext('Switched to branch: %s'),
5791
6248
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5792
6249
5793
def _get_branch_location(self, control_dir):
5794
"""Return location of branch for this control dir."""
5795
try:
5796
this_branch = control_dir.open_branch()
5797
# This may be a heavy checkout, where we want the master branch
5798
master_location = this_branch.get_bound_location()
5799
if master_location is not None:
5800
return master_location
5801
# If not, use a local sibling
5802
return this_branch.base
5803
except errors.NotBranchError:
5804
format = control_dir.find_branch_format()
5805
if getattr(format, 'get_reference', None) is not None:
5806
return format.get_reference(control_dir)
5807
else:
5808
return control_dir.root_transport.base
5809
6250
5810
6251
5811
6252
class cmd_view(Command):
5902
6343
name = current_view
5903
6344
if delete:
5904
6345
if file_list:
5905
raise errors.BzrCommandError(
5906
"Both --delete and a file list specified")
6346
raise errors.BzrCommandError(gettext(
6347
"Both --delete and a file list specified"))
5907
6348
elif switch:
5908
raise errors.BzrCommandError(
5909
"Both --delete and --switch specified")
6349
raise errors.BzrCommandError(gettext(
6350
"Both --delete and --switch specified"))
5910
6351
elif all:
5911
6352
tree.views.set_view_info(None, {})
5912
self.outf.write("Deleted all views.\n")
6353
self.outf.write(gettext("Deleted all views.\n"))
5913
6354
elif name is None:
5914
raise errors.BzrCommandError("No current view to delete")
6355
raise errors.BzrCommandError(gettext("No current view to delete"))
5915
6356
else:
5916
6357
tree.views.delete_view(name)
5917
self.outf.write("Deleted '%s' view.\n" % name)
6358
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5918
6359
elif switch:
5919
6360
if file_list:
5920
raise errors.BzrCommandError(
5921
"Both --switch and a file list specified")
6361
raise errors.BzrCommandError(gettext(
6362
"Both --switch and a file list specified"))
5922
6363
elif all:
5923
raise errors.BzrCommandError(
5924
"Both --switch and --all specified")
6364
raise errors.BzrCommandError(gettext(
6365
"Both --switch and --all specified"))
5925
6366
elif switch == 'off':
5926
6367
if current_view is None:
5927
raise errors.BzrCommandError("No current view to disable")
6368
raise errors.BzrCommandError(gettext("No current view to disable"))
5928
6369
tree.views.set_view_info(None, view_dict)
5929
self.outf.write("Disabled '%s' view.\n" % (current_view))
6370
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5930
6371
else:
5931
6372
tree.views.set_view_info(switch, view_dict)
5932
6373
view_str = views.view_display_str(tree.views.lookup_view())
5933
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6374
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5934
6375
elif all:
5935
6376
if view_dict:
5936
self.outf.write('Views defined:\n')
6377
self.outf.write(gettext('Views defined:\n'))
5937
6378
for view in sorted(view_dict):
5938
6379
if view == current_view:
5939
6380
active = "=>"
5942
6383
view_str = views.view_display_str(view_dict[view])
5943
6384
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5944
6385
else:
5945
self.outf.write('No views defined.\n')
6386
self.outf.write(gettext('No views defined.\n'))
5946
6387
elif file_list:
5947
6388
if name is None:
5948
6389
# No name given and no current view set
5949
6390
name = 'my'
5950
6391
elif name == 'off':
5951
raise errors.BzrCommandError(
5952
"Cannot change the 'off' pseudo view")
6392
raise errors.BzrCommandError(gettext(
6393
"Cannot change the 'off' pseudo view"))
5953
6394
tree.views.set_view(name, sorted(file_list))
5954
6395
view_str = views.view_display_str(tree.views.lookup_view())
5955
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6396
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5956
6397
else:
5957
6398
# list the files
5958
6399
if name is None:
5959
6400
# No name given and no current view set
5960
self.outf.write('No current view.\n')
6401
self.outf.write(gettext('No current view.\n'))
5961
6402
else:
5962
6403
view_str = views.view_display_str(tree.views.lookup_view(name))
5963
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6404
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5964
6405
5965
6406
5966
6407
class cmd_hooks(Command):
5980
6421
self.outf.write(" %s\n" %
5981
6422
(some_hooks.get_hook_name(hook),))
5982
6423
else:
5983
self.outf.write(" <no hooks installed>\n")
6424
self.outf.write(gettext(" <no hooks installed>\n"))
5984
6425
5985
6426
5986
6427
class cmd_remove_branch(Command):
5999
6440
6000
6441
takes_args = ["location?"]
6001
6442
6443
takes_options = ['directory',
6444
Option('force', help='Remove branch even if it is the active branch.')]
6445
6002
6446
aliases = ["rmbranch"]
6003
6447
6004
def run(self, location=None):
6005
if location is None:
6006
location = "."
6007
branch = Branch.open_containing(location)[0]
6008
branch.bzrdir.destroy_branch()
6448
def run(self, directory=None, location=None, force=False):
6449
br = open_nearby_branch(near=directory, location=location)
6450
if not force and br.bzrdir.has_workingtree():
6451
try:
6452
active_branch = br.bzrdir.open_branch(name="")
6453
except errors.NotBranchError:
6454
active_branch = None
6455
if (active_branch is not None and
6456
br.control_url == active_branch.control_url):
6457
raise errors.BzrCommandError(
6458
gettext("Branch is active. Use --force to remove it."))
6459
br.bzrdir.destroy_branch(br.name)
6009
6460
6010
6461
6011
6462
class cmd_shelve(Command):
6087
6538
manager = tree.get_shelf_manager()
6088
6539
shelves = manager.active_shelves()
6089
6540
if len(shelves) == 0:
6090
note('No shelved changes.')
6541
note(gettext('No shelved changes.'))
6091
6542
return 0
6092
6543
for shelf_id in reversed(shelves):
6093
6544
message = manager.get_metadata(shelf_id).get('message')
6182
6633
if path is not None:
6183
6634
branchdir = path
6184
6635
tree, branch, relpath =(
6185
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6636
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
6186
6637
if path is not None:
6187
6638
path = relpath
6188
6639
if tree is None:
6216
6667
__doc__ = """Export command helps and error messages in po format."""
6217
6668
6218
6669
hidden = True
6670
takes_options = [Option('plugin',
6671
help='Export help text from named command '\
6672
'(defaults to all built in commands).',
6673
type=str),
6674
Option('include-duplicates',
6675
help='Output multiple copies of the same msgid '
6676
'string if it appears more than once.'),
6677
]
6219
6678
6220
def run(self):
6679
def run(self, plugin=None, include_duplicates=False):
6221
6680
from bzrlib.export_pot import export_pot
6222
export_pot(self.outf)
6681
export_pot(self.outf, plugin, include_duplicates)
6223
6682
6224
6683
6225
6684
def _register_lazy_builtins():
6233
6692
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6234
6693
('cmd_conflicts', [], 'bzrlib.conflicts'),
6235
6694
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6236
('cmd_verify_signatures', [],
6237
'bzrlib.commit_signature_commands'),
6695
('cmd_verify_signatures', [], 'bzrlib.commit_signature_commands'),
6238
6696
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6239
6697
]:
6240
6698
builtin_command_registry.register_lazy(name, aliases, module_name)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1