« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 6581
- compare with another revision
- download diff
- download tarball
- view history from revision 6581
- Committer: Patch Queue Manager
- Date: 2013-07-14 10:59:28 UTC
- mfrom: (6579.2.1 1195783-platform-utf8)
- Revision ID: pqm@pqm.ubuntu.com-20130714105928-78j748r1djstxmo1
(vila) Make 'bzr version' support utf8 platform names. (Vincent Ladeuil)
- files added:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- 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/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- .bzrignore
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,
49
54
ui,
50
55
urlutils,
51
56
views,
57
gpg,
52
58
)
53
59
from bzrlib.branch import Branch
54
60
from bzrlib.conflicts import ConflictList
56
62
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
57
63
from bzrlib.smtp_connection import SMTPConnection
58
64
from bzrlib.workingtree import WorkingTree
65
from bzrlib.i18n import gettext, ngettext
59
66
""")
60
67
61
68
from bzrlib.commands import (
76
83
)
77
84
78
85
79
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
80
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
apply_view=True):
82
return internal_tree_files(file_list, default_branch, canonicalize,
83
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
84
221
85
222
86
223
def tree_files_for_add(file_list):
111
248
if view_files:
112
249
file_list = view_files
113
250
view_str = views.view_display_str(view_files)
114
note("Ignoring files outside view. View is %s" % view_str)
251
note(gettext("Ignoring files outside view. View is %s") % view_str)
115
252
return tree, file_list
116
253
117
254
119
256
if revisions is None:
120
257
return None
121
258
if len(revisions) != 1:
122
raise errors.BzrCommandError(
123
'bzr %s --revision takes exactly one revision identifier' % (
259
raise errors.BzrCommandError(gettext(
260
'bzr %s --revision takes exactly one revision identifier') % (
124
261
command_name,))
125
262
return revisions[0]
126
263
148
285
return rev_tree
149
286
150
287
151
# XXX: Bad function name; should possibly also be a class method of
152
# WorkingTree rather than a function.
153
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
154
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
155
apply_view=True):
156
"""Convert command-line paths to a WorkingTree and relative paths.
157
158
Deprecated: use WorkingTree.open_containing_paths instead.
159
160
This is typically used for command-line processors that take one or
161
more filenames, and infer the workingtree that contains them.
162
163
The filenames given are not required to exist.
164
165
:param file_list: Filenames to convert.
166
167
:param default_branch: Fallback tree path to use if file_list is empty or
168
None.
169
170
:param apply_view: if True and a view is set, apply it or check that
171
specified files are within it
172
173
:return: workingtree, [relative_paths]
174
"""
175
return WorkingTree.open_containing_paths(
176
file_list, default_directory='.',
177
canonicalize=True,
178
apply_view=True)
179
180
181
288
def _get_view_info_for_change_reporter(tree):
182
289
"""Get the view information from a tree for change reporting."""
183
290
view_info = None
195
302
the --directory option is used to specify a different branch."""
196
303
if directory is not None:
197
304
return (None, Branch.open(directory), filename)
198
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
305
return controldir.ControlDir.open_containing_tree_or_branch(filename)
199
306
200
307
201
308
# TODO: Make sure no commands unconditionally use the working directory as a
231
338
unknown
232
339
Not versioned and not matching an ignore pattern.
233
340
234
Additionally for directories, symlinks and files with an executable
235
bit, Bazaar indicates their type using a trailing character: '/', '@'
236
or '*' respectively.
341
Additionally for directories, symlinks and files with a changed
342
executable bit, Bazaar indicates their type using a trailing
343
character: '/', '@' or '*' respectively. These decorations can be
344
disabled using the '--no-classify' option.
237
345
238
346
To see ignored files use 'bzr ignored'. For details on the
239
347
changes to file texts, use 'bzr diff'.
260
368
This will produce the same results as calling 'bzr diff --summarize'.
261
369
"""
262
370
263
# TODO: --no-recurse, --recurse options
371
# TODO: --no-recurse/-N, --recurse options
264
372
265
373
takes_args = ['file*']
266
374
takes_options = ['show-ids', 'revision', 'change', 'verbose',
270
378
short_name='V'),
271
379
Option('no-pending', help='Don\'t show pending merges.',
272
380
),
381
Option('no-classify',
382
help='Do not mark object type using indicator.',
383
),
273
384
]
274
385
aliases = ['st', 'stat']
275
386
278
389
279
390
@display_command
280
391
def run(self, show_ids=False, file_list=None, revision=None, short=False,
281
versioned=False, no_pending=False, verbose=False):
392
versioned=False, no_pending=False, verbose=False,
393
no_classify=False):
282
394
from bzrlib.status import show_tree_status
283
395
284
396
if revision and len(revision) > 2:
285
raise errors.BzrCommandError('bzr status --revision takes exactly'
286
' one or two revision specifiers')
397
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
398
' one or two revision specifiers'))
287
399
288
400
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
289
401
# Avoid asking for specific files when that is not needed.
298
410
show_tree_status(tree, show_ids=show_ids,
299
411
specific_files=relfile_list, revision=revision,
300
412
to_file=self.outf, short=short, versioned=versioned,
301
show_pending=(not no_pending), verbose=verbose)
413
show_pending=(not no_pending), verbose=verbose,
414
classify=not no_classify)
302
415
303
416
304
417
class cmd_cat_revision(Command):
325
438
@display_command
326
439
def run(self, revision_id=None, revision=None, directory=u'.'):
327
440
if revision_id is not None and revision is not None:
328
raise errors.BzrCommandError('You can only supply one of'
329
' revision_id or --revision')
441
raise errors.BzrCommandError(gettext('You can only supply one of'
442
' revision_id or --revision'))
330
443
if revision_id is None and revision is None:
331
raise errors.BzrCommandError('You must supply either'
332
' --revision or a revision_id')
444
raise errors.BzrCommandError(gettext('You must supply either'
445
' --revision or a revision_id'))
333
446
334
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
447
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
335
448
336
449
revisions = b.repository.revisions
337
450
if revisions is None:
338
raise errors.BzrCommandError('Repository %r does not support '
339
'access to raw revision texts')
451
raise errors.BzrCommandError(gettext('Repository %r does not support '
452
'access to raw revision texts'))
340
453
341
454
b.repository.lock_read()
342
455
try:
346
459
try:
347
460
self.print_revision(revisions, revision_id)
348
461
except errors.NoSuchRevision:
349
msg = "The repository %s contains no revision %s." % (
462
msg = gettext("The repository {0} contains no revision {1}.").format(
350
463
b.repository.base, revision_id)
351
464
raise errors.BzrCommandError(msg)
352
465
elif revision is not None:
353
466
for rev in revision:
354
467
if rev is None:
355
468
raise errors.BzrCommandError(
356
'You cannot specify a NULL revision.')
469
gettext('You cannot specify a NULL revision.'))
357
470
rev_id = rev.as_revision_id(b)
358
471
self.print_revision(revisions, rev_id)
359
472
finally:
465
578
location_list=['.']
466
579
467
580
for location in location_list:
468
d = bzrdir.BzrDir.open(location)
469
581
d = controldir.ControlDir.open(location)
582
470
583
try:
471
584
working = d.open_workingtree()
472
585
except errors.NoWorkingTree:
473
raise errors.BzrCommandError("No working tree to remove")
586
raise errors.BzrCommandError(gettext("No working tree to remove"))
474
587
except errors.NotLocalUrl:
475
raise errors.BzrCommandError("You cannot remove the working tree"
476
" of a remote path")
588
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
589
" of a remote path"))
477
590
if not force:
478
591
if (working.has_changes()):
479
592
raise errors.UncommittedChanges(working)
481
594
raise errors.ShelvedChanges(working)
482
595
483
596
if working.user_url != working.branch.user_url:
484
raise errors.BzrCommandError("You cannot remove the working tree"
485
" from a lightweight checkout")
597
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
598
" from a lightweight checkout"))
486
599
487
600
d.destroy_workingtree()
488
601
520
633
pass # There seems to be a real error here, so we'll reset
521
634
else:
522
635
# Refuse
523
raise errors.BzrCommandError(
636
raise errors.BzrCommandError(gettext(
524
637
'The tree does not appear to be corrupt. You probably'
525
638
' want "bzr revert" instead. Use "--force" if you are'
526
' sure you want to reset the working tree.')
639
' sure you want to reset the working tree.'))
527
640
if revision is None:
528
641
revision_ids = None
529
642
else:
532
645
tree.reset_state(revision_ids)
533
646
except errors.BzrError, e:
534
647
if revision_ids is None:
535
extra = (', the header appears corrupt, try passing -r -1'
536
' 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'))
537
650
else:
538
651
extra = ''
539
raise errors.BzrCommandError('failed to reset the tree state'
540
+ extra)
652
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
541
653
542
654
543
655
class cmd_revno(Command):
549
661
_see_also = ['info']
550
662
takes_args = ['location?']
551
663
takes_options = [
552
Option('tree', help='Show revno of working tree'),
664
Option('tree', help='Show revno of working tree.'),
665
'revision',
553
666
]
554
667
555
668
@display_command
556
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
557
674
if tree:
558
675
try:
559
676
wt = WorkingTree.open_containing(location)[0]
560
677
self.add_cleanup(wt.lock_read().unlock)
561
678
except (errors.NoWorkingTree, errors.NotLocalUrl):
562
679
raise errors.NoWorkingTree(location)
680
b = wt.branch
563
681
revid = wt.last_revision()
564
try:
565
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
566
except errors.NoSuchRevision:
567
revno_t = ('???',)
568
revno = ".".join(str(n) for n in revno_t)
569
682
else:
570
683
b = Branch.open_containing(location)[0]
571
684
self.add_cleanup(b.lock_read().unlock)
572
revno = b.revno()
685
if revision:
686
if len(revision) != 1:
687
raise errors.BzrCommandError(gettext(
688
"Revision numbers only make sense for single "
689
"revisions, not ranges"))
690
revid = revision[0].as_revision_id(b)
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)
573
698
self.cleanup_now()
574
self.outf.write(str(revno) + '\n')
699
self.outf.write(revno + '\n')
575
700
576
701
577
702
class cmd_revision_info(Command):
584
709
custom_help('directory',
585
710
help='Branch to examine, '
586
711
'rather than the one containing the working directory.'),
587
Option('tree', help='Show revno of working tree'),
712
Option('tree', help='Show revno of working tree.'),
588
713
]
589
714
590
715
@display_command
646
771
are added. This search proceeds recursively into versioned
647
772
directories. If no names are given '.' is assumed.
648
773
774
A warning will be printed when nested trees are encountered,
775
unless they are explicitly ignored.
776
649
777
Therefore simply saying 'bzr add' will version all files that
650
778
are currently unknown.
651
779
667
795
668
796
Any files matching patterns in the ignore list will not be added
669
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.
670
802
"""
671
803
takes_args = ['file*']
672
804
takes_options = [
673
805
Option('no-recurse',
674
help="Don't recursively add the contents of directories."),
806
help="Don't recursively add the contents of directories.",
807
short_name='N'),
675
808
Option('dry-run',
676
809
help="Show what would be done, but don't actually do anything."),
677
810
'verbose',
699
832
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
700
833
to_file=self.outf, should_print=(not is_quiet()))
701
834
else:
702
action = bzrlib.add.AddAction(to_file=self.outf,
835
action = bzrlib.add.AddWithSkipLargeAction(to_file=self.outf,
703
836
should_print=(not is_quiet()))
704
837
705
838
if base_tree:
712
845
if verbose:
713
846
for glob in sorted(ignored.keys()):
714
847
for path in ignored[glob]:
715
self.outf.write("ignored %s matching \"%s\"\n"
716
% (path, glob))
848
self.outf.write(
849
gettext("ignored {0} matching \"{1}\"\n").format(
850
path, glob))
717
851
718
852
719
853
class cmd_mkdir(Command):
723
857
"""
724
858
725
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
]
726
867
encoding_type = 'replace'
727
868
728
def run(self, dir_list):
729
for d in dir_list:
730
wt, dd = WorkingTree.open_containing(d)
731
base = os.path.dirname(dd)
732
id = wt.path2id(base)
733
if id != None:
734
os.mkdir(d)
735
wt.add([dd])
736
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
737
893
else:
738
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)
739
898
740
899
741
900
class cmd_relpath(Command):
777
936
@display_command
778
937
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
779
938
if kind and kind not in ['file', 'directory', 'symlink']:
780
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
939
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
781
940
782
941
revision = _get_one_revision('inventory', revision)
783
942
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
791
950
tree = work_tree
792
951
extra_trees = []
793
952
953
self.add_cleanup(tree.lock_read().unlock)
794
954
if file_list is not None:
795
955
file_ids = tree.paths2ids(file_list, trees=extra_trees,
796
956
require_versioned=True)
797
957
# find_ids_across_trees may include some paths that don't
798
958
# exist in 'tree'.
799
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
800
for file_id in file_ids if file_id in tree)
959
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
801
960
else:
802
entries = tree.inventory.entries()
961
entries = tree.iter_entries_by_dir()
803
962
804
self.cleanup_now()
805
for path, entry in entries:
963
for path, entry in sorted(entries):
806
964
if kind and kind != entry.kind:
807
965
continue
966
if path == "":
967
continue
808
968
if show_ids:
809
969
self.outf.write('%-50s %s\n' % (path, entry.file_id))
810
970
else:
846
1006
if auto:
847
1007
return self.run_auto(names_list, after, dry_run)
848
1008
elif dry_run:
849
raise errors.BzrCommandError('--dry-run requires --auto.')
1009
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
850
1010
if names_list is None:
851
1011
names_list = []
852
1012
if len(names_list) < 2:
853
raise errors.BzrCommandError("missing file argument")
1013
raise errors.BzrCommandError(gettext("missing file argument"))
854
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"))
855
1018
self.add_cleanup(tree.lock_tree_write().unlock)
856
1019
self._run(tree, names_list, rel_names, after)
857
1020
858
1021
def run_auto(self, names_list, after, dry_run):
859
1022
if names_list is not None and len(names_list) > 1:
860
raise errors.BzrCommandError('Only one path may be specified to'
861
' --auto.')
1023
raise errors.BzrCommandError(gettext('Only one path may be specified to'
1024
' --auto.'))
862
1025
if after:
863
raise errors.BzrCommandError('--after cannot be specified with'
864
' --auto.')
1026
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1027
' --auto.'))
865
1028
work_tree, file_list = WorkingTree.open_containing_paths(
866
1029
names_list, default_directory='.')
867
1030
self.add_cleanup(work_tree.lock_tree_write().unlock)
879
1042
and rel_names[0].lower() == rel_names[1].lower()):
880
1043
into_existing = False
881
1044
else:
882
inv = tree.inventory
883
1045
# 'fix' the case of a potential 'from'
884
1046
from_id = tree.path2id(
885
1047
tree.get_canonical_inventory_path(rel_names[0]))
886
1048
if (not osutils.lexists(names_list[0]) and
887
from_id and inv.get_file_kind(from_id) == "directory"):
1049
from_id and tree.stored_kind(from_id) == "directory"):
888
1050
into_existing = False
889
1051
# move/rename
890
1052
if into_existing:
897
1059
self.outf.write("%s => %s\n" % (src, dest))
898
1060
else:
899
1061
if len(names_list) != 2:
900
raise errors.BzrCommandError('to mv multiple files the'
1062
raise errors.BzrCommandError(gettext('to mv multiple files the'
901
1063
' destination must be a versioned'
902
' directory')
1064
' directory'))
903
1065
904
1066
# for cicp file-systems: the src references an existing inventory
905
1067
# item:
965
1127
branches have diverged.
966
1128
967
1129
If there is no default location set, the first pull will set it (use
968
--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
969
1131
location to use the default. To change the default, use --remember. The
970
1132
value will only be saved if the remote location can be accessed.
971
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
972
1138
Note: The location can be specified either in the form of a branch,
973
1139
or in the form of a path to a file containing a merge directive generated
974
1140
with bzr send.
987
1153
"the master branch."
988
1154
),
989
1155
Option('show-base',
990
help="Show base revision text in conflicts.")
1156
help="Show base revision text in conflicts."),
1157
Option('overwrite-tags',
1158
help="Overwrite tags only."),
991
1159
]
992
1160
takes_args = ['location?']
993
1161
encoding_type = 'replace'
995
1163
def run(self, location=None, remember=None, overwrite=False,
996
1164
revision=None, verbose=False,
997
1165
directory=None, local=False,
998
show_base=False):
1166
show_base=False, overwrite_tags=False):
1167
1168
if overwrite:
1169
overwrite = ["history", "tags"]
1170
elif overwrite_tags:
1171
overwrite = ["tags"]
1172
else:
1173
overwrite = []
999
1174
# FIXME: too much stuff is in the command class
1000
1175
revision_id = None
1001
1176
mergeable = None
1009
1184
tree_to = None
1010
1185
branch_to = Branch.open_containing(directory)[0]
1011
1186
self.add_cleanup(branch_to.lock_write().unlock)
1012
1013
if tree_to is None and show_base:
1014
raise errors.BzrCommandError("Need working tree for --show-base.")
1187
if show_base:
1188
warning(gettext("No working tree, ignoring --show-base"))
1015
1189
1016
1190
if local and not branch_to.get_bound_location():
1017
1191
raise errors.LocalRequiresBoundBranch()
1027
1201
stored_loc = branch_to.get_parent()
1028
1202
if location is None:
1029
1203
if stored_loc is None:
1030
raise errors.BzrCommandError("No pull location known or"
1031
" specified.")
1204
raise errors.BzrCommandError(gettext("No pull location known or"
1205
" specified."))
1032
1206
else:
1033
1207
display_url = urlutils.unescape_for_display(stored_loc,
1034
1208
self.outf.encoding)
1035
1209
if not is_quiet():
1036
self.outf.write("Using saved parent location: %s\n" % display_url)
1210
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1037
1211
location = stored_loc
1038
1212
1039
1213
revision = _get_one_revision('pull', revision)
1040
1214
if mergeable is not None:
1041
1215
if revision is not None:
1042
raise errors.BzrCommandError(
1043
'Cannot use -r with merge directives or bundles')
1216
raise errors.BzrCommandError(gettext(
1217
'Cannot use -r with merge directives or bundles'))
1044
1218
mergeable.install_revisions(branch_to.repository)
1045
1219
base_revision_id, revision_id, verified = \
1046
1220
mergeable.get_merge_request(branch_to.repository)
1052
1226
# Remembers if asked explicitly or no previous location is set
1053
1227
if (remember
1054
1228
or (remember is None and branch_to.get_parent() is None)):
1229
# FIXME: This shouldn't be done before the pull
1230
# succeeds... -- vila 2012-01-02
1055
1231
branch_to.set_parent(branch_from.base)
1056
1232
1057
1233
if revision is not None:
1064
1240
view_info=view_info)
1065
1241
result = tree_to.pull(
1066
1242
branch_from, overwrite, revision_id, change_reporter,
1067
possible_transports=possible_transports, local=local,
1068
show_base=show_base)
1243
local=local, show_base=show_base)
1069
1244
else:
1070
1245
result = branch_to.pull(
1071
1246
branch_from, overwrite, revision_id, local=local)
1102
1277
After that you will be able to do a push without '--overwrite'.
1103
1278
1104
1279
If there is no default push location set, the first push will set it (use
1105
--no-remember to avoid settting it). After that, you can omit the
1280
--no-remember to avoid setting it). After that, you can omit the
1106
1281
location to use the default. To change the default, use --remember. The
1107
1282
value will only be saved if the remote location can be accessed.
1283
1284
The --verbose option will display the revisions pushed using the log_format
1285
configuration option. You can use a different format by overriding it with
1286
-Olog_format=<other_format>.
1108
1287
"""
1109
1288
1110
1289
_see_also = ['pull', 'update', 'working-trees']
1134
1313
Option('no-tree',
1135
1314
help="Don't populate the working tree, even for protocols"
1136
1315
" that support it."),
1316
Option('overwrite-tags',
1317
help="Overwrite tags only."),
1137
1318
]
1138
1319
takes_args = ['location?']
1139
1320
encoding_type = 'replace'
1141
1322
def run(self, location=None, remember=None, overwrite=False,
1142
1323
create_prefix=False, verbose=False, revision=None,
1143
1324
use_existing_dir=False, directory=None, stacked_on=None,
1144
stacked=False, strict=None, no_tree=False):
1325
stacked=False, strict=None, no_tree=False,
1326
overwrite_tags=False):
1145
1327
from bzrlib.push import _show_push_branch
1146
1328
1329
if overwrite:
1330
overwrite = ["history", "tags"]
1331
elif overwrite_tags:
1332
overwrite = ["tags"]
1333
else:
1334
overwrite = []
1335
1147
1336
if directory is None:
1148
1337
directory = '.'
1149
1338
# Get the source branch
1150
1339
(tree, br_from,
1151
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1340
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1152
1341
# Get the tip's revision_id
1153
1342
revision = _get_one_revision('push', revision)
1154
1343
if revision is not None:
1175
1364
# error by the feedback given to them. RBC 20080227.
1176
1365
stacked_on = parent_url
1177
1366
if not stacked_on:
1178
raise errors.BzrCommandError(
1179
"Could not determine branch to refer to.")
1367
raise errors.BzrCommandError(gettext(
1368
"Could not determine branch to refer to."))
1180
1369
1181
1370
# Get the destination location
1182
1371
if location is None:
1183
1372
stored_loc = br_from.get_push_location()
1184
1373
if stored_loc is None:
1185
raise errors.BzrCommandError(
1186
"No push location known or specified.")
1374
parent_loc = br_from.get_parent()
1375
if parent_loc:
1376
raise errors.BzrCommandError(gettext(
1377
"No push location known or specified. To push to the "
1378
"parent branch (at %s), use 'bzr push :parent'." %
1379
urlutils.unescape_for_display(parent_loc,
1380
self.outf.encoding)))
1381
else:
1382
raise errors.BzrCommandError(gettext(
1383
"No push location known or specified."))
1187
1384
else:
1188
1385
display_url = urlutils.unescape_for_display(stored_loc,
1189
1386
self.outf.encoding)
1190
self.outf.write("Using saved push location: %s\n" % display_url)
1387
note(gettext("Using saved push location: %s") % display_url)
1191
1388
location = stored_loc
1192
1389
1193
1390
_show_push_branch(br_from, revision_id, location, self.outf,
1251
1448
deprecated_name=self.invoked_as,
1252
1449
recommended_name='branch',
1253
1450
deprecated_in_version='2.4')
1254
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1451
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1255
1452
from_location)
1256
1453
if not (hardlink or files_from):
1257
1454
# accelerator_tree is usually slower because you have to read N
1270
1467
# RBC 20060209
1271
1468
revision_id = br_from.last_revision()
1272
1469
if to_location is None:
1273
to_location = urlutils.derive_to_location(from_location)
1470
to_location = getattr(br_from, "name", None)
1471
if not to_location:
1472
to_location = urlutils.derive_to_location(from_location)
1274
1473
to_transport = transport.get_transport(to_location)
1275
1474
try:
1276
1475
to_transport.mkdir('.')
1277
1476
except errors.FileExists:
1278
if not use_existing_dir:
1279
raise errors.BzrCommandError('Target directory "%s" '
1280
'already exists.' % to_location)
1477
try:
1478
to_dir = controldir.ControlDir.open_from_transport(
1479
to_transport)
1480
except errors.NotBranchError:
1481
if not use_existing_dir:
1482
raise errors.BzrCommandError(gettext('Target directory "%s" '
1483
'already exists.') % to_location)
1484
else:
1485
to_dir = None
1281
1486
else:
1282
1487
try:
1283
bzrdir.BzrDir.open_from_transport(to_transport)
1488
to_dir.open_branch()
1284
1489
except errors.NotBranchError:
1285
1490
pass
1286
1491
else:
1287
1492
raise errors.AlreadyBranchError(to_location)
1288
1493
except errors.NoSuchFile:
1289
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1494
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1290
1495
% to_location)
1291
try:
1292
# preserve whatever source format we have.
1293
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1294
possible_transports=[to_transport],
1295
accelerator_tree=accelerator_tree,
1296
hardlink=hardlink, stacked=stacked,
1297
force_new_repo=standalone,
1298
create_tree_if_local=not no_tree,
1299
source_branch=br_from)
1300
branch = dir.open_branch()
1301
except errors.NoSuchRevision:
1302
to_transport.delete_tree('.')
1303
msg = "The branch %s has no revision %s." % (from_location,
1304
revision)
1305
raise errors.BzrCommandError(msg)
1496
else:
1497
to_dir = None
1498
if to_dir is None:
1499
try:
1500
# preserve whatever source format we have.
1501
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1502
possible_transports=[to_transport],
1503
accelerator_tree=accelerator_tree,
1504
hardlink=hardlink, stacked=stacked,
1505
force_new_repo=standalone,
1506
create_tree_if_local=not no_tree,
1507
source_branch=br_from)
1508
branch = to_dir.open_branch(
1509
possible_transports=[
1510
br_from.bzrdir.root_transport, to_transport])
1511
except errors.NoSuchRevision:
1512
to_transport.delete_tree('.')
1513
msg = gettext("The branch {0} has no revision {1}.").format(
1514
from_location, revision)
1515
raise errors.BzrCommandError(msg)
1516
else:
1517
try:
1518
to_repo = to_dir.open_repository()
1519
except errors.NoRepositoryPresent:
1520
to_repo = to_dir.create_repository()
1521
to_repo.fetch(br_from.repository, revision_id=revision_id)
1522
branch = br_from.sprout(to_dir, revision_id=revision_id)
1306
1523
_merge_tags_if_possible(br_from, branch)
1307
1524
# If the source branch is stacked, the new branch may
1308
1525
# be stacked whether we asked for that explicitly or not.
1309
1526
# We therefore need a try/except here and not just 'if stacked:'
1310
1527
try:
1311
note('Created new stacked branch referring to %s.' %
1528
note(gettext('Created new stacked branch referring to %s.') %
1312
1529
branch.get_stacked_on_url())
1313
1530
except (errors.NotStacked, errors.UnstackableBranchFormat,
1314
1531
errors.UnstackableRepositoryFormat), e:
1315
note('Branched %d revision(s).' % branch.revno())
1532
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1316
1533
if bind:
1317
1534
# Bind to the parent
1318
1535
parent_branch = Branch.open(from_location)
1319
1536
branch.bind(parent_branch)
1320
note('New branch bound to %s' % from_location)
1537
note(gettext('New branch bound to %s') % from_location)
1321
1538
if switch:
1322
1539
# Switch to the new branch
1323
1540
wt, _ = WorkingTree.open_containing('.')
1324
1541
_mod_switch.switch(wt.bzrdir, branch)
1325
note('Switched to branch: %s',
1542
note(gettext('Switched to branch: %s'),
1326
1543
urlutils.unescape_for_display(branch.base, 'utf-8'))
1327
1544
1328
1545
1546
class cmd_branches(Command):
1547
__doc__ = """List the branches available at the current location.
1548
1549
This command will print the names of all the branches at the current
1550
location.
1551
"""
1552
1553
takes_args = ['location?']
1554
takes_options = [
1555
Option('recursive', short_name='R',
1556
help='Recursively scan for branches rather than '
1557
'just looking in the specified location.')]
1558
1559
def run(self, location=".", recursive=False):
1560
if recursive:
1561
t = transport.get_transport(location)
1562
if not t.listable():
1563
raise errors.BzrCommandError(
1564
"Can't scan this type of location.")
1565
for b in controldir.ControlDir.find_branches(t):
1566
self.outf.write("%s\n" % urlutils.unescape_for_display(
1567
urlutils.relative_url(t.base, b.base),
1568
self.outf.encoding).rstrip("/"))
1569
else:
1570
dir = controldir.ControlDir.open_containing(location)[0]
1571
try:
1572
active_branch = dir.open_branch(name="")
1573
except errors.NotBranchError:
1574
active_branch = None
1575
names = {}
1576
for name, branch in iter_sibling_branches(dir):
1577
if name == "":
1578
continue
1579
active = (active_branch is not None and
1580
active_branch.base == branch.base)
1581
names[name] = active
1582
# Only mention the current branch explicitly if it's not
1583
# one of the colocated branches
1584
if not any(names.values()) and active_branch is not None:
1585
self.outf.write("* %s\n" % gettext("(default)"))
1586
for name in sorted(names.keys()):
1587
active = names[name]
1588
if active:
1589
prefix = "*"
1590
else:
1591
prefix = " "
1592
self.outf.write("%s %s\n" % (
1593
prefix, name.encode(self.outf.encoding)))
1594
1595
1329
1596
class cmd_checkout(Command):
1330
1597
__doc__ = """Create a new checkout of an existing branch.
1331
1598
1347
1614
code.)
1348
1615
"""
1349
1616
1350
_see_also = ['checkouts', 'branch']
1617
_see_also = ['checkouts', 'branch', 'working-trees', 'remove-tree']
1351
1618
takes_args = ['branch_location?', 'to_location?']
1352
1619
takes_options = ['revision',
1353
1620
Option('lightweight',
1370
1637
if branch_location is None:
1371
1638
branch_location = osutils.getcwd()
1372
1639
to_location = branch_location
1373
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1640
accelerator_tree, source = controldir.ControlDir.open_tree_or_branch(
1374
1641
branch_location)
1375
1642
if not (hardlink or files_from):
1376
1643
# accelerator_tree is usually slower because you have to read N
1413
1680
def run(self, dir=u'.'):
1414
1681
tree = WorkingTree.open_containing(dir)[0]
1415
1682
self.add_cleanup(tree.lock_read().unlock)
1416
new_inv = tree.inventory
1417
1683
old_tree = tree.basis_tree()
1418
1684
self.add_cleanup(old_tree.lock_read().unlock)
1419
old_inv = old_tree.inventory
1420
1685
renames = []
1421
1686
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1422
1687
for f, paths, c, v, p, n, k, e in iterator:
1431
1696
1432
1697
1433
1698
class cmd_update(Command):
1434
__doc__ = """Update a tree to have the latest code committed to its branch.
1435
1436
This will perform a merge into the working tree, and may generate
1437
conflicts. If you have any local changes, you will still
1438
need to commit them after the update for the update to be complete.
1439
1440
If you want to discard your local changes, you can just do a
1441
'bzr revert' instead of 'bzr commit' after the update.
1442
1443
If you want to restore a file that has been removed locally, use
1444
'bzr revert' instead of 'bzr update'.
1445
1446
If the tree's branch is bound to a master branch, it will also update
1699
__doc__ = """Update a working tree to a new revision.
1700
1701
This will perform a merge of the destination revision (the tip of the
1702
branch, or the specified revision) into the working tree, and then make
1703
that revision the basis revision for the working tree.
1704
1705
You can use this to visit an older revision, or to update a working tree
1706
that is out of date from its branch.
1707
1708
If there are any uncommitted changes in the tree, they will be carried
1709
across and remain as uncommitted changes after the update. To discard
1710
these changes, use 'bzr revert'. The uncommitted changes may conflict
1711
with the changes brought in by the change in basis revision.
1712
1713
If the tree's branch is bound to a master branch, bzr will also update
1447
1714
the branch from the master.
1715
1716
You cannot update just a single file or directory, because each Bazaar
1717
working tree has just a single basis revision. If you want to restore a
1718
file that has been removed locally, use 'bzr revert' instead of 'bzr
1719
update'. If you want to restore a file to its state in a previous
1720
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1721
out the old content of that file to a new location.
1722
1723
The 'dir' argument, if given, must be the location of the root of a
1724
working tree to update. By default, the working tree that contains the
1725
current working directory is used.
1448
1726
"""
1449
1727
1450
1728
_see_also = ['pull', 'working-trees', 'status-flags']
1455
1733
]
1456
1734
aliases = ['up']
1457
1735
1458
def run(self, dir='.', revision=None, show_base=None):
1736
def run(self, dir=None, revision=None, show_base=None):
1459
1737
if revision is not None and len(revision) != 1:
1460
raise errors.BzrCommandError(
1461
"bzr update --revision takes exactly one revision")
1462
tree = WorkingTree.open_containing(dir)[0]
1738
raise errors.BzrCommandError(gettext(
1739
"bzr update --revision takes exactly one revision"))
1740
if dir is None:
1741
tree = WorkingTree.open_containing('.')[0]
1742
else:
1743
tree, relpath = WorkingTree.open_containing(dir)
1744
if relpath:
1745
# See bug 557886.
1746
raise errors.BzrCommandError(gettext(
1747
"bzr update can only update a whole tree, "
1748
"not a file or subdirectory"))
1463
1749
branch = tree.branch
1464
1750
possible_transports = []
1465
1751
master = branch.get_master_branch(
1489
1775
revision_id = branch.last_revision()
1490
1776
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1491
1777
revno = branch.revision_id_to_dotted_revno(revision_id)
1492
note("Tree is up to date at revision %s of branch %s" %
1493
('.'.join(map(str, revno)), branch_location))
1778
note(gettext("Tree is up to date at revision {0} of branch {1}"
1779
).format('.'.join(map(str, revno)), branch_location))
1494
1780
return 0
1495
1781
view_info = _get_view_info_for_change_reporter(tree)
1496
1782
change_reporter = delta._ChangeReporter(
1504
1790
old_tip=old_tip,
1505
1791
show_base=show_base)
1506
1792
except errors.NoSuchRevision, e:
1507
raise errors.BzrCommandError(
1793
raise errors.BzrCommandError(gettext(
1508
1794
"branch has no revision %s\n"
1509
1795
"bzr update --revision only works"
1510
" for a revision in the branch history"
1796
" for a revision in the branch history")
1511
1797
% (e.revision))
1512
1798
revno = tree.branch.revision_id_to_dotted_revno(
1513
1799
_mod_revision.ensure_null(tree.last_revision()))
1514
note('Updated to revision %s of branch %s' %
1515
('.'.join(map(str, revno)), branch_location))
1800
note(gettext('Updated to revision {0} of branch {1}').format(
1801
'.'.join(map(str, revno)), branch_location))
1516
1802
parent_ids = tree.get_parent_ids()
1517
1803
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1518
note('Your local commits will now show as pending merges with '
1519
"'bzr status', and can be committed with 'bzr commit'.")
1804
note(gettext('Your local commits will now show as pending merges with '
1805
"'bzr status', and can be committed with 'bzr commit'."))
1520
1806
if conflicts != 0:
1521
1807
return 1
1522
1808
else:
1563
1849
else:
1564
1850
noise_level = 0
1565
1851
from bzrlib.info import show_bzrdir_info
1566
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1852
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1567
1853
verbose=noise_level, outfile=self.outf)
1568
1854
1569
1855
1572
1858
1573
1859
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1574
1860
delete them if they can easily be recovered using revert otherwise they
1575
will be backed up (adding an extention of the form .~#~). If no options or
1861
will be backed up (adding an extension of the form .~#~). If no options or
1576
1862
parameters are given Bazaar will scan for files that are being tracked by
1577
1863
Bazaar but missing in your tree and stop tracking them for you.
1578
1864
"""
1584
1870
title='Deletion Strategy', value_switches=True, enum_switch=False,
1585
1871
safe='Backup changed files (default).',
1586
1872
keep='Delete from bzr but leave the working copy.',
1587
no_backup='Don\'t backup changed files.',
1588
force='Delete all the specified files, even if they can not be '
1589
'recovered and even if they are non-empty directories. '
1590
'(deprecated, use no-backup)')]
1873
no_backup='Don\'t backup changed files.'),
1874
]
1591
1875
aliases = ['rm', 'del']
1592
1876
encoding_type = 'replace'
1593
1877
1594
1878
def run(self, file_list, verbose=False, new=False,
1595
1879
file_deletion_strategy='safe'):
1596
if file_deletion_strategy == 'force':
1597
note("(The --force option is deprecated, rather use --no-backup "
1598
"in future.)")
1599
file_deletion_strategy = 'no-backup'
1600
1880
1601
1881
tree, file_list = WorkingTree.open_containing_paths(file_list)
1602
1882
1611
1891
specific_files=file_list).added
1612
1892
file_list = sorted([f[0] for f in added], reverse=True)
1613
1893
if len(file_list) == 0:
1614
raise errors.BzrCommandError('No matching files.')
1894
raise errors.BzrCommandError(gettext('No matching files.'))
1615
1895
elif file_list is None:
1616
1896
# missing files show up in iter_changes(basis) as
1617
1897
# versioned-with-no-kind.
1701
1981
1702
1982
def run(self, branch=".", canonicalize_chks=False):
1703
1983
from bzrlib.reconcile import reconcile
1704
dir = bzrdir.BzrDir.open(branch)
1984
dir = controldir.ControlDir.open(branch)
1705
1985
reconcile(dir, canonicalize_chks=canonicalize_chks)
1706
1986
1707
1987
1716
1996
@display_command
1717
1997
def run(self, location="."):
1718
1998
branch = Branch.open_containing(location)[0]
1719
for revid in branch.revision_history():
1999
self.add_cleanup(branch.lock_read().unlock)
2000
graph = branch.repository.get_graph()
2001
history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
2002
[_mod_revision.NULL_REVISION]))
2003
for revid in reversed(history):
1720
2004
self.outf.write(revid)
1721
2005
self.outf.write('\n')
1722
2006
1740
2024
b = wt.branch
1741
2025
last_revision = wt.last_revision()
1742
2026
1743
revision_ids = b.repository.get_ancestry(last_revision)
1744
revision_ids.pop(0)
1745
for revision_id in revision_ids:
2027
self.add_cleanup(b.repository.lock_read().unlock)
2028
graph = b.repository.get_graph()
2029
revisions = [revid for revid, parents in
2030
graph.iter_ancestry([last_revision])]
2031
for revision_id in reversed(revisions):
2032
if _mod_revision.is_null(revision_id):
2033
continue
1746
2034
self.outf.write(revision_id + '\n')
1747
2035
1748
2036
1778
2066
RegistryOption('format',
1779
2067
help='Specify a format for this branch. '
1780
2068
'See "help formats".',
1781
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1782
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2069
lazy_registry=('bzrlib.controldir', 'format_registry'),
2070
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1783
2071
value_switches=True,
1784
2072
title="Branch format",
1785
2073
),
1792
2080
def run(self, location=None, format=None, append_revisions_only=False,
1793
2081
create_prefix=False, no_tree=False):
1794
2082
if format is None:
1795
format = bzrdir.format_registry.make_bzrdir('default')
2083
format = controldir.format_registry.make_bzrdir('default')
1796
2084
if location is None:
1797
2085
location = u'.'
1798
2086
1807
2095
to_transport.ensure_base()
1808
2096
except errors.NoSuchFile:
1809
2097
if not create_prefix:
1810
raise errors.BzrCommandError("Parent directory of %s"
2098
raise errors.BzrCommandError(gettext("Parent directory of %s"
1811
2099
" does not exist."
1812
2100
"\nYou may supply --create-prefix to create all"
1813
" leading parent directories."
2101
" leading parent directories.")
1814
2102
% location)
1815
2103
to_transport.create_prefix()
1816
2104
1817
2105
try:
1818
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2106
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1819
2107
except errors.NotBranchError:
1820
2108
# really a NotBzrDir error...
1821
create_branch = bzrdir.BzrDir.create_branch_convenience
2109
create_branch = controldir.ControlDir.create_branch_convenience
1822
2110
if no_tree:
1823
2111
force_new_tree = False
1824
2112
else:
1835
2123
raise errors.BranchExistsWithoutWorkingTree(location)
1836
2124
raise errors.AlreadyBranchError(location)
1837
2125
branch = a_bzrdir.create_branch()
1838
if not no_tree:
2126
if not no_tree and not a_bzrdir.has_workingtree():
1839
2127
a_bzrdir.create_workingtree()
1840
2128
if append_revisions_only:
1841
2129
try:
1842
2130
branch.set_append_revisions_only(True)
1843
2131
except errors.UpgradeRequired:
1844
raise errors.BzrCommandError('This branch format cannot be set'
1845
' to append-revisions-only. Try --default.')
2132
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2133
' to append-revisions-only. Try --default.'))
1846
2134
if not is_quiet():
1847
2135
from bzrlib.info import describe_layout, describe_format
1848
2136
try:
1852
2140
repository = branch.repository
1853
2141
layout = describe_layout(repository, branch, tree).lower()
1854
2142
format = describe_format(a_bzrdir, repository, branch, tree)
1855
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2143
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
2144
layout, format))
1856
2145
if repository.is_shared():
1857
2146
#XXX: maybe this can be refactored into transport.path_or_url()
1858
2147
url = repository.bzrdir.root_transport.external_url()
1860
2149
url = urlutils.local_path_from_url(url)
1861
2150
except errors.InvalidURL:
1862
2151
pass
1863
self.outf.write("Using shared repository: %s\n" % url)
2152
self.outf.write(gettext("Using shared repository: %s\n") % url)
1864
2153
1865
2154
1866
2155
class cmd_init_repository(Command):
1896
2185
takes_options = [RegistryOption('format',
1897
2186
help='Specify a format for this repository. See'
1898
2187
' "bzr help formats" for details.',
1899
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1900
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2188
lazy_registry=('bzrlib.controldir', 'format_registry'),
2189
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1901
2190
value_switches=True, title='Repository format'),
1902
2191
Option('no-trees',
1903
2192
help='Branches in the repository will default to'
1907
2196
1908
2197
def run(self, location, format=None, no_trees=False):
1909
2198
if format is None:
1910
format = bzrdir.format_registry.make_bzrdir('default')
2199
format = controldir.format_registry.make_bzrdir('default')
1911
2200
1912
2201
if location is None:
1913
2202
location = '.'
1914
2203
1915
2204
to_transport = transport.get_transport(location)
1916
to_transport.ensure_base()
1917
2205
1918
newdir = format.initialize_on_transport(to_transport)
1919
repo = newdir.create_repository(shared=True)
1920
repo.set_make_working_trees(not no_trees)
2206
(repo, newdir, require_stacking, repository_policy) = (
2207
format.initialize_on_transport_ex(to_transport,
2208
create_prefix=True, make_working_trees=not no_trees,
2209
shared_repo=True, force_new_repo=True,
2210
use_existing_dir=True,
2211
repo_format_name=format.repository_format.get_format_string()))
1921
2212
if not is_quiet():
1922
2213
from bzrlib.info import show_bzrdir_info
1923
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2214
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1924
2215
1925
2216
1926
2217
class cmd_diff(Command):
2037
2328
help='Diff format to use.',
2038
2329
lazy_registry=('bzrlib.diff', 'format_registry'),
2039
2330
title='Diff format'),
2331
Option('context',
2332
help='How many lines of context to show.',
2333
type=int,
2334
),
2040
2335
]
2041
2336
aliases = ['di', 'dif']
2042
2337
encoding_type = 'exact'
2043
2338
2044
2339
@display_command
2045
2340
def run(self, revision=None, file_list=None, diff_options=None,
2046
prefix=None, old=None, new=None, using=None, format=None):
2341
prefix=None, old=None, new=None, using=None, format=None,
2342
context=None):
2047
2343
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2048
2344
show_diff_trees)
2049
2345
2057
2353
elif ':' in prefix:
2058
2354
old_label, new_label = prefix.split(":")
2059
2355
else:
2060
raise errors.BzrCommandError(
2356
raise errors.BzrCommandError(gettext(
2061
2357
'--prefix expects two values separated by a colon'
2062
' (eg "old/:new/")')
2358
' (eg "old/:new/")'))
2063
2359
2064
2360
if revision and len(revision) > 2:
2065
raise errors.BzrCommandError('bzr diff --revision takes exactly'
2066
' one or two revision specifiers')
2361
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2362
' one or two revision specifiers'))
2067
2363
2068
2364
if using is not None and format is not None:
2069
raise errors.BzrCommandError('--using and --format are mutually '
2070
'exclusive.')
2365
raise errors.BzrCommandError(gettext(
2366
'{0} and {1} are mutually exclusive').format(
2367
'--using', '--format'))
2071
2368
2072
2369
(old_tree, new_tree,
2073
2370
old_branch, new_branch,
2081
2378
old_label=old_label, new_label=new_label,
2082
2379
extra_trees=extra_trees,
2083
2380
path_encoding=path_encoding,
2084
using=using,
2381
using=using, context=context,
2085
2382
format_cls=format)
2086
2383
2087
2384
2103
2400
self.add_cleanup(tree.lock_read().unlock)
2104
2401
old = tree.basis_tree()
2105
2402
self.add_cleanup(old.lock_read().unlock)
2106
for path, ie in old.inventory.iter_entries():
2403
for path, ie in old.iter_entries_by_dir():
2107
2404
if not tree.has_id(ie.file_id):
2108
2405
self.outf.write(path)
2109
2406
if show_ids:
2147
2444
self.add_cleanup(wt.lock_read().unlock)
2148
2445
basis = wt.basis_tree()
2149
2446
self.add_cleanup(basis.lock_read().unlock)
2150
basis_inv = basis.inventory
2151
inv = wt.inventory
2152
for file_id in inv:
2153
if file_id in basis_inv:
2154
continue
2155
if inv.is_root(file_id) and len(basis_inv) == 0:
2156
continue
2157
path = inv.id2path(file_id)
2447
root_id = wt.get_root_id()
2448
for file_id in wt.all_file_ids():
2449
if basis.has_id(file_id):
2450
continue
2451
if root_id == file_id:
2452
continue
2453
path = wt.id2path(file_id)
2158
2454
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2159
2455
continue
2160
2456
if null:
2181
2477
try:
2182
2478
return int(limitstring)
2183
2479
except ValueError:
2184
msg = "The limit argument must be an integer."
2480
msg = gettext("The limit argument must be an integer.")
2185
2481
raise errors.BzrCommandError(msg)
2186
2482
2187
2483
2189
2485
try:
2190
2486
return int(s)
2191
2487
except ValueError:
2192
msg = "The levels argument must be an integer."
2488
msg = gettext("The levels argument must be an integer.")
2193
2489
raise errors.BzrCommandError(msg)
2194
2490
2195
2491
2305
2601
2306
2602
:Other filtering:
2307
2603
2308
The --message option can be used for finding revisions that match a
2309
regular expression in a commit message.
2604
The --match option can be used for finding revisions that match a
2605
regular expression in a commit message, committer, author or bug.
2606
Specifying the option several times will match any of the supplied
2607
expressions. --match-author, --match-bugs, --match-committer and
2608
--match-message can be used to only match a specific field.
2310
2609
2311
2610
:Tips & tricks:
2312
2611
2372
2671
argname='N',
2373
2672
type=_parse_levels),
2374
2673
Option('message',
2375
short_name='m',
2376
2674
help='Show revisions whose message matches this '
2377
2675
'regular expression.',
2378
type=str),
2676
type=str,
2677
hidden=True),
2379
2678
Option('limit',
2380
2679
short_name='l',
2381
2680
help='Limit the output to the first N revisions.',
2384
2683
Option('show-diff',
2385
2684
short_name='p',
2386
2685
help='Show changes made in each revision as a patch.'),
2387
Option('include-merges',
2686
Option('include-merged',
2388
2687
help='Show merged revisions like --levels 0 does.'),
2688
Option('include-merges', hidden=True,
2689
help='Historical alias for --include-merged.'),
2690
Option('omit-merges',
2691
help='Do not report commits with more than one parent.'),
2389
2692
Option('exclude-common-ancestry',
2390
2693
help='Display only the revisions that are not part'
2391
' of both ancestries (require -rX..Y)'
2392
)
2694
' of both ancestries (require -rX..Y).'
2695
),
2696
Option('signatures',
2697
help='Show digital signature validity.'),
2698
ListOption('match',
2699
short_name='m',
2700
help='Show revisions whose properties match this '
2701
'expression.',
2702
type=str),
2703
ListOption('match-message',
2704
help='Show revisions whose message matches this '
2705
'expression.',
2706
type=str),
2707
ListOption('match-committer',
2708
help='Show revisions whose committer matches this '
2709
'expression.',
2710
type=str),
2711
ListOption('match-author',
2712
help='Show revisions whose authors match this '
2713
'expression.',
2714
type=str),
2715
ListOption('match-bugs',
2716
help='Show revisions whose bugs match this '
2717
'expression.',
2718
type=str)
2393
2719
]
2394
2720
encoding_type = 'replace'
2395
2721
2405
2731
message=None,
2406
2732
limit=None,
2407
2733
show_diff=False,
2408
include_merges=False,
2734
include_merged=None,
2409
2735
authors=None,
2410
2736
exclude_common_ancestry=False,
2737
signatures=False,
2738
match=None,
2739
match_message=None,
2740
match_committer=None,
2741
match_author=None,
2742
match_bugs=None,
2743
omit_merges=False,
2744
include_merges=symbol_versioning.DEPRECATED_PARAMETER,
2411
2745
):
2412
2746
from bzrlib.log import (
2413
2747
Logger,
2415
2749
_get_info_for_log_files,
2416
2750
)
2417
2751
direction = (forward and 'forward') or 'reverse'
2752
if symbol_versioning.deprecated_passed(include_merges):
2753
ui.ui_factory.show_user_warning(
2754
'deprecated_command_option',
2755
deprecated_name='--include-merges',
2756
recommended_name='--include-merged',
2757
deprecated_in_version='2.5',
2758
command=self.invoked_as)
2759
if include_merged is None:
2760
include_merged = include_merges
2761
else:
2762
raise errors.BzrCommandError(gettext(
2763
'{0} and {1} are mutually exclusive').format(
2764
'--include-merges', '--include-merged'))
2765
if include_merged is None:
2766
include_merged = False
2418
2767
if (exclude_common_ancestry
2419
2768
and (revision is None or len(revision) != 2)):
2420
raise errors.BzrCommandError(
2421
'--exclude-common-ancestry requires -r with two revisions')
2422
if include_merges:
2769
raise errors.BzrCommandError(gettext(
2770
'--exclude-common-ancestry requires -r with two revisions'))
2771
if include_merged:
2423
2772
if levels is None:
2424
2773
levels = 0
2425
2774
else:
2426
raise errors.BzrCommandError(
2427
'--levels and --include-merges are mutually exclusive')
2775
raise errors.BzrCommandError(gettext(
2776
'{0} and {1} are mutually exclusive').format(
2777
'--levels', '--include-merged'))
2428
2778
2429
2779
if change is not None:
2430
2780
if len(change) > 1:
2431
2781
raise errors.RangeInChangeOption()
2432
2782
if revision is not None:
2433
raise errors.BzrCommandError(
2434
'--revision and --change are mutually exclusive')
2783
raise errors.BzrCommandError(gettext(
2784
'{0} and {1} are mutually exclusive').format(
2785
'--revision', '--change'))
2435
2786
else:
2436
2787
revision = change
2437
2788
2443
2794
revision, file_list, self.add_cleanup)
2444
2795
for relpath, file_id, kind in file_info_list:
2445
2796
if file_id is None:
2446
raise errors.BzrCommandError(
2447
"Path unknown at end or start of revision range: %s" %
2797
raise errors.BzrCommandError(gettext(
2798
"Path unknown at end or start of revision range: %s") %
2448
2799
relpath)
2449
2800
# If the relpath is the top of the tree, we log everything
2450
2801
if relpath == '':
2462
2813
location = revision[0].get_branch()
2463
2814
else:
2464
2815
location = '.'
2465
dir, relpath = bzrdir.BzrDir.open_containing(location)
2816
dir, relpath = controldir.ControlDir.open_containing(location)
2466
2817
b = dir.open_branch()
2467
2818
self.add_cleanup(b.lock_read().unlock)
2468
2819
rev1, rev2 = _get_revision_range(revision, b, self.name())
2469
2820
2821
if b.get_config_stack().get('validate_signatures_in_log'):
2822
signatures = True
2823
2824
if signatures:
2825
if not gpg.GPGStrategy.verify_signatures_available():
2826
raise errors.GpgmeNotInstalled(None)
2827
2470
2828
# Decide on the type of delta & diff filtering to use
2471
2829
# TODO: add an --all-files option to make this configurable & consistent
2472
2830
if not verbose:
2509
2867
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2510
2868
or delta_type or partial_history)
2511
2869
2870
match_dict = {}
2871
if match:
2872
match_dict[''] = match
2873
if match_message:
2874
match_dict['message'] = match_message
2875
if match_committer:
2876
match_dict['committer'] = match_committer
2877
if match_author:
2878
match_dict['author'] = match_author
2879
if match_bugs:
2880
match_dict['bugs'] = match_bugs
2881
2512
2882
# Build the LogRequest and execute it
2513
2883
if len(file_ids) == 0:
2514
2884
file_ids = None
2517
2887
start_revision=rev1, end_revision=rev2, limit=limit,
2518
2888
message_search=message, delta_type=delta_type,
2519
2889
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2520
exclude_common_ancestry=exclude_common_ancestry,
2890
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2891
signature=signatures, omit_merges=omit_merges,
2521
2892
)
2522
2893
Logger(b, rqst).show(lf)
2523
2894
2540
2911
# b is taken from revision[0].get_branch(), and
2541
2912
# show_log will use its revision_history. Having
2542
2913
# different branches will lead to weird behaviors.
2543
raise errors.BzrCommandError(
2914
raise errors.BzrCommandError(gettext(
2544
2915
"bzr %s doesn't accept two revisions in different"
2545
" branches." % command_name)
2916
" branches.") % command_name)
2546
2917
if start_spec.spec is None:
2547
2918
# Avoid loading all the history.
2548
2919
rev1 = RevisionInfo(branch, None, None)
2556
2927
else:
2557
2928
rev2 = end_spec.in_history(branch)
2558
2929
else:
2559
raise errors.BzrCommandError(
2560
'bzr %s --revision takes one or two values.' % command_name)
2930
raise errors.BzrCommandError(gettext(
2931
'bzr %s --revision takes one or two values.') % command_name)
2561
2932
return rev1, rev2
2562
2933
2563
2934
2634
3005
null=False, kind=None, show_ids=False, path=None, directory=None):
2635
3006
2636
3007
if kind and kind not in ('file', 'directory', 'symlink'):
2637
raise errors.BzrCommandError('invalid kind specified')
3008
raise errors.BzrCommandError(gettext('invalid kind specified'))
2638
3009
2639
3010
if verbose and null:
2640
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3011
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2641
3012
all = not (unknown or versioned or ignored)
2642
3013
2643
3014
selection = {'I':ignored, '?':unknown, 'V':versioned}
2646
3017
fs_path = '.'
2647
3018
else:
2648
3019
if from_root:
2649
raise errors.BzrCommandError('cannot specify both --from-root'
2650
' and PATH')
3020
raise errors.BzrCommandError(gettext('cannot specify both --from-root'
3021
' and PATH'))
2651
3022
fs_path = path
2652
3023
tree, branch, relpath = \
2653
3024
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2669
3040
if view_files:
2670
3041
apply_view = True
2671
3042
view_str = views.view_display_str(view_files)
2672
note("Ignoring files outside view. View is %s" % view_str)
3043
note(gettext("Ignoring files outside view. View is %s") % view_str)
2673
3044
2674
3045
self.add_cleanup(tree.lock_read().unlock)
2675
3046
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2822
3193
self.outf.write("%s\n" % pattern)
2823
3194
return
2824
3195
if not name_pattern_list:
2825
raise errors.BzrCommandError("ignore requires at least one "
2826
"NAME_PATTERN or --default-rules.")
3196
raise errors.BzrCommandError(gettext("ignore requires at least one "
3197
"NAME_PATTERN or --default-rules."))
2827
3198
name_pattern_list = [globbing.normalize_pattern(p)
2828
3199
for p in name_pattern_list]
2829
3200
bad_patterns = ''
3201
bad_patterns_count = 0
2830
3202
for p in name_pattern_list:
2831
3203
if not globbing.Globster.is_pattern_valid(p):
3204
bad_patterns_count += 1
2832
3205
bad_patterns += ('\n %s' % p)
2833
3206
if bad_patterns:
2834
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
3207
msg = (ngettext('Invalid ignore pattern found. %s',
3208
'Invalid ignore patterns found. %s',
3209
bad_patterns_count) % bad_patterns)
2835
3210
ui.ui_factory.show_error(msg)
2836
3211
raise errors.InvalidPattern('')
2837
3212
for name_pattern in name_pattern_list:
2838
3213
if (name_pattern[0] == '/' or
2839
3214
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2840
raise errors.BzrCommandError(
2841
"NAME_PATTERN should not be an absolute path")
3215
raise errors.BzrCommandError(gettext(
3216
"NAME_PATTERN should not be an absolute path"))
2842
3217
tree, relpath = WorkingTree.open_containing(directory)
2843
3218
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2844
3219
ignored = globbing.Globster(name_pattern_list)
2851
3226
if ignored.match(filename):
2852
3227
matches.append(filename)
2853
3228
if len(matches) > 0:
2854
self.outf.write("Warning: the following files are version controlled and"
2855
" match your ignore pattern:\n%s"
3229
self.outf.write(gettext("Warning: the following files are version "
3230
"controlled and match your ignore pattern:\n%s"
2856
3231
"\nThese files will continue to be version controlled"
2857
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3232
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2858
3233
2859
3234
2860
3235
class cmd_ignored(Command):
2899
3274
try:
2900
3275
revno = int(revno)
2901
3276
except ValueError:
2902
raise errors.BzrCommandError("not a valid revision-number: %r"
3277
raise errors.BzrCommandError(gettext("not a valid revision-number: %r")
2903
3278
% revno)
2904
3279
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2905
3280
self.outf.write("%s\n" % revid)
2948
3323
Option('per-file-timestamps',
2949
3324
help='Set modification time of files to that of the last '
2950
3325
'revision in which it was changed.'),
3326
Option('uncommitted',
3327
help='Export the working tree contents rather than that of the '
3328
'last revision.'),
2951
3329
]
2952
3330
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2953
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
3331
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3332
directory=u'.'):
2954
3333
from bzrlib.export import export
2955
3334
2956
3335
if branch_or_subdir is None:
2957
tree = WorkingTree.open_containing(directory)[0]
2958
b = tree.branch
2959
subdir = None
3336
branch_or_subdir = directory
3337
3338
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3339
branch_or_subdir)
3340
if tree is not None:
3341
self.add_cleanup(tree.lock_read().unlock)
3342
3343
if uncommitted:
3344
if tree is None:
3345
raise errors.BzrCommandError(
3346
gettext("--uncommitted requires a working tree"))
3347
export_tree = tree
2960
3348
else:
2961
b, subdir = Branch.open_containing(branch_or_subdir)
2962
tree = None
2963
2964
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3349
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2965
3350
try:
2966
export(rev_tree, dest, format, root, subdir, filtered=filters,
3351
export(export_tree, dest, format, root, subdir, filtered=filters,
2967
3352
per_file_timestamps=per_file_timestamps)
2968
3353
except errors.NoSuchExportFormat, e:
2969
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3354
raise errors.BzrCommandError(
3355
gettext('Unsupported export format: %s') % e.format)
2970
3356
2971
3357
2972
3358
class cmd_cat(Command):
2992
3378
def run(self, filename, revision=None, name_from_revision=False,
2993
3379
filters=False, directory=None):
2994
3380
if revision is not None and len(revision) != 1:
2995
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2996
" one revision specifier")
3381
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3382
" one revision specifier"))
2997
3383
tree, branch, relpath = \
2998
3384
_open_directory_or_containing_tree_or_branch(filename, directory)
2999
3385
self.add_cleanup(branch.lock_read().unlock)
3009
3395
3010
3396
old_file_id = rev_tree.path2id(relpath)
3011
3397
3398
# TODO: Split out this code to something that generically finds the
3399
# best id for a path across one or more trees; it's like
3400
# find_ids_across_trees but restricted to find just one. -- mbp
3401
# 20110705.
3012
3402
if name_from_revision:
3013
3403
# Try in revision if requested
3014
3404
if old_file_id is None:
3015
raise errors.BzrCommandError(
3016
"%r is not present in revision %s" % (
3405
raise errors.BzrCommandError(gettext(
3406
"{0!r} is not present in revision {1}").format(
3017
3407
filename, rev_tree.get_revision_id()))
3018
3408
else:
3019
content = rev_tree.get_file_text(old_file_id)
3409
actual_file_id = old_file_id
3020
3410
else:
3021
3411
cur_file_id = tree.path2id(relpath)
3022
found = False
3023
if cur_file_id is not None:
3024
# Then try with the actual file id
3025
try:
3026
content = rev_tree.get_file_text(cur_file_id)
3027
found = True
3028
except errors.NoSuchId:
3029
# The actual file id didn't exist at that time
3030
pass
3031
if not found and old_file_id is not None:
3032
# Finally try with the old file id
3033
content = rev_tree.get_file_text(old_file_id)
3034
found = True
3035
if not found:
3036
# Can't be found anywhere
3037
raise errors.BzrCommandError(
3038
"%r is not present in revision %s" % (
3412
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3413
actual_file_id = cur_file_id
3414
elif old_file_id is not None:
3415
actual_file_id = old_file_id
3416
else:
3417
raise errors.BzrCommandError(gettext(
3418
"{0!r} is not present in revision {1}").format(
3039
3419
filename, rev_tree.get_revision_id()))
3040
3420
if filtered:
3041
from bzrlib.filters import (
3042
ContentFilterContext,
3043
filtered_output_bytes,
3044
)
3045
filters = rev_tree._content_filter_stack(relpath)
3046
chunks = content.splitlines(True)
3047
content = filtered_output_bytes(chunks, filters,
3048
ContentFilterContext(relpath, rev_tree))
3049
self.cleanup_now()
3050
self.outf.writelines(content)
3421
from bzrlib.filter_tree import ContentFilterTree
3422
filter_tree = ContentFilterTree(rev_tree,
3423
rev_tree._content_filter_stack)
3424
content = filter_tree.get_file_text(actual_file_id)
3051
3425
else:
3052
self.cleanup_now()
3053
self.outf.write(content)
3426
content = rev_tree.get_file_text(actual_file_id)
3427
self.cleanup_now()
3428
self.outf.write(content)
3054
3429
3055
3430
3056
3431
class cmd_local_time_offset(Command):
3163
3538
aliases = ['ci', 'checkin']
3164
3539
3165
3540
def _iter_bug_fix_urls(self, fixes, branch):
3541
default_bugtracker = None
3166
3542
# Configure the properties for bug fixing attributes.
3167
3543
for fixed_bug in fixes:
3168
3544
tokens = fixed_bug.split(':')
3169
if len(tokens) != 2:
3170
raise errors.BzrCommandError(
3545
if len(tokens) == 1:
3546
if default_bugtracker is None:
3547
branch_config = branch.get_config_stack()
3548
default_bugtracker = branch_config.get(
3549
"bugtracker")
3550
if default_bugtracker is None:
3551
raise errors.BzrCommandError(gettext(
3552
"No tracker specified for bug %s. Use the form "
3553
"'tracker:id' or specify a default bug tracker "
3554
"using the `bugtracker` option.\nSee "
3555
"\"bzr help bugs\" for more information on this "
3556
"feature. Commit refused.") % fixed_bug)
3557
tag = default_bugtracker
3558
bug_id = tokens[0]
3559
elif len(tokens) != 2:
3560
raise errors.BzrCommandError(gettext(
3171
3561
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3172
3562
"See \"bzr help bugs\" for more information on this "
3173
"feature.\nCommit refused." % fixed_bug)
3174
tag, bug_id = tokens
3563
"feature.\nCommit refused.") % fixed_bug)
3564
else:
3565
tag, bug_id = tokens
3175
3566
try:
3176
3567
yield bugtracker.get_bug_url(tag, branch, bug_id)
3177
3568
except errors.UnknownBugTrackerAbbreviation:
3178
raise errors.BzrCommandError(
3179
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3569
raise errors.BzrCommandError(gettext(
3570
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3180
3571
except errors.MalformedBugIdentifier, e:
3181
raise errors.BzrCommandError(
3182
"%s\nCommit refused." % (str(e),))
3572
raise errors.BzrCommandError(gettext(
3573
"%s\nCommit refused.") % (str(e),))
3183
3574
3184
3575
def run(self, message=None, file=None, verbose=False, selected_list=None,
3185
3576
unchanged=False, strict=False, local=False, fixes=None,
3193
3584
from bzrlib.msgeditor import (
3194
3585
edit_commit_message_encoded,
3195
3586
generate_commit_message_template,
3196
make_commit_message_template_encoded
3587
make_commit_message_template_encoded,
3588
set_commit_message,
3197
3589
)
3198
3590
3199
3591
commit_stamp = offset = None
3201
3593
try:
3202
3594
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3203
3595
except ValueError, e:
3204
raise errors.BzrCommandError(
3205
"Could not parse --commit-time: " + str(e))
3596
raise errors.BzrCommandError(gettext(
3597
"Could not parse --commit-time: " + str(e)))
3206
3598
3207
3599
properties = {}
3208
3600
3241
3633
message = message.replace('\r\n', '\n')
3242
3634
message = message.replace('\r', '\n')
3243
3635
if file:
3244
raise errors.BzrCommandError(
3245
"please specify either --message or --file")
3636
raise errors.BzrCommandError(gettext(
3637
"please specify either --message or --file"))
3246
3638
3247
3639
def get_message(commit_obj):
3248
3640
"""Callback to get commit message"""
3265
3657
# make_commit_message_template_encoded returns user encoding.
3266
3658
# We probably want to be using edit_commit_message instead to
3267
3659
# avoid this.
3268
start_message = generate_commit_message_template(commit_obj)
3269
my_message = edit_commit_message_encoded(text,
3270
start_message=start_message)
3271
if my_message is None:
3272
raise errors.BzrCommandError("please specify a commit"
3273
" message with either --message or --file")
3274
if my_message == "":
3275
raise errors.BzrCommandError("empty commit message specified")
3660
my_message = set_commit_message(commit_obj)
3661
if my_message is None:
3662
start_message = generate_commit_message_template(commit_obj)
3663
my_message = edit_commit_message_encoded(text,
3664
start_message=start_message)
3665
if my_message is None:
3666
raise errors.BzrCommandError(gettext("please specify a commit"
3667
" message with either --message or --file"))
3668
if my_message == "":
3669
raise errors.BzrCommandError(gettext("Empty commit message specified."
3670
" Please specify a commit message with either"
3671
" --message or --file or leave a blank message"
3672
" with --message \"\"."))
3276
3673
return my_message
3277
3674
3278
3675
# The API permits a commit with a filter of [] to mean 'select nothing'
3289
3686
exclude=tree.safe_relpath_files(exclude),
3290
3687
lossy=lossy)
3291
3688
except PointlessCommit:
3292
raise errors.BzrCommandError("No changes to commit."
3689
raise errors.BzrCommandError(gettext("No changes to commit."
3293
3690
" Please 'bzr add' the files you want to commit, or use"
3294
" --unchanged to force an empty commit.")
3691
" --unchanged to force an empty commit."))
3295
3692
except ConflictsInTree:
3296
raise errors.BzrCommandError('Conflicts detected in working '
3693
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3297
3694
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3298
' resolve.')
3695
' resolve.'))
3299
3696
except StrictCommitFailed:
3300
raise errors.BzrCommandError("Commit refused because there are"
3301
" unknown files in the working tree.")
3697
raise errors.BzrCommandError(gettext("Commit refused because there are"
3698
" unknown files in the working tree."))
3302
3699
except errors.BoundBranchOutOfDate, e:
3303
e.extra_help = ("\n"
3700
e.extra_help = (gettext("\n"
3304
3701
'To commit to master branch, run update and then commit.\n'
3305
3702
'You can also pass --local to commit to continue working '
3306
'disconnected.')
3703
'disconnected.'))
3307
3704
raise
3308
3705
3309
3706
3416
3813
RegistryOption('format',
3417
3814
help='Upgrade to a specific format. See "bzr help'
3418
3815
' formats" for details.',
3419
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3420
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3816
lazy_registry=('bzrlib.controldir', 'format_registry'),
3817
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3421
3818
value_switches=True, title='Branch format'),
3422
3819
Option('clean',
3423
3820
help='Remove the backup.bzr directory if successful.'),
3464
3861
if directory is None:
3465
3862
# use branch if we're inside one; otherwise global config
3466
3863
try:
3467
c = Branch.open_containing(u'.')[0].get_config()
3864
c = Branch.open_containing(u'.')[0].get_config_stack()
3468
3865
except errors.NotBranchError:
3469
c = _mod_config.GlobalConfig()
3866
c = _mod_config.GlobalStack()
3470
3867
else:
3471
c = Branch.open(directory).get_config()
3868
c = Branch.open(directory).get_config_stack()
3869
identity = c.get('email')
3472
3870
if email:
3473
self.outf.write(c.user_email() + '\n')
3871
self.outf.write(_mod_config.extract_email_address(identity)
3872
+ '\n')
3474
3873
else:
3475
self.outf.write(c.username() + '\n')
3874
self.outf.write(identity + '\n')
3476
3875
return
3477
3876
3478
3877
if email:
3479
raise errors.BzrCommandError("--email can only be used to display existing "
3480
"identity")
3878
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3879
"identity"))
3481
3880
3482
3881
# display a warning if an email address isn't included in the given name.
3483
3882
try:
3489
3888
# use global config unless --branch given
3490
3889
if branch:
3491
3890
if directory is None:
3492
c = Branch.open_containing(u'.')[0].get_config()
3891
c = Branch.open_containing(u'.')[0].get_config_stack()
3493
3892
else:
3494
c = Branch.open(directory).get_config()
3893
b = Branch.open(directory)
3894
self.add_cleanup(b.lock_write().unlock)
3895
c = b.get_config_stack()
3495
3896
else:
3496
c = _mod_config.GlobalConfig()
3497
c.set_user_option('email', name)
3897
c = _mod_config.GlobalStack()
3898
c.set('email', name)
3498
3899
3499
3900
3500
3901
class cmd_nick(Command):
3501
3902
__doc__ = """Print or set the branch nickname.
3502
3903
3503
If unset, the tree root directory name is used as the nickname.
3504
To print the current nickname, execute with no argument.
3904
If unset, the colocated branch name is used for colocated branches, and
3905
the branch directory name is used for other branches. To print the
3906
current nickname, execute with no argument.
3505
3907
3506
3908
Bound branches use the nickname of its master branch unless it is set
3507
3909
locally.
3562
3964
3563
3965
def remove_alias(self, alias_name):
3564
3966
if alias_name is None:
3565
raise errors.BzrCommandError(
3566
'bzr alias --remove expects an alias to remove.')
3967
raise errors.BzrCommandError(gettext(
3968
'bzr alias --remove expects an alias to remove.'))
3567
3969
# If alias is not found, print something like:
3568
3970
# unalias: foo: not found
3569
3971
c = _mod_config.GlobalConfig()
3707
4109
param_name='starting_with', short_name='s',
3708
4110
help=
3709
4111
'Load only the tests starting with TESTID.'),
4112
Option('sync',
4113
help="By default we disable fsync and fdatasync"
4114
" while running the test suite.")
3710
4115
]
3711
4116
encoding_type = 'replace'
3712
4117
3720
4125
first=False, list_only=False,
3721
4126
randomize=None, exclude=None, strict=False,
3722
4127
load_list=None, debugflag=None, starting_with=None, subunit=False,
3723
parallel=None, lsprof_tests=False):
4128
parallel=None, lsprof_tests=False,
4129
sync=False):
4130
4131
# During selftest, disallow proxying, as it can cause severe
4132
# performance penalties and is only needed for thread
4133
# safety. The selftest command is assumed to not use threads
4134
# too heavily. The call should be as early as possible, as
4135
# error reporting for past duplicate imports won't have useful
4136
# backtraces.
4137
lazy_import.disallow_proxying()
4138
3724
4139
from bzrlib import tests
3725
4140
3726
4141
if testspecs_list is not None:
3731
4146
try:
3732
4147
from bzrlib.tests import SubUnitBzrRunner
3733
4148
except ImportError:
3734
raise errors.BzrCommandError("subunit not available. subunit "
3735
"needs to be installed to use --subunit.")
4149
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4150
"needs to be installed to use --subunit."))
3736
4151
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3737
4152
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3738
4153
# stdout, which would corrupt the subunit stream.
3747
4162
self.additional_selftest_args.setdefault(
3748
4163
'suite_decorators', []).append(parallel)
3749
4164
if benchmark:
3750
raise errors.BzrCommandError(
4165
raise errors.BzrCommandError(gettext(
3751
4166
"--benchmark is no longer supported from bzr 2.2; "
3752
"use bzr-usertest instead")
4167
"use bzr-usertest instead"))
3753
4168
test_suite_factory = None
3754
4169
if not exclude:
3755
4170
exclude_pattern = None
3756
4171
else:
3757
4172
exclude_pattern = '(' + '|'.join(exclude) + ')'
4173
if not sync:
4174
self._disable_fsync()
3758
4175
selftest_kwargs = {"verbose": verbose,
3759
4176
"pattern": pattern,
3760
4177
"stop_on_failure": one,
3782
4199
cleanup()
3783
4200
return int(not result)
3784
4201
4202
def _disable_fsync(self):
4203
"""Change the 'os' functionality to not synchronize."""
4204
self._orig_fsync = getattr(os, 'fsync', None)
4205
if self._orig_fsync is not None:
4206
os.fsync = lambda filedes: None
4207
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4208
if self._orig_fdatasync is not None:
4209
os.fdatasync = lambda filedes: None
4210
3785
4211
3786
4212
class cmd_version(Command):
3787
4213
__doc__ = """Show version of bzr."""
3807
4233
3808
4234
@display_command
3809
4235
def run(self):
3810
self.outf.write("It sure does!\n")
4236
self.outf.write(gettext("It sure does!\n"))
3811
4237
3812
4238
3813
4239
class cmd_find_merge_base(Command):
3831
4257
graph = branch1.repository.get_graph(branch2.repository)
3832
4258
base_rev_id = graph.find_unique_lca(last1, last2)
3833
4259
3834
self.outf.write('merge base is revision %s\n' % base_rev_id)
4260
self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
3835
4261
3836
4262
3837
4263
class cmd_merge(Command):
3865
4291
Merge will do its best to combine the changes in two branches, but there
3866
4292
are some kinds of problems only a human can fix. When it encounters those,
3867
4293
it will mark a conflict. A conflict means that you need to fix something,
3868
before you should commit.
4294
before you can commit.
3869
4295
3870
4296
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3871
4297
3872
4298
If there is no default branch set, the first merge will set it (use
3873
--no-remember to avoid settting it). After that, you can omit the branch
4299
--no-remember to avoid setting it). After that, you can omit the branch
3874
4300
to use the default. To change the default, use --remember. The value will
3875
4301
only be saved if the remote location can be accessed.
3876
4302
3962
4388
3963
4389
tree = WorkingTree.open_containing(directory)[0]
3964
4390
if tree.branch.revno() == 0:
3965
raise errors.BzrCommandError('Merging into empty branches not currently supported, '
3966
'https://bugs.launchpad.net/bzr/+bug/308562')
4391
raise errors.BzrCommandError(gettext('Merging into empty branches not currently supported, '
4392
'https://bugs.launchpad.net/bzr/+bug/308562'))
3967
4393
3968
4394
try:
3969
4395
basis_tree = tree.revision_tree(tree.last_revision())
3989
4415
mergeable = None
3990
4416
else:
3991
4417
if uncommitted:
3992
raise errors.BzrCommandError('Cannot use --uncommitted'
3993
' with bundles or merge directives.')
4418
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4419
' with bundles or merge directives.'))
3994
4420
3995
4421
if revision is not None:
3996
raise errors.BzrCommandError(
3997
'Cannot use -r with merge directives or bundles')
4422
raise errors.BzrCommandError(gettext(
4423
'Cannot use -r with merge directives or bundles'))
3998
4424
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3999
4425
mergeable, None)
4000
4426
4001
4427
if merger is None and uncommitted:
4002
4428
if revision is not None and len(revision) > 0:
4003
raise errors.BzrCommandError('Cannot use --uncommitted and'
4004
' --revision at the same time.')
4429
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4430
' --revision at the same time.'))
4005
4431
merger = self.get_merger_from_uncommitted(tree, location, None)
4006
4432
allow_pending = False
4007
4433
4020
4446
if merger.interesting_files:
4021
4447
if not merger.other_tree.has_filename(
4022
4448
merger.interesting_files[0]):
4023
note("merger: " + str(merger))
4449
note(gettext("merger: ") + str(merger))
4024
4450
raise errors.PathsDoNotExist([location])
4025
note('Nothing to do.')
4451
note(gettext('Nothing to do.'))
4026
4452
return 0
4027
4453
if pull and not preview:
4028
4454
if merger.interesting_files is not None:
4029
raise errors.BzrCommandError('Cannot pull individual files')
4455
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
4030
4456
if (merger.base_rev_id == tree.last_revision()):
4031
4457
result = tree.pull(merger.other_branch, False,
4032
4458
merger.other_rev_id)
4033
4459
result.report(self.outf)
4034
4460
return 0
4035
4461
if merger.this_basis is None:
4036
raise errors.BzrCommandError(
4462
raise errors.BzrCommandError(gettext(
4037
4463
"This branch has no commits."
4038
" (perhaps you would prefer 'bzr pull')")
4464
" (perhaps you would prefer 'bzr pull')"))
4039
4465
if preview:
4040
4466
return self._do_preview(merger)
4041
4467
elif interactive:
4092
4518
def sanity_check_merger(self, merger):
4093
4519
if (merger.show_base and
4094
4520
not merger.merge_type is _mod_merge.Merge3Merger):
4095
raise errors.BzrCommandError("Show-base is not supported for this"
4096
" merge type. %s" % merger.merge_type)
4521
raise errors.BzrCommandError(gettext("Show-base is not supported for this"
4522
" merge type. %s") % merger.merge_type)
4097
4523
if merger.reprocess is None:
4098
4524
if merger.show_base:
4099
4525
merger.reprocess = False
4101
4527
# Use reprocess if the merger supports it
4102
4528
merger.reprocess = merger.merge_type.supports_reprocess
4103
4529
if merger.reprocess and not merger.merge_type.supports_reprocess:
4104
raise errors.BzrCommandError("Conflict reduction is not supported"
4105
" for merge type %s." %
4530
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4531
" for merge type %s.") %
4106
4532
merger.merge_type)
4107
4533
if merger.reprocess and merger.show_base:
4108
raise errors.BzrCommandError("Cannot do conflict reduction and"
4109
" show base.")
4534
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4535
" show base."))
4110
4536
4111
4537
def _get_merger_from_branch(self, tree, location, revision, remember,
4112
4538
possible_transports, pb):
4216
4642
stored_location_type = "parent"
4217
4643
mutter("%s", stored_location)
4218
4644
if stored_location is None:
4219
raise errors.BzrCommandError("No location specified or remembered")
4645
raise errors.BzrCommandError(gettext("No location specified or remembered"))
4220
4646
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
4221
note(u"%s remembered %s location %s", verb_string,
4222
stored_location_type, display_url)
4647
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4648
stored_location_type, display_url))
4223
4649
return stored_location
4224
4650
4225
4651
4262
4688
self.add_cleanup(tree.lock_write().unlock)
4263
4689
parents = tree.get_parent_ids()
4264
4690
if len(parents) != 2:
4265
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4691
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4266
4692
" merges. Not cherrypicking or"
4267
" multi-merges.")
4693
" multi-merges."))
4268
4694
repository = tree.branch.repository
4269
4695
interesting_ids = None
4270
4696
new_conflicts = []
4279
4705
if tree.kind(file_id) != "directory":
4280
4706
continue
4281
4707
4282
for name, ie in tree.inventory.iter_entries(file_id):
4708
# FIXME: Support nested trees
4709
for name, ie in tree.root_inventory.iter_entries(file_id):
4283
4710
interesting_ids.add(ie.file_id)
4284
4711
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4285
4712
else:
4318
4745
4319
4746
4320
4747
class cmd_revert(Command):
4321
__doc__ = """Revert files to a previous revision.
4748
__doc__ = """\
4749
Set files in the working tree back to the contents of a previous revision.
4322
4750
4323
4751
Giving a list of files will revert only those files. Otherwise, all files
4324
4752
will be reverted. If the revision is not specified with '--revision', the
4325
last committed revision is used.
4753
working tree basis revision is used. A revert operation affects only the
4754
working tree, not any revision history like the branch and repository or
4755
the working tree basis revision.
4326
4756
4327
4757
To remove only some changes, without reverting to a prior version, use
4328
4758
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4329
4759
will remove the changes introduced by the second last commit (-2), without
4330
4760
affecting the changes introduced by the last commit (-1). To remove
4331
4761
certain changes on a hunk-by-hunk basis, see the shelve command.
4762
To update the branch to a specific revision or the latest revision and
4763
update the working tree accordingly while preserving local changes, see the
4764
update command.
4332
4765
4333
By default, any files that have been manually changed will be backed up
4334
first. (Files changed only by merge are not backed up.) Backup files have
4335
'.~#~' appended to their name, where # is a number.
4766
Uncommitted changes to files that are reverted will be discarded.
4767
Howver, by default, any files that have been manually changed will be
4768
backed up first. (Files changed only by merge are not backed up.) Backup
4769
files have '.~#~' appended to their name, where # is a number.
4336
4770
4337
4771
When you provide files, you can use their current pathname or the pathname
4338
4772
from the target revision. So you can use revert to "undelete" a file by
4429
4863
4430
4864
@display_command
4431
4865
def run(self, context=None):
4432
import shellcomplete
4866
from bzrlib import shellcomplete
4433
4867
shellcomplete.shellcomplete(context)
4434
4868
4435
4869
4489
4923
type=_parse_revision_str,
4490
4924
help='Filter on local branch revisions (inclusive). '
4491
4925
'See "help revisionspec" for details.'),
4492
Option('include-merges',
4926
Option('include-merged',
4493
4927
'Show all revisions in addition to the mainline ones.'),
4928
Option('include-merges', hidden=True,
4929
help='Historical alias for --include-merged.'),
4494
4930
]
4495
4931
encoding_type = 'replace'
4496
4932
4499
4935
theirs_only=False,
4500
4936
log_format=None, long=False, short=False, line=False,
4501
4937
show_ids=False, verbose=False, this=False, other=False,
4502
include_merges=False, revision=None, my_revision=None,
4503
directory=u'.'):
4938
include_merged=None, revision=None, my_revision=None,
4939
directory=u'.',
4940
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4504
4941
from bzrlib.missing import find_unmerged, iter_log_revisions
4505
4942
def message(s):
4506
4943
if not is_quiet():
4507
4944
self.outf.write(s)
4508
4945
4946
if symbol_versioning.deprecated_passed(include_merges):
4947
ui.ui_factory.show_user_warning(
4948
'deprecated_command_option',
4949
deprecated_name='--include-merges',
4950
recommended_name='--include-merged',
4951
deprecated_in_version='2.5',
4952
command=self.invoked_as)
4953
if include_merged is None:
4954
include_merged = include_merges
4955
else:
4956
raise errors.BzrCommandError(gettext(
4957
'{0} and {1} are mutually exclusive').format(
4958
'--include-merges', '--include-merged'))
4959
if include_merged is None:
4960
include_merged = False
4509
4961
if this:
4510
4962
mine_only = this
4511
4963
if other:
4526
4978
if other_branch is None:
4527
4979
other_branch = parent
4528
4980
if other_branch is None:
4529
raise errors.BzrCommandError("No peer location known"
4530
" or specified.")
4981
raise errors.BzrCommandError(gettext("No peer location known"
4982
" or specified."))
4531
4983
display_url = urlutils.unescape_for_display(parent,
4532
4984
self.outf.encoding)
4533
message("Using saved parent location: "
4534
+ display_url + "\n")
4985
message(gettext("Using saved parent location: {0}\n").format(
4986
display_url))
4535
4987
4536
4988
remote_branch = Branch.open(other_branch)
4537
4989
if remote_branch.base == local_branch.base:
4550
5002
local_extra, remote_extra = find_unmerged(
4551
5003
local_branch, remote_branch, restrict,
4552
5004
backward=not reverse,
4553
include_merges=include_merges,
5005
include_merged=include_merged,
4554
5006
local_revid_range=local_revid_range,
4555
5007
remote_revid_range=remote_revid_range)
4556
5008
4563
5015
4564
5016
status_code = 0
4565
5017
if local_extra and not theirs_only:
4566
message("You have %d extra revision(s):\n" %
5018
message(ngettext("You have %d extra revision:\n",
5019
"You have %d extra revisions:\n",
5020
len(local_extra)) %
4567
5021
len(local_extra))
5022
rev_tag_dict = {}
5023
if local_branch.supports_tags():
5024
rev_tag_dict = local_branch.tags.get_reverse_tag_dict()
4568
5025
for revision in iter_log_revisions(local_extra,
4569
5026
local_branch.repository,
4570
verbose):
5027
verbose,
5028
rev_tag_dict):
4571
5029
lf.log_revision(revision)
4572
5030
printed_local = True
4573
5031
status_code = 1
4577
5035
if remote_extra and not mine_only:
4578
5036
if printed_local is True:
4579
5037
message("\n\n\n")
4580
message("You are missing %d revision(s):\n" %
5038
message(ngettext("You are missing %d revision:\n",
5039
"You are missing %d revisions:\n",
5040
len(remote_extra)) %
4581
5041
len(remote_extra))
5042
if remote_branch.supports_tags():
5043
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4582
5044
for revision in iter_log_revisions(remote_extra,
4583
5045
remote_branch.repository,
4584
verbose):
5046
verbose,
5047
rev_tag_dict):
4585
5048
lf.log_revision(revision)
4586
5049
status_code = 1
4587
5050
4588
5051
if mine_only and not local_extra:
4589
5052
# We checked local, and found nothing extra
4590
message('This branch is up to date.\n')
5053
message(gettext('This branch has no new revisions.\n'))
4591
5054
elif theirs_only and not remote_extra:
4592
5055
# We checked remote, and found nothing extra
4593
message('Other branch is up to date.\n')
5056
message(gettext('Other branch has no new revisions.\n'))
4594
5057
elif not (mine_only or theirs_only or local_extra or
4595
5058
remote_extra):
4596
5059
# We checked both branches, and neither one had extra
4597
5060
# revisions
4598
message("Branches are up to date.\n")
5061
message(gettext("Branches are up to date.\n"))
4599
5062
self.cleanup_now()
4600
5063
if not status_code and parent is None and other_branch is not None:
4601
5064
self.add_cleanup(local_branch.lock_write().unlock)
4631
5094
]
4632
5095
4633
5096
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4634
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
5097
dir = controldir.ControlDir.open_containing(branch_or_repo)[0]
4635
5098
try:
4636
5099
branch = dir.open_branch()
4637
5100
repository = branch.repository
4677
5140
Option('strict',
4678
5141
help='Produce a strict-format testament.')]
4679
5142
takes_args = ['branch?']
5143
encoding_type = 'exact'
4680
5144
@display_command
4681
5145
def run(self, branch=u'.', revision=None, long=False, strict=False):
4682
5146
from bzrlib.testament import Testament, StrictTestament
4695
5159
rev_id = revision[0].as_revision_id(b)
4696
5160
t = testament_class.from_revision(b.repository, rev_id)
4697
5161
if long:
4698
sys.stdout.writelines(t.as_text_lines())
5162
self.outf.writelines(t.as_text_lines())
4699
5163
else:
4700
sys.stdout.write(t.as_short_text())
5164
self.outf.write(t.as_short_text())
4701
5165
4702
5166
4703
5167
class cmd_annotate(Command):
4762
5226
4763
5227
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4764
5228
if revision_id_list is not None and revision is not None:
4765
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5229
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4766
5230
if revision_id_list is None and revision is None:
4767
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
5231
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
4768
5232
b = WorkingTree.open_containing(directory)[0].branch
4769
5233
self.add_cleanup(b.lock_write().unlock)
4770
5234
return self._run(b, revision_id_list, revision)
4771
5235
4772
5236
def _run(self, b, revision_id_list, revision):
4773
5237
import bzrlib.gpg as gpg
4774
gpg_strategy = gpg.GPGStrategy(b.get_config())
5238
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4775
5239
if revision_id_list is not None:
4776
5240
b.repository.start_write_group()
4777
5241
try:
4802
5266
if to_revid is None:
4803
5267
to_revno = b.revno()
4804
5268
if from_revno is None or to_revno is None:
4805
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
5269
raise errors.BzrCommandError(gettext('Cannot sign a range of non-revision-history revisions'))
4806
5270
b.repository.start_write_group()
4807
5271
try:
4808
5272
for revno in range(from_revno, to_revno + 1):
4814
5278
else:
4815
5279
b.repository.commit_write_group()
4816
5280
else:
4817
raise errors.BzrCommandError('Please supply either one revision, or a range.')
5281
raise errors.BzrCommandError(gettext('Please supply either one revision, or a range.'))
4818
5282
4819
5283
4820
5284
class cmd_bind(Command):
4839
5303
try:
4840
5304
location = b.get_old_bound_location()
4841
5305
except errors.UpgradeRequired:
4842
raise errors.BzrCommandError('No location supplied. '
4843
'This format does not remember old locations.')
5306
raise errors.BzrCommandError(gettext('No location supplied. '
5307
'This format does not remember old locations.'))
4844
5308
else:
4845
5309
if location is None:
4846
5310
if b.get_bound_location() is not None:
4847
raise errors.BzrCommandError('Branch is already bound')
5311
raise errors.BzrCommandError(
5312
gettext('Branch is already bound'))
4848
5313
else:
4849
raise errors.BzrCommandError('No location supplied '
4850
'and no previous location known')
5314
raise errors.BzrCommandError(
5315
gettext('No location supplied'
5316
' and no previous location known'))
4851
5317
b_other = Branch.open(location)
4852
5318
try:
4853
5319
b.bind(b_other)
4854
5320
except errors.DivergedBranches:
4855
raise errors.BzrCommandError('These branches have diverged.'
4856
' Try merging, and then bind again.')
5321
raise errors.BzrCommandError(gettext('These branches have diverged.'
5322
' Try merging, and then bind again.'))
4857
5323
if b.get_config().has_explicit_nickname():
4858
5324
b.nick = b_other.nick
4859
5325
4872
5338
def run(self, directory=u'.'):
4873
5339
b, relpath = Branch.open_containing(directory)
4874
5340
if not b.unbind():
4875
raise errors.BzrCommandError('Local branch is not bound')
5341
raise errors.BzrCommandError(gettext('Local branch is not bound'))
4876
5342
4877
5343
4878
5344
class cmd_uncommit(Command):
4899
5365
takes_options = ['verbose', 'revision',
4900
5366
Option('dry-run', help='Don\'t actually make changes.'),
4901
5367
Option('force', help='Say yes to all questions.'),
5368
Option('keep-tags',
5369
help='Keep tags that point to removed revisions.'),
4902
5370
Option('local',
4903
5371
help="Only remove the commits from the local branch"
4904
5372
" when in a checkout."
4908
5376
aliases = []
4909
5377
encoding_type = 'replace'
4910
5378
4911
def run(self, location=None,
4912
dry_run=False, verbose=False,
4913
revision=None, force=False, local=False):
5379
def run(self, location=None, dry_run=False, verbose=False,
5380
revision=None, force=False, local=False, keep_tags=False):
4914
5381
if location is None:
4915
5382
location = u'.'
4916
control, relpath = bzrdir.BzrDir.open_containing(location)
5383
control, relpath = controldir.ControlDir.open_containing(location)
4917
5384
try:
4918
5385
tree = control.open_workingtree()
4919
5386
b = tree.branch
4925
5392
self.add_cleanup(tree.lock_write().unlock)
4926
5393
else:
4927
5394
self.add_cleanup(b.lock_write().unlock)
4928
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5395
return self._run(b, tree, dry_run, verbose, revision, force,
5396
local, keep_tags)
4929
5397
4930
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5398
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5399
keep_tags):
4931
5400
from bzrlib.log import log_formatter, show_log
4932
5401
from bzrlib.uncommit import uncommit
4933
5402
4948
5417
rev_id = b.get_rev_id(revno)
4949
5418
4950
5419
if rev_id is None or _mod_revision.is_null(rev_id):
4951
self.outf.write('No revisions to uncommit.\n')
5420
self.outf.write(gettext('No revisions to uncommit.\n'))
4952
5421
return 1
4953
5422
4954
5423
lf = log_formatter('short',
4963
5432
end_revision=last_revno)
4964
5433
4965
5434
if dry_run:
4966
self.outf.write('Dry-run, pretending to remove'
4967
' the above revisions.\n')
5435
self.outf.write(gettext('Dry-run, pretending to remove'
5436
' the above revisions.\n'))
4968
5437
else:
4969
self.outf.write('The above revision(s) will be removed.\n')
5438
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4970
5439
4971
5440
if not force:
4972
5441
if not ui.ui_factory.confirm_action(
4973
u'Uncommit these revisions',
5442
gettext(u'Uncommit these revisions'),
4974
5443
'bzrlib.builtins.uncommit',
4975
5444
{}):
4976
self.outf.write('Canceled\n')
5445
self.outf.write(gettext('Canceled\n'))
4977
5446
return 0
4978
5447
4979
5448
mutter('Uncommitting from {%s} to {%s}',
4980
5449
last_rev_id, rev_id)
4981
5450
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4982
revno=revno, local=local)
4983
self.outf.write('You can restore the old tip by running:\n'
4984
' bzr pull . -r revid:%s\n' % last_rev_id)
5451
revno=revno, local=local, keep_tags=keep_tags)
5452
self.outf.write(gettext('You can restore the old tip by running:\n'
5453
' bzr pull . -r revid:%s\n') % last_rev_id)
4985
5454
4986
5455
4987
5456
class cmd_break_lock(Command):
5021
5490
conf = _mod_config.LockableConfig(file_name=location)
5022
5491
conf.break_lock()
5023
5492
else:
5024
control, relpath = bzrdir.BzrDir.open_containing(location)
5493
control, relpath = controldir.ControlDir.open_containing(location)
5025
5494
try:
5026
5495
control.break_lock()
5027
5496
except NotImplementedError:
5054
5523
help="Protocol to serve.",
5055
5524
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5056
5525
value_switches=True),
5526
Option('listen',
5527
help='Listen for connections on nominated address.', type=str),
5057
5528
Option('port',
5058
help='Listen for connections on nominated port of the form '
5059
'[hostname:]portnumber. Passing 0 as the port number will '
5060
'result in a dynamically allocated port. The default port '
5061
'depends on the protocol.',
5062
type=str),
5529
help='Listen for connections on nominated port. Passing 0 as '
5530
'the port number will result in a dynamically allocated '
5531
'port. The default port depends on the protocol.',
5532
type=int),
5063
5533
custom_help('directory',
5064
5534
help='Serve contents of this directory.'),
5065
5535
Option('allow-writes',
5071
5541
'option leads to global uncontrolled write access to your '
5072
5542
'file system.'
5073
5543
),
5544
Option('client-timeout', type=float,
5545
help='Override the default idle client timeout (5min).'),
5074
5546
]
5075
5547
5076
def get_host_and_port(self, port):
5077
"""Return the host and port to run the smart server on.
5078
5079
If 'port' is None, None will be returned for the host and port.
5080
5081
If 'port' has a colon in it, the string before the colon will be
5082
interpreted as the host.
5083
5084
:param port: A string of the port to run the server on.
5085
:return: A tuple of (host, port), where 'host' is a host name or IP,
5086
and port is an integer TCP/IP port.
5087
"""
5088
host = None
5089
if port is not None:
5090
if ':' in port:
5091
host, port = port.split(':')
5092
port = int(port)
5093
return host, port
5094
5095
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5096
protocol=None):
5548
def run(self, listen=None, port=None, inet=False, directory=None,
5549
allow_writes=False, protocol=None, client_timeout=None):
5097
5550
from bzrlib import transport
5098
5551
if directory is None:
5099
5552
directory = os.getcwd()
5100
5553
if protocol is None:
5101
5554
protocol = transport.transport_server_registry.get()
5102
host, port = self.get_host_and_port(port)
5103
url = urlutils.local_path_to_url(directory)
5555
url = transport.location_to_url(directory)
5104
5556
if not allow_writes:
5105
5557
url = 'readonly+' + url
5106
t = transport.get_transport(url)
5107
protocol(t, host, port, inet)
5558
t = transport.get_transport_from_url(url)
5559
protocol(t, listen, port, inet, client_timeout)
5108
5560
5109
5561
5110
5562
class cmd_join(Command):
5133
5585
containing_tree = WorkingTree.open_containing(parent_dir)[0]
5134
5586
repo = containing_tree.branch.repository
5135
5587
if not repo.supports_rich_root():
5136
raise errors.BzrCommandError(
5588
raise errors.BzrCommandError(gettext(
5137
5589
"Can't join trees because %s doesn't support rich root data.\n"
5138
"You can use bzr upgrade on the repository."
5590
"You can use bzr upgrade on the repository.")
5139
5591
% (repo,))
5140
5592
if reference:
5141
5593
try:
5143
5595
except errors.BadReferenceTarget, e:
5144
5596
# XXX: Would be better to just raise a nicely printable
5145
5597
# exception from the real origin. Also below. mbp 20070306
5146
raise errors.BzrCommandError("Cannot join %s. %s" %
5147
(tree, e.reason))
5598
raise errors.BzrCommandError(
5599
gettext("Cannot join {0}. {1}").format(tree, e.reason))
5148
5600
else:
5149
5601
try:
5150
5602
containing_tree.subsume(sub_tree)
5151
5603
except errors.BadSubsumeSource, e:
5152
raise errors.BzrCommandError("Cannot join %s. %s" %
5153
(tree, e.reason))
5604
raise errors.BzrCommandError(
5605
gettext("Cannot join {0}. {1}").format(tree, e.reason))
5154
5606
5155
5607
5156
5608
class cmd_split(Command):
5240
5692
if submit_branch is None:
5241
5693
submit_branch = branch.get_parent()
5242
5694
if submit_branch is None:
5243
raise errors.BzrCommandError('No submit branch specified or known')
5695
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5244
5696
5245
5697
stored_public_branch = branch.get_public_branch()
5246
5698
if public_branch is None:
5247
5699
public_branch = stored_public_branch
5248
5700
elif stored_public_branch is None:
5701
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5249
5702
branch.set_public_branch(public_branch)
5250
5703
if not include_bundle and public_branch is None:
5251
raise errors.BzrCommandError('No public branch specified or'
5252
' known')
5704
raise errors.BzrCommandError(gettext('No public branch specified or'
5705
' known'))
5253
5706
base_revision_id = None
5254
5707
if revision is not None:
5255
5708
if len(revision) > 2:
5256
raise errors.BzrCommandError('bzr merge-directive takes '
5257
'at most two one revision identifiers')
5709
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5710
'at most two one revision identifiers'))
5258
5711
revision_id = revision[-1].as_revision_id(branch)
5259
5712
if len(revision) == 2:
5260
5713
base_revision_id = revision[0].as_revision_id(branch)
5262
5715
revision_id = branch.last_revision()
5263
5716
revision_id = ensure_null(revision_id)
5264
5717
if revision_id == NULL_REVISION:
5265
raise errors.BzrCommandError('No revisions to bundle.')
5718
raise errors.BzrCommandError(gettext('No revisions to bundle.'))
5266
5719
directive = merge_directive.MergeDirective2.from_objects(
5267
5720
branch.repository, revision_id, time.time(),
5268
5721
osutils.local_time_offset(), submit_branch,
5276
5729
self.outf.writelines(directive.to_lines())
5277
5730
else:
5278
5731
message = directive.to_email(mail_to, branch, sign)
5279
s = SMTPConnection(branch.get_config())
5732
s = SMTPConnection(branch.get_config_stack())
5280
5733
s.send_email(message)
5281
5734
5282
5735
5314
5767
5315
5768
Both the submit branch and the public branch follow the usual behavior with
5316
5769
respect to --remember: If there is no default location set, the first send
5317
will set it (use --no-remember to avoid settting it). After that, you can
5770
will set it (use --no-remember to avoid setting it). After that, you can
5318
5771
omit the location to use the default. To change the default, use
5319
5772
--remember. The value will only be saved if the location can be accessed.
5320
5773
5522
5975
self.add_cleanup(branch.lock_write().unlock)
5523
5976
if delete:
5524
5977
if tag_name is None:
5525
raise errors.BzrCommandError("No tag specified to delete.")
5978
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5526
5979
branch.tags.delete_tag(tag_name)
5527
note('Deleted tag %s.' % tag_name)
5980
note(gettext('Deleted tag %s.') % tag_name)
5528
5981
else:
5529
5982
if revision:
5530
5983
if len(revision) != 1:
5531
raise errors.BzrCommandError(
5984
raise errors.BzrCommandError(gettext(
5532
5985
"Tags can only be placed on a single revision, "
5533
"not on a range")
5986
"not on a range"))
5534
5987
revision_id = revision[0].as_revision_id(branch)
5535
5988
else:
5536
5989
revision_id = branch.last_revision()
5537
5990
if tag_name is None:
5538
5991
tag_name = branch.automatic_tag_name(revision_id)
5539
5992
if tag_name is None:
5540
raise errors.BzrCommandError(
5541
"Please specify a tag name.")
5542
if (not force) and branch.tags.has_tag(tag_name):
5993
raise errors.BzrCommandError(gettext(
5994
"Please specify a tag name."))
5995
try:
5996
existing_target = branch.tags.lookup_tag(tag_name)
5997
except errors.NoSuchTag:
5998
existing_target = None
5999
if not force and existing_target not in (None, revision_id):
5543
6000
raise errors.TagAlreadyExists(tag_name)
5544
branch.tags.set_tag(tag_name, revision_id)
5545
note('Created tag %s.' % tag_name)
6001
if existing_target == revision_id:
6002
note(gettext('Tag %s already exists for that revision.') % tag_name)
6003
else:
6004
branch.tags.set_tag(tag_name, revision_id)
6005
if existing_target is None:
6006
note(gettext('Created tag %s.') % tag_name)
6007
else:
6008
note(gettext('Updated tag %s.') % tag_name)
5546
6009
5547
6010
5548
6011
class cmd_tags(Command):
5574
6037
5575
6038
self.add_cleanup(branch.lock_read().unlock)
5576
6039
if revision:
5577
graph = branch.repository.get_graph()
5578
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5579
revid1, revid2 = rev1.rev_id, rev2.rev_id
5580
# only show revisions between revid1 and revid2 (inclusive)
5581
tags = [(tag, revid) for tag, revid in tags if
5582
graph.is_between(revid, revid1, revid2)]
6040
# Restrict to the specified range
6041
tags = self._tags_for_range(branch, revision)
5583
6042
if sort is None:
5584
6043
sort = tag_sort_methods.get()
5585
6044
sort(branch, tags)
5590
6049
revno = branch.revision_id_to_dotted_revno(revid)
5591
6050
if isinstance(revno, tuple):
5592
6051
revno = '.'.join(map(str, revno))
5593
except (errors.NoSuchRevision, errors.GhostRevisionsHaveNoRevno):
6052
except (errors.NoSuchRevision,
6053
errors.GhostRevisionsHaveNoRevno,
6054
errors.UnsupportedOperation):
5594
6055
# Bad tag data/merges can lead to tagged revisions
5595
6056
# which are not in this branch. Fail gracefully ...
5596
6057
revno = '?'
5599
6060
for tag, revspec in tags:
5600
6061
self.outf.write('%-20s %s\n' % (tag, revspec))
5601
6062
6063
def _tags_for_range(self, branch, revision):
6064
range_valid = True
6065
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6066
revid1, revid2 = rev1.rev_id, rev2.rev_id
6067
# _get_revision_range will always set revid2 if it's not specified.
6068
# If revid1 is None, it means we want to start from the branch
6069
# origin which is always a valid ancestor. If revid1 == revid2, the
6070
# ancestry check is useless.
6071
if revid1 and revid1 != revid2:
6072
# FIXME: We really want to use the same graph than
6073
# branch.iter_merge_sorted_revisions below, but this is not
6074
# easily available -- vila 2011-09-23
6075
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6076
# We don't want to output anything in this case...
6077
return []
6078
# only show revisions between revid1 and revid2 (inclusive)
6079
tagged_revids = branch.tags.get_reverse_tag_dict()
6080
found = []
6081
for r in branch.iter_merge_sorted_revisions(
6082
start_revision_id=revid2, stop_revision_id=revid1,
6083
stop_rule='include'):
6084
revid_tags = tagged_revids.get(r[0], None)
6085
if revid_tags:
6086
found.extend([(tag, r[0]) for tag in revid_tags])
6087
return found
6088
5602
6089
5603
6090
class cmd_reconfigure(Command):
5604
6091
__doc__ = """Reconfigure the type of a bzr directory.
5618
6105
takes_args = ['location?']
5619
6106
takes_options = [
5620
6107
RegistryOption.from_kwargs(
5621
'target_type',
5622
title='Target type',
5623
help='The type to reconfigure the directory to.',
6108
'tree_type',
6109
title='Tree type',
6110
help='The relation between branch and tree.',
5624
6111
value_switches=True, enum_switch=False,
5625
6112
branch='Reconfigure to be an unbound branch with no working tree.',
5626
6113
tree='Reconfigure to be an unbound branch with a working tree.',
5627
6114
checkout='Reconfigure to be a bound branch with a working tree.',
5628
6115
lightweight_checkout='Reconfigure to be a lightweight'
5629
6116
' checkout (with no local history).',
6117
),
6118
RegistryOption.from_kwargs(
6119
'repository_type',
6120
title='Repository type',
6121
help='Location fo the repository.',
6122
value_switches=True, enum_switch=False,
5630
6123
standalone='Reconfigure to be a standalone branch '
5631
6124
'(i.e. stop using shared repository).',
5632
6125
use_shared='Reconfigure to use a shared repository.',
6126
),
6127
RegistryOption.from_kwargs(
6128
'repository_trees',
6129
title='Trees in Repository',
6130
help='Whether new branches in the repository have trees.',
6131
value_switches=True, enum_switch=False,
5633
6132
with_trees='Reconfigure repository to create '
5634
6133
'working trees on branches by default.',
5635
6134
with_no_trees='Reconfigure repository to not create '
5649
6148
),
5650
6149
]
5651
6150
5652
def run(self, location=None, target_type=None, bind_to=None, force=False,
5653
stacked_on=None,
5654
unstacked=None):
5655
directory = bzrdir.BzrDir.open(location)
6151
def run(self, location=None, bind_to=None, force=False,
6152
tree_type=None, repository_type=None, repository_trees=None,
6153
stacked_on=None, unstacked=None):
6154
directory = controldir.ControlDir.open(location)
5656
6155
if stacked_on and unstacked:
5657
raise errors.BzrCommandError("Can't use both --stacked-on and --unstacked")
6156
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5658
6157
elif stacked_on is not None:
5659
6158
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5660
6159
elif unstacked:
5662
6161
# At the moment you can use --stacked-on and a different
5663
6162
# reconfiguration shape at the same time; there seems no good reason
5664
6163
# to ban it.
5665
if target_type is None:
6164
if (tree_type is None and
6165
repository_type is None and
6166
repository_trees is None):
5666
6167
if stacked_on or unstacked:
5667
6168
return
5668
6169
else:
5669
raise errors.BzrCommandError('No target configuration '
5670
'specified')
5671
elif target_type == 'branch':
6170
raise errors.BzrCommandError(gettext('No target configuration '
6171
'specified'))
6172
reconfiguration = None
6173
if tree_type == 'branch':
5672
6174
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5673
elif target_type == 'tree':
6175
elif tree_type == 'tree':
5674
6176
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5675
elif target_type == 'checkout':
6177
elif tree_type == 'checkout':
5676
6178
reconfiguration = reconfigure.Reconfigure.to_checkout(
5677
6179
directory, bind_to)
5678
elif target_type == 'lightweight-checkout':
6180
elif tree_type == 'lightweight-checkout':
5679
6181
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5680
6182
directory, bind_to)
5681
elif target_type == 'use-shared':
6183
if reconfiguration:
6184
reconfiguration.apply(force)
6185
reconfiguration = None
6186
if repository_type == 'use-shared':
5682
6187
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5683
elif target_type == 'standalone':
6188
elif repository_type == 'standalone':
5684
6189
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5685
elif target_type == 'with-trees':
6190
if reconfiguration:
6191
reconfiguration.apply(force)
6192
reconfiguration = None
6193
if repository_trees == 'with-trees':
5686
6194
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5687
6195
directory, True)
5688
elif target_type == 'with-no-trees':
6196
elif repository_trees == 'with-no-trees':
5689
6197
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5690
6198
directory, False)
5691
reconfiguration.apply(force)
6199
if reconfiguration:
6200
reconfiguration.apply(force)
6201
reconfiguration = None
5692
6202
5693
6203
5694
6204
class cmd_switch(Command):
5722
6232
Option('create-branch', short_name='b',
5723
6233
help='Create the target branch from this one before'
5724
6234
' switching to it.'),
6235
Option('store',
6236
help='Store and restore uncommitted changes in the'
6237
' branch.'),
5725
6238
]
5726
6239
5727
6240
def run(self, to_location=None, force=False, create_branch=False,
5728
revision=None, directory=u'.'):
6241
revision=None, directory=u'.', store=False):
5729
6242
from bzrlib import switch
5730
6243
tree_location = directory
5731
6244
revision = _get_one_revision('switch', revision)
5732
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6245
possible_transports = []
6246
control_dir = controldir.ControlDir.open_containing(tree_location,
6247
possible_transports=possible_transports)[0]
5733
6248
if to_location is None:
5734
6249
if revision is None:
5735
raise errors.BzrCommandError('You must supply either a'
5736
' revision or a location')
6250
raise errors.BzrCommandError(gettext('You must supply either a'
6251
' revision or a location'))
5737
6252
to_location = tree_location
5738
6253
try:
5739
branch = control_dir.open_branch()
6254
branch = control_dir.open_branch(
6255
possible_transports=possible_transports)
5740
6256
had_explicit_nick = branch.get_config().has_explicit_nickname()
5741
6257
except errors.NotBranchError:
5742
6258
branch = None
5743
6259
had_explicit_nick = False
5744
6260
if create_branch:
5745
6261
if branch is None:
5746
raise errors.BzrCommandError('cannot create branch without'
5747
' source branch')
5748
to_location = directory_service.directories.dereference(
5749
to_location)
5750
if '/' not in to_location and '\\' not in to_location:
5751
# This path is meant to be relative to the existing branch
5752
this_url = self._get_branch_location(control_dir)
5753
to_location = urlutils.join(this_url, '..', to_location)
6262
raise errors.BzrCommandError(
6263
gettext('cannot create branch without source branch'))
6264
to_location = lookup_new_sibling_branch(control_dir, to_location,
6265
possible_transports=possible_transports)
5754
6266
to_branch = branch.bzrdir.sprout(to_location,
5755
possible_transports=[branch.bzrdir.root_transport],
5756
source_branch=branch).open_branch()
6267
possible_transports=possible_transports,
6268
source_branch=branch).open_branch()
5757
6269
else:
5758
6270
try:
5759
to_branch = Branch.open(to_location)
6271
to_branch = Branch.open(to_location,
6272
possible_transports=possible_transports)
5760
6273
except errors.NotBranchError:
5761
this_url = self._get_branch_location(control_dir)
5762
to_branch = Branch.open(
5763
urlutils.join(this_url, '..', to_location))
6274
to_branch = open_sibling_branch(control_dir, to_location,
6275
possible_transports=possible_transports)
5764
6276
if revision is not None:
5765
6277
revision = revision.as_revision_id(to_branch)
5766
switch.switch(control_dir, to_branch, force, revision_id=revision)
6278
switch.switch(control_dir, to_branch, force, revision_id=revision,
6279
store_uncommitted=store)
5767
6280
if had_explicit_nick:
5768
6281
branch = control_dir.open_branch() #get the new branch!
5769
6282
branch.nick = to_branch.nick
5770
note('Switched to branch: %s',
6283
note(gettext('Switched to branch: %s'),
5771
6284
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5772
6285
5773
def _get_branch_location(self, control_dir):
5774
"""Return location of branch for this control dir."""
5775
try:
5776
this_branch = control_dir.open_branch()
5777
# This may be a heavy checkout, where we want the master branch
5778
master_location = this_branch.get_bound_location()
5779
if master_location is not None:
5780
return master_location
5781
# If not, use a local sibling
5782
return this_branch.base
5783
except errors.NotBranchError:
5784
format = control_dir.find_branch_format()
5785
if getattr(format, 'get_reference', None) is not None:
5786
return format.get_reference(control_dir)
5787
else:
5788
return control_dir.root_transport.base
5789
6286
5790
6287
5791
6288
class cmd_view(Command):
5882
6379
name = current_view
5883
6380
if delete:
5884
6381
if file_list:
5885
raise errors.BzrCommandError(
5886
"Both --delete and a file list specified")
6382
raise errors.BzrCommandError(gettext(
6383
"Both --delete and a file list specified"))
5887
6384
elif switch:
5888
raise errors.BzrCommandError(
5889
"Both --delete and --switch specified")
6385
raise errors.BzrCommandError(gettext(
6386
"Both --delete and --switch specified"))
5890
6387
elif all:
5891
6388
tree.views.set_view_info(None, {})
5892
self.outf.write("Deleted all views.\n")
6389
self.outf.write(gettext("Deleted all views.\n"))
5893
6390
elif name is None:
5894
raise errors.BzrCommandError("No current view to delete")
6391
raise errors.BzrCommandError(gettext("No current view to delete"))
5895
6392
else:
5896
6393
tree.views.delete_view(name)
5897
self.outf.write("Deleted '%s' view.\n" % name)
6394
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5898
6395
elif switch:
5899
6396
if file_list:
5900
raise errors.BzrCommandError(
5901
"Both --switch and a file list specified")
6397
raise errors.BzrCommandError(gettext(
6398
"Both --switch and a file list specified"))
5902
6399
elif all:
5903
raise errors.BzrCommandError(
5904
"Both --switch and --all specified")
6400
raise errors.BzrCommandError(gettext(
6401
"Both --switch and --all specified"))
5905
6402
elif switch == 'off':
5906
6403
if current_view is None:
5907
raise errors.BzrCommandError("No current view to disable")
6404
raise errors.BzrCommandError(gettext("No current view to disable"))
5908
6405
tree.views.set_view_info(None, view_dict)
5909
self.outf.write("Disabled '%s' view.\n" % (current_view))
6406
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5910
6407
else:
5911
6408
tree.views.set_view_info(switch, view_dict)
5912
6409
view_str = views.view_display_str(tree.views.lookup_view())
5913
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6410
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5914
6411
elif all:
5915
6412
if view_dict:
5916
self.outf.write('Views defined:\n')
6413
self.outf.write(gettext('Views defined:\n'))
5917
6414
for view in sorted(view_dict):
5918
6415
if view == current_view:
5919
6416
active = "=>"
5922
6419
view_str = views.view_display_str(view_dict[view])
5923
6420
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5924
6421
else:
5925
self.outf.write('No views defined.\n')
6422
self.outf.write(gettext('No views defined.\n'))
5926
6423
elif file_list:
5927
6424
if name is None:
5928
6425
# No name given and no current view set
5929
6426
name = 'my'
5930
6427
elif name == 'off':
5931
raise errors.BzrCommandError(
5932
"Cannot change the 'off' pseudo view")
6428
raise errors.BzrCommandError(gettext(
6429
"Cannot change the 'off' pseudo view"))
5933
6430
tree.views.set_view(name, sorted(file_list))
5934
6431
view_str = views.view_display_str(tree.views.lookup_view())
5935
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6432
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5936
6433
else:
5937
6434
# list the files
5938
6435
if name is None:
5939
6436
# No name given and no current view set
5940
self.outf.write('No current view.\n')
6437
self.outf.write(gettext('No current view.\n'))
5941
6438
else:
5942
6439
view_str = views.view_display_str(tree.views.lookup_view(name))
5943
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6440
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5944
6441
5945
6442
5946
6443
class cmd_hooks(Command):
5960
6457
self.outf.write(" %s\n" %
5961
6458
(some_hooks.get_hook_name(hook),))
5962
6459
else:
5963
self.outf.write(" <no hooks installed>\n")
6460
self.outf.write(gettext(" <no hooks installed>\n"))
5964
6461
5965
6462
5966
6463
class cmd_remove_branch(Command):
5979
6476
5980
6477
takes_args = ["location?"]
5981
6478
6479
takes_options = ['directory',
6480
Option('force', help='Remove branch even if it is the active branch.')]
6481
5982
6482
aliases = ["rmbranch"]
5983
6483
5984
def run(self, location=None):
5985
if location is None:
5986
location = "."
5987
branch = Branch.open_containing(location)[0]
5988
branch.bzrdir.destroy_branch()
6484
def run(self, directory=None, location=None, force=False):
6485
br = open_nearby_branch(near=directory, location=location)
6486
if not force and br.bzrdir.has_workingtree():
6487
try:
6488
active_branch = br.bzrdir.open_branch(name="")
6489
except errors.NotBranchError:
6490
active_branch = None
6491
if (active_branch is not None and
6492
br.control_url == active_branch.control_url):
6493
raise errors.BzrCommandError(
6494
gettext("Branch is active. Use --force to remove it."))
6495
br.bzrdir.destroy_branch(br.name)
5989
6496
5990
6497
5991
6498
class cmd_shelve(Command):
6067
6574
manager = tree.get_shelf_manager()
6068
6575
shelves = manager.active_shelves()
6069
6576
if len(shelves) == 0:
6070
note('No shelved changes.')
6577
note(gettext('No shelved changes.'))
6071
6578
return 0
6072
6579
for shelf_id in reversed(shelves):
6073
6580
message = manager.get_metadata(shelf_id).get('message')
6162
6669
if path is not None:
6163
6670
branchdir = path
6164
6671
tree, branch, relpath =(
6165
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6672
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
6166
6673
if path is not None:
6167
6674
path = relpath
6168
6675
if tree is None:
6196
6703
__doc__ = """Export command helps and error messages in po format."""
6197
6704
6198
6705
hidden = True
6706
takes_options = [Option('plugin',
6707
help='Export help text from named command '\
6708
'(defaults to all built in commands).',
6709
type=str),
6710
Option('include-duplicates',
6711
help='Output multiple copies of the same msgid '
6712
'string if it appears more than once.'),
6713
]
6199
6714
6200
def run(self):
6715
def run(self, plugin=None, include_duplicates=False):
6201
6716
from bzrlib.export_pot import export_pot
6202
export_pot(self.outf)
6717
export_pot(self.outf, plugin, include_duplicates)
6203
6718
6204
6719
6205
6720
def _register_lazy_builtins():
6212
6727
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6213
6728
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6214
6729
('cmd_conflicts', [], 'bzrlib.conflicts'),
6215
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6730
('cmd_ping', [], 'bzrlib.smart.ping'),
6731
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6732
('cmd_verify_signatures', [], 'bzrlib.commit_signature_commands'),
6216
6733
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6217
6734
]:
6218
6735
builtin_command_registry.register_lazy(name, aliases, module_name)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1