« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 6027.1.12
- compare with another revision
- compare with revision 5401
- download diff
- download tarball
- view history from revision 6027.1.12
- Committer: Vincent Ladeuil
- Date: 2012-03-13 17:25:29 UTC
- mfrom: (6499 +trunk)
- mto: This revision was merged to the branch mainline in revision 6501.
- Revision ID: v.ladeuil+lp@free.fr-20120313172529-i0suyjnepsor25i7
Merge trunk
- 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
262
368
This will produce the same results as calling 'bzr diff --summarize'.
263
369
"""
264
370
265
# TODO: --no-recurse, --recurse options
371
# TODO: --no-recurse/-N, --recurse options
266
372
267
373
takes_args = ['file*']
268
374
takes_options = ['show-ids', 'revision', 'change', 'verbose',
288
394
from bzrlib.status import show_tree_status
289
395
290
396
if revision and len(revision) > 2:
291
raise errors.BzrCommandError('bzr status --revision takes exactly'
292
' one or two revision specifiers')
397
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
398
' one or two revision specifiers'))
293
399
294
400
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
295
401
# Avoid asking for specific files when that is not needed.
332
438
@display_command
333
439
def run(self, revision_id=None, revision=None, directory=u'.'):
334
440
if revision_id is not None and revision is not None:
335
raise errors.BzrCommandError('You can only supply one of'
336
' revision_id or --revision')
441
raise errors.BzrCommandError(gettext('You can only supply one of'
442
' revision_id or --revision'))
337
443
if revision_id is None and revision is None:
338
raise errors.BzrCommandError('You must supply either'
339
' --revision or a revision_id')
444
raise errors.BzrCommandError(gettext('You must supply either'
445
' --revision or a revision_id'))
340
446
341
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
447
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
342
448
343
449
revisions = b.repository.revisions
344
450
if revisions is None:
345
raise errors.BzrCommandError('Repository %r does not support '
346
'access to raw revision texts')
451
raise errors.BzrCommandError(gettext('Repository %r does not support '
452
'access to raw revision texts'))
347
453
348
454
b.repository.lock_read()
349
455
try:
353
459
try:
354
460
self.print_revision(revisions, revision_id)
355
461
except errors.NoSuchRevision:
356
msg = "The repository %s contains no revision %s." % (
462
msg = gettext("The repository {0} contains no revision {1}.").format(
357
463
b.repository.base, revision_id)
358
464
raise errors.BzrCommandError(msg)
359
465
elif revision is not None:
360
466
for rev in revision:
361
467
if rev is None:
362
468
raise errors.BzrCommandError(
363
'You cannot specify a NULL revision.')
469
gettext('You cannot specify a NULL revision.'))
364
470
rev_id = rev.as_revision_id(b)
365
471
self.print_revision(revisions, rev_id)
366
472
finally:
472
578
location_list=['.']
473
579
474
580
for location in location_list:
475
d = bzrdir.BzrDir.open(location)
476
581
d = controldir.ControlDir.open(location)
582
477
583
try:
478
584
working = d.open_workingtree()
479
585
except errors.NoWorkingTree:
480
raise errors.BzrCommandError("No working tree to remove")
586
raise errors.BzrCommandError(gettext("No working tree to remove"))
481
587
except errors.NotLocalUrl:
482
raise errors.BzrCommandError("You cannot remove the working tree"
483
" of a remote path")
588
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
589
" of a remote path"))
484
590
if not force:
485
591
if (working.has_changes()):
486
592
raise errors.UncommittedChanges(working)
488
594
raise errors.ShelvedChanges(working)
489
595
490
596
if working.user_url != working.branch.user_url:
491
raise errors.BzrCommandError("You cannot remove the working tree"
492
" from a lightweight checkout")
597
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
598
" from a lightweight checkout"))
493
599
494
600
d.destroy_workingtree()
495
601
527
633
pass # There seems to be a real error here, so we'll reset
528
634
else:
529
635
# Refuse
530
raise errors.BzrCommandError(
636
raise errors.BzrCommandError(gettext(
531
637
'The tree does not appear to be corrupt. You probably'
532
638
' want "bzr revert" instead. Use "--force" if you are'
533
' sure you want to reset the working tree.')
639
' sure you want to reset the working tree.'))
534
640
if revision is None:
535
641
revision_ids = None
536
642
else:
539
645
tree.reset_state(revision_ids)
540
646
except errors.BzrError, e:
541
647
if revision_ids is None:
542
extra = (', the header appears corrupt, try passing -r -1'
543
' 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'))
544
650
else:
545
651
extra = ''
546
raise errors.BzrCommandError('failed to reset the tree state'
547
+ extra)
652
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
548
653
549
654
550
655
class cmd_revno(Command):
556
661
_see_also = ['info']
557
662
takes_args = ['location?']
558
663
takes_options = [
559
Option('tree', help='Show revno of working tree'),
664
Option('tree', help='Show revno of working tree.'),
665
'revision',
560
666
]
561
667
562
668
@display_command
563
def run(self, tree=False, location=u'.'):
669
def run(self, tree=False, location=u'.', revision=None):
670
if revision is not None and tree:
671
raise errors.BzrCommandError(gettext("--tree and --revision can "
672
"not be used together"))
673
564
674
if tree:
565
675
try:
566
676
wt = WorkingTree.open_containing(location)[0]
567
677
self.add_cleanup(wt.lock_read().unlock)
568
678
except (errors.NoWorkingTree, errors.NotLocalUrl):
569
679
raise errors.NoWorkingTree(location)
680
b = wt.branch
570
681
revid = wt.last_revision()
571
try:
572
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
573
except errors.NoSuchRevision:
574
revno_t = ('???',)
575
revno = ".".join(str(n) for n in revno_t)
576
682
else:
577
683
b = Branch.open_containing(location)[0]
578
684
self.add_cleanup(b.lock_read().unlock)
579
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)
580
698
self.cleanup_now()
581
self.outf.write(str(revno) + '\n')
699
self.outf.write(revno + '\n')
582
700
583
701
584
702
class cmd_revision_info(Command):
591
709
custom_help('directory',
592
710
help='Branch to examine, '
593
711
'rather than the one containing the working directory.'),
594
Option('tree', help='Show revno of working tree'),
712
Option('tree', help='Show revno of working tree.'),
595
713
]
596
714
597
715
@display_command
653
771
are added. This search proceeds recursively into versioned
654
772
directories. If no names are given '.' is assumed.
655
773
774
A warning will be printed when nested trees are encountered,
775
unless they are explicitly ignored.
776
656
777
Therefore simply saying 'bzr add' will version all files that
657
778
are currently unknown.
658
779
674
795
675
796
Any files matching patterns in the ignore list will not be added
676
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.
677
802
"""
678
803
takes_args = ['file*']
679
804
takes_options = [
680
805
Option('no-recurse',
681
help="Don't recursively add the contents of directories."),
806
help="Don't recursively add the contents of directories.",
807
short_name='N'),
682
808
Option('dry-run',
683
809
help="Show what would be done, but don't actually do anything."),
684
810
'verbose',
706
832
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
707
833
to_file=self.outf, should_print=(not is_quiet()))
708
834
else:
709
action = bzrlib.add.AddAction(to_file=self.outf,
835
action = bzrlib.add.AddWithSkipLargeAction(to_file=self.outf,
710
836
should_print=(not is_quiet()))
711
837
712
838
if base_tree:
719
845
if verbose:
720
846
for glob in sorted(ignored.keys()):
721
847
for path in ignored[glob]:
722
self.outf.write("ignored %s matching \"%s\"\n"
723
% (path, glob))
848
self.outf.write(
849
gettext("ignored {0} matching \"{1}\"\n").format(
850
path, glob))
724
851
725
852
726
853
class cmd_mkdir(Command):
730
857
"""
731
858
732
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
]
733
867
encoding_type = 'replace'
734
868
735
def run(self, dir_list):
736
for d in dir_list:
737
wt, dd = WorkingTree.open_containing(d)
738
base = os.path.dirname(dd)
739
id = wt.path2id(base)
740
if id != None:
741
os.mkdir(d)
742
wt.add([dd])
743
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
744
893
else:
745
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)
746
898
747
899
748
900
class cmd_relpath(Command):
784
936
@display_command
785
937
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
786
938
if kind and kind not in ['file', 'directory', 'symlink']:
787
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
939
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
788
940
789
941
revision = _get_one_revision('inventory', revision)
790
942
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
798
950
tree = work_tree
799
951
extra_trees = []
800
952
953
self.add_cleanup(tree.lock_read().unlock)
801
954
if file_list is not None:
802
955
file_ids = tree.paths2ids(file_list, trees=extra_trees,
803
956
require_versioned=True)
804
957
# find_ids_across_trees may include some paths that don't
805
958
# exist in 'tree'.
806
entries = sorted(
807
(tree.id2path(file_id), tree.inventory[file_id])
808
for file_id in file_ids if tree.has_id(file_id))
959
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
809
960
else:
810
entries = tree.inventory.entries()
961
entries = tree.iter_entries_by_dir()
811
962
812
self.cleanup_now()
813
for path, entry in entries:
963
for path, entry in sorted(entries):
814
964
if kind and kind != entry.kind:
815
965
continue
966
if path == "":
967
continue
816
968
if show_ids:
817
969
self.outf.write('%-50s %s\n' % (path, entry.file_id))
818
970
else:
854
1006
if auto:
855
1007
return self.run_auto(names_list, after, dry_run)
856
1008
elif dry_run:
857
raise errors.BzrCommandError('--dry-run requires --auto.')
1009
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
858
1010
if names_list is None:
859
1011
names_list = []
860
1012
if len(names_list) < 2:
861
raise errors.BzrCommandError("missing file argument")
1013
raise errors.BzrCommandError(gettext("missing file argument"))
862
1014
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1015
for file_name in rel_names[0:-1]:
1016
if file_name == '':
1017
raise errors.BzrCommandError(gettext("can not move root of branch"))
863
1018
self.add_cleanup(tree.lock_tree_write().unlock)
864
1019
self._run(tree, names_list, rel_names, after)
865
1020
866
1021
def run_auto(self, names_list, after, dry_run):
867
1022
if names_list is not None and len(names_list) > 1:
868
raise errors.BzrCommandError('Only one path may be specified to'
869
' --auto.')
1023
raise errors.BzrCommandError(gettext('Only one path may be specified to'
1024
' --auto.'))
870
1025
if after:
871
raise errors.BzrCommandError('--after cannot be specified with'
872
' --auto.')
1026
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1027
' --auto.'))
873
1028
work_tree, file_list = WorkingTree.open_containing_paths(
874
1029
names_list, default_directory='.')
875
1030
self.add_cleanup(work_tree.lock_tree_write().unlock)
887
1042
and rel_names[0].lower() == rel_names[1].lower()):
888
1043
into_existing = False
889
1044
else:
890
inv = tree.inventory
891
1045
# 'fix' the case of a potential 'from'
892
1046
from_id = tree.path2id(
893
1047
tree.get_canonical_inventory_path(rel_names[0]))
894
1048
if (not osutils.lexists(names_list[0]) and
895
from_id and inv.get_file_kind(from_id) == "directory"):
1049
from_id and tree.stored_kind(from_id) == "directory"):
896
1050
into_existing = False
897
1051
# move/rename
898
1052
if into_existing:
905
1059
self.outf.write("%s => %s\n" % (src, dest))
906
1060
else:
907
1061
if len(names_list) != 2:
908
raise errors.BzrCommandError('to mv multiple files the'
1062
raise errors.BzrCommandError(gettext('to mv multiple files the'
909
1063
' destination must be a versioned'
910
' directory')
1064
' directory'))
911
1065
912
1066
# for cicp file-systems: the src references an existing inventory
913
1067
# item:
973
1127
branches have diverged.
974
1128
975
1129
If there is no default location set, the first pull will set it (use
976
--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
977
1131
location to use the default. To change the default, use --remember. The
978
1132
value will only be saved if the remote location can be accessed.
979
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
980
1138
Note: The location can be specified either in the form of a branch,
981
1139
or in the form of a path to a file containing a merge directive generated
982
1140
with bzr send.
1019
1177
self.add_cleanup(branch_to.lock_write().unlock)
1020
1178
1021
1179
if tree_to is None and show_base:
1022
raise errors.BzrCommandError("Need working tree for --show-base.")
1180
raise errors.BzrCommandError(gettext("Need working tree for --show-base."))
1023
1181
1024
1182
if local and not branch_to.get_bound_location():
1025
1183
raise errors.LocalRequiresBoundBranch()
1035
1193
stored_loc = branch_to.get_parent()
1036
1194
if location is None:
1037
1195
if stored_loc is None:
1038
raise errors.BzrCommandError("No pull location known or"
1039
" specified.")
1196
raise errors.BzrCommandError(gettext("No pull location known or"
1197
" specified."))
1040
1198
else:
1041
1199
display_url = urlutils.unescape_for_display(stored_loc,
1042
1200
self.outf.encoding)
1043
1201
if not is_quiet():
1044
self.outf.write("Using saved parent location: %s\n" % display_url)
1202
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1045
1203
location = stored_loc
1046
1204
1047
1205
revision = _get_one_revision('pull', revision)
1048
1206
if mergeable is not None:
1049
1207
if revision is not None:
1050
raise errors.BzrCommandError(
1051
'Cannot use -r with merge directives or bundles')
1208
raise errors.BzrCommandError(gettext(
1209
'Cannot use -r with merge directives or bundles'))
1052
1210
mergeable.install_revisions(branch_to.repository)
1053
1211
base_revision_id, revision_id, verified = \
1054
1212
mergeable.get_merge_request(branch_to.repository)
1060
1218
# Remembers if asked explicitly or no previous location is set
1061
1219
if (remember
1062
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
1063
1223
branch_to.set_parent(branch_from.base)
1064
1224
1065
1225
if revision is not None:
1072
1232
view_info=view_info)
1073
1233
result = tree_to.pull(
1074
1234
branch_from, overwrite, revision_id, change_reporter,
1075
possible_transports=possible_transports, local=local,
1076
show_base=show_base)
1235
local=local, show_base=show_base)
1077
1236
else:
1078
1237
result = branch_to.pull(
1079
1238
branch_from, overwrite, revision_id, local=local)
1110
1269
After that you will be able to do a push without '--overwrite'.
1111
1270
1112
1271
If there is no default push location set, the first push will set it (use
1113
--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
1114
1273
location to use the default. To change the default, use --remember. The
1115
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>.
1116
1279
"""
1117
1280
1118
1281
_see_also = ['pull', 'update', 'working-trees']
1156
1319
directory = '.'
1157
1320
# Get the source branch
1158
1321
(tree, br_from,
1159
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1322
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1160
1323
# Get the tip's revision_id
1161
1324
revision = _get_one_revision('push', revision)
1162
1325
if revision is not None:
1183
1346
# error by the feedback given to them. RBC 20080227.
1184
1347
stacked_on = parent_url
1185
1348
if not stacked_on:
1186
raise errors.BzrCommandError(
1187
"Could not determine branch to refer to.")
1349
raise errors.BzrCommandError(gettext(
1350
"Could not determine branch to refer to."))
1188
1351
1189
1352
# Get the destination location
1190
1353
if location is None:
1191
1354
stored_loc = br_from.get_push_location()
1192
1355
if stored_loc is None:
1193
raise errors.BzrCommandError(
1194
"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."))
1195
1366
else:
1196
1367
display_url = urlutils.unescape_for_display(stored_loc,
1197
1368
self.outf.encoding)
1198
self.outf.write("Using saved push location: %s\n" % display_url)
1369
note(gettext("Using saved push location: %s") % display_url)
1199
1370
location = stored_loc
1200
1371
1201
1372
_show_push_branch(br_from, revision_id, location, self.outf,
1259
1430
deprecated_name=self.invoked_as,
1260
1431
recommended_name='branch',
1261
1432
deprecated_in_version='2.4')
1262
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1433
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1263
1434
from_location)
1264
1435
if not (hardlink or files_from):
1265
1436
# accelerator_tree is usually slower because you have to read N
1278
1449
# RBC 20060209
1279
1450
revision_id = br_from.last_revision()
1280
1451
if to_location is None:
1281
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)
1282
1455
to_transport = transport.get_transport(to_location)
1283
1456
try:
1284
1457
to_transport.mkdir('.')
1285
1458
except errors.FileExists:
1286
if not use_existing_dir:
1287
raise errors.BzrCommandError('Target directory "%s" '
1288
'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
1289
1468
else:
1290
1469
try:
1291
bzrdir.BzrDir.open_from_transport(to_transport)
1470
to_dir.open_branch()
1292
1471
except errors.NotBranchError:
1293
1472
pass
1294
1473
else:
1295
1474
raise errors.AlreadyBranchError(to_location)
1296
1475
except errors.NoSuchFile:
1297
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1476
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1298
1477
% to_location)
1299
try:
1300
# preserve whatever source format we have.
1301
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1302
possible_transports=[to_transport],
1303
accelerator_tree=accelerator_tree,
1304
hardlink=hardlink, stacked=stacked,
1305
force_new_repo=standalone,
1306
create_tree_if_local=not no_tree,
1307
source_branch=br_from)
1308
branch = dir.open_branch()
1309
except errors.NoSuchRevision:
1310
to_transport.delete_tree('.')
1311
msg = "The branch %s has no revision %s." % (from_location,
1312
revision)
1313
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)
1314
1505
_merge_tags_if_possible(br_from, branch)
1315
1506
# If the source branch is stacked, the new branch may
1316
1507
# be stacked whether we asked for that explicitly or not.
1317
1508
# We therefore need a try/except here and not just 'if stacked:'
1318
1509
try:
1319
note('Created new stacked branch referring to %s.' %
1510
note(gettext('Created new stacked branch referring to %s.') %
1320
1511
branch.get_stacked_on_url())
1321
1512
except (errors.NotStacked, errors.UnstackableBranchFormat,
1322
1513
errors.UnstackableRepositoryFormat), e:
1323
note('Branched %d revision(s).' % branch.revno())
1514
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1324
1515
if bind:
1325
1516
# Bind to the parent
1326
1517
parent_branch = Branch.open(from_location)
1327
1518
branch.bind(parent_branch)
1328
note('New branch bound to %s' % from_location)
1519
note(gettext('New branch bound to %s') % from_location)
1329
1520
if switch:
1330
1521
# Switch to the new branch
1331
1522
wt, _ = WorkingTree.open_containing('.')
1332
1523
_mod_switch.switch(wt.bzrdir, branch)
1333
note('Switched to branch: %s',
1524
note(gettext('Switched to branch: %s'),
1334
1525
urlutils.unescape_for_display(branch.base, 'utf-8'))
1335
1526
1336
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
1337
1578
class cmd_checkout(Command):
1338
1579
__doc__ = """Create a new checkout of an existing branch.
1339
1580
1378
1619
if branch_location is None:
1379
1620
branch_location = osutils.getcwd()
1380
1621
to_location = branch_location
1381
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1622
accelerator_tree, source = controldir.ControlDir.open_tree_or_branch(
1382
1623
branch_location)
1383
1624
if not (hardlink or files_from):
1384
1625
# accelerator_tree is usually slower because you have to read N
1421
1662
def run(self, dir=u'.'):
1422
1663
tree = WorkingTree.open_containing(dir)[0]
1423
1664
self.add_cleanup(tree.lock_read().unlock)
1424
new_inv = tree.inventory
1425
1665
old_tree = tree.basis_tree()
1426
1666
self.add_cleanup(old_tree.lock_read().unlock)
1427
old_inv = old_tree.inventory
1428
1667
renames = []
1429
1668
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1430
1669
for f, paths, c, v, p, n, k, e in iterator:
1439
1678
1440
1679
1441
1680
class cmd_update(Command):
1442
__doc__ = """Update a tree to have the latest code committed to its branch.
1443
1444
This will perform a merge into the working tree, and may generate
1445
conflicts. If you have any local changes, you will still
1446
need to commit them after the update for the update to be complete.
1447
1448
If you want to discard your local changes, you can just do a
1449
'bzr revert' instead of 'bzr commit' after the update.
1450
1451
If you want to restore a file that has been removed locally, use
1452
'bzr revert' instead of 'bzr update'.
1453
1454
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
1455
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.
1456
1708
"""
1457
1709
1458
1710
_see_also = ['pull', 'working-trees', 'status-flags']
1463
1715
]
1464
1716
aliases = ['up']
1465
1717
1466
def run(self, dir='.', revision=None, show_base=None):
1718
def run(self, dir=None, revision=None, show_base=None):
1467
1719
if revision is not None and len(revision) != 1:
1468
raise errors.BzrCommandError(
1469
"bzr update --revision takes exactly one revision")
1470
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"))
1471
1731
branch = tree.branch
1472
1732
possible_transports = []
1473
1733
master = branch.get_master_branch(
1497
1757
revision_id = branch.last_revision()
1498
1758
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1499
1759
revno = branch.revision_id_to_dotted_revno(revision_id)
1500
note("Tree is up to date at revision %s of branch %s" %
1501
('.'.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))
1502
1762
return 0
1503
1763
view_info = _get_view_info_for_change_reporter(tree)
1504
1764
change_reporter = delta._ChangeReporter(
1512
1772
old_tip=old_tip,
1513
1773
show_base=show_base)
1514
1774
except errors.NoSuchRevision, e:
1515
raise errors.BzrCommandError(
1775
raise errors.BzrCommandError(gettext(
1516
1776
"branch has no revision %s\n"
1517
1777
"bzr update --revision only works"
1518
" for a revision in the branch history"
1778
" for a revision in the branch history")
1519
1779
% (e.revision))
1520
1780
revno = tree.branch.revision_id_to_dotted_revno(
1521
1781
_mod_revision.ensure_null(tree.last_revision()))
1522
note('Updated to revision %s of branch %s' %
1523
('.'.join(map(str, revno)), branch_location))
1782
note(gettext('Updated to revision {0} of branch {1}').format(
1783
'.'.join(map(str, revno)), branch_location))
1524
1784
parent_ids = tree.get_parent_ids()
1525
1785
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1526
note('Your local commits will now show as pending merges with '
1527
"'bzr status', and can be committed with 'bzr commit'.")
1786
note(gettext('Your local commits will now show as pending merges with '
1787
"'bzr status', and can be committed with 'bzr commit'."))
1528
1788
if conflicts != 0:
1529
1789
return 1
1530
1790
else:
1571
1831
else:
1572
1832
noise_level = 0
1573
1833
from bzrlib.info import show_bzrdir_info
1574
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1834
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1575
1835
verbose=noise_level, outfile=self.outf)
1576
1836
1577
1837
1602
1862
def run(self, file_list, verbose=False, new=False,
1603
1863
file_deletion_strategy='safe'):
1604
1864
if file_deletion_strategy == 'force':
1605
note("(The --force option is deprecated, rather use --no-backup "
1606
"in future.)")
1865
note(gettext("(The --force option is deprecated, rather use --no-backup "
1866
"in future.)"))
1607
1867
file_deletion_strategy = 'no-backup'
1608
1868
1609
1869
tree, file_list = WorkingTree.open_containing_paths(file_list)
1619
1879
specific_files=file_list).added
1620
1880
file_list = sorted([f[0] for f in added], reverse=True)
1621
1881
if len(file_list) == 0:
1622
raise errors.BzrCommandError('No matching files.')
1882
raise errors.BzrCommandError(gettext('No matching files.'))
1623
1883
elif file_list is None:
1624
1884
# missing files show up in iter_changes(basis) as
1625
1885
# versioned-with-no-kind.
1709
1969
1710
1970
def run(self, branch=".", canonicalize_chks=False):
1711
1971
from bzrlib.reconcile import reconcile
1712
dir = bzrdir.BzrDir.open(branch)
1972
dir = controldir.ControlDir.open(branch)
1713
1973
reconcile(dir, canonicalize_chks=canonicalize_chks)
1714
1974
1715
1975
1724
1984
@display_command
1725
1985
def run(self, location="."):
1726
1986
branch = Branch.open_containing(location)[0]
1727
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):
1728
1992
self.outf.write(revid)
1729
1993
self.outf.write('\n')
1730
1994
1790
2054
RegistryOption('format',
1791
2055
help='Specify a format for this branch. '
1792
2056
'See "help formats".',
1793
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1794
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),
1795
2059
value_switches=True,
1796
2060
title="Branch format",
1797
2061
),
1804
2068
def run(self, location=None, format=None, append_revisions_only=False,
1805
2069
create_prefix=False, no_tree=False):
1806
2070
if format is None:
1807
format = bzrdir.format_registry.make_bzrdir('default')
2071
format = controldir.format_registry.make_bzrdir('default')
1808
2072
if location is None:
1809
2073
location = u'.'
1810
2074
1819
2083
to_transport.ensure_base()
1820
2084
except errors.NoSuchFile:
1821
2085
if not create_prefix:
1822
raise errors.BzrCommandError("Parent directory of %s"
2086
raise errors.BzrCommandError(gettext("Parent directory of %s"
1823
2087
" does not exist."
1824
2088
"\nYou may supply --create-prefix to create all"
1825
" leading parent directories."
2089
" leading parent directories.")
1826
2090
% location)
1827
2091
to_transport.create_prefix()
1828
2092
1829
2093
try:
1830
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2094
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1831
2095
except errors.NotBranchError:
1832
2096
# really a NotBzrDir error...
1833
create_branch = bzrdir.BzrDir.create_branch_convenience
2097
create_branch = controldir.ControlDir.create_branch_convenience
1834
2098
if no_tree:
1835
2099
force_new_tree = False
1836
2100
else:
1847
2111
raise errors.BranchExistsWithoutWorkingTree(location)
1848
2112
raise errors.AlreadyBranchError(location)
1849
2113
branch = a_bzrdir.create_branch()
1850
if not no_tree:
2114
if not no_tree and not a_bzrdir.has_workingtree():
1851
2115
a_bzrdir.create_workingtree()
1852
2116
if append_revisions_only:
1853
2117
try:
1854
2118
branch.set_append_revisions_only(True)
1855
2119
except errors.UpgradeRequired:
1856
raise errors.BzrCommandError('This branch format cannot be set'
1857
' to append-revisions-only. Try --default.')
2120
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2121
' to append-revisions-only. Try --default.'))
1858
2122
if not is_quiet():
1859
2123
from bzrlib.info import describe_layout, describe_format
1860
2124
try:
1864
2128
repository = branch.repository
1865
2129
layout = describe_layout(repository, branch, tree).lower()
1866
2130
format = describe_format(a_bzrdir, repository, branch, tree)
1867
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))
1868
2133
if repository.is_shared():
1869
2134
#XXX: maybe this can be refactored into transport.path_or_url()
1870
2135
url = repository.bzrdir.root_transport.external_url()
1872
2137
url = urlutils.local_path_from_url(url)
1873
2138
except errors.InvalidURL:
1874
2139
pass
1875
self.outf.write("Using shared repository: %s\n" % url)
2140
self.outf.write(gettext("Using shared repository: %s\n") % url)
1876
2141
1877
2142
1878
2143
class cmd_init_repository(Command):
1908
2173
takes_options = [RegistryOption('format',
1909
2174
help='Specify a format for this repository. See'
1910
2175
' "bzr help formats" for details.',
1911
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1912
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),
1913
2178
value_switches=True, title='Repository format'),
1914
2179
Option('no-trees',
1915
2180
help='Branches in the repository will default to'
1919
2184
1920
2185
def run(self, location, format=None, no_trees=False):
1921
2186
if format is None:
1922
format = bzrdir.format_registry.make_bzrdir('default')
2187
format = controldir.format_registry.make_bzrdir('default')
1923
2188
1924
2189
if location is None:
1925
2190
location = '.'
1926
2191
1927
2192
to_transport = transport.get_transport(location)
1928
to_transport.ensure_base()
1929
2193
1930
newdir = format.initialize_on_transport(to_transport)
1931
repo = newdir.create_repository(shared=True)
1932
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()))
1933
2200
if not is_quiet():
1934
2201
from bzrlib.info import show_bzrdir_info
1935
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2202
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1936
2203
1937
2204
1938
2205
class cmd_diff(Command):
2069
2336
elif ':' in prefix:
2070
2337
old_label, new_label = prefix.split(":")
2071
2338
else:
2072
raise errors.BzrCommandError(
2339
raise errors.BzrCommandError(gettext(
2073
2340
'--prefix expects two values separated by a colon'
2074
' (eg "old/:new/")')
2341
' (eg "old/:new/")'))
2075
2342
2076
2343
if revision and len(revision) > 2:
2077
raise errors.BzrCommandError('bzr diff --revision takes exactly'
2078
' one or two revision specifiers')
2344
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2345
' one or two revision specifiers'))
2079
2346
2080
2347
if using is not None and format is not None:
2081
raise errors.BzrCommandError('--using and --format are mutually '
2082
'exclusive.')
2348
raise errors.BzrCommandError(gettext(
2349
'{0} and {1} are mutually exclusive').format(
2350
'--using', '--format'))
2083
2351
2084
2352
(old_tree, new_tree,
2085
2353
old_branch, new_branch,
2115
2383
self.add_cleanup(tree.lock_read().unlock)
2116
2384
old = tree.basis_tree()
2117
2385
self.add_cleanup(old.lock_read().unlock)
2118
for path, ie in old.inventory.iter_entries():
2386
for path, ie in old.iter_entries_by_dir():
2119
2387
if not tree.has_id(ie.file_id):
2120
2388
self.outf.write(path)
2121
2389
if show_ids:
2159
2427
self.add_cleanup(wt.lock_read().unlock)
2160
2428
basis = wt.basis_tree()
2161
2429
self.add_cleanup(basis.lock_read().unlock)
2162
basis_inv = basis.inventory
2163
inv = wt.inventory
2164
for file_id in inv:
2165
if basis_inv.has_id(file_id):
2166
continue
2167
if inv.is_root(file_id) and len(basis_inv) == 0:
2168
continue
2169
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)
2170
2437
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2171
2438
continue
2172
2439
if null:
2193
2460
try:
2194
2461
return int(limitstring)
2195
2462
except ValueError:
2196
msg = "The limit argument must be an integer."
2463
msg = gettext("The limit argument must be an integer.")
2197
2464
raise errors.BzrCommandError(msg)
2198
2465
2199
2466
2201
2468
try:
2202
2469
return int(s)
2203
2470
except ValueError:
2204
msg = "The levels argument must be an integer."
2471
msg = gettext("The levels argument must be an integer.")
2205
2472
raise errors.BzrCommandError(msg)
2206
2473
2207
2474
2399
2666
Option('show-diff',
2400
2667
short_name='p',
2401
2668
help='Show changes made in each revision as a patch.'),
2402
Option('include-merges',
2669
Option('include-merged',
2403
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.'),
2404
2675
Option('exclude-common-ancestry',
2405
2676
help='Display only the revisions that are not part'
2406
' of both ancestries (require -rX..Y)'
2677
' of both ancestries (require -rX..Y).'
2407
2678
),
2408
2679
Option('signatures',
2409
help='Show digital signature validity'),
2680
help='Show digital signature validity.'),
2410
2681
ListOption('match',
2411
2682
short_name='m',
2412
2683
help='Show revisions whose properties match this '
2443
2714
message=None,
2444
2715
limit=None,
2445
2716
show_diff=False,
2446
include_merges=False,
2717
include_merged=None,
2447
2718
authors=None,
2448
2719
exclude_common_ancestry=False,
2449
2720
signatures=False,
2452
2723
match_committer=None,
2453
2724
match_author=None,
2454
2725
match_bugs=None,
2726
omit_merges=False,
2727
include_merges=symbol_versioning.DEPRECATED_PARAMETER,
2455
2728
):
2456
2729
from bzrlib.log import (
2457
2730
Logger,
2459
2732
_get_info_for_log_files,
2460
2733
)
2461
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
2462
2750
if (exclude_common_ancestry
2463
2751
and (revision is None or len(revision) != 2)):
2464
raise errors.BzrCommandError(
2465
'--exclude-common-ancestry requires -r with two revisions')
2466
if include_merges:
2752
raise errors.BzrCommandError(gettext(
2753
'--exclude-common-ancestry requires -r with two revisions'))
2754
if include_merged:
2467
2755
if levels is None:
2468
2756
levels = 0
2469
2757
else:
2470
raise errors.BzrCommandError(
2471
'--levels and --include-merges are mutually exclusive')
2758
raise errors.BzrCommandError(gettext(
2759
'{0} and {1} are mutually exclusive').format(
2760
'--levels', '--include-merged'))
2472
2761
2473
2762
if change is not None:
2474
2763
if len(change) > 1:
2475
2764
raise errors.RangeInChangeOption()
2476
2765
if revision is not None:
2477
raise errors.BzrCommandError(
2478
'--revision and --change are mutually exclusive')
2766
raise errors.BzrCommandError(gettext(
2767
'{0} and {1} are mutually exclusive').format(
2768
'--revision', '--change'))
2479
2769
else:
2480
2770
revision = change
2481
2771
2487
2777
revision, file_list, self.add_cleanup)
2488
2778
for relpath, file_id, kind in file_info_list:
2489
2779
if file_id is None:
2490
raise errors.BzrCommandError(
2491
"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") %
2492
2782
relpath)
2493
2783
# If the relpath is the top of the tree, we log everything
2494
2784
if relpath == '':
2506
2796
location = revision[0].get_branch()
2507
2797
else:
2508
2798
location = '.'
2509
dir, relpath = bzrdir.BzrDir.open_containing(location)
2799
dir, relpath = controldir.ControlDir.open_containing(location)
2510
2800
b = dir.open_branch()
2511
2801
self.add_cleanup(b.lock_read().unlock)
2512
2802
rev1, rev2 = _get_revision_range(revision, b, self.name())
2513
2803
2514
if b.get_config().validate_signatures_in_log():
2804
if b.get_config_stack().get('validate_signatures_in_log'):
2515
2805
signatures = True
2516
2806
2517
2807
if signatures:
2571
2861
match_dict['author'] = match_author
2572
2862
if match_bugs:
2573
2863
match_dict['bugs'] = match_bugs
2574
2864
2575
2865
# Build the LogRequest and execute it
2576
2866
if len(file_ids) == 0:
2577
2867
file_ids = None
2581
2871
message_search=message, delta_type=delta_type,
2582
2872
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2583
2873
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2584
signature=signatures
2874
signature=signatures, omit_merges=omit_merges,
2585
2875
)
2586
2876
Logger(b, rqst).show(lf)
2587
2877
2604
2894
# b is taken from revision[0].get_branch(), and
2605
2895
# show_log will use its revision_history. Having
2606
2896
# different branches will lead to weird behaviors.
2607
raise errors.BzrCommandError(
2897
raise errors.BzrCommandError(gettext(
2608
2898
"bzr %s doesn't accept two revisions in different"
2609
" branches." % command_name)
2899
" branches.") % command_name)
2610
2900
if start_spec.spec is None:
2611
2901
# Avoid loading all the history.
2612
2902
rev1 = RevisionInfo(branch, None, None)
2620
2910
else:
2621
2911
rev2 = end_spec.in_history(branch)
2622
2912
else:
2623
raise errors.BzrCommandError(
2624
'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)
2625
2915
return rev1, rev2
2626
2916
2627
2917
2698
2988
null=False, kind=None, show_ids=False, path=None, directory=None):
2699
2989
2700
2990
if kind and kind not in ('file', 'directory', 'symlink'):
2701
raise errors.BzrCommandError('invalid kind specified')
2991
raise errors.BzrCommandError(gettext('invalid kind specified'))
2702
2992
2703
2993
if verbose and null:
2704
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2994
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2705
2995
all = not (unknown or versioned or ignored)
2706
2996
2707
2997
selection = {'I':ignored, '?':unknown, 'V':versioned}
2710
3000
fs_path = '.'
2711
3001
else:
2712
3002
if from_root:
2713
raise errors.BzrCommandError('cannot specify both --from-root'
2714
' and PATH')
3003
raise errors.BzrCommandError(gettext('cannot specify both --from-root'
3004
' and PATH'))
2715
3005
fs_path = path
2716
3006
tree, branch, relpath = \
2717
3007
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2733
3023
if view_files:
2734
3024
apply_view = True
2735
3025
view_str = views.view_display_str(view_files)
2736
note("Ignoring files outside view. View is %s" % view_str)
3026
note(gettext("Ignoring files outside view. View is %s") % view_str)
2737
3027
2738
3028
self.add_cleanup(tree.lock_read().unlock)
2739
3029
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2886
3176
self.outf.write("%s\n" % pattern)
2887
3177
return
2888
3178
if not name_pattern_list:
2889
raise errors.BzrCommandError("ignore requires at least one "
2890
"NAME_PATTERN or --default-rules.")
3179
raise errors.BzrCommandError(gettext("ignore requires at least one "
3180
"NAME_PATTERN or --default-rules."))
2891
3181
name_pattern_list = [globbing.normalize_pattern(p)
2892
3182
for p in name_pattern_list]
2893
3183
bad_patterns = ''
3184
bad_patterns_count = 0
2894
3185
for p in name_pattern_list:
2895
3186
if not globbing.Globster.is_pattern_valid(p):
3187
bad_patterns_count += 1
2896
3188
bad_patterns += ('\n %s' % p)
2897
3189
if bad_patterns:
2898
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)
2899
3193
ui.ui_factory.show_error(msg)
2900
3194
raise errors.InvalidPattern('')
2901
3195
for name_pattern in name_pattern_list:
2902
3196
if (name_pattern[0] == '/' or
2903
3197
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2904
raise errors.BzrCommandError(
2905
"NAME_PATTERN should not be an absolute path")
3198
raise errors.BzrCommandError(gettext(
3199
"NAME_PATTERN should not be an absolute path"))
2906
3200
tree, relpath = WorkingTree.open_containing(directory)
2907
3201
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2908
3202
ignored = globbing.Globster(name_pattern_list)
2915
3209
if ignored.match(filename):
2916
3210
matches.append(filename)
2917
3211
if len(matches) > 0:
2918
self.outf.write("Warning: the following files are version controlled and"
2919
" 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"
2920
3214
"\nThese files will continue to be version controlled"
2921
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3215
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2922
3216
2923
3217
2924
3218
class cmd_ignored(Command):
2963
3257
try:
2964
3258
revno = int(revno)
2965
3259
except ValueError:
2966
raise errors.BzrCommandError("not a valid revision-number: %r"
3260
raise errors.BzrCommandError(gettext("not a valid revision-number: %r")
2967
3261
% revno)
2968
3262
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2969
3263
self.outf.write("%s\n" % revid)
3012
3306
Option('per-file-timestamps',
3013
3307
help='Set modification time of files to that of the last '
3014
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.'),
3015
3312
]
3016
3313
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3017
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
3314
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3315
directory=u'.'):
3018
3316
from bzrlib.export import export
3019
3317
3020
3318
if branch_or_subdir is None:
3021
tree = WorkingTree.open_containing(directory)[0]
3022
b = tree.branch
3023
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
3024
3331
else:
3025
b, subdir = Branch.open_containing(branch_or_subdir)
3026
tree = None
3027
3028
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)
3029
3333
try:
3030
export(rev_tree, dest, format, root, subdir, filtered=filters,
3334
export(export_tree, dest, format, root, subdir, filtered=filters,
3031
3335
per_file_timestamps=per_file_timestamps)
3032
3336
except errors.NoSuchExportFormat, e:
3033
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3337
raise errors.BzrCommandError(
3338
gettext('Unsupported export format: %s') % e.format)
3034
3339
3035
3340
3036
3341
class cmd_cat(Command):
3056
3361
def run(self, filename, revision=None, name_from_revision=False,
3057
3362
filters=False, directory=None):
3058
3363
if revision is not None and len(revision) != 1:
3059
raise errors.BzrCommandError("bzr cat --revision takes exactly"
3060
" one revision specifier")
3364
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3365
" one revision specifier"))
3061
3366
tree, branch, relpath = \
3062
3367
_open_directory_or_containing_tree_or_branch(filename, directory)
3063
3368
self.add_cleanup(branch.lock_read().unlock)
3073
3378
3074
3379
old_file_id = rev_tree.path2id(relpath)
3075
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.
3076
3385
if name_from_revision:
3077
3386
# Try in revision if requested
3078
3387
if old_file_id is None:
3079
raise errors.BzrCommandError(
3080
"%r is not present in revision %s" % (
3388
raise errors.BzrCommandError(gettext(
3389
"{0!r} is not present in revision {1}").format(
3081
3390
filename, rev_tree.get_revision_id()))
3082
3391
else:
3083
content = rev_tree.get_file_text(old_file_id)
3392
actual_file_id = old_file_id
3084
3393
else:
3085
3394
cur_file_id = tree.path2id(relpath)
3086
found = False
3087
if cur_file_id is not None:
3088
# Then try with the actual file id
3089
try:
3090
content = rev_tree.get_file_text(cur_file_id)
3091
found = True
3092
except errors.NoSuchId:
3093
# The actual file id didn't exist at that time
3094
pass
3095
if not found and old_file_id is not None:
3096
# Finally try with the old file id
3097
content = rev_tree.get_file_text(old_file_id)
3098
found = True
3099
if not found:
3100
# Can't be found anywhere
3101
raise errors.BzrCommandError(
3102
"%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(
3103
3402
filename, rev_tree.get_revision_id()))
3104
3403
if filtered:
3105
from bzrlib.filters import (
3106
ContentFilterContext,
3107
filtered_output_bytes,
3108
)
3109
filters = rev_tree._content_filter_stack(relpath)
3110
chunks = content.splitlines(True)
3111
content = filtered_output_bytes(chunks, filters,
3112
ContentFilterContext(relpath, rev_tree))
3113
self.cleanup_now()
3114
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)
3115
3408
else:
3116
self.cleanup_now()
3117
self.outf.write(content)
3409
content = rev_tree.get_file_text(actual_file_id)
3410
self.cleanup_now()
3411
self.outf.write(content)
3118
3412
3119
3413
3120
3414
class cmd_local_time_offset(Command):
3227
3521
aliases = ['ci', 'checkin']
3228
3522
3229
3523
def _iter_bug_fix_urls(self, fixes, branch):
3524
default_bugtracker = None
3230
3525
# Configure the properties for bug fixing attributes.
3231
3526
for fixed_bug in fixes:
3232
3527
tokens = fixed_bug.split(':')
3233
if len(tokens) != 2:
3234
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(
3235
3544
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3236
3545
"See \"bzr help bugs\" for more information on this "
3237
"feature.\nCommit refused." % fixed_bug)
3238
tag, bug_id = tokens
3546
"feature.\nCommit refused.") % fixed_bug)
3547
else:
3548
tag, bug_id = tokens
3239
3549
try:
3240
3550
yield bugtracker.get_bug_url(tag, branch, bug_id)
3241
3551
except errors.UnknownBugTrackerAbbreviation:
3242
raise errors.BzrCommandError(
3243
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3552
raise errors.BzrCommandError(gettext(
3553
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3244
3554
except errors.MalformedBugIdentifier, e:
3245
raise errors.BzrCommandError(
3246
"%s\nCommit refused." % (str(e),))
3555
raise errors.BzrCommandError(gettext(
3556
"%s\nCommit refused.") % (str(e),))
3247
3557
3248
3558
def run(self, message=None, file=None, verbose=False, selected_list=None,
3249
3559
unchanged=False, strict=False, local=False, fixes=None,
3266
3576
try:
3267
3577
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3268
3578
except ValueError, e:
3269
raise errors.BzrCommandError(
3270
"Could not parse --commit-time: " + str(e))
3579
raise errors.BzrCommandError(gettext(
3580
"Could not parse --commit-time: " + str(e)))
3271
3581
3272
3582
properties = {}
3273
3583
3306
3616
message = message.replace('\r\n', '\n')
3307
3617
message = message.replace('\r', '\n')
3308
3618
if file:
3309
raise errors.BzrCommandError(
3310
"please specify either --message or --file")
3619
raise errors.BzrCommandError(gettext(
3620
"please specify either --message or --file"))
3311
3621
3312
3622
def get_message(commit_obj):
3313
3623
"""Callback to get commit message"""
3336
3646
my_message = edit_commit_message_encoded(text,
3337
3647
start_message=start_message)
3338
3648
if my_message is None:
3339
raise errors.BzrCommandError("please specify a commit"
3340
" message with either --message or --file")
3341
if my_message == "":
3342
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 \"\"."))
3343
3656
return my_message
3344
3657
3345
3658
# The API permits a commit with a filter of [] to mean 'select nothing'
3356
3669
exclude=tree.safe_relpath_files(exclude),
3357
3670
lossy=lossy)
3358
3671
except PointlessCommit:
3359
raise errors.BzrCommandError("No changes to commit."
3672
raise errors.BzrCommandError(gettext("No changes to commit."
3360
3673
" Please 'bzr add' the files you want to commit, or use"
3361
" --unchanged to force an empty commit.")
3674
" --unchanged to force an empty commit."))
3362
3675
except ConflictsInTree:
3363
raise errors.BzrCommandError('Conflicts detected in working '
3676
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3364
3677
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3365
' resolve.')
3678
' resolve.'))
3366
3679
except StrictCommitFailed:
3367
raise errors.BzrCommandError("Commit refused because there are"
3368
" unknown files in the working tree.")
3680
raise errors.BzrCommandError(gettext("Commit refused because there are"
3681
" unknown files in the working tree."))
3369
3682
except errors.BoundBranchOutOfDate, e:
3370
e.extra_help = ("\n"
3683
e.extra_help = (gettext("\n"
3371
3684
'To commit to master branch, run update and then commit.\n'
3372
3685
'You can also pass --local to commit to continue working '
3373
'disconnected.')
3686
'disconnected.'))
3374
3687
raise
3375
3688
3376
3689
3483
3796
RegistryOption('format',
3484
3797
help='Upgrade to a specific format. See "bzr help'
3485
3798
' formats" for details.',
3486
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3487
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),
3488
3801
value_switches=True, title='Branch format'),
3489
3802
Option('clean',
3490
3803
help='Remove the backup.bzr directory if successful.'),
3531
3844
if directory is None:
3532
3845
# use branch if we're inside one; otherwise global config
3533
3846
try:
3534
c = Branch.open_containing(u'.')[0].get_config()
3847
c = Branch.open_containing(u'.')[0].get_config_stack()
3535
3848
except errors.NotBranchError:
3536
c = _mod_config.GlobalConfig()
3849
c = _mod_config.GlobalStack()
3537
3850
else:
3538
c = Branch.open(directory).get_config()
3851
c = Branch.open(directory).get_config_stack()
3852
identity = c.get('email')
3539
3853
if email:
3540
self.outf.write(c.user_email() + '\n')
3854
self.outf.write(_mod_config.extract_email_address(identity)
3855
+ '\n')
3541
3856
else:
3542
self.outf.write(c.username() + '\n')
3857
self.outf.write(identity + '\n')
3543
3858
return
3544
3859
3545
3860
if email:
3546
raise errors.BzrCommandError("--email can only be used to display existing "
3547
"identity")
3861
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3862
"identity"))
3548
3863
3549
3864
# display a warning if an email address isn't included in the given name.
3550
3865
try:
3556
3871
# use global config unless --branch given
3557
3872
if branch:
3558
3873
if directory is None:
3559
c = Branch.open_containing(u'.')[0].get_config()
3874
c = Branch.open_containing(u'.')[0].get_config_stack()
3560
3875
else:
3561
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()
3562
3879
else:
3563
c = _mod_config.GlobalConfig()
3564
c.set_user_option('email', name)
3880
c = _mod_config.GlobalStack()
3881
c.set('email', name)
3565
3882
3566
3883
3567
3884
class cmd_nick(Command):
3568
3885
__doc__ = """Print or set the branch nickname.
3569
3886
3570
If unset, the tree root directory name is used as the nickname.
3571
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.
3572
3890
3573
3891
Bound branches use the nickname of its master branch unless it is set
3574
3892
locally.
3629
3947
3630
3948
def remove_alias(self, alias_name):
3631
3949
if alias_name is None:
3632
raise errors.BzrCommandError(
3633
'bzr alias --remove expects an alias to remove.')
3950
raise errors.BzrCommandError(gettext(
3951
'bzr alias --remove expects an alias to remove.'))
3634
3952
# If alias is not found, print something like:
3635
3953
# unalias: foo: not found
3636
3954
c = _mod_config.GlobalConfig()
3774
4092
param_name='starting_with', short_name='s',
3775
4093
help=
3776
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.")
3777
4098
]
3778
4099
encoding_type = 'replace'
3779
4100
3787
4108
first=False, list_only=False,
3788
4109
randomize=None, exclude=None, strict=False,
3789
4110
load_list=None, debugflag=None, starting_with=None, subunit=False,
3790
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
3791
4122
from bzrlib import tests
3792
4123
3793
4124
if testspecs_list is not None:
3798
4129
try:
3799
4130
from bzrlib.tests import SubUnitBzrRunner
3800
4131
except ImportError:
3801
raise errors.BzrCommandError("subunit not available. subunit "
3802
"needs to be installed to use --subunit.")
4132
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4133
"needs to be installed to use --subunit."))
3803
4134
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3804
4135
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3805
4136
# stdout, which would corrupt the subunit stream.
3814
4145
self.additional_selftest_args.setdefault(
3815
4146
'suite_decorators', []).append(parallel)
3816
4147
if benchmark:
3817
raise errors.BzrCommandError(
4148
raise errors.BzrCommandError(gettext(
3818
4149
"--benchmark is no longer supported from bzr 2.2; "
3819
"use bzr-usertest instead")
4150
"use bzr-usertest instead"))
3820
4151
test_suite_factory = None
3821
4152
if not exclude:
3822
4153
exclude_pattern = None
3823
4154
else:
3824
4155
exclude_pattern = '(' + '|'.join(exclude) + ')'
4156
if not sync:
4157
self._disable_fsync()
3825
4158
selftest_kwargs = {"verbose": verbose,
3826
4159
"pattern": pattern,
3827
4160
"stop_on_failure": one,
3849
4182
cleanup()
3850
4183
return int(not result)
3851
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
3852
4194
3853
4195
class cmd_version(Command):
3854
4196
__doc__ = """Show version of bzr."""
3874
4216
3875
4217
@display_command
3876
4218
def run(self):
3877
self.outf.write("It sure does!\n")
4219
self.outf.write(gettext("It sure does!\n"))
3878
4220
3879
4221
3880
4222
class cmd_find_merge_base(Command):
3898
4240
graph = branch1.repository.get_graph(branch2.repository)
3899
4241
base_rev_id = graph.find_unique_lca(last1, last2)
3900
4242
3901
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)
3902
4244
3903
4245
3904
4246
class cmd_merge(Command):
3932
4274
Merge will do its best to combine the changes in two branches, but there
3933
4275
are some kinds of problems only a human can fix. When it encounters those,
3934
4276
it will mark a conflict. A conflict means that you need to fix something,
3935
before you should commit.
4277
before you can commit.
3936
4278
3937
4279
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3938
4280
3939
4281
If there is no default branch set, the first merge will set it (use
3940
--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
3941
4283
to use the default. To change the default, use --remember. The value will
3942
4284
only be saved if the remote location can be accessed.
3943
4285
4029
4371
4030
4372
tree = WorkingTree.open_containing(directory)[0]
4031
4373
if tree.branch.revno() == 0:
4032
raise errors.BzrCommandError('Merging into empty branches not currently supported, '
4033
'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'))
4034
4376
4035
4377
try:
4036
4378
basis_tree = tree.revision_tree(tree.last_revision())
4056
4398
mergeable = None
4057
4399
else:
4058
4400
if uncommitted:
4059
raise errors.BzrCommandError('Cannot use --uncommitted'
4060
' with bundles or merge directives.')
4401
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4402
' with bundles or merge directives.'))
4061
4403
4062
4404
if revision is not None:
4063
raise errors.BzrCommandError(
4064
'Cannot use -r with merge directives or bundles')
4405
raise errors.BzrCommandError(gettext(
4406
'Cannot use -r with merge directives or bundles'))
4065
4407
merger, verified = _mod_merge.Merger.from_mergeable(tree,
4066
4408
mergeable, None)
4067
4409
4068
4410
if merger is None and uncommitted:
4069
4411
if revision is not None and len(revision) > 0:
4070
raise errors.BzrCommandError('Cannot use --uncommitted and'
4071
' --revision at the same time.')
4412
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4413
' --revision at the same time.'))
4072
4414
merger = self.get_merger_from_uncommitted(tree, location, None)
4073
4415
allow_pending = False
4074
4416
4087
4429
if merger.interesting_files:
4088
4430
if not merger.other_tree.has_filename(
4089
4431
merger.interesting_files[0]):
4090
note("merger: " + str(merger))
4432
note(gettext("merger: ") + str(merger))
4091
4433
raise errors.PathsDoNotExist([location])
4092
note('Nothing to do.')
4434
note(gettext('Nothing to do.'))
4093
4435
return 0
4094
4436
if pull and not preview:
4095
4437
if merger.interesting_files is not None:
4096
raise errors.BzrCommandError('Cannot pull individual files')
4438
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
4097
4439
if (merger.base_rev_id == tree.last_revision()):
4098
4440
result = tree.pull(merger.other_branch, False,
4099
4441
merger.other_rev_id)
4100
4442
result.report(self.outf)
4101
4443
return 0
4102
4444
if merger.this_basis is None:
4103
raise errors.BzrCommandError(
4445
raise errors.BzrCommandError(gettext(
4104
4446
"This branch has no commits."
4105
" (perhaps you would prefer 'bzr pull')")
4447
" (perhaps you would prefer 'bzr pull')"))
4106
4448
if preview:
4107
4449
return self._do_preview(merger)
4108
4450
elif interactive:
4159
4501
def sanity_check_merger(self, merger):
4160
4502
if (merger.show_base and
4161
4503
not merger.merge_type is _mod_merge.Merge3Merger):
4162
raise errors.BzrCommandError("Show-base is not supported for this"
4163
" 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)
4164
4506
if merger.reprocess is None:
4165
4507
if merger.show_base:
4166
4508
merger.reprocess = False
4168
4510
# Use reprocess if the merger supports it
4169
4511
merger.reprocess = merger.merge_type.supports_reprocess
4170
4512
if merger.reprocess and not merger.merge_type.supports_reprocess:
4171
raise errors.BzrCommandError("Conflict reduction is not supported"
4172
" for merge type %s." %
4513
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4514
" for merge type %s.") %
4173
4515
merger.merge_type)
4174
4516
if merger.reprocess and merger.show_base:
4175
raise errors.BzrCommandError("Cannot do conflict reduction and"
4176
" show base.")
4517
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4518
" show base."))
4177
4519
4178
4520
def _get_merger_from_branch(self, tree, location, revision, remember,
4179
4521
possible_transports, pb):
4283
4625
stored_location_type = "parent"
4284
4626
mutter("%s", stored_location)
4285
4627
if stored_location is None:
4286
raise errors.BzrCommandError("No location specified or remembered")
4628
raise errors.BzrCommandError(gettext("No location specified or remembered"))
4287
4629
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
4288
note(u"%s remembered %s location %s", verb_string,
4289
stored_location_type, display_url)
4630
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4631
stored_location_type, display_url))
4290
4632
return stored_location
4291
4633
4292
4634
4329
4671
self.add_cleanup(tree.lock_write().unlock)
4330
4672
parents = tree.get_parent_ids()
4331
4673
if len(parents) != 2:
4332
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4674
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4333
4675
" merges. Not cherrypicking or"
4334
" multi-merges.")
4676
" multi-merges."))
4335
4677
repository = tree.branch.repository
4336
4678
interesting_ids = None
4337
4679
new_conflicts = []
4346
4688
if tree.kind(file_id) != "directory":
4347
4689
continue
4348
4690
4349
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):
4350
4693
interesting_ids.add(ie.file_id)
4351
4694
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4352
4695
else:
4496
4839
4497
4840
@display_command
4498
4841
def run(self, context=None):
4499
import shellcomplete
4842
from bzrlib import shellcomplete
4500
4843
shellcomplete.shellcomplete(context)
4501
4844
4502
4845
4556
4899
type=_parse_revision_str,
4557
4900
help='Filter on local branch revisions (inclusive). '
4558
4901
'See "help revisionspec" for details.'),
4559
Option('include-merges',
4902
Option('include-merged',
4560
4903
'Show all revisions in addition to the mainline ones.'),
4904
Option('include-merges', hidden=True,
4905
help='Historical alias for --include-merged.'),
4561
4906
]
4562
4907
encoding_type = 'replace'
4563
4908
4566
4911
theirs_only=False,
4567
4912
log_format=None, long=False, short=False, line=False,
4568
4913
show_ids=False, verbose=False, this=False, other=False,
4569
include_merges=False, revision=None, my_revision=None,
4570
directory=u'.'):
4914
include_merged=None, revision=None, my_revision=None,
4915
directory=u'.',
4916
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4571
4917
from bzrlib.missing import find_unmerged, iter_log_revisions
4572
4918
def message(s):
4573
4919
if not is_quiet():
4574
4920
self.outf.write(s)
4575
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
4576
4937
if this:
4577
4938
mine_only = this
4578
4939
if other:
4593
4954
if other_branch is None:
4594
4955
other_branch = parent
4595
4956
if other_branch is None:
4596
raise errors.BzrCommandError("No peer location known"
4597
" or specified.")
4957
raise errors.BzrCommandError(gettext("No peer location known"
4958
" or specified."))
4598
4959
display_url = urlutils.unescape_for_display(parent,
4599
4960
self.outf.encoding)
4600
message("Using saved parent location: "
4601
+ display_url + "\n")
4961
message(gettext("Using saved parent location: {0}\n").format(
4962
display_url))
4602
4963
4603
4964
remote_branch = Branch.open(other_branch)
4604
4965
if remote_branch.base == local_branch.base:
4617
4978
local_extra, remote_extra = find_unmerged(
4618
4979
local_branch, remote_branch, restrict,
4619
4980
backward=not reverse,
4620
include_merges=include_merges,
4981
include_merged=include_merged,
4621
4982
local_revid_range=local_revid_range,
4622
4983
remote_revid_range=remote_revid_range)
4623
4984
4630
4991
4631
4992
status_code = 0
4632
4993
if local_extra and not theirs_only:
4633
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)) %
4634
4997
len(local_extra))
4635
4998
for revision in iter_log_revisions(local_extra,
4636
4999
local_branch.repository,
4644
5007
if remote_extra and not mine_only:
4645
5008
if printed_local is True:
4646
5009
message("\n\n\n")
4647
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)) %
4648
5013
len(remote_extra))
4649
5014
for revision in iter_log_revisions(remote_extra,
4650
5015
remote_branch.repository,
4654
5019
4655
5020
if mine_only and not local_extra:
4656
5021
# We checked local, and found nothing extra
4657
message('This branch is up to date.\n')
5022
message(gettext('This branch has no new revisions.\n'))
4658
5023
elif theirs_only and not remote_extra:
4659
5024
# We checked remote, and found nothing extra
4660
message('Other branch is up to date.\n')
5025
message(gettext('Other branch has no new revisions.\n'))
4661
5026
elif not (mine_only or theirs_only or local_extra or
4662
5027
remote_extra):
4663
5028
# We checked both branches, and neither one had extra
4664
5029
# revisions
4665
message("Branches are up to date.\n")
5030
message(gettext("Branches are up to date.\n"))
4666
5031
self.cleanup_now()
4667
5032
if not status_code and parent is None and other_branch is not None:
4668
5033
self.add_cleanup(local_branch.lock_write().unlock)
4698
5063
]
4699
5064
4700
5065
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4701
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
5066
dir = controldir.ControlDir.open_containing(branch_or_repo)[0]
4702
5067
try:
4703
5068
branch = dir.open_branch()
4704
5069
repository = branch.repository
4829
5194
4830
5195
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4831
5196
if revision_id_list is not None and revision is not None:
4832
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'))
4833
5198
if revision_id_list is None and revision is None:
4834
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'))
4835
5200
b = WorkingTree.open_containing(directory)[0].branch
4836
5201
self.add_cleanup(b.lock_write().unlock)
4837
5202
return self._run(b, revision_id_list, revision)
4838
5203
4839
5204
def _run(self, b, revision_id_list, revision):
4840
5205
import bzrlib.gpg as gpg
4841
gpg_strategy = gpg.GPGStrategy(b.get_config())
5206
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4842
5207
if revision_id_list is not None:
4843
5208
b.repository.start_write_group()
4844
5209
try:
4869
5234
if to_revid is None:
4870
5235
to_revno = b.revno()
4871
5236
if from_revno is None or to_revno is None:
4872
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'))
4873
5238
b.repository.start_write_group()
4874
5239
try:
4875
5240
for revno in range(from_revno, to_revno + 1):
4881
5246
else:
4882
5247
b.repository.commit_write_group()
4883
5248
else:
4884
raise errors.BzrCommandError('Please supply either one revision, or a range.')
5249
raise errors.BzrCommandError(gettext('Please supply either one revision, or a range.'))
4885
5250
4886
5251
4887
5252
class cmd_bind(Command):
4906
5271
try:
4907
5272
location = b.get_old_bound_location()
4908
5273
except errors.UpgradeRequired:
4909
raise errors.BzrCommandError('No location supplied. '
4910
'This format does not remember old locations.')
5274
raise errors.BzrCommandError(gettext('No location supplied. '
5275
'This format does not remember old locations.'))
4911
5276
else:
4912
5277
if location is None:
4913
5278
if b.get_bound_location() is not None:
4914
raise errors.BzrCommandError('Branch is already bound')
5279
raise errors.BzrCommandError(
5280
gettext('Branch is already bound'))
4915
5281
else:
4916
raise errors.BzrCommandError('No location supplied '
4917
'and no previous location known')
5282
raise errors.BzrCommandError(
5283
gettext('No location supplied'
5284
' and no previous location known'))
4918
5285
b_other = Branch.open(location)
4919
5286
try:
4920
5287
b.bind(b_other)
4921
5288
except errors.DivergedBranches:
4922
raise errors.BzrCommandError('These branches have diverged.'
4923
' Try merging, and then bind again.')
5289
raise errors.BzrCommandError(gettext('These branches have diverged.'
5290
' Try merging, and then bind again.'))
4924
5291
if b.get_config().has_explicit_nickname():
4925
5292
b.nick = b_other.nick
4926
5293
4939
5306
def run(self, directory=u'.'):
4940
5307
b, relpath = Branch.open_containing(directory)
4941
5308
if not b.unbind():
4942
raise errors.BzrCommandError('Local branch is not bound')
5309
raise errors.BzrCommandError(gettext('Local branch is not bound'))
4943
5310
4944
5311
4945
5312
class cmd_uncommit(Command):
4966
5333
takes_options = ['verbose', 'revision',
4967
5334
Option('dry-run', help='Don\'t actually make changes.'),
4968
5335
Option('force', help='Say yes to all questions.'),
5336
Option('keep-tags',
5337
help='Keep tags that point to removed revisions.'),
4969
5338
Option('local',
4970
5339
help="Only remove the commits from the local branch"
4971
5340
" when in a checkout."
4975
5344
aliases = []
4976
5345
encoding_type = 'replace'
4977
5346
4978
def run(self, location=None,
4979
dry_run=False, verbose=False,
4980
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):
4981
5349
if location is None:
4982
5350
location = u'.'
4983
control, relpath = bzrdir.BzrDir.open_containing(location)
5351
control, relpath = controldir.ControlDir.open_containing(location)
4984
5352
try:
4985
5353
tree = control.open_workingtree()
4986
5354
b = tree.branch
4992
5360
self.add_cleanup(tree.lock_write().unlock)
4993
5361
else:
4994
5362
self.add_cleanup(b.lock_write().unlock)
4995
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)
4996
5365
4997
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):
4998
5368
from bzrlib.log import log_formatter, show_log
4999
5369
from bzrlib.uncommit import uncommit
5000
5370
5015
5385
rev_id = b.get_rev_id(revno)
5016
5386
5017
5387
if rev_id is None or _mod_revision.is_null(rev_id):
5018
self.outf.write('No revisions to uncommit.\n')
5388
self.outf.write(gettext('No revisions to uncommit.\n'))
5019
5389
return 1
5020
5390
5021
5391
lf = log_formatter('short',
5030
5400
end_revision=last_revno)
5031
5401
5032
5402
if dry_run:
5033
self.outf.write('Dry-run, pretending to remove'
5034
' the above revisions.\n')
5403
self.outf.write(gettext('Dry-run, pretending to remove'
5404
' the above revisions.\n'))
5035
5405
else:
5036
self.outf.write('The above revision(s) will be removed.\n')
5406
self.outf.write(gettext('The above revision(s) will be removed.\n'))
5037
5407
5038
5408
if not force:
5039
5409
if not ui.ui_factory.confirm_action(
5040
u'Uncommit these revisions',
5410
gettext(u'Uncommit these revisions'),
5041
5411
'bzrlib.builtins.uncommit',
5042
5412
{}):
5043
self.outf.write('Canceled\n')
5413
self.outf.write(gettext('Canceled\n'))
5044
5414
return 0
5045
5415
5046
5416
mutter('Uncommitting from {%s} to {%s}',
5047
5417
last_rev_id, rev_id)
5048
5418
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5049
revno=revno, local=local)
5050
self.outf.write('You can restore the old tip by running:\n'
5051
' 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)
5052
5422
5053
5423
5054
5424
class cmd_break_lock(Command):
5088
5458
conf = _mod_config.LockableConfig(file_name=location)
5089
5459
conf.break_lock()
5090
5460
else:
5091
control, relpath = bzrdir.BzrDir.open_containing(location)
5461
control, relpath = controldir.ControlDir.open_containing(location)
5092
5462
try:
5093
5463
control.break_lock()
5094
5464
except NotImplementedError:
5121
5491
help="Protocol to serve.",
5122
5492
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5123
5493
value_switches=True),
5494
Option('listen',
5495
help='Listen for connections on nominated address.', type=str),
5124
5496
Option('port',
5125
help='Listen for connections on nominated port of the form '
5126
'[hostname:]portnumber. Passing 0 as the port number will '
5127
'result in a dynamically allocated port. The default port '
5128
'depends on the protocol.',
5129
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),
5130
5501
custom_help('directory',
5131
5502
help='Serve contents of this directory.'),
5132
5503
Option('allow-writes',
5138
5509
'option leads to global uncontrolled write access to your '
5139
5510
'file system.'
5140
5511
),
5512
Option('client-timeout', type=float,
5513
help='Override the default idle client timeout (5min).'),
5141
5514
]
5142
5515
5143
def get_host_and_port(self, port):
5144
"""Return the host and port to run the smart server on.
5145
5146
If 'port' is None, None will be returned for the host and port.
5147
5148
If 'port' has a colon in it, the string before the colon will be
5149
interpreted as the host.
5150
5151
:param port: A string of the port to run the server on.
5152
:return: A tuple of (host, port), where 'host' is a host name or IP,
5153
and port is an integer TCP/IP port.
5154
"""
5155
host = None
5156
if port is not None:
5157
if ':' in port:
5158
host, port = port.split(':')
5159
port = int(port)
5160
return host, port
5161
5162
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5163
protocol=None):
5516
def run(self, listen=None, port=None, inet=False, directory=None,
5517
allow_writes=False, protocol=None, client_timeout=None):
5164
5518
from bzrlib import transport
5165
5519
if directory is None:
5166
5520
directory = os.getcwd()
5167
5521
if protocol is None:
5168
5522
protocol = transport.transport_server_registry.get()
5169
host, port = self.get_host_and_port(port)
5170
url = urlutils.local_path_to_url(directory)
5523
url = transport.location_to_url(directory)
5171
5524
if not allow_writes:
5172
5525
url = 'readonly+' + url
5173
t = transport.get_transport(url)
5174
protocol(t, host, port, inet)
5526
t = transport.get_transport_from_url(url)
5527
protocol(t, listen, port, inet, client_timeout)
5175
5528
5176
5529
5177
5530
class cmd_join(Command):
5200
5553
containing_tree = WorkingTree.open_containing(parent_dir)[0]
5201
5554
repo = containing_tree.branch.repository
5202
5555
if not repo.supports_rich_root():
5203
raise errors.BzrCommandError(
5556
raise errors.BzrCommandError(gettext(
5204
5557
"Can't join trees because %s doesn't support rich root data.\n"
5205
"You can use bzr upgrade on the repository."
5558
"You can use bzr upgrade on the repository.")
5206
5559
% (repo,))
5207
5560
if reference:
5208
5561
try:
5210
5563
except errors.BadReferenceTarget, e:
5211
5564
# XXX: Would be better to just raise a nicely printable
5212
5565
# exception from the real origin. Also below. mbp 20070306
5213
raise errors.BzrCommandError("Cannot join %s. %s" %
5214
(tree, e.reason))
5566
raise errors.BzrCommandError(
5567
gettext("Cannot join {0}. {1}").format(tree, e.reason))
5215
5568
else:
5216
5569
try:
5217
5570
containing_tree.subsume(sub_tree)
5218
5571
except errors.BadSubsumeSource, e:
5219
raise errors.BzrCommandError("Cannot join %s. %s" %
5220
(tree, e.reason))
5572
raise errors.BzrCommandError(
5573
gettext("Cannot join {0}. {1}").format(tree, e.reason))
5221
5574
5222
5575
5223
5576
class cmd_split(Command):
5307
5660
if submit_branch is None:
5308
5661
submit_branch = branch.get_parent()
5309
5662
if submit_branch is None:
5310
raise errors.BzrCommandError('No submit branch specified or known')
5663
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5311
5664
5312
5665
stored_public_branch = branch.get_public_branch()
5313
5666
if public_branch is None:
5314
5667
public_branch = stored_public_branch
5315
5668
elif stored_public_branch is None:
5669
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5316
5670
branch.set_public_branch(public_branch)
5317
5671
if not include_bundle and public_branch is None:
5318
raise errors.BzrCommandError('No public branch specified or'
5319
' known')
5672
raise errors.BzrCommandError(gettext('No public branch specified or'
5673
' known'))
5320
5674
base_revision_id = None
5321
5675
if revision is not None:
5322
5676
if len(revision) > 2:
5323
raise errors.BzrCommandError('bzr merge-directive takes '
5324
'at most two one revision identifiers')
5677
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5678
'at most two one revision identifiers'))
5325
5679
revision_id = revision[-1].as_revision_id(branch)
5326
5680
if len(revision) == 2:
5327
5681
base_revision_id = revision[0].as_revision_id(branch)
5329
5683
revision_id = branch.last_revision()
5330
5684
revision_id = ensure_null(revision_id)
5331
5685
if revision_id == NULL_REVISION:
5332
raise errors.BzrCommandError('No revisions to bundle.')
5686
raise errors.BzrCommandError(gettext('No revisions to bundle.'))
5333
5687
directive = merge_directive.MergeDirective2.from_objects(
5334
5688
branch.repository, revision_id, time.time(),
5335
5689
osutils.local_time_offset(), submit_branch,
5343
5697
self.outf.writelines(directive.to_lines())
5344
5698
else:
5345
5699
message = directive.to_email(mail_to, branch, sign)
5346
s = SMTPConnection(branch.get_config())
5700
s = SMTPConnection(branch.get_config_stack())
5347
5701
s.send_email(message)
5348
5702
5349
5703
5381
5735
5382
5736
Both the submit branch and the public branch follow the usual behavior with
5383
5737
respect to --remember: If there is no default location set, the first send
5384
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
5385
5739
omit the location to use the default. To change the default, use
5386
5740
--remember. The value will only be saved if the location can be accessed.
5387
5741
5589
5943
self.add_cleanup(branch.lock_write().unlock)
5590
5944
if delete:
5591
5945
if tag_name is None:
5592
raise errors.BzrCommandError("No tag specified to delete.")
5946
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5593
5947
branch.tags.delete_tag(tag_name)
5594
note('Deleted tag %s.' % tag_name)
5948
note(gettext('Deleted tag %s.') % tag_name)
5595
5949
else:
5596
5950
if revision:
5597
5951
if len(revision) != 1:
5598
raise errors.BzrCommandError(
5952
raise errors.BzrCommandError(gettext(
5599
5953
"Tags can only be placed on a single revision, "
5600
"not on a range")
5954
"not on a range"))
5601
5955
revision_id = revision[0].as_revision_id(branch)
5602
5956
else:
5603
5957
revision_id = branch.last_revision()
5604
5958
if tag_name is None:
5605
5959
tag_name = branch.automatic_tag_name(revision_id)
5606
5960
if tag_name is None:
5607
raise errors.BzrCommandError(
5608
"Please specify a tag name.")
5609
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):
5610
5968
raise errors.TagAlreadyExists(tag_name)
5611
branch.tags.set_tag(tag_name, revision_id)
5612
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)
5613
5977
5614
5978
5615
5979
class cmd_tags(Command):
5641
6005
5642
6006
self.add_cleanup(branch.lock_read().unlock)
5643
6007
if revision:
5644
graph = branch.repository.get_graph()
5645
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5646
revid1, revid2 = rev1.rev_id, rev2.rev_id
5647
# only show revisions between revid1 and revid2 (inclusive)
5648
tags = [(tag, revid) for tag, revid in tags if
5649
graph.is_between(revid, revid1, revid2)]
6008
# Restrict to the specified range
6009
tags = self._tags_for_range(branch, revision)
5650
6010
if sort is None:
5651
6011
sort = tag_sort_methods.get()
5652
6012
sort(branch, tags)
5657
6017
revno = branch.revision_id_to_dotted_revno(revid)
5658
6018
if isinstance(revno, tuple):
5659
6019
revno = '.'.join(map(str, revno))
5660
except (errors.NoSuchRevision, errors.GhostRevisionsHaveNoRevno):
6020
except (errors.NoSuchRevision,
6021
errors.GhostRevisionsHaveNoRevno,
6022
errors.UnsupportedOperation):
5661
6023
# Bad tag data/merges can lead to tagged revisions
5662
6024
# which are not in this branch. Fail gracefully ...
5663
6025
revno = '?'
5666
6028
for tag, revspec in tags:
5667
6029
self.outf.write('%-20s %s\n' % (tag, revspec))
5668
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
5669
6057
5670
6058
class cmd_reconfigure(Command):
5671
6059
__doc__ = """Reconfigure the type of a bzr directory.
5685
6073
takes_args = ['location?']
5686
6074
takes_options = [
5687
6075
RegistryOption.from_kwargs(
5688
'target_type',
5689
title='Target type',
5690
help='The type to reconfigure the directory to.',
6076
'tree_type',
6077
title='Tree type',
6078
help='The relation between branch and tree.',
5691
6079
value_switches=True, enum_switch=False,
5692
6080
branch='Reconfigure to be an unbound branch with no working tree.',
5693
6081
tree='Reconfigure to be an unbound branch with a working tree.',
5694
6082
checkout='Reconfigure to be a bound branch with a working tree.',
5695
6083
lightweight_checkout='Reconfigure to be a lightweight'
5696
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,
5697
6091
standalone='Reconfigure to be a standalone branch '
5698
6092
'(i.e. stop using shared repository).',
5699
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,
5700
6100
with_trees='Reconfigure repository to create '
5701
6101
'working trees on branches by default.',
5702
6102
with_no_trees='Reconfigure repository to not create '
5716
6116
),
5717
6117
]
5718
6118
5719
def run(self, location=None, target_type=None, bind_to=None, force=False,
5720
stacked_on=None,
5721
unstacked=None):
5722
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)
5723
6123
if stacked_on and unstacked:
5724
raise errors.BzrCommandError("Can't use both --stacked-on and --unstacked")
6124
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5725
6125
elif stacked_on is not None:
5726
6126
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5727
6127
elif unstacked:
5729
6129
# At the moment you can use --stacked-on and a different
5730
6130
# reconfiguration shape at the same time; there seems no good reason
5731
6131
# to ban it.
5732
if target_type is None:
6132
if (tree_type is None and
6133
repository_type is None and
6134
repository_trees is None):
5733
6135
if stacked_on or unstacked:
5734
6136
return
5735
6137
else:
5736
raise errors.BzrCommandError('No target configuration '
5737
'specified')
5738
elif target_type == 'branch':
6138
raise errors.BzrCommandError(gettext('No target configuration '
6139
'specified'))
6140
reconfiguration = None
6141
if tree_type == 'branch':
5739
6142
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5740
elif target_type == 'tree':
6143
elif tree_type == 'tree':
5741
6144
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5742
elif target_type == 'checkout':
6145
elif tree_type == 'checkout':
5743
6146
reconfiguration = reconfigure.Reconfigure.to_checkout(
5744
6147
directory, bind_to)
5745
elif target_type == 'lightweight-checkout':
6148
elif tree_type == 'lightweight-checkout':
5746
6149
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5747
6150
directory, bind_to)
5748
elif target_type == 'use-shared':
6151
if reconfiguration:
6152
reconfiguration.apply(force)
6153
reconfiguration = None
6154
if repository_type == 'use-shared':
5749
6155
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5750
elif target_type == 'standalone':
6156
elif repository_type == 'standalone':
5751
6157
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5752
elif target_type == 'with-trees':
6158
if reconfiguration:
6159
reconfiguration.apply(force)
6160
reconfiguration = None
6161
if repository_trees == 'with-trees':
5753
6162
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5754
6163
directory, True)
5755
elif target_type == 'with-no-trees':
6164
elif repository_trees == 'with-no-trees':
5756
6165
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5757
6166
directory, False)
5758
reconfiguration.apply(force)
6167
if reconfiguration:
6168
reconfiguration.apply(force)
6169
reconfiguration = None
5759
6170
5760
6171
5761
6172
class cmd_switch(Command):
5796
6207
from bzrlib import switch
5797
6208
tree_location = directory
5798
6209
revision = _get_one_revision('switch', revision)
5799
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]
5800
6213
if to_location is None:
5801
6214
if revision is None:
5802
raise errors.BzrCommandError('You must supply either a'
5803
' revision or a location')
6215
raise errors.BzrCommandError(gettext('You must supply either a'
6216
' revision or a location'))
5804
6217
to_location = tree_location
5805
6218
try:
5806
branch = control_dir.open_branch()
6219
branch = control_dir.open_branch(
6220
possible_transports=possible_transports)
5807
6221
had_explicit_nick = branch.get_config().has_explicit_nickname()
5808
6222
except errors.NotBranchError:
5809
6223
branch = None
5810
6224
had_explicit_nick = False
5811
6225
if create_branch:
5812
6226
if branch is None:
5813
raise errors.BzrCommandError('cannot create branch without'
5814
' source branch')
5815
to_location = directory_service.directories.dereference(
5816
to_location)
5817
if '/' not in to_location and '\\' not in to_location:
5818
# This path is meant to be relative to the existing branch
5819
this_url = self._get_branch_location(control_dir)
5820
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)
5821
6231
to_branch = branch.bzrdir.sprout(to_location,
5822
possible_transports=[branch.bzrdir.root_transport],
5823
source_branch=branch).open_branch()
6232
possible_transports=possible_transports,
6233
source_branch=branch).open_branch()
5824
6234
else:
5825
6235
try:
5826
to_branch = Branch.open(to_location)
6236
to_branch = Branch.open(to_location,
6237
possible_transports=possible_transports)
5827
6238
except errors.NotBranchError:
5828
this_url = self._get_branch_location(control_dir)
5829
to_branch = Branch.open(
5830
urlutils.join(this_url, '..', to_location))
6239
to_branch = open_sibling_branch(control_dir, to_location,
6240
possible_transports=possible_transports)
5831
6241
if revision is not None:
5832
6242
revision = revision.as_revision_id(to_branch)
5833
6243
switch.switch(control_dir, to_branch, force, revision_id=revision)
5834
6244
if had_explicit_nick:
5835
6245
branch = control_dir.open_branch() #get the new branch!
5836
6246
branch.nick = to_branch.nick
5837
note('Switched to branch: %s',
6247
note(gettext('Switched to branch: %s'),
5838
6248
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5839
6249
5840
def _get_branch_location(self, control_dir):
5841
"""Return location of branch for this control dir."""
5842
try:
5843
this_branch = control_dir.open_branch()
5844
# This may be a heavy checkout, where we want the master branch
5845
master_location = this_branch.get_bound_location()
5846
if master_location is not None:
5847
return master_location
5848
# If not, use a local sibling
5849
return this_branch.base
5850
except errors.NotBranchError:
5851
format = control_dir.find_branch_format()
5852
if getattr(format, 'get_reference', None) is not None:
5853
return format.get_reference(control_dir)
5854
else:
5855
return control_dir.root_transport.base
5856
6250
5857
6251
5858
6252
class cmd_view(Command):
5949
6343
name = current_view
5950
6344
if delete:
5951
6345
if file_list:
5952
raise errors.BzrCommandError(
5953
"Both --delete and a file list specified")
6346
raise errors.BzrCommandError(gettext(
6347
"Both --delete and a file list specified"))
5954
6348
elif switch:
5955
raise errors.BzrCommandError(
5956
"Both --delete and --switch specified")
6349
raise errors.BzrCommandError(gettext(
6350
"Both --delete and --switch specified"))
5957
6351
elif all:
5958
6352
tree.views.set_view_info(None, {})
5959
self.outf.write("Deleted all views.\n")
6353
self.outf.write(gettext("Deleted all views.\n"))
5960
6354
elif name is None:
5961
raise errors.BzrCommandError("No current view to delete")
6355
raise errors.BzrCommandError(gettext("No current view to delete"))
5962
6356
else:
5963
6357
tree.views.delete_view(name)
5964
self.outf.write("Deleted '%s' view.\n" % name)
6358
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5965
6359
elif switch:
5966
6360
if file_list:
5967
raise errors.BzrCommandError(
5968
"Both --switch and a file list specified")
6361
raise errors.BzrCommandError(gettext(
6362
"Both --switch and a file list specified"))
5969
6363
elif all:
5970
raise errors.BzrCommandError(
5971
"Both --switch and --all specified")
6364
raise errors.BzrCommandError(gettext(
6365
"Both --switch and --all specified"))
5972
6366
elif switch == 'off':
5973
6367
if current_view is None:
5974
raise errors.BzrCommandError("No current view to disable")
6368
raise errors.BzrCommandError(gettext("No current view to disable"))
5975
6369
tree.views.set_view_info(None, view_dict)
5976
self.outf.write("Disabled '%s' view.\n" % (current_view))
6370
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5977
6371
else:
5978
6372
tree.views.set_view_info(switch, view_dict)
5979
6373
view_str = views.view_display_str(tree.views.lookup_view())
5980
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))
5981
6375
elif all:
5982
6376
if view_dict:
5983
self.outf.write('Views defined:\n')
6377
self.outf.write(gettext('Views defined:\n'))
5984
6378
for view in sorted(view_dict):
5985
6379
if view == current_view:
5986
6380
active = "=>"
5989
6383
view_str = views.view_display_str(view_dict[view])
5990
6384
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5991
6385
else:
5992
self.outf.write('No views defined.\n')
6386
self.outf.write(gettext('No views defined.\n'))
5993
6387
elif file_list:
5994
6388
if name is None:
5995
6389
# No name given and no current view set
5996
6390
name = 'my'
5997
6391
elif name == 'off':
5998
raise errors.BzrCommandError(
5999
"Cannot change the 'off' pseudo view")
6392
raise errors.BzrCommandError(gettext(
6393
"Cannot change the 'off' pseudo view"))
6000
6394
tree.views.set_view(name, sorted(file_list))
6001
6395
view_str = views.view_display_str(tree.views.lookup_view())
6002
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))
6003
6397
else:
6004
6398
# list the files
6005
6399
if name is None:
6006
6400
# No name given and no current view set
6007
self.outf.write('No current view.\n')
6401
self.outf.write(gettext('No current view.\n'))
6008
6402
else:
6009
6403
view_str = views.view_display_str(tree.views.lookup_view(name))
6010
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))
6011
6405
6012
6406
6013
6407
class cmd_hooks(Command):
6027
6421
self.outf.write(" %s\n" %
6028
6422
(some_hooks.get_hook_name(hook),))
6029
6423
else:
6030
self.outf.write(" <no hooks installed>\n")
6424
self.outf.write(gettext(" <no hooks installed>\n"))
6031
6425
6032
6426
6033
6427
class cmd_remove_branch(Command):
6046
6440
6047
6441
takes_args = ["location?"]
6048
6442
6443
takes_options = ['directory',
6444
Option('force', help='Remove branch even if it is the active branch.')]
6445
6049
6446
aliases = ["rmbranch"]
6050
6447
6051
def run(self, location=None):
6052
if location is None:
6053
location = "."
6054
branch = Branch.open_containing(location)[0]
6055
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)
6056
6460
6057
6461
6058
6462
class cmd_shelve(Command):
6134
6538
manager = tree.get_shelf_manager()
6135
6539
shelves = manager.active_shelves()
6136
6540
if len(shelves) == 0:
6137
note('No shelved changes.')
6541
note(gettext('No shelved changes.'))
6138
6542
return 0
6139
6543
for shelf_id in reversed(shelves):
6140
6544
message = manager.get_metadata(shelf_id).get('message')
6229
6633
if path is not None:
6230
6634
branchdir = path
6231
6635
tree, branch, relpath =(
6232
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6636
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
6233
6637
if path is not None:
6234
6638
path = relpath
6235
6639
if tree is None:
6263
6667
__doc__ = """Export command helps and error messages in po format."""
6264
6668
6265
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
]
6266
6678
6267
def run(self):
6679
def run(self, plugin=None, include_duplicates=False):
6268
6680
from bzrlib.export_pot import export_pot
6269
export_pot(self.outf)
6681
export_pot(self.outf, plugin, include_duplicates)
6270
6682
6271
6683
6272
6684
def _register_lazy_builtins():
6280
6692
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6281
6693
('cmd_conflicts', [], 'bzrlib.conflicts'),
6282
6694
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6283
('cmd_verify_signatures', [],
6284
'bzrlib.commit_signature_commands'),
6695
('cmd_verify_signatures', [], 'bzrlib.commit_signature_commands'),
6285
6696
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6286
6697
]:
6287
6698
builtin_command_registry.register_lazy(name, aliases, module_name)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1