1
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""builtin bzr commands"""
20
from StringIO import StringIO
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
43
revision as _mod_revision,
50
from bzrlib.branch import Branch
51
from bzrlib.conflicts import ConflictList
52
from bzrlib.revisionspec import RevisionSpec
53
from bzrlib.smtp_connection import SMTPConnection
54
from bzrlib.workingtree import WorkingTree
57
from bzrlib.commands import Command, display_command
58
from bzrlib.option import ListOption, Option, RegistryOption, custom_help
59
from bzrlib.trace import mutter, note, warning, is_quiet, info
62
def tree_files(file_list, default_branch=u'.'):
64
return internal_tree_files(file_list, default_branch)
65
except errors.FileInWrongBranch, e:
66
raise errors.BzrCommandError("%s is not in the same branch as %s" %
67
(e.path, file_list[0]))
70
# XXX: Bad function name; should possibly also be a class method of
71
# WorkingTree rather than a function.
72
def internal_tree_files(file_list, default_branch=u'.'):
73
"""Convert command-line paths to a WorkingTree and relative paths.
75
This is typically used for command-line processors that take one or
76
more filenames, and infer the workingtree that contains them.
78
The filenames given are not required to exist.
80
:param file_list: Filenames to convert.
82
:param default_branch: Fallback tree path to use if file_list is empty or
85
:return: workingtree, [relative_paths]
87
if file_list is None or len(file_list) == 0:
88
return WorkingTree.open_containing(default_branch)[0], file_list
89
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
91
for filename in file_list:
93
new_list.append(tree.relpath(osutils.dereference_path(filename)))
94
except errors.PathNotChild:
95
raise errors.FileInWrongBranch(tree.branch, filename)
99
@symbol_versioning.deprecated_function(symbol_versioning.zero_fifteen)
100
def get_format_type(typestring):
101
"""Parse and return a format specifier."""
102
# Have to use BzrDirMetaFormat1 directly, so that
103
# RepositoryFormat.set_default_format works
104
if typestring == "default":
105
return bzrdir.BzrDirMetaFormat1()
107
return bzrdir.format_registry.make_bzrdir(typestring)
109
msg = 'Unknown bzr format "%s". See "bzr help formats".' % typestring
110
raise errors.BzrCommandError(msg)
113
# TODO: Make sure no commands unconditionally use the working directory as a
114
# branch. If a filename argument is used, the first of them should be used to
115
# specify the branch. (Perhaps this can be factored out into some kind of
116
# Argument class, representing a file in a branch, where the first occurrence
119
class cmd_status(Command):
120
"""Display status summary.
122
This reports on versioned and unknown files, reporting them
123
grouped by state. Possible states are:
126
Versioned in the working copy but not in the previous revision.
129
Versioned in the previous revision but removed or deleted
133
Path of this file changed from the previous revision;
134
the text may also have changed. This includes files whose
135
parent directory was renamed.
138
Text has changed since the previous revision.
141
File kind has been changed (e.g. from file to directory).
144
Not versioned and not matching an ignore pattern.
146
To see ignored files use 'bzr ignored'. For details on the
147
changes to file texts, use 'bzr diff'.
149
Note that --short or -S gives status flags for each item, similar
150
to Subversion's status command. To get output similar to svn -q,
153
If no arguments are specified, the status of the entire working
154
directory is shown. Otherwise, only the status of the specified
155
files or directories is reported. If a directory is given, status
156
is reported for everything inside that directory.
158
If a revision argument is given, the status is calculated against
159
that revision, or between two revisions if two are provided.
162
# TODO: --no-recurse, --recurse options
164
takes_args = ['file*']
165
takes_options = ['show-ids', 'revision', 'change',
166
Option('short', help='Use short status indicators.',
168
Option('versioned', help='Only show versioned files.',
170
Option('no-pending', help='Don\'t show pending merges.',
173
aliases = ['st', 'stat']
175
encoding_type = 'replace'
176
_see_also = ['diff', 'revert', 'status-flags']
179
def run(self, show_ids=False, file_list=None, revision=None, short=False,
180
versioned=False, no_pending=False):
181
from bzrlib.status import show_tree_status
183
if revision and len(revision) > 2:
184
raise errors.BzrCommandError('bzr status --revision takes exactly'
185
' one or two revision specifiers')
187
tree, file_list = tree_files(file_list)
189
show_tree_status(tree, show_ids=show_ids,
190
specific_files=file_list, revision=revision,
191
to_file=self.outf, short=short, versioned=versioned,
192
show_pending=not no_pending)
195
class cmd_cat_revision(Command):
196
"""Write out metadata for a revision.
198
The revision to print can either be specified by a specific
199
revision identifier, or you can use --revision.
203
takes_args = ['revision_id?']
204
takes_options = ['revision']
205
# cat-revision is more for frontends so should be exact
209
def run(self, revision_id=None, revision=None):
210
if revision_id is not None and revision is not None:
211
raise errors.BzrCommandError('You can only supply one of'
212
' revision_id or --revision')
213
if revision_id is None and revision is None:
214
raise errors.BzrCommandError('You must supply either'
215
' --revision or a revision_id')
216
b = WorkingTree.open_containing(u'.')[0].branch
218
# TODO: jam 20060112 should cat-revision always output utf-8?
219
if revision_id is not None:
220
revision_id = osutils.safe_revision_id(revision_id, warn=False)
221
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
222
elif revision is not None:
225
raise errors.BzrCommandError('You cannot specify a NULL'
227
rev_id = rev.as_revision_id(b)
228
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
231
class cmd_remove_tree(Command):
232
"""Remove the working tree from a given branch/checkout.
234
Since a lightweight checkout is little more than a working tree
235
this will refuse to run against one.
237
To re-create the working tree, use "bzr checkout".
239
_see_also = ['checkout', 'working-trees']
241
takes_args = ['location?']
243
def run(self, location='.'):
244
d = bzrdir.BzrDir.open(location)
247
working = d.open_workingtree()
248
except errors.NoWorkingTree:
249
raise errors.BzrCommandError("No working tree to remove")
250
except errors.NotLocalUrl:
251
raise errors.BzrCommandError("You cannot remove the working tree of a "
254
working_path = working.bzrdir.root_transport.base
255
branch_path = working.branch.bzrdir.root_transport.base
256
if working_path != branch_path:
257
raise errors.BzrCommandError("You cannot remove the working tree from "
258
"a lightweight checkout")
260
d.destroy_workingtree()
263
class cmd_revno(Command):
264
"""Show current revision number.
266
This is equal to the number of revisions on this branch.
270
takes_args = ['location?']
273
def run(self, location=u'.'):
274
self.outf.write(str(Branch.open_containing(location)[0].revno()))
275
self.outf.write('\n')
278
class cmd_revision_info(Command):
279
"""Show revision number and revision id for a given revision identifier.
282
takes_args = ['revision_info*']
283
takes_options = ['revision']
286
def run(self, revision=None, revision_info_list=[]):
289
if revision is not None:
290
revs.extend(revision)
291
if revision_info_list is not None:
292
for rev in revision_info_list:
293
revs.append(RevisionSpec.from_string(rev))
295
b = Branch.open_containing(u'.')[0]
298
revs.append(RevisionSpec.from_string('-1'))
301
revision_id = rev.as_revision_id(b)
303
revno = '%4d' % (b.revision_id_to_revno(revision_id))
304
except errors.NoSuchRevision:
305
dotted_map = b.get_revision_id_to_revno_map()
306
revno = '.'.join(str(i) for i in dotted_map[revision_id])
307
print '%s %s' % (revno, revision_id)
310
class cmd_add(Command):
311
"""Add specified files or directories.
313
In non-recursive mode, all the named items are added, regardless
314
of whether they were previously ignored. A warning is given if
315
any of the named files are already versioned.
317
In recursive mode (the default), files are treated the same way
318
but the behaviour for directories is different. Directories that
319
are already versioned do not give a warning. All directories,
320
whether already versioned or not, are searched for files or
321
subdirectories that are neither versioned or ignored, and these
322
are added. This search proceeds recursively into versioned
323
directories. If no names are given '.' is assumed.
325
Therefore simply saying 'bzr add' will version all files that
326
are currently unknown.
328
Adding a file whose parent directory is not versioned will
329
implicitly add the parent, and so on up to the root. This means
330
you should never need to explicitly add a directory, they'll just
331
get added when you add a file in the directory.
333
--dry-run will show which files would be added, but not actually
336
--file-ids-from will try to use the file ids from the supplied path.
337
It looks up ids trying to find a matching parent directory with the
338
same filename, and then by pure path. This option is rarely needed
339
but can be useful when adding the same logical file into two
340
branches that will be merged later (without showing the two different
341
adds as a conflict). It is also useful when merging another project
342
into a subdirectory of this one.
344
takes_args = ['file*']
347
help="Don't recursively add the contents of directories."),
349
help="Show what would be done, but don't actually do anything."),
351
Option('file-ids-from',
353
help='Lookup file ids from this tree.'),
355
encoding_type = 'replace'
356
_see_also = ['remove']
358
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
363
if file_ids_from is not None:
365
base_tree, base_path = WorkingTree.open_containing(
367
except errors.NoWorkingTree:
368
base_branch, base_path = Branch.open_containing(
370
base_tree = base_branch.basis_tree()
372
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
373
to_file=self.outf, should_print=(not is_quiet()))
375
action = bzrlib.add.AddAction(to_file=self.outf,
376
should_print=(not is_quiet()))
379
base_tree.lock_read()
381
file_list = self._maybe_expand_globs(file_list)
383
tree = WorkingTree.open_containing(file_list[0])[0]
385
tree = WorkingTree.open_containing(u'.')[0]
386
added, ignored = tree.smart_add(file_list, not
387
no_recurse, action=action, save=not dry_run)
389
if base_tree is not None:
393
for glob in sorted(ignored.keys()):
394
for path in ignored[glob]:
395
self.outf.write("ignored %s matching \"%s\"\n"
399
for glob, paths in ignored.items():
400
match_len += len(paths)
401
self.outf.write("ignored %d file(s).\n" % match_len)
402
self.outf.write("If you wish to add some of these files,"
403
" please add them by name.\n")
406
class cmd_mkdir(Command):
407
"""Create a new versioned directory.
409
This is equivalent to creating the directory and then adding it.
412
takes_args = ['dir+']
413
encoding_type = 'replace'
415
def run(self, dir_list):
418
wt, dd = WorkingTree.open_containing(d)
420
self.outf.write('added %s\n' % d)
423
class cmd_relpath(Command):
424
"""Show path of a file relative to root"""
426
takes_args = ['filename']
430
def run(self, filename):
431
# TODO: jam 20050106 Can relpath return a munged path if
432
# sys.stdout encoding cannot represent it?
433
tree, relpath = WorkingTree.open_containing(filename)
434
self.outf.write(relpath)
435
self.outf.write('\n')
438
class cmd_inventory(Command):
439
"""Show inventory of the current working copy or a revision.
441
It is possible to limit the output to a particular entry
442
type using the --kind option. For example: --kind file.
444
It is also possible to restrict the list of files to a specific
445
set. For example: bzr inventory --show-ids this/file
454
help='List entries of a particular kind: file, directory, symlink.',
457
takes_args = ['file*']
460
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
461
if kind and kind not in ['file', 'directory', 'symlink']:
462
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
464
work_tree, file_list = tree_files(file_list)
465
work_tree.lock_read()
467
if revision is not None:
468
if len(revision) > 1:
469
raise errors.BzrCommandError(
470
'bzr inventory --revision takes exactly one revision'
472
revision_id = revision[0].as_revision_id(work_tree.branch)
473
tree = work_tree.branch.repository.revision_tree(revision_id)
475
extra_trees = [work_tree]
481
if file_list is not None:
482
file_ids = tree.paths2ids(file_list, trees=extra_trees,
483
require_versioned=True)
484
# find_ids_across_trees may include some paths that don't
486
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
487
for file_id in file_ids if file_id in tree)
489
entries = tree.inventory.entries()
492
if tree is not work_tree:
495
for path, entry in entries:
496
if kind and kind != entry.kind:
499
self.outf.write('%-50s %s\n' % (path, entry.file_id))
501
self.outf.write(path)
502
self.outf.write('\n')
505
class cmd_mv(Command):
506
"""Move or rename a file.
509
bzr mv OLDNAME NEWNAME
511
bzr mv SOURCE... DESTINATION
513
If the last argument is a versioned directory, all the other names
514
are moved into it. Otherwise, there must be exactly two arguments
515
and the file is changed to a new name.
517
If OLDNAME does not exist on the filesystem but is versioned and
518
NEWNAME does exist on the filesystem but is not versioned, mv
519
assumes that the file has been manually moved and only updates
520
its internal inventory to reflect that change.
521
The same is valid when moving many SOURCE files to a DESTINATION.
523
Files cannot be moved between branches.
526
takes_args = ['names*']
527
takes_options = [Option("after", help="Move only the bzr identifier"
528
" of the file, because the file has already been moved."),
530
aliases = ['move', 'rename']
531
encoding_type = 'replace'
533
def run(self, names_list, after=False):
534
if names_list is None:
537
if len(names_list) < 2:
538
raise errors.BzrCommandError("missing file argument")
539
tree, rel_names = tree_files(names_list)
542
self._run(tree, names_list, rel_names, after)
546
def _run(self, tree, names_list, rel_names, after):
547
into_existing = osutils.isdir(names_list[-1])
548
if into_existing and len(names_list) == 2:
550
# a. case-insensitive filesystem and change case of dir
551
# b. move directory after the fact (if the source used to be
552
# a directory, but now doesn't exist in the working tree
553
# and the target is an existing directory, just rename it)
554
if (not tree.case_sensitive
555
and rel_names[0].lower() == rel_names[1].lower()):
556
into_existing = False
559
from_id = tree.path2id(rel_names[0])
560
if (not osutils.lexists(names_list[0]) and
561
from_id and inv.get_file_kind(from_id) == "directory"):
562
into_existing = False
565
# move into existing directory
566
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
567
self.outf.write("%s => %s\n" % pair)
569
if len(names_list) != 2:
570
raise errors.BzrCommandError('to mv multiple files the'
571
' destination must be a versioned'
573
tree.rename_one(rel_names[0], rel_names[1], after=after)
574
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
577
class cmd_pull(Command):
578
"""Turn this branch into a mirror of another branch.
580
This command only works on branches that have not diverged. Branches are
581
considered diverged if the destination branch's most recent commit is one
582
that has not been merged (directly or indirectly) into the parent.
584
If branches have diverged, you can use 'bzr merge' to integrate the changes
585
from one into the other. Once one branch has merged, the other should
586
be able to pull it again.
588
If you want to forget your local changes and just update your branch to
589
match the remote one, use pull --overwrite.
591
If there is no default location set, the first pull will set it. After
592
that, you can omit the location to use the default. To change the
593
default, use --remember. The value will only be saved if the remote
594
location can be accessed.
596
Note: The location can be specified either in the form of a branch,
597
or in the form of a path to a file containing a merge directive generated
601
_see_also = ['push', 'update', 'status-flags']
602
takes_options = ['remember', 'overwrite', 'revision',
603
custom_help('verbose',
604
help='Show logs of pulled revisions.'),
606
help='Branch to pull into, '
607
'rather than the one containing the working directory.',
612
takes_args = ['location?']
613
encoding_type = 'replace'
615
def run(self, location=None, remember=False, overwrite=False,
616
revision=None, verbose=False,
618
# FIXME: too much stuff is in the command class
621
if directory is None:
624
tree_to = WorkingTree.open_containing(directory)[0]
625
branch_to = tree_to.branch
626
except errors.NoWorkingTree:
628
branch_to = Branch.open_containing(directory)[0]
630
possible_transports = []
631
if location is not None:
633
mergeable = bundle.read_mergeable_from_url(location,
634
possible_transports=possible_transports)
635
except errors.NotABundle:
638
stored_loc = branch_to.get_parent()
640
if stored_loc is None:
641
raise errors.BzrCommandError("No pull location known or"
644
display_url = urlutils.unescape_for_display(stored_loc,
647
self.outf.write("Using saved location: %s\n" % display_url)
648
location = stored_loc
650
if mergeable is not None:
651
if revision is not None:
652
raise errors.BzrCommandError(
653
'Cannot use -r with merge directives or bundles')
654
mergeable.install_revisions(branch_to.repository)
655
base_revision_id, revision_id, verified = \
656
mergeable.get_merge_request(branch_to.repository)
657
branch_from = branch_to
659
branch_from = Branch.open(location,
660
possible_transports=possible_transports)
662
if branch_to.get_parent() is None or remember:
663
branch_to.set_parent(branch_from.base)
665
if revision is not None:
666
if len(revision) == 1:
667
revision_id = revision[0].as_revision_id(branch_from)
669
raise errors.BzrCommandError(
670
'bzr pull --revision takes one value.')
673
old_rh = branch_to.revision_history()
674
if tree_to is not None:
675
change_reporter = delta._ChangeReporter(
676
unversioned_filter=tree_to.is_ignored)
677
result = tree_to.pull(branch_from, overwrite, revision_id,
679
possible_transports=possible_transports)
681
result = branch_to.pull(branch_from, overwrite, revision_id)
683
result.report(self.outf)
685
new_rh = branch_to.revision_history()
686
log.show_changed_revisions(branch_to, old_rh, new_rh,
690
class cmd_push(Command):
691
"""Update a mirror of this branch.
693
The target branch will not have its working tree populated because this
694
is both expensive, and is not supported on remote file systems.
696
Some smart servers or protocols *may* put the working tree in place in
699
This command only works on branches that have not diverged. Branches are
700
considered diverged if the destination branch's most recent commit is one
701
that has not been merged (directly or indirectly) by the source branch.
703
If branches have diverged, you can use 'bzr push --overwrite' to replace
704
the other branch completely, discarding its unmerged changes.
706
If you want to ensure you have the different changes in the other branch,
707
do a merge (see bzr help merge) from the other branch, and commit that.
708
After that you will be able to do a push without '--overwrite'.
710
If there is no default push location set, the first push will set it.
711
After that, you can omit the location to use the default. To change the
712
default, use --remember. The value will only be saved if the remote
713
location can be accessed.
716
_see_also = ['pull', 'update', 'working-trees']
717
takes_options = ['remember', 'overwrite', 'verbose', 'revision',
718
Option('create-prefix',
719
help='Create the path leading up to the branch '
720
'if it does not already exist.'),
722
help='Branch to push from, '
723
'rather than the one containing the working directory.',
727
Option('use-existing-dir',
728
help='By default push will fail if the target'
729
' directory exists, but does not already'
730
' have a control directory. This flag will'
731
' allow push to proceed.'),
733
takes_args = ['location?']
734
encoding_type = 'replace'
736
def run(self, location=None, remember=False, overwrite=False,
737
create_prefix=False, verbose=False, revision=None,
738
use_existing_dir=False,
740
# FIXME: Way too big! Put this into a function called from the
742
if directory is None:
744
br_from = Branch.open_containing(directory)[0]
745
stored_loc = br_from.get_push_location()
747
if stored_loc is None:
748
raise errors.BzrCommandError("No push location known or specified.")
750
display_url = urlutils.unescape_for_display(stored_loc,
752
self.outf.write("Using saved location: %s\n" % display_url)
753
location = stored_loc
755
to_transport = transport.get_transport(location)
757
br_to = repository_to = dir_to = None
759
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
760
except errors.NotBranchError:
761
pass # Didn't find anything
763
# If we can open a branch, use its direct repository, otherwise see
764
# if there is a repository without a branch.
766
br_to = dir_to.open_branch()
767
except errors.NotBranchError:
768
# Didn't find a branch, can we find a repository?
770
repository_to = dir_to.find_repository()
771
except errors.NoRepositoryPresent:
774
# Found a branch, so we must have found a repository
775
repository_to = br_to.repository
777
if revision is not None:
778
if len(revision) == 1:
779
revision_id = revision[0].in_history(br_from).rev_id
781
raise errors.BzrCommandError(
782
'bzr push --revision takes one value.')
784
revision_id = br_from.last_revision()
790
# The destination doesn't exist; create it.
791
# XXX: Refactor the create_prefix/no_create_prefix code into a
792
# common helper function
794
def make_directory(transport):
798
def redirected(redirected_transport, e, redirection_notice):
799
return transport.get_transport(e.get_target_url())
802
to_transport = transport.do_catching_redirections(
803
make_directory, to_transport, redirected)
804
except errors.FileExists:
805
if not use_existing_dir:
806
raise errors.BzrCommandError("Target directory %s"
807
" already exists, but does not have a valid .bzr"
808
" directory. Supply --use-existing-dir to push"
809
" there anyway." % location)
810
except errors.NoSuchFile:
811
if not create_prefix:
812
raise errors.BzrCommandError("Parent directory of %s"
814
"\nYou may supply --create-prefix to create all"
815
" leading parent directories."
817
_create_prefix(to_transport)
818
except errors.TooManyRedirections:
819
raise errors.BzrCommandError("Too many redirections trying "
820
"to make %s." % location)
822
# Now the target directory exists, but doesn't have a .bzr
823
# directory. So we need to create it, along with any work to create
824
# all of the dependent branches, etc.
825
dir_to = br_from.bzrdir.clone_on_transport(to_transport,
826
revision_id=revision_id)
827
br_to = dir_to.open_branch()
828
# TODO: Some more useful message about what was copied
829
note('Created new branch.')
830
# We successfully created the target, remember it
831
if br_from.get_push_location() is None or remember:
832
br_from.set_push_location(br_to.base)
833
elif repository_to is None:
834
# we have a bzrdir but no branch or repository
835
# XXX: Figure out what to do other than complain.
836
raise errors.BzrCommandError("At %s you have a valid .bzr control"
837
" directory, but not a branch or repository. This is an"
838
" unsupported configuration. Please move the target directory"
839
" out of the way and try again."
842
# We have a repository but no branch, copy the revisions, and then
844
repository_to.fetch(br_from.repository, revision_id=revision_id)
845
br_to = br_from.clone(dir_to, revision_id=revision_id)
846
note('Created new branch.')
847
if br_from.get_push_location() is None or remember:
848
br_from.set_push_location(br_to.base)
849
else: # We have a valid to branch
850
# We were able to connect to the remote location, so remember it
851
# we don't need to successfully push because of possible divergence.
852
if br_from.get_push_location() is None or remember:
853
br_from.set_push_location(br_to.base)
855
old_rh = br_to.revision_history()
858
tree_to = dir_to.open_workingtree()
859
except errors.NotLocalUrl:
860
warning("This transport does not update the working "
861
"tree of: %s. See 'bzr help working-trees' for "
862
"more information." % br_to.base)
863
push_result = br_from.push(br_to, overwrite,
864
stop_revision=revision_id)
865
except errors.NoWorkingTree:
866
push_result = br_from.push(br_to, overwrite,
867
stop_revision=revision_id)
871
push_result = br_from.push(tree_to.branch, overwrite,
872
stop_revision=revision_id)
876
except errors.DivergedBranches:
877
raise errors.BzrCommandError('These branches have diverged.'
878
' Try using "merge" and then "push".')
879
if push_result is not None:
880
push_result.report(self.outf)
882
new_rh = br_to.revision_history()
885
from bzrlib.log import show_changed_revisions
886
show_changed_revisions(br_to, old_rh, new_rh,
889
# we probably did a clone rather than a push, so a message was
894
class cmd_branch(Command):
895
"""Create a new copy of a branch.
897
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
898
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
899
If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
900
is derived from the FROM_LOCATION by stripping a leading scheme or drive
901
identifier, if any. For example, "branch lp:foo-bar" will attempt to
904
To retrieve the branch as of a particular revision, supply the --revision
905
parameter, as in "branch foo/bar -r 5".
908
_see_also = ['checkout']
909
takes_args = ['from_location', 'to_location?']
910
takes_options = ['revision', Option('hardlink',
911
help='Hard-link working tree files where possible.')]
912
aliases = ['get', 'clone']
914
def run(self, from_location, to_location=None, revision=None,
916
from bzrlib.tag import _merge_tags_if_possible
919
elif len(revision) > 1:
920
raise errors.BzrCommandError(
921
'bzr branch --revision takes exactly 1 revision value')
923
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
927
if len(revision) == 1 and revision[0] is not None:
928
revision_id = revision[0].as_revision_id(br_from)
930
# FIXME - wt.last_revision, fallback to branch, fall back to
931
# None or perhaps NULL_REVISION to mean copy nothing
933
revision_id = br_from.last_revision()
934
if to_location is None:
935
to_location = urlutils.derive_to_location(from_location)
938
name = os.path.basename(to_location) + '\n'
940
to_transport = transport.get_transport(to_location)
942
to_transport.mkdir('.')
943
except errors.FileExists:
944
raise errors.BzrCommandError('Target directory "%s" already'
945
' exists.' % to_location)
946
except errors.NoSuchFile:
947
raise errors.BzrCommandError('Parent of "%s" does not exist.'
950
# preserve whatever source format we have.
951
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
952
possible_transports=[to_transport],
953
accelerator_tree=accelerator_tree,
955
branch = dir.open_branch()
956
except errors.NoSuchRevision:
957
to_transport.delete_tree('.')
958
msg = "The branch %s has no revision %s." % (from_location, revision[0])
959
raise errors.BzrCommandError(msg)
961
branch.control_files.put_utf8('branch-name', name)
962
_merge_tags_if_possible(br_from, branch)
963
note('Branched %d revision(s).' % branch.revno())
968
class cmd_checkout(Command):
969
"""Create a new checkout of an existing branch.
971
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
972
the branch found in '.'. This is useful if you have removed the working tree
973
or if it was never created - i.e. if you pushed the branch to its current
976
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
977
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
978
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
979
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
980
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
983
To retrieve the branch as of a particular revision, supply the --revision
984
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
985
out of date [so you cannot commit] but it may be useful (i.e. to examine old
989
_see_also = ['checkouts', 'branch']
990
takes_args = ['branch_location?', 'to_location?']
991
takes_options = ['revision',
992
Option('lightweight',
993
help="Perform a lightweight checkout. Lightweight "
994
"checkouts depend on access to the branch for "
995
"every operation. Normal checkouts can perform "
996
"common operations like diff and status without "
997
"such access, and also support local commits."
999
Option('files-from', type=str,
1000
help="Get file contents from this tree."),
1002
help='Hard-link working tree files where possible.'
1007
def run(self, branch_location=None, to_location=None, revision=None,
1008
lightweight=False, files_from=None, hardlink=False):
1009
if revision is None:
1011
elif len(revision) > 1:
1012
raise errors.BzrCommandError(
1013
'bzr checkout --revision takes exactly 1 revision value')
1014
if branch_location is None:
1015
branch_location = osutils.getcwd()
1016
to_location = branch_location
1017
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1019
if files_from is not None:
1020
accelerator_tree = WorkingTree.open(files_from)
1021
if len(revision) == 1 and revision[0] is not None:
1022
revision_id = revision[0].as_revision_id(source)
1025
if to_location is None:
1026
to_location = urlutils.derive_to_location(branch_location)
1027
# if the source and to_location are the same,
1028
# and there is no working tree,
1029
# then reconstitute a branch
1030
if (osutils.abspath(to_location) ==
1031
osutils.abspath(branch_location)):
1033
source.bzrdir.open_workingtree()
1034
except errors.NoWorkingTree:
1035
source.bzrdir.create_workingtree(revision_id)
1037
source.create_checkout(to_location, revision_id, lightweight,
1038
accelerator_tree, hardlink)
1041
class cmd_renames(Command):
1042
"""Show list of renamed files.
1044
# TODO: Option to show renames between two historical versions.
1046
# TODO: Only show renames under dir, rather than in the whole branch.
1047
_see_also = ['status']
1048
takes_args = ['dir?']
1051
def run(self, dir=u'.'):
1052
tree = WorkingTree.open_containing(dir)[0]
1055
new_inv = tree.inventory
1056
old_tree = tree.basis_tree()
1057
old_tree.lock_read()
1059
old_inv = old_tree.inventory
1060
renames = list(_mod_tree.find_renames(old_inv, new_inv))
1062
for old_name, new_name in renames:
1063
self.outf.write("%s => %s\n" % (old_name, new_name))
1070
class cmd_update(Command):
1071
"""Update a tree to have the latest code committed to its branch.
1073
This will perform a merge into the working tree, and may generate
1074
conflicts. If you have any local changes, you will still
1075
need to commit them after the update for the update to be complete.
1077
If you want to discard your local changes, you can just do a
1078
'bzr revert' instead of 'bzr commit' after the update.
1081
_see_also = ['pull', 'working-trees', 'status-flags']
1082
takes_args = ['dir?']
1085
def run(self, dir='.'):
1086
tree = WorkingTree.open_containing(dir)[0]
1087
possible_transports = []
1088
master = tree.branch.get_master_branch(
1089
possible_transports=possible_transports)
1090
if master is not None:
1093
tree.lock_tree_write()
1095
existing_pending_merges = tree.get_parent_ids()[1:]
1096
last_rev = _mod_revision.ensure_null(tree.last_revision())
1097
if last_rev == _mod_revision.ensure_null(
1098
tree.branch.last_revision()):
1099
# may be up to date, check master too.
1100
if master is None or last_rev == _mod_revision.ensure_null(
1101
master.last_revision()):
1102
revno = tree.branch.revision_id_to_revno(last_rev)
1103
note("Tree is up to date at revision %d." % (revno,))
1105
conflicts = tree.update(
1106
delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1107
possible_transports=possible_transports)
1108
revno = tree.branch.revision_id_to_revno(
1109
_mod_revision.ensure_null(tree.last_revision()))
1110
note('Updated to revision %d.' % (revno,))
1111
if tree.get_parent_ids()[1:] != existing_pending_merges:
1112
note('Your local commits will now show as pending merges with '
1113
"'bzr status', and can be committed with 'bzr commit'.")
1122
class cmd_info(Command):
1123
"""Show information about a working tree, branch or repository.
1125
This command will show all known locations and formats associated to the
1126
tree, branch or repository. Statistical information is included with
1129
Branches and working trees will also report any missing revisions.
1131
_see_also = ['revno', 'working-trees', 'repositories']
1132
takes_args = ['location?']
1133
takes_options = ['verbose']
1134
encoding_type = 'replace'
1137
def run(self, location=None, verbose=False):
1142
from bzrlib.info import show_bzrdir_info
1143
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1144
verbose=noise_level, outfile=self.outf)
1147
class cmd_remove(Command):
1148
"""Remove files or directories.
1150
This makes bzr stop tracking changes to the specified files and
1151
delete them if they can easily be recovered using revert.
1153
You can specify one or more files, and/or --new. If you specify --new,
1154
only 'added' files will be removed. If you specify both, then new files
1155
in the specified directories will be removed. If the directories are
1156
also new, they will also be removed.
1158
takes_args = ['file*']
1159
takes_options = ['verbose',
1160
Option('new', help='Remove newly-added files.'),
1161
RegistryOption.from_kwargs('file-deletion-strategy',
1162
'The file deletion mode to be used.',
1163
title='Deletion Strategy', value_switches=True, enum_switch=False,
1164
safe='Only delete files if they can be'
1165
' safely recovered (default).',
1166
keep="Don't delete any files.",
1167
force='Delete all the specified files, even if they can not be '
1168
'recovered and even if they are non-empty directories.')]
1170
encoding_type = 'replace'
1172
def run(self, file_list, verbose=False, new=False,
1173
file_deletion_strategy='safe'):
1174
tree, file_list = tree_files(file_list)
1176
if file_list is not None:
1177
file_list = [f for f in file_list]
1179
raise errors.BzrCommandError('Specify one or more files to'
1180
' remove, or use --new.')
1183
added = tree.changes_from(tree.basis_tree(),
1184
specific_files=file_list).added
1185
file_list = sorted([f[0] for f in added], reverse=True)
1186
if len(file_list) == 0:
1187
raise errors.BzrCommandError('No matching files.')
1188
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1189
keep_files=file_deletion_strategy=='keep',
1190
force=file_deletion_strategy=='force')
1193
class cmd_file_id(Command):
1194
"""Print file_id of a particular file or directory.
1196
The file_id is assigned when the file is first added and remains the
1197
same through all revisions where the file exists, even when it is
1202
_see_also = ['inventory', 'ls']
1203
takes_args = ['filename']
1206
def run(self, filename):
1207
tree, relpath = WorkingTree.open_containing(filename)
1208
i = tree.path2id(relpath)
1210
raise errors.NotVersionedError(filename)
1212
self.outf.write(i + '\n')
1215
class cmd_file_path(Command):
1216
"""Print path of file_ids to a file or directory.
1218
This prints one line for each directory down to the target,
1219
starting at the branch root.
1223
takes_args = ['filename']
1226
def run(self, filename):
1227
tree, relpath = WorkingTree.open_containing(filename)
1228
fid = tree.path2id(relpath)
1230
raise errors.NotVersionedError(filename)
1231
segments = osutils.splitpath(relpath)
1232
for pos in range(1, len(segments) + 1):
1233
path = osutils.joinpath(segments[:pos])
1234
self.outf.write("%s\n" % tree.path2id(path))
1237
class cmd_reconcile(Command):
1238
"""Reconcile bzr metadata in a branch.
1240
This can correct data mismatches that may have been caused by
1241
previous ghost operations or bzr upgrades. You should only
1242
need to run this command if 'bzr check' or a bzr developer
1243
advises you to run it.
1245
If a second branch is provided, cross-branch reconciliation is
1246
also attempted, which will check that data like the tree root
1247
id which was not present in very early bzr versions is represented
1248
correctly in both branches.
1250
At the same time it is run it may recompress data resulting in
1251
a potential saving in disk space or performance gain.
1253
The branch *MUST* be on a listable system such as local disk or sftp.
1256
_see_also = ['check']
1257
takes_args = ['branch?']
1259
def run(self, branch="."):
1260
from bzrlib.reconcile import reconcile
1261
dir = bzrdir.BzrDir.open(branch)
1265
class cmd_revision_history(Command):
1266
"""Display the list of revision ids on a branch."""
1269
takes_args = ['location?']
1274
def run(self, location="."):
1275
branch = Branch.open_containing(location)[0]
1276
for revid in branch.revision_history():
1277
self.outf.write(revid)
1278
self.outf.write('\n')
1281
class cmd_ancestry(Command):
1282
"""List all revisions merged into this branch."""
1284
_see_also = ['log', 'revision-history']
1285
takes_args = ['location?']
1290
def run(self, location="."):
1292
wt = WorkingTree.open_containing(location)[0]
1293
except errors.NoWorkingTree:
1294
b = Branch.open(location)
1295
last_revision = b.last_revision()
1298
last_revision = wt.last_revision()
1300
revision_ids = b.repository.get_ancestry(last_revision)
1301
assert revision_ids[0] is None
1303
for revision_id in revision_ids:
1304
self.outf.write(revision_id + '\n')
1307
class cmd_init(Command):
1308
"""Make a directory into a versioned branch.
1310
Use this to create an empty branch, or before importing an
1313
If there is a repository in a parent directory of the location, then
1314
the history of the branch will be stored in the repository. Otherwise
1315
init creates a standalone branch which carries its own history
1316
in the .bzr directory.
1318
If there is already a branch at the location but it has no working tree,
1319
the tree can be populated with 'bzr checkout'.
1321
Recipe for importing a tree of files::
1327
bzr commit -m "imported project"
1330
_see_also = ['init-repository', 'branch', 'checkout']
1331
takes_args = ['location?']
1333
Option('create-prefix',
1334
help='Create the path leading up to the branch '
1335
'if it does not already exist.'),
1336
RegistryOption('format',
1337
help='Specify a format for this branch. '
1338
'See "help formats".',
1339
registry=bzrdir.format_registry,
1340
converter=bzrdir.format_registry.make_bzrdir,
1341
value_switches=True,
1342
title="Branch Format",
1344
Option('append-revisions-only',
1345
help='Never change revnos or the existing log.'
1346
' Append revisions to it only.')
1348
def run(self, location=None, format=None, append_revisions_only=False,
1349
create_prefix=False):
1351
format = bzrdir.format_registry.make_bzrdir('default')
1352
if location is None:
1355
to_transport = transport.get_transport(location)
1357
# The path has to exist to initialize a
1358
# branch inside of it.
1359
# Just using os.mkdir, since I don't
1360
# believe that we want to create a bunch of
1361
# locations if the user supplies an extended path
1363
to_transport.ensure_base()
1364
except errors.NoSuchFile:
1365
if not create_prefix:
1366
raise errors.BzrCommandError("Parent directory of %s"
1368
"\nYou may supply --create-prefix to create all"
1369
" leading parent directories."
1371
_create_prefix(to_transport)
1374
existing_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1375
except errors.NotBranchError:
1376
# really a NotBzrDir error...
1377
create_branch = bzrdir.BzrDir.create_branch_convenience
1378
branch = create_branch(to_transport.base, format=format,
1379
possible_transports=[to_transport])
1381
from bzrlib.transport.local import LocalTransport
1382
if existing_bzrdir.has_branch():
1383
if (isinstance(to_transport, LocalTransport)
1384
and not existing_bzrdir.has_workingtree()):
1385
raise errors.BranchExistsWithoutWorkingTree(location)
1386
raise errors.AlreadyBranchError(location)
1388
branch = existing_bzrdir.create_branch()
1389
existing_bzrdir.create_workingtree()
1390
if append_revisions_only:
1392
branch.set_append_revisions_only(True)
1393
except errors.UpgradeRequired:
1394
raise errors.BzrCommandError('This branch format cannot be set'
1395
' to append-revisions-only. Try --experimental-branch6')
1398
class cmd_init_repository(Command):
1399
"""Create a shared repository to hold branches.
1401
New branches created under the repository directory will store their
1402
revisions in the repository, not in the branch directory.
1404
If the --no-trees option is used then the branches in the repository
1405
will not have working trees by default.
1408
Create a shared repositories holding just branches::
1410
bzr init-repo --no-trees repo
1413
Make a lightweight checkout elsewhere::
1415
bzr checkout --lightweight repo/trunk trunk-checkout
1420
_see_also = ['init', 'branch', 'checkout', 'repositories']
1421
takes_args = ["location"]
1422
takes_options = [RegistryOption('format',
1423
help='Specify a format for this repository. See'
1424
' "bzr help formats" for details.',
1425
registry=bzrdir.format_registry,
1426
converter=bzrdir.format_registry.make_bzrdir,
1427
value_switches=True, title='Repository format'),
1429
help='Branches in the repository will default to'
1430
' not having a working tree.'),
1432
aliases = ["init-repo"]
1434
def run(self, location, format=None, no_trees=False):
1436
format = bzrdir.format_registry.make_bzrdir('default')
1438
if location is None:
1441
to_transport = transport.get_transport(location)
1442
to_transport.ensure_base()
1444
newdir = format.initialize_on_transport(to_transport)
1445
repo = newdir.create_repository(shared=True)
1446
repo.set_make_working_trees(not no_trees)
1449
class cmd_diff(Command):
1450
"""Show differences in the working tree, between revisions or branches.
1452
If no arguments are given, all changes for the current tree are listed.
1453
If files are given, only the changes in those files are listed.
1454
Remote and multiple branches can be compared by using the --old and
1455
--new options. If not provided, the default for both is derived from
1456
the first argument, if any, or the current tree if no arguments are
1459
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1460
produces patches suitable for "patch -p1".
1464
2 - unrepresentable changes
1469
Shows the difference in the working tree versus the last commit::
1473
Difference between the working tree and revision 1::
1477
Difference between revision 2 and revision 1::
1481
Difference between revision 2 and revision 1 for branch xxx::
1485
Show just the differences for file NEWS::
1489
Show the differences in working tree xxx for file NEWS::
1493
Show the differences from branch xxx to this working tree:
1497
Show the differences between two branches for file NEWS::
1499
bzr diff --old xxx --new yyy NEWS
1501
Same as 'bzr diff' but prefix paths with old/ and new/::
1503
bzr diff --prefix old/:new/
1505
_see_also = ['status']
1506
takes_args = ['file*']
1508
Option('diff-options', type=str,
1509
help='Pass these options to the external diff program.'),
1510
Option('prefix', type=str,
1512
help='Set prefixes added to old and new filenames, as '
1513
'two values separated by a colon. (eg "old/:new/").'),
1515
help='Branch/tree to compare from.',
1519
help='Branch/tree to compare to.',
1525
help='Use this command to compare files.',
1529
aliases = ['di', 'dif']
1530
encoding_type = 'exact'
1533
def run(self, revision=None, file_list=None, diff_options=None,
1534
prefix=None, old=None, new=None, using=None):
1535
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1537
if (prefix is None) or (prefix == '0'):
1545
old_label, new_label = prefix.split(":")
1547
raise errors.BzrCommandError(
1548
'--prefix expects two values separated by a colon'
1549
' (eg "old/:new/")')
1551
if revision and len(revision) > 2:
1552
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1553
' one or two revision specifiers')
1555
old_tree, new_tree, specific_files, extra_trees = \
1556
_get_trees_to_diff(file_list, revision, old, new)
1557
return show_diff_trees(old_tree, new_tree, sys.stdout,
1558
specific_files=specific_files,
1559
external_diff_options=diff_options,
1560
old_label=old_label, new_label=new_label,
1561
extra_trees=extra_trees, using=using)
1564
class cmd_deleted(Command):
1565
"""List files deleted in the working tree.
1567
# TODO: Show files deleted since a previous revision, or
1568
# between two revisions.
1569
# TODO: Much more efficient way to do this: read in new
1570
# directories with readdir, rather than stating each one. Same
1571
# level of effort but possibly much less IO. (Or possibly not,
1572
# if the directories are very large...)
1573
_see_also = ['status', 'ls']
1574
takes_options = ['show-ids']
1577
def run(self, show_ids=False):
1578
tree = WorkingTree.open_containing(u'.')[0]
1581
old = tree.basis_tree()
1584
for path, ie in old.inventory.iter_entries():
1585
if not tree.has_id(ie.file_id):
1586
self.outf.write(path)
1588
self.outf.write(' ')
1589
self.outf.write(ie.file_id)
1590
self.outf.write('\n')
1597
class cmd_modified(Command):
1598
"""List files modified in working tree.
1602
_see_also = ['status', 'ls']
1606
tree = WorkingTree.open_containing(u'.')[0]
1607
td = tree.changes_from(tree.basis_tree())
1608
for path, id, kind, text_modified, meta_modified in td.modified:
1609
self.outf.write(path + '\n')
1612
class cmd_added(Command):
1613
"""List files added in working tree.
1617
_see_also = ['status', 'ls']
1621
wt = WorkingTree.open_containing(u'.')[0]
1624
basis = wt.basis_tree()
1627
basis_inv = basis.inventory
1630
if file_id in basis_inv:
1632
if inv.is_root(file_id) and len(basis_inv) == 0:
1634
path = inv.id2path(file_id)
1635
if not os.access(osutils.abspath(path), os.F_OK):
1637
self.outf.write(path + '\n')
1644
class cmd_root(Command):
1645
"""Show the tree root directory.
1647
The root is the nearest enclosing directory with a .bzr control
1650
takes_args = ['filename?']
1652
def run(self, filename=None):
1653
"""Print the branch root."""
1654
tree = WorkingTree.open_containing(filename)[0]
1655
self.outf.write(tree.basedir + '\n')
1658
def _parse_limit(limitstring):
1660
return int(limitstring)
1662
msg = "The limit argument must be an integer."
1663
raise errors.BzrCommandError(msg)
1666
class cmd_log(Command):
1667
"""Show log of a branch, file, or directory.
1669
By default show the log of the branch containing the working directory.
1671
To request a range of logs, you can use the command -r begin..end
1672
-r revision requests a specific revision, -r ..end or -r begin.. are
1676
Log the current branch::
1684
Log the last 10 revisions of a branch::
1686
bzr log -r -10.. http://server/branch
1689
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1691
takes_args = ['location?']
1694
help='Show from oldest to newest.'),
1697
help='Display timezone as local, original, or utc.'),
1698
custom_help('verbose',
1699
help='Show files changed in each revision.'),
1705
help='Show revisions whose message matches this '
1706
'regular expression.',
1710
help='Limit the output to the first N revisions.',
1714
encoding_type = 'replace'
1717
def run(self, location=None, timezone='original',
1725
from bzrlib.log import show_log
1726
assert message is None or isinstance(message, basestring), \
1727
"invalid message argument %r" % message
1728
direction = (forward and 'forward') or 'reverse'
1733
# find the file id to log:
1735
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1739
tree = b.basis_tree()
1740
file_id = tree.path2id(fp)
1742
raise errors.BzrCommandError(
1743
"Path does not have any revision history: %s" %
1747
# FIXME ? log the current subdir only RBC 20060203
1748
if revision is not None \
1749
and len(revision) > 0 and revision[0].get_branch():
1750
location = revision[0].get_branch()
1753
dir, relpath = bzrdir.BzrDir.open_containing(location)
1754
b = dir.open_branch()
1758
if revision is None:
1761
elif len(revision) == 1:
1762
rev1 = rev2 = revision[0].in_history(b)
1763
elif len(revision) == 2:
1764
if revision[1].get_branch() != revision[0].get_branch():
1765
# b is taken from revision[0].get_branch(), and
1766
# show_log will use its revision_history. Having
1767
# different branches will lead to weird behaviors.
1768
raise errors.BzrCommandError(
1769
"Log doesn't accept two revisions in different"
1771
rev1 = revision[0].in_history(b)
1772
rev2 = revision[1].in_history(b)
1774
raise errors.BzrCommandError(
1775
'bzr log --revision takes one or two values.')
1777
if log_format is None:
1778
log_format = log.log_formatter_registry.get_default(b)
1780
lf = log_format(show_ids=show_ids, to_file=self.outf,
1781
show_timezone=timezone)
1787
direction=direction,
1788
start_revision=rev1,
1796
def get_log_format(long=False, short=False, line=False, default='long'):
1797
log_format = default
1801
log_format = 'short'
1807
class cmd_touching_revisions(Command):
1808
"""Return revision-ids which affected a particular file.
1810
A more user-friendly interface is "bzr log FILE".
1814
takes_args = ["filename"]
1817
def run(self, filename):
1818
tree, relpath = WorkingTree.open_containing(filename)
1820
file_id = tree.path2id(relpath)
1821
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1822
self.outf.write("%6d %s\n" % (revno, what))
1825
class cmd_ls(Command):
1826
"""List files in a tree.
1829
_see_also = ['status', 'cat']
1830
takes_args = ['path?']
1831
# TODO: Take a revision or remote path and list that tree instead.
1835
Option('non-recursive',
1836
help='Don\'t recurse into subdirectories.'),
1838
help='Print paths relative to the root of the branch.'),
1839
Option('unknown', help='Print unknown files.'),
1840
Option('versioned', help='Print versioned files.'),
1841
Option('ignored', help='Print ignored files.'),
1843
help='Write an ascii NUL (\\0) separator '
1844
'between files rather than a newline.'),
1846
help='List entries of a particular kind: file, directory, symlink.',
1851
def run(self, revision=None, verbose=False,
1852
non_recursive=False, from_root=False,
1853
unknown=False, versioned=False, ignored=False,
1854
null=False, kind=None, show_ids=False, path=None):
1856
if kind and kind not in ('file', 'directory', 'symlink'):
1857
raise errors.BzrCommandError('invalid kind specified')
1859
if verbose and null:
1860
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1861
all = not (unknown or versioned or ignored)
1863
selection = {'I':ignored, '?':unknown, 'V':versioned}
1870
raise errors.BzrCommandError('cannot specify both --from-root'
1874
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1880
if revision is not None:
1881
tree = branch.repository.revision_tree(
1882
revision[0].as_revision_id(branch))
1884
tree = branch.basis_tree()
1888
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1889
if fp.startswith(relpath):
1890
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1891
if non_recursive and '/' in fp:
1893
if not all and not selection[fc]:
1895
if kind is not None and fkind != kind:
1898
kindch = entry.kind_character()
1899
outstring = '%-8s %s%s' % (fc, fp, kindch)
1900
if show_ids and fid is not None:
1901
outstring = "%-50s %s" % (outstring, fid)
1902
self.outf.write(outstring + '\n')
1904
self.outf.write(fp + '\0')
1907
self.outf.write(fid)
1908
self.outf.write('\0')
1916
self.outf.write('%-50s %s\n' % (fp, my_id))
1918
self.outf.write(fp + '\n')
1923
class cmd_unknowns(Command):
1924
"""List unknown files.
1932
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1933
self.outf.write(osutils.quotefn(f) + '\n')
1936
class cmd_ignore(Command):
1937
"""Ignore specified files or patterns.
1939
To remove patterns from the ignore list, edit the .bzrignore file.
1941
Trailing slashes on patterns are ignored.
1942
If the pattern contains a slash or is a regular expression, it is compared
1943
to the whole path from the branch root. Otherwise, it is compared to only
1944
the last component of the path. To match a file only in the root
1945
directory, prepend './'.
1947
Ignore patterns specifying absolute paths are not allowed.
1949
Ignore patterns may include globbing wildcards such as::
1951
? - Matches any single character except '/'
1952
* - Matches 0 or more characters except '/'
1953
/**/ - Matches 0 or more directories in a path
1954
[a-z] - Matches a single character from within a group of characters
1956
Ignore patterns may also be Python regular expressions.
1957
Regular expression ignore patterns are identified by a 'RE:' prefix
1958
followed by the regular expression. Regular expression ignore patterns
1959
may not include named or numbered groups.
1961
Note: ignore patterns containing shell wildcards must be quoted from
1965
Ignore the top level Makefile::
1967
bzr ignore ./Makefile
1969
Ignore class files in all directories::
1971
bzr ignore "*.class"
1973
Ignore .o files under the lib directory::
1975
bzr ignore "lib/**/*.o"
1977
Ignore .o files under the lib directory::
1979
bzr ignore "RE:lib/.*\.o"
1981
Ignore everything but the "debian" toplevel directory::
1983
bzr ignore "RE:(?!debian/).*"
1986
_see_also = ['status', 'ignored']
1987
takes_args = ['name_pattern*']
1989
Option('old-default-rules',
1990
help='Write out the ignore rules bzr < 0.9 always used.')
1993
def run(self, name_pattern_list=None, old_default_rules=None):
1994
from bzrlib.atomicfile import AtomicFile
1995
if old_default_rules is not None:
1996
# dump the rules and exit
1997
for pattern in ignores.OLD_DEFAULTS:
2000
if not name_pattern_list:
2001
raise errors.BzrCommandError("ignore requires at least one "
2002
"NAME_PATTERN or --old-default-rules")
2003
name_pattern_list = [globbing.normalize_pattern(p)
2004
for p in name_pattern_list]
2005
for name_pattern in name_pattern_list:
2006
if (name_pattern[0] == '/' or
2007
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2008
raise errors.BzrCommandError(
2009
"NAME_PATTERN should not be an absolute path")
2010
tree, relpath = WorkingTree.open_containing(u'.')
2011
ifn = tree.abspath('.bzrignore')
2012
if os.path.exists(ifn):
2015
igns = f.read().decode('utf-8')
2021
# TODO: If the file already uses crlf-style termination, maybe
2022
# we should use that for the newly added lines?
2024
if igns and igns[-1] != '\n':
2026
for name_pattern in name_pattern_list:
2027
igns += name_pattern + '\n'
2029
f = AtomicFile(ifn, 'wb')
2031
f.write(igns.encode('utf-8'))
2036
if not tree.path2id('.bzrignore'):
2037
tree.add(['.bzrignore'])
2039
ignored = globbing.Globster(name_pattern_list)
2042
for entry in tree.list_files():
2046
if ignored.match(filename):
2047
matches.append(filename.encode('utf-8'))
2049
if len(matches) > 0:
2050
print "Warning: the following files are version controlled and" \
2051
" match your ignore pattern:\n%s" % ("\n".join(matches),)
2053
class cmd_ignored(Command):
2054
"""List ignored files and the patterns that matched them.
2057
encoding_type = 'replace'
2058
_see_also = ['ignore']
2062
tree = WorkingTree.open_containing(u'.')[0]
2065
for path, file_class, kind, file_id, entry in tree.list_files():
2066
if file_class != 'I':
2068
## XXX: Slightly inefficient since this was already calculated
2069
pat = tree.is_ignored(path)
2070
self.outf.write('%-50s %s\n' % (path, pat))
2075
class cmd_lookup_revision(Command):
2076
"""Lookup the revision-id from a revision-number
2079
bzr lookup-revision 33
2082
takes_args = ['revno']
2085
def run(self, revno):
2089
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2091
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2094
class cmd_export(Command):
2095
"""Export current or past revision to a destination directory or archive.
2097
If no revision is specified this exports the last committed revision.
2099
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
2100
given, try to find the format with the extension. If no extension
2101
is found exports to a directory (equivalent to --format=dir).
2103
If root is supplied, it will be used as the root directory inside
2104
container formats (tar, zip, etc). If it is not supplied it will default
2105
to the exported filename. The root option has no effect for 'dir' format.
2107
If branch is omitted then the branch containing the current working
2108
directory will be used.
2110
Note: Export of tree with non-ASCII filenames to zip is not supported.
2112
================= =========================
2113
Supported formats Autodetected by extension
2114
================= =========================
2117
tbz2 .tar.bz2, .tbz2
2120
================= =========================
2122
takes_args = ['dest', 'branch?']
2125
help="Type of file to export to.",
2130
help="Name of the root directory inside the exported file."),
2132
def run(self, dest, branch=None, revision=None, format=None, root=None):
2133
from bzrlib.export import export
2136
tree = WorkingTree.open_containing(u'.')[0]
2139
b = Branch.open(branch)
2141
if revision is None:
2142
# should be tree.last_revision FIXME
2143
rev_id = b.last_revision()
2145
if len(revision) != 1:
2146
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
2147
rev_id = revision[0].as_revision_id(b)
2148
t = b.repository.revision_tree(rev_id)
2150
export(t, dest, format, root)
2151
except errors.NoSuchExportFormat, e:
2152
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2155
class cmd_cat(Command):
2156
"""Write the contents of a file as of a given revision to standard output.
2158
If no revision is nominated, the last revision is used.
2160
Note: Take care to redirect standard output when using this command on a
2166
Option('name-from-revision', help='The path name in the old tree.'),
2169
takes_args = ['filename']
2170
encoding_type = 'exact'
2173
def run(self, filename, revision=None, name_from_revision=False):
2174
if revision is not None and len(revision) != 1:
2175
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2176
" one revision specifier")
2177
tree, branch, relpath = \
2178
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2181
return self._run(tree, branch, relpath, filename, revision,
2186
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
2188
tree = b.basis_tree()
2189
if revision is None:
2190
revision_id = b.last_revision()
2192
revision_id = revision[0].as_revision_id(b)
2194
cur_file_id = tree.path2id(relpath)
2195
rev_tree = b.repository.revision_tree(revision_id)
2196
old_file_id = rev_tree.path2id(relpath)
2198
if name_from_revision:
2199
if old_file_id is None:
2200
raise errors.BzrCommandError("%r is not present in revision %s"
2201
% (filename, revision_id))
2203
rev_tree.print_file(old_file_id)
2204
elif cur_file_id is not None:
2205
rev_tree.print_file(cur_file_id)
2206
elif old_file_id is not None:
2207
rev_tree.print_file(old_file_id)
2209
raise errors.BzrCommandError("%r is not present in revision %s" %
2210
(filename, revision_id))
2213
class cmd_local_time_offset(Command):
2214
"""Show the offset in seconds from GMT to local time."""
2218
print osutils.local_time_offset()
2222
class cmd_commit(Command):
2223
"""Commit changes into a new revision.
2225
If no arguments are given, the entire tree is committed.
2227
If selected files are specified, only changes to those files are
2228
committed. If a directory is specified then the directory and everything
2229
within it is committed.
2231
If author of the change is not the same person as the committer, you can
2232
specify the author's name using the --author option. The name should be
2233
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2235
A selected-file commit may fail in some cases where the committed
2236
tree would be invalid. Consider::
2241
bzr commit foo -m "committing foo"
2242
bzr mv foo/bar foo/baz
2245
bzr commit foo/bar -m "committing bar but not baz"
2247
In the example above, the last commit will fail by design. This gives
2248
the user the opportunity to decide whether they want to commit the
2249
rename at the same time, separately first, or not at all. (As a general
2250
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2252
Note: A selected-file commit after a merge is not yet supported.
2254
# TODO: Run hooks on tree to-be-committed, and after commit.
2256
# TODO: Strict commit that fails if there are deleted files.
2257
# (what does "deleted files" mean ??)
2259
# TODO: Give better message for -s, --summary, used by tla people
2261
# XXX: verbose currently does nothing
2263
_see_also = ['bugs', 'uncommit']
2264
takes_args = ['selected*']
2266
Option('message', type=unicode,
2268
help="Description of the new revision."),
2271
help='Commit even if nothing has changed.'),
2272
Option('file', type=str,
2275
help='Take commit message from this file.'),
2277
help="Refuse to commit if there are unknown "
2278
"files in the working tree."),
2279
ListOption('fixes', type=str,
2280
help="Mark a bug as being fixed by this revision."),
2281
Option('author', type=unicode,
2282
help="Set the author's name, if it's different "
2283
"from the committer."),
2285
help="Perform a local commit in a bound "
2286
"branch. Local commits are not pushed to "
2287
"the master branch until a normal commit "
2291
help='When no message is supplied, show the diff along'
2292
' with the status summary in the message editor.'),
2294
aliases = ['ci', 'checkin']
2296
def _get_bug_fix_properties(self, fixes, branch):
2298
# Configure the properties for bug fixing attributes.
2299
for fixed_bug in fixes:
2300
tokens = fixed_bug.split(':')
2301
if len(tokens) != 2:
2302
raise errors.BzrCommandError(
2303
"Invalid bug %s. Must be in the form of 'tag:id'. "
2304
"Commit refused." % fixed_bug)
2305
tag, bug_id = tokens
2307
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
2308
except errors.UnknownBugTrackerAbbreviation:
2309
raise errors.BzrCommandError(
2310
'Unrecognized bug %s. Commit refused.' % fixed_bug)
2311
except errors.MalformedBugIdentifier:
2312
raise errors.BzrCommandError(
2313
"Invalid bug identifier for %s. Commit refused."
2315
properties.append('%s fixed' % bug_url)
2316
return '\n'.join(properties)
2318
def run(self, message=None, file=None, verbose=False, selected_list=None,
2319
unchanged=False, strict=False, local=False, fixes=None,
2320
author=None, show_diff=False):
2321
from bzrlib.errors import (
2326
from bzrlib.msgeditor import (
2327
edit_commit_message_encoded,
2328
make_commit_message_template_encoded
2331
# TODO: Need a blackbox test for invoking the external editor; may be
2332
# slightly problematic to run this cross-platform.
2334
# TODO: do more checks that the commit will succeed before
2335
# spending the user's valuable time typing a commit message.
2339
tree, selected_list = tree_files(selected_list)
2340
if selected_list == ['']:
2341
# workaround - commit of root of tree should be exactly the same
2342
# as just default commit in that tree, and succeed even though
2343
# selected-file merge commit is not done yet
2348
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
2350
properties['bugs'] = bug_property
2352
if local and not tree.branch.get_bound_location():
2353
raise errors.LocalRequiresBoundBranch()
2355
def get_message(commit_obj):
2356
"""Callback to get commit message"""
2357
my_message = message
2358
if my_message is None and not file:
2359
t = make_commit_message_template_encoded(tree,
2360
selected_list, diff=show_diff,
2361
output_encoding=bzrlib.user_encoding)
2362
my_message = edit_commit_message_encoded(t)
2363
if my_message is None:
2364
raise errors.BzrCommandError("please specify a commit"
2365
" message with either --message or --file")
2366
elif my_message and file:
2367
raise errors.BzrCommandError(
2368
"please specify either --message or --file")
2370
my_message = codecs.open(file, 'rt',
2371
bzrlib.user_encoding).read()
2372
if my_message == "":
2373
raise errors.BzrCommandError("empty commit message specified")
2377
tree.commit(message_callback=get_message,
2378
specific_files=selected_list,
2379
allow_pointless=unchanged, strict=strict, local=local,
2380
reporter=None, verbose=verbose, revprops=properties,
2382
except PointlessCommit:
2383
# FIXME: This should really happen before the file is read in;
2384
# perhaps prepare the commit; get the message; then actually commit
2385
raise errors.BzrCommandError("no changes to commit."
2386
" use --unchanged to commit anyhow")
2387
except ConflictsInTree:
2388
raise errors.BzrCommandError('Conflicts detected in working '
2389
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2391
except StrictCommitFailed:
2392
raise errors.BzrCommandError("Commit refused because there are"
2393
" unknown files in the working tree.")
2394
except errors.BoundBranchOutOfDate, e:
2395
raise errors.BzrCommandError(str(e) + "\n"
2396
'To commit to master branch, run update and then commit.\n'
2397
'You can also pass --local to commit to continue working '
2401
class cmd_check(Command):
2402
"""Validate consistency of branch history.
2404
This command checks various invariants about the branch storage to
2405
detect data corruption or bzr bugs.
2409
revisions: This is just the number of revisions checked. It doesn't
2411
versionedfiles: This is just the number of versionedfiles checked. It
2412
doesn't indicate a problem.
2413
unreferenced ancestors: Texts that are ancestors of other texts, but
2414
are not properly referenced by the revision ancestry. This is a
2415
subtle problem that Bazaar can work around.
2416
unique file texts: This is the total number of unique file contents
2417
seen in the checked revisions. It does not indicate a problem.
2418
repeated file texts: This is the total number of repeated texts seen
2419
in the checked revisions. Texts can be repeated when their file
2420
entries are modified, but the file contents are not. It does not
2424
_see_also = ['reconcile']
2425
takes_args = ['branch?']
2426
takes_options = ['verbose']
2428
def run(self, branch=None, verbose=False):
2429
from bzrlib.check import check
2431
branch_obj = Branch.open_containing('.')[0]
2433
branch_obj = Branch.open(branch)
2434
check(branch_obj, verbose)
2435
# bit hacky, check the tree parent is accurate
2438
tree = WorkingTree.open_containing('.')[0]
2440
tree = WorkingTree.open(branch)
2441
except (errors.NoWorkingTree, errors.NotLocalUrl):
2444
# This is a primitive 'check' for tree state. Currently this is not
2445
# integrated into the main check logic as yet.
2448
tree_basis = tree.basis_tree()
2449
tree_basis.lock_read()
2451
repo_basis = tree.branch.repository.revision_tree(
2452
tree.last_revision())
2453
if len(list(repo_basis.iter_changes(tree_basis))):
2454
raise errors.BzrCheckError(
2455
"Mismatched basis inventory content.")
2463
class cmd_upgrade(Command):
2464
"""Upgrade branch storage to current format.
2466
The check command or bzr developers may sometimes advise you to run
2467
this command. When the default format has changed you may also be warned
2468
during other operations to upgrade.
2471
_see_also = ['check']
2472
takes_args = ['url?']
2474
RegistryOption('format',
2475
help='Upgrade to a specific format. See "bzr help'
2476
' formats" for details.',
2477
registry=bzrdir.format_registry,
2478
converter=bzrdir.format_registry.make_bzrdir,
2479
value_switches=True, title='Branch format'),
2482
def run(self, url='.', format=None):
2483
from bzrlib.upgrade import upgrade
2485
format = bzrdir.format_registry.make_bzrdir('default')
2486
upgrade(url, format)
2489
class cmd_whoami(Command):
2490
"""Show or set bzr user id.
2493
Show the email of the current user::
2497
Set the current user::
2499
bzr whoami "Frank Chu <fchu@example.com>"
2501
takes_options = [ Option('email',
2502
help='Display email address only.'),
2504
help='Set identity for the current branch instead of '
2507
takes_args = ['name?']
2508
encoding_type = 'replace'
2511
def run(self, email=False, branch=False, name=None):
2513
# use branch if we're inside one; otherwise global config
2515
c = Branch.open_containing('.')[0].get_config()
2516
except errors.NotBranchError:
2517
c = config.GlobalConfig()
2519
self.outf.write(c.user_email() + '\n')
2521
self.outf.write(c.username() + '\n')
2524
# display a warning if an email address isn't included in the given name.
2526
config.extract_email_address(name)
2527
except errors.NoEmailInUsername, e:
2528
warning('"%s" does not seem to contain an email address. '
2529
'This is allowed, but not recommended.', name)
2531
# use global config unless --branch given
2533
c = Branch.open_containing('.')[0].get_config()
2535
c = config.GlobalConfig()
2536
c.set_user_option('email', name)
2539
class cmd_nick(Command):
2540
"""Print or set the branch nickname.
2542
If unset, the tree root directory name is used as the nickname
2543
To print the current nickname, execute with no argument.
2546
_see_also = ['info']
2547
takes_args = ['nickname?']
2548
def run(self, nickname=None):
2549
branch = Branch.open_containing(u'.')[0]
2550
if nickname is None:
2551
self.printme(branch)
2553
branch.nick = nickname
2556
def printme(self, branch):
2560
class cmd_selftest(Command):
2561
"""Run internal test suite.
2563
If arguments are given, they are regular expressions that say which tests
2564
should run. Tests matching any expression are run, and other tests are
2567
Alternatively if --first is given, matching tests are run first and then
2568
all other tests are run. This is useful if you have been working in a
2569
particular area, but want to make sure nothing else was broken.
2571
If --exclude is given, tests that match that regular expression are
2572
excluded, regardless of whether they match --first or not.
2574
To help catch accidential dependencies between tests, the --randomize
2575
option is useful. In most cases, the argument used is the word 'now'.
2576
Note that the seed used for the random number generator is displayed
2577
when this option is used. The seed can be explicitly passed as the
2578
argument to this option if required. This enables reproduction of the
2579
actual ordering used if and when an order sensitive problem is encountered.
2581
If --list-only is given, the tests that would be run are listed. This is
2582
useful when combined with --first, --exclude and/or --randomize to
2583
understand their impact. The test harness reports "Listed nn tests in ..."
2584
instead of "Ran nn tests in ..." when list mode is enabled.
2586
If the global option '--no-plugins' is given, plugins are not loaded
2587
before running the selftests. This has two effects: features provided or
2588
modified by plugins will not be tested, and tests provided by plugins will
2591
Tests that need working space on disk use a common temporary directory,
2592
typically inside $TMPDIR or /tmp.
2595
Run only tests relating to 'ignore'::
2599
Disable plugins and list tests as they're run::
2601
bzr --no-plugins selftest -v
2603
# NB: this is used from the class without creating an instance, which is
2604
# why it does not have a self parameter.
2605
def get_transport_type(typestring):
2606
"""Parse and return a transport specifier."""
2607
if typestring == "sftp":
2608
from bzrlib.transport.sftp import SFTPAbsoluteServer
2609
return SFTPAbsoluteServer
2610
if typestring == "memory":
2611
from bzrlib.transport.memory import MemoryServer
2613
if typestring == "fakenfs":
2614
from bzrlib.transport.fakenfs import FakeNFSServer
2615
return FakeNFSServer
2616
msg = "No known transport type %s. Supported types are: sftp\n" %\
2618
raise errors.BzrCommandError(msg)
2621
takes_args = ['testspecs*']
2622
takes_options = ['verbose',
2624
help='Stop when one test fails.',
2628
help='Use a different transport by default '
2629
'throughout the test suite.',
2630
type=get_transport_type),
2632
help='Run the benchmarks rather than selftests.'),
2633
Option('lsprof-timed',
2634
help='Generate lsprof output for benchmarked'
2635
' sections of code.'),
2636
Option('cache-dir', type=str,
2637
help='Cache intermediate benchmark output in this '
2640
help='Run all tests, but run specified tests first.',
2644
help='List the tests instead of running them.'),
2645
Option('randomize', type=str, argname="SEED",
2646
help='Randomize the order of tests using the given'
2647
' seed or "now" for the current time.'),
2648
Option('exclude', type=str, argname="PATTERN",
2650
help='Exclude tests that match this regular'
2652
Option('strict', help='Fail on missing dependencies or '
2654
Option('load-list', type=str, argname='TESTLISTFILE',
2655
help='Load a test id list from a text file.'),
2657
encoding_type = 'replace'
2659
def run(self, testspecs_list=None, verbose=False, one=False,
2660
transport=None, benchmark=None,
2661
lsprof_timed=None, cache_dir=None,
2662
first=False, list_only=False,
2663
randomize=None, exclude=None, strict=False,
2666
from bzrlib.tests import selftest
2667
import bzrlib.benchmarks as benchmarks
2668
from bzrlib.benchmarks import tree_creator
2670
if cache_dir is not None:
2671
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2673
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
2674
print ' %s (%s python%s)' % (
2676
bzrlib.version_string,
2677
bzrlib._format_version_tuple(sys.version_info),
2680
if testspecs_list is not None:
2681
pattern = '|'.join(testspecs_list)
2685
test_suite_factory = benchmarks.test_suite
2686
# Unless user explicitly asks for quiet, be verbose in benchmarks
2687
verbose = not is_quiet()
2688
# TODO: should possibly lock the history file...
2689
benchfile = open(".perf_history", "at", buffering=1)
2691
test_suite_factory = None
2694
result = selftest(verbose=verbose,
2696
stop_on_failure=one,
2697
transport=transport,
2698
test_suite_factory=test_suite_factory,
2699
lsprof_timed=lsprof_timed,
2700
bench_history=benchfile,
2701
matching_tests_first=first,
2702
list_only=list_only,
2703
random_seed=randomize,
2704
exclude_pattern=exclude,
2706
load_list=load_list,
2709
if benchfile is not None:
2712
note('tests passed')
2714
note('tests failed')
2715
return int(not result)
2718
class cmd_version(Command):
2719
"""Show version of bzr."""
2721
encoding_type = 'replace'
2723
Option("short", help="Print just the version number."),
2727
def run(self, short=False):
2728
from bzrlib.version import show_version
2730
self.outf.write(bzrlib.version_string + '\n')
2732
show_version(to_file=self.outf)
2735
class cmd_rocks(Command):
2736
"""Statement of optimism."""
2742
print "It sure does!"
2745
class cmd_find_merge_base(Command):
2746
"""Find and print a base revision for merging two branches."""
2747
# TODO: Options to specify revisions on either side, as if
2748
# merging only part of the history.
2749
takes_args = ['branch', 'other']
2753
def run(self, branch, other):
2754
from bzrlib.revision import ensure_null
2756
branch1 = Branch.open_containing(branch)[0]
2757
branch2 = Branch.open_containing(other)[0]
2762
last1 = ensure_null(branch1.last_revision())
2763
last2 = ensure_null(branch2.last_revision())
2765
graph = branch1.repository.get_graph(branch2.repository)
2766
base_rev_id = graph.find_unique_lca(last1, last2)
2768
print 'merge base is revision %s' % base_rev_id
2775
class cmd_merge(Command):
2776
"""Perform a three-way merge.
2778
The source of the merge can be specified either in the form of a branch,
2779
or in the form of a path to a file containing a merge directive generated
2780
with bzr send. If neither is specified, the default is the upstream branch
2781
or the branch most recently merged using --remember.
2783
When merging a branch, by default the tip will be merged. To pick a different
2784
revision, pass --revision. If you specify two values, the first will be used as
2785
BASE and the second one as OTHER. Merging individual revisions, or a subset of
2786
available revisions, like this is commonly referred to as "cherrypicking".
2788
Revision numbers are always relative to the branch being merged.
2790
By default, bzr will try to merge in all new work from the other
2791
branch, automatically determining an appropriate base. If this
2792
fails, you may need to give an explicit base.
2794
Merge will do its best to combine the changes in two branches, but there
2795
are some kinds of problems only a human can fix. When it encounters those,
2796
it will mark a conflict. A conflict means that you need to fix something,
2797
before you should commit.
2799
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2801
If there is no default branch set, the first merge will set it. After
2802
that, you can omit the branch to use the default. To change the
2803
default, use --remember. The value will only be saved if the remote
2804
location can be accessed.
2806
The results of the merge are placed into the destination working
2807
directory, where they can be reviewed (with bzr diff), tested, and then
2808
committed to record the result of the merge.
2810
merge refuses to run if there are any uncommitted changes, unless
2814
To merge the latest revision from bzr.dev::
2816
bzr merge ../bzr.dev
2818
To merge changes up to and including revision 82 from bzr.dev::
2820
bzr merge -r 82 ../bzr.dev
2822
To merge the changes introduced by 82, without previous changes::
2824
bzr merge -r 81..82 ../bzr.dev
2826
To apply a merge directive contained in in /tmp/merge:
2828
bzr merge /tmp/merge
2831
encoding_type = 'exact'
2832
_see_also = ['update', 'remerge', 'status-flags']
2833
takes_args = ['location?']
2838
help='Merge even if the destination tree has uncommitted changes.'),
2842
Option('show-base', help="Show base revision text in "
2844
Option('uncommitted', help='Apply uncommitted changes'
2845
' from a working copy, instead of branch changes.'),
2846
Option('pull', help='If the destination is already'
2847
' completely merged into the source, pull from the'
2848
' source rather than merging. When this happens,'
2849
' you do not need to commit the result.'),
2851
help='Branch to merge into, '
2852
'rather than the one containing the working directory.',
2856
Option('preview', help='Instead of merging, show a diff of the merge.')
2859
def run(self, location=None, revision=None, force=False,
2860
merge_type=None, show_base=False, reprocess=False, remember=False,
2861
uncommitted=False, pull=False,
2865
if merge_type is None:
2866
merge_type = _mod_merge.Merge3Merger
2868
if directory is None: directory = u'.'
2869
possible_transports = []
2871
allow_pending = True
2872
verified = 'inapplicable'
2873
tree = WorkingTree.open_containing(directory)[0]
2874
change_reporter = delta._ChangeReporter(
2875
unversioned_filter=tree.is_ignored)
2878
pb = ui.ui_factory.nested_progress_bar()
2879
cleanups.append(pb.finished)
2881
cleanups.append(tree.unlock)
2882
if location is not None:
2884
mergeable = bundle.read_mergeable_from_url(location,
2885
possible_transports=possible_transports)
2886
except errors.NotABundle:
2890
raise errors.BzrCommandError('Cannot use --uncommitted'
2891
' with bundles or merge directives.')
2893
if revision is not None:
2894
raise errors.BzrCommandError(
2895
'Cannot use -r with merge directives or bundles')
2896
merger, verified = _mod_merge.Merger.from_mergeable(tree,
2899
if merger is None and uncommitted:
2900
if revision is not None and len(revision) > 0:
2901
raise errors.BzrCommandError('Cannot use --uncommitted and'
2902
' --revision at the same time.')
2903
location = self._select_branch_location(tree, location)[0]
2904
other_tree, other_path = WorkingTree.open_containing(location)
2905
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
2907
allow_pending = False
2908
if other_path != '':
2909
merger.interesting_files = [other_path]
2912
merger, allow_pending = self._get_merger_from_branch(tree,
2913
location, revision, remember, possible_transports, pb)
2915
merger.merge_type = merge_type
2916
merger.reprocess = reprocess
2917
merger.show_base = show_base
2918
self.sanity_check_merger(merger)
2919
if (merger.base_rev_id == merger.other_rev_id and
2920
merger.other_rev_id != None):
2921
note('Nothing to do.')
2924
if merger.interesting_files is not None:
2925
raise errors.BzrCommandError('Cannot pull individual files')
2926
if (merger.base_rev_id == tree.last_revision()):
2927
result = tree.pull(merger.other_branch, False,
2928
merger.other_rev_id)
2929
result.report(self.outf)
2931
merger.check_basis(not force)
2933
return self._do_preview(merger)
2935
return self._do_merge(merger, change_reporter, allow_pending,
2938
for cleanup in reversed(cleanups):
2941
def _do_preview(self, merger):
2942
from bzrlib.diff import show_diff_trees
2943
tree_merger = merger.make_merger()
2944
tt = tree_merger.make_preview_transform()
2946
result_tree = tt.get_preview_tree()
2947
show_diff_trees(merger.this_tree, result_tree, self.outf,
2948
old_label='', new_label='')
2952
def _do_merge(self, merger, change_reporter, allow_pending, verified):
2953
merger.change_reporter = change_reporter
2954
conflict_count = merger.do_merge()
2956
merger.set_pending()
2957
if verified == 'failed':
2958
warning('Preview patch does not match changes')
2959
if conflict_count != 0:
2964
def sanity_check_merger(self, merger):
2965
if (merger.show_base and
2966
not merger.merge_type is _mod_merge.Merge3Merger):
2967
raise errors.BzrCommandError("Show-base is not supported for this"
2968
" merge type. %s" % merger.merge_type)
2969
if merger.reprocess and not merger.merge_type.supports_reprocess:
2970
raise errors.BzrCommandError("Conflict reduction is not supported"
2971
" for merge type %s." %
2973
if merger.reprocess and merger.show_base:
2974
raise errors.BzrCommandError("Cannot do conflict reduction and"
2977
def _get_merger_from_branch(self, tree, location, revision, remember,
2978
possible_transports, pb):
2979
"""Produce a merger from a location, assuming it refers to a branch."""
2980
from bzrlib.tag import _merge_tags_if_possible
2981
assert revision is None or len(revision) < 3
2982
# find the branch locations
2983
other_loc, user_location = self._select_branch_location(tree, location,
2985
if revision is not None and len(revision) == 2:
2986
base_loc, _unused = self._select_branch_location(tree,
2987
location, revision, 0)
2989
base_loc = other_loc
2991
other_branch, other_path = Branch.open_containing(other_loc,
2992
possible_transports)
2993
if base_loc == other_loc:
2994
base_branch = other_branch
2996
base_branch, base_path = Branch.open_containing(base_loc,
2997
possible_transports)
2998
# Find the revision ids
2999
if revision is None or len(revision) < 1 or revision[-1] is None:
3000
other_revision_id = _mod_revision.ensure_null(
3001
other_branch.last_revision())
3003
other_revision_id = revision[-1].as_revision_id(other_branch)
3004
if (revision is not None and len(revision) == 2
3005
and revision[0] is not None):
3006
base_revision_id = revision[0].as_revision_id(base_branch)
3008
base_revision_id = None
3009
# Remember where we merge from
3010
if ((remember or tree.branch.get_submit_branch() is None) and
3011
user_location is not None):
3012
tree.branch.set_submit_branch(other_branch.base)
3013
_merge_tags_if_possible(other_branch, tree.branch)
3014
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3015
other_revision_id, base_revision_id, other_branch, base_branch)
3016
if other_path != '':
3017
allow_pending = False
3018
merger.interesting_files = [other_path]
3020
allow_pending = True
3021
return merger, allow_pending
3023
def _select_branch_location(self, tree, user_location, revision=None,
3025
"""Select a branch location, according to possible inputs.
3027
If provided, branches from ``revision`` are preferred. (Both
3028
``revision`` and ``index`` must be supplied.)
3030
Otherwise, the ``location`` parameter is used. If it is None, then the
3031
``submit`` or ``parent`` location is used, and a note is printed.
3033
:param tree: The working tree to select a branch for merging into
3034
:param location: The location entered by the user
3035
:param revision: The revision parameter to the command
3036
:param index: The index to use for the revision parameter. Negative
3037
indices are permitted.
3038
:return: (selected_location, user_location). The default location
3039
will be the user-entered location.
3041
if (revision is not None and index is not None
3042
and revision[index] is not None):
3043
branch = revision[index].get_branch()
3044
if branch is not None:
3045
return branch, branch
3046
if user_location is None:
3047
location = self._get_remembered(tree, 'Merging from')
3049
location = user_location
3050
return location, user_location
3052
def _get_remembered(self, tree, verb_string):
3053
"""Use tree.branch's parent if none was supplied.
3055
Report if the remembered location was used.
3057
stored_location = tree.branch.get_submit_branch()
3058
if stored_location is None:
3059
stored_location = tree.branch.get_parent()
3060
mutter("%s", stored_location)
3061
if stored_location is None:
3062
raise errors.BzrCommandError("No location specified or remembered")
3063
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
3064
note(u"%s remembered location %s", verb_string, display_url)
3065
return stored_location
3068
class cmd_remerge(Command):
3071
Use this if you want to try a different merge technique while resolving
3072
conflicts. Some merge techniques are better than others, and remerge
3073
lets you try different ones on different files.
3075
The options for remerge have the same meaning and defaults as the ones for
3076
merge. The difference is that remerge can (only) be run when there is a
3077
pending merge, and it lets you specify particular files.
3080
Re-do the merge of all conflicted files, and show the base text in
3081
conflict regions, in addition to the usual THIS and OTHER texts::
3083
bzr remerge --show-base
3085
Re-do the merge of "foobar", using the weave merge algorithm, with
3086
additional processing to reduce the size of conflict regions::
3088
bzr remerge --merge-type weave --reprocess foobar
3090
takes_args = ['file*']
3095
help="Show base revision text in conflicts."),
3098
def run(self, file_list=None, merge_type=None, show_base=False,
3100
if merge_type is None:
3101
merge_type = _mod_merge.Merge3Merger
3102
tree, file_list = tree_files(file_list)
3105
parents = tree.get_parent_ids()
3106
if len(parents) != 2:
3107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3108
" merges. Not cherrypicking or"
3110
repository = tree.branch.repository
3111
interesting_ids = None
3113
conflicts = tree.conflicts()
3114
if file_list is not None:
3115
interesting_ids = set()
3116
for filename in file_list:
3117
file_id = tree.path2id(filename)
3119
raise errors.NotVersionedError(filename)
3120
interesting_ids.add(file_id)
3121
if tree.kind(file_id) != "directory":
3124
for name, ie in tree.inventory.iter_entries(file_id):
3125
interesting_ids.add(ie.file_id)
3126
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3128
# Remerge only supports resolving contents conflicts
3129
allowed_conflicts = ('text conflict', 'contents conflict')
3130
restore_files = [c.path for c in conflicts
3131
if c.typestring in allowed_conflicts]
3132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3133
tree.set_conflicts(ConflictList(new_conflicts))
3134
if file_list is not None:
3135
restore_files = file_list
3136
for filename in restore_files:
3138
restore(tree.abspath(filename))
3139
except errors.NotConflicted:
3141
# Disable pending merges, because the file texts we are remerging
3142
# have not had those merges performed. If we use the wrong parents
3143
# list, we imply that the working tree text has seen and rejected
3144
# all the changes from the other tree, when in fact those changes
3145
# have not yet been seen.
3146
pb = ui.ui_factory.nested_progress_bar()
3147
tree.set_parent_ids(parents[:1])
3149
merger = _mod_merge.Merger.from_revision_ids(pb,
3151
merger.interesting_ids = interesting_ids
3152
merger.merge_type = merge_type
3153
merger.show_base = show_base
3154
merger.reprocess = reprocess
3155
conflicts = merger.do_merge()
3157
tree.set_parent_ids(parents)
3167
class cmd_revert(Command):
3168
"""Revert files to a previous revision.
3170
Giving a list of files will revert only those files. Otherwise, all files
3171
will be reverted. If the revision is not specified with '--revision', the
3172
last committed revision is used.
3174
To remove only some changes, without reverting to a prior version, use
3175
merge instead. For example, "merge . --revision -2..-3" will remove the
3176
changes introduced by -2, without affecting the changes introduced by -1.
3177
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
3179
By default, any files that have been manually changed will be backed up
3180
first. (Files changed only by merge are not backed up.) Backup files have
3181
'.~#~' appended to their name, where # is a number.
3183
When you provide files, you can use their current pathname or the pathname
3184
from the target revision. So you can use revert to "undelete" a file by
3185
name. If you name a directory, all the contents of that directory will be
3188
Any files that have been newly added since that revision will be deleted,
3189
with a backup kept if appropriate. Directories containing unknown files
3190
will not be deleted.
3192
The working tree contains a list of pending merged revisions, which will
3193
be included as parents in the next commit. Normally, revert clears that
3194
list as well as reverting the files. If any files are specified, revert
3195
leaves the pending merge list alone and reverts only the files. Use "bzr
3196
revert ." in the tree root to revert all files but keep the merge record,
3197
and "bzr revert --forget-merges" to clear the pending merge list without
3198
reverting any files.
3201
_see_also = ['cat', 'export']
3204
Option('no-backup', "Do not save backups of reverted files."),
3205
Option('forget-merges',
3206
'Remove pending merge marker, without changing any files.'),
3208
takes_args = ['file*']
3210
def run(self, revision=None, no_backup=False, file_list=None,
3211
forget_merges=None):
3212
tree, file_list = tree_files(file_list)
3214
tree.set_parent_ids(tree.get_parent_ids()[:1])
3216
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3219
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
3220
if revision is None:
3221
rev_id = tree.last_revision()
3222
elif len(revision) != 1:
3223
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
3225
rev_id = revision[0].as_revision_id(tree.branch)
3226
pb = ui.ui_factory.nested_progress_bar()
3228
tree.revert(file_list,
3229
tree.branch.repository.revision_tree(rev_id),
3230
not no_backup, pb, report_changes=True)
3235
class cmd_assert_fail(Command):
3236
"""Test reporting of assertion failures"""
3237
# intended just for use in testing
3242
raise AssertionError("always fails")
3245
class cmd_help(Command):
3246
"""Show help on a command or other topic.
3249
_see_also = ['topics']
3251
Option('long', 'Show help on all commands.'),
3253
takes_args = ['topic?']
3254
aliases = ['?', '--help', '-?', '-h']
3257
def run(self, topic=None, long=False):
3259
if topic is None and long:
3261
bzrlib.help.help(topic)
3264
class cmd_shell_complete(Command):
3265
"""Show appropriate completions for context.
3267
For a list of all available commands, say 'bzr shell-complete'.
3269
takes_args = ['context?']
3274
def run(self, context=None):
3275
import shellcomplete
3276
shellcomplete.shellcomplete(context)
3279
class cmd_fetch(Command):
3280
"""Copy in history from another branch but don't merge it.
3282
This is an internal method used for pull and merge.
3285
takes_args = ['from_branch', 'to_branch']
3286
def run(self, from_branch, to_branch):
3287
from bzrlib.fetch import Fetcher
3288
from_b = Branch.open(from_branch)
3289
to_b = Branch.open(to_branch)
3290
Fetcher(to_b, from_b)
3293
class cmd_missing(Command):
3294
"""Show unmerged/unpulled revisions between two branches.
3296
OTHER_BRANCH may be local or remote.
3299
_see_also = ['merge', 'pull']
3300
takes_args = ['other_branch?']
3302
Option('reverse', 'Reverse the order of revisions.'),
3304
'Display changes in the local branch only.'),
3305
Option('this' , 'Same as --mine-only.'),
3306
Option('theirs-only',
3307
'Display changes in the remote branch only.'),
3308
Option('other', 'Same as --theirs-only.'),
3313
encoding_type = 'replace'
3316
def run(self, other_branch=None, reverse=False, mine_only=False,
3317
theirs_only=False, log_format=None, long=False, short=False, line=False,
3318
show_ids=False, verbose=False, this=False, other=False):
3319
from bzrlib.missing import find_unmerged, iter_log_revisions
3326
local_branch = Branch.open_containing(u".")[0]
3327
parent = local_branch.get_parent()
3328
if other_branch is None:
3329
other_branch = parent
3330
if other_branch is None:
3331
raise errors.BzrCommandError("No peer location known"
3333
display_url = urlutils.unescape_for_display(parent,
3335
self.outf.write("Using last location: " + display_url + "\n")
3337
remote_branch = Branch.open(other_branch)
3338
if remote_branch.base == local_branch.base:
3339
remote_branch = local_branch
3340
local_branch.lock_read()
3342
remote_branch.lock_read()
3344
local_extra, remote_extra = find_unmerged(local_branch,
3346
if log_format is None:
3347
registry = log.log_formatter_registry
3348
log_format = registry.get_default(local_branch)
3349
lf = log_format(to_file=self.outf,
3351
show_timezone='original')
3352
if reverse is False:
3353
local_extra.reverse()
3354
remote_extra.reverse()
3355
if local_extra and not theirs_only:
3356
self.outf.write("You have %d extra revision(s):\n" %
3358
for revision in iter_log_revisions(local_extra,
3359
local_branch.repository,
3361
lf.log_revision(revision)
3362
printed_local = True
3364
printed_local = False
3365
if remote_extra and not mine_only:
3366
if printed_local is True:
3367
self.outf.write("\n\n\n")
3368
self.outf.write("You are missing %d revision(s):\n" %
3370
for revision in iter_log_revisions(remote_extra,
3371
remote_branch.repository,
3373
lf.log_revision(revision)
3374
if not remote_extra and not local_extra:
3376
self.outf.write("Branches are up to date.\n")
3380
remote_branch.unlock()
3382
local_branch.unlock()
3383
if not status_code and parent is None and other_branch is not None:
3384
local_branch.lock_write()
3386
# handle race conditions - a parent might be set while we run.
3387
if local_branch.get_parent() is None:
3388
local_branch.set_parent(remote_branch.base)
3390
local_branch.unlock()
3394
class cmd_pack(Command):
3395
"""Compress the data within a repository."""
3397
_see_also = ['repositories']
3398
takes_args = ['branch_or_repo?']
3400
def run(self, branch_or_repo='.'):
3401
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
3403
branch = dir.open_branch()
3404
repository = branch.repository
3405
except errors.NotBranchError:
3406
repository = dir.open_repository()
3410
class cmd_plugins(Command):
3411
"""List the installed plugins.
3413
This command displays the list of installed plugins including
3414
version of plugin and a short description of each.
3416
--verbose shows the path where each plugin is located.
3418
A plugin is an external component for Bazaar that extends the
3419
revision control system, by adding or replacing code in Bazaar.
3420
Plugins can do a variety of things, including overriding commands,
3421
adding new commands, providing additional network transports and
3422
customizing log output.
3424
See the Bazaar web site, http://bazaar-vcs.org, for further
3425
information on plugins including where to find them and how to
3426
install them. Instructions are also provided there on how to
3427
write new plugins using the Python programming language.
3429
takes_options = ['verbose']
3432
def run(self, verbose=False):
3433
import bzrlib.plugin
3434
from inspect import getdoc
3436
for name, plugin in bzrlib.plugin.plugins().items():
3437
version = plugin.__version__
3438
if version == 'unknown':
3440
name_ver = '%s %s' % (name, version)
3441
d = getdoc(plugin.module)
3443
doc = d.split('\n')[0]
3445
doc = '(no description)'
3446
result.append((name_ver, doc, plugin.path()))
3447
for name_ver, doc, path in sorted(result):
3455
class cmd_testament(Command):
3456
"""Show testament (signing-form) of a revision."""
3459
Option('long', help='Produce long-format testament.'),
3461
help='Produce a strict-format testament.')]
3462
takes_args = ['branch?']
3464
def run(self, branch=u'.', revision=None, long=False, strict=False):
3465
from bzrlib.testament import Testament, StrictTestament
3467
testament_class = StrictTestament
3469
testament_class = Testament
3470
b = WorkingTree.open_containing(branch)[0].branch
3473
if revision is None:
3474
rev_id = b.last_revision()
3476
rev_id = revision[0].as_revision_id(b)
3477
t = testament_class.from_revision(b.repository, rev_id)
3479
sys.stdout.writelines(t.as_text_lines())
3481
sys.stdout.write(t.as_short_text())
3486
class cmd_annotate(Command):
3487
"""Show the origin of each line in a file.
3489
This prints out the given file with an annotation on the left side
3490
indicating which revision, author and date introduced the change.
3492
If the origin is the same for a run of consecutive lines, it is
3493
shown only at the top, unless the --all option is given.
3495
# TODO: annotate directories; showing when each file was last changed
3496
# TODO: if the working copy is modified, show annotations on that
3497
# with new uncommitted lines marked
3498
aliases = ['ann', 'blame', 'praise']
3499
takes_args = ['filename']
3500
takes_options = [Option('all', help='Show annotations on all lines.'),
3501
Option('long', help='Show commit date in annotations.'),
3505
encoding_type = 'exact'
3508
def run(self, filename, all=False, long=False, revision=None,
3510
from bzrlib.annotate import annotate_file
3511
wt, branch, relpath = \
3512
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
3518
if revision is None:
3519
revision_id = branch.last_revision()
3520
elif len(revision) != 1:
3521
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
3523
revision_id = revision[0].as_revision_id(branch)
3524
tree = branch.repository.revision_tree(revision_id)
3526
file_id = wt.path2id(relpath)
3528
file_id = tree.path2id(relpath)
3530
raise errors.NotVersionedError(filename)
3531
file_version = tree.inventory[file_id].revision
3532
annotate_file(branch, file_version, file_id, long, all, self.outf,
3541
class cmd_re_sign(Command):
3542
"""Create a digital signature for an existing revision."""
3543
# TODO be able to replace existing ones.
3545
hidden = True # is this right ?
3546
takes_args = ['revision_id*']
3547
takes_options = ['revision']
3549
def run(self, revision_id_list=None, revision=None):
3550
if revision_id_list is not None and revision is not None:
3551
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
3552
if revision_id_list is None and revision is None:
3553
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
3554
b = WorkingTree.open_containing(u'.')[0].branch
3557
return self._run(b, revision_id_list, revision)
3561
def _run(self, b, revision_id_list, revision):
3562
import bzrlib.gpg as gpg
3563
gpg_strategy = gpg.GPGStrategy(b.get_config())
3564
if revision_id_list is not None:
3565
b.repository.start_write_group()
3567
for revision_id in revision_id_list:
3568
b.repository.sign_revision(revision_id, gpg_strategy)
3570
b.repository.abort_write_group()
3573
b.repository.commit_write_group()
3574
elif revision is not None:
3575
if len(revision) == 1:
3576
revno, rev_id = revision[0].in_history(b)
3577
b.repository.start_write_group()
3579
b.repository.sign_revision(rev_id, gpg_strategy)
3581
b.repository.abort_write_group()
3584
b.repository.commit_write_group()
3585
elif len(revision) == 2:
3586
# are they both on rh- if so we can walk between them
3587
# might be nice to have a range helper for arbitrary
3588
# revision paths. hmm.
3589
from_revno, from_revid = revision[0].in_history(b)
3590
to_revno, to_revid = revision[1].in_history(b)
3591
if to_revid is None:
3592
to_revno = b.revno()
3593
if from_revno is None or to_revno is None:
3594
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
3595
b.repository.start_write_group()
3597
for revno in range(from_revno, to_revno + 1):
3598
b.repository.sign_revision(b.get_rev_id(revno),
3601
b.repository.abort_write_group()
3604
b.repository.commit_write_group()
3606
raise errors.BzrCommandError('Please supply either one revision, or a range.')
3609
class cmd_bind(Command):
3610
"""Convert the current branch into a checkout of the supplied branch.
3612
Once converted into a checkout, commits must succeed on the master branch
3613
before they will be applied to the local branch.
3616
_see_also = ['checkouts', 'unbind']
3617
takes_args = ['location?']
3620
def run(self, location=None):
3621
b, relpath = Branch.open_containing(u'.')
3622
if location is None:
3624
location = b.get_old_bound_location()
3625
except errors.UpgradeRequired:
3626
raise errors.BzrCommandError('No location supplied. '
3627
'This format does not remember old locations.')
3629
if location is None:
3630
raise errors.BzrCommandError('No location supplied and no '
3631
'previous location known')
3632
b_other = Branch.open(location)
3635
except errors.DivergedBranches:
3636
raise errors.BzrCommandError('These branches have diverged.'
3637
' Try merging, and then bind again.')
3640
class cmd_unbind(Command):
3641
"""Convert the current checkout into a regular branch.
3643
After unbinding, the local branch is considered independent and subsequent
3644
commits will be local only.
3647
_see_also = ['checkouts', 'bind']
3652
b, relpath = Branch.open_containing(u'.')
3654
raise errors.BzrCommandError('Local branch is not bound')
3657
class cmd_uncommit(Command):
3658
"""Remove the last committed revision.
3660
--verbose will print out what is being removed.
3661
--dry-run will go through all the motions, but not actually
3664
If --revision is specified, uncommit revisions to leave the branch at the
3665
specified revision. For example, "bzr uncommit -r 15" will leave the
3666
branch at revision 15.
3668
In the future, uncommit will create a revision bundle, which can then
3672
# TODO: jam 20060108 Add an option to allow uncommit to remove
3673
# unreferenced information in 'branch-as-repository' branches.
3674
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
3675
# information in shared branches as well.
3676
_see_also = ['commit']
3677
takes_options = ['verbose', 'revision',
3678
Option('dry-run', help='Don\'t actually make changes.'),
3679
Option('force', help='Say yes to all questions.'),
3681
help="Only remove the commits from the local branch"
3682
" when in a checkout."
3685
takes_args = ['location?']
3687
encoding_type = 'replace'
3689
def run(self, location=None,
3690
dry_run=False, verbose=False,
3691
revision=None, force=False, local=False):
3692
if location is None:
3694
control, relpath = bzrdir.BzrDir.open_containing(location)
3696
tree = control.open_workingtree()
3698
except (errors.NoWorkingTree, errors.NotLocalUrl):
3700
b = control.open_branch()
3702
if tree is not None:
3707
return self._run(b, tree, dry_run, verbose, revision, force,
3710
if tree is not None:
3715
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
3716
from bzrlib.log import log_formatter, show_log
3717
from bzrlib.uncommit import uncommit
3719
last_revno, last_rev_id = b.last_revision_info()
3722
if revision is None:
3724
rev_id = last_rev_id
3726
# 'bzr uncommit -r 10' actually means uncommit
3727
# so that the final tree is at revno 10.
3728
# but bzrlib.uncommit.uncommit() actually uncommits
3729
# the revisions that are supplied.
3730
# So we need to offset it by one
3731
revno = revision[0].in_history(b).revno + 1
3732
if revno <= last_revno:
3733
rev_id = b.get_rev_id(revno)
3735
if rev_id is None or _mod_revision.is_null(rev_id):
3736
self.outf.write('No revisions to uncommit.\n')
3739
lf = log_formatter('short',
3741
show_timezone='original')
3746
direction='forward',
3747
start_revision=revno,
3748
end_revision=last_revno)
3751
print 'Dry-run, pretending to remove the above revisions.'
3753
val = raw_input('Press <enter> to continue')
3755
print 'The above revision(s) will be removed.'
3757
val = raw_input('Are you sure [y/N]? ')
3758
if val.lower() not in ('y', 'yes'):
3762
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
3763
revno=revno, local=local)
3766
class cmd_break_lock(Command):
3767
"""Break a dead lock on a repository, branch or working directory.
3769
CAUTION: Locks should only be broken when you are sure that the process
3770
holding the lock has been stopped.
3772
You can get information on what locks are open via the 'bzr info' command.
3777
takes_args = ['location?']
3779
def run(self, location=None, show=False):
3780
if location is None:
3782
control, relpath = bzrdir.BzrDir.open_containing(location)
3784
control.break_lock()
3785
except NotImplementedError:
3789
class cmd_wait_until_signalled(Command):
3790
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3792
This just prints a line to signal when it is ready, then blocks on stdin.
3798
sys.stdout.write("running\n")
3800
sys.stdin.readline()
3803
class cmd_serve(Command):
3804
"""Run the bzr server."""
3806
aliases = ['server']
3810
help='Serve on stdin/out for use from inetd or sshd.'),
3812
help='Listen for connections on nominated port of the form '
3813
'[hostname:]portnumber. Passing 0 as the port number will '
3814
'result in a dynamically allocated port. The default port is '
3818
help='Serve contents of this directory.',
3820
Option('allow-writes',
3821
help='By default the server is a readonly server. Supplying '
3822
'--allow-writes enables write access to the contents of '
3823
'the served directory and below.'
3827
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3828
from bzrlib import lockdir
3829
from bzrlib.smart import medium, server
3830
from bzrlib.transport import get_transport
3831
from bzrlib.transport.chroot import ChrootServer
3832
if directory is None:
3833
directory = os.getcwd()
3834
url = urlutils.local_path_to_url(directory)
3835
if not allow_writes:
3836
url = 'readonly+' + url
3837
chroot_server = ChrootServer(get_transport(url))
3838
chroot_server.setUp()
3839
t = get_transport(chroot_server.get_url())
3841
smart_server = medium.SmartServerPipeStreamMedium(
3842
sys.stdin, sys.stdout, t)
3844
host = medium.BZR_DEFAULT_INTERFACE
3846
port = medium.BZR_DEFAULT_PORT
3849
host, port = port.split(':')
3851
smart_server = server.SmartTCPServer(t, host=host, port=port)
3852
print 'listening on port: ', smart_server.port
3854
# for the duration of this server, no UI output is permitted.
3855
# note that this may cause problems with blackbox tests. This should
3856
# be changed with care though, as we dont want to use bandwidth sending
3857
# progress over stderr to smart server clients!
3858
old_factory = ui.ui_factory
3859
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
3861
ui.ui_factory = ui.SilentUIFactory()
3862
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
3863
smart_server.serve()
3865
ui.ui_factory = old_factory
3866
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
3869
class cmd_join(Command):
3870
"""Combine a subtree into its containing tree.
3872
This command is for experimental use only. It requires the target tree
3873
to be in dirstate-with-subtree format, which cannot be converted into
3876
The TREE argument should be an independent tree, inside another tree, but
3877
not part of it. (Such trees can be produced by "bzr split", but also by
3878
running "bzr branch" with the target inside a tree.)
3880
The result is a combined tree, with the subtree no longer an independant
3881
part. This is marked as a merge of the subtree into the containing tree,
3882
and all history is preserved.
3884
If --reference is specified, the subtree retains its independence. It can
3885
be branched by itself, and can be part of multiple projects at the same
3886
time. But operations performed in the containing tree, such as commit
3887
and merge, will recurse into the subtree.
3890
_see_also = ['split']
3891
takes_args = ['tree']
3893
Option('reference', help='Join by reference.'),
3897
def run(self, tree, reference=False):
3898
sub_tree = WorkingTree.open(tree)
3899
parent_dir = osutils.dirname(sub_tree.basedir)
3900
containing_tree = WorkingTree.open_containing(parent_dir)[0]
3901
repo = containing_tree.branch.repository
3902
if not repo.supports_rich_root():
3903
raise errors.BzrCommandError(
3904
"Can't join trees because %s doesn't support rich root data.\n"
3905
"You can use bzr upgrade on the repository."
3909
containing_tree.add_reference(sub_tree)
3910
except errors.BadReferenceTarget, e:
3911
# XXX: Would be better to just raise a nicely printable
3912
# exception from the real origin. Also below. mbp 20070306
3913
raise errors.BzrCommandError("Cannot join %s. %s" %
3917
containing_tree.subsume(sub_tree)
3918
except errors.BadSubsumeSource, e:
3919
raise errors.BzrCommandError("Cannot join %s. %s" %
3923
class cmd_split(Command):
3924
"""Split a subdirectory of a tree into a separate tree.
3926
This command will produce a target tree in a format that supports
3927
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
3928
converted into earlier formats like 'dirstate-tags'.
3930
The TREE argument should be a subdirectory of a working tree. That
3931
subdirectory will be converted into an independent tree, with its own
3932
branch. Commits in the top-level tree will not apply to the new subtree.
3935
# join is not un-hidden yet
3936
#_see_also = ['join']
3937
takes_args = ['tree']
3939
def run(self, tree):
3940
containing_tree, subdir = WorkingTree.open_containing(tree)
3941
sub_id = containing_tree.path2id(subdir)
3943
raise errors.NotVersionedError(subdir)
3945
containing_tree.extract(sub_id)
3946
except errors.RootNotRich:
3947
raise errors.UpgradeRequired(containing_tree.branch.base)
3950
class cmd_merge_directive(Command):
3951
"""Generate a merge directive for auto-merge tools.
3953
A directive requests a merge to be performed, and also provides all the
3954
information necessary to do so. This means it must either include a
3955
revision bundle, or the location of a branch containing the desired
3958
A submit branch (the location to merge into) must be supplied the first
3959
time the command is issued. After it has been supplied once, it will
3960
be remembered as the default.
3962
A public branch is optional if a revision bundle is supplied, but required
3963
if --diff or --plain is specified. It will be remembered as the default
3964
after the first use.
3967
takes_args = ['submit_branch?', 'public_branch?']
3971
_see_also = ['send']
3974
RegistryOption.from_kwargs('patch-type',
3975
'The type of patch to include in the directive.',
3977
value_switches=True,
3979
bundle='Bazaar revision bundle (default).',
3980
diff='Normal unified diff.',
3981
plain='No patch, just directive.'),
3982
Option('sign', help='GPG-sign the directive.'), 'revision',
3983
Option('mail-to', type=str,
3984
help='Instead of printing the directive, email to this address.'),
3985
Option('message', type=str, short_name='m',
3986
help='Message to use when committing this merge.')
3989
encoding_type = 'exact'
3991
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
3992
sign=False, revision=None, mail_to=None, message=None):
3993
from bzrlib.revision import ensure_null, NULL_REVISION
3994
include_patch, include_bundle = {
3995
'plain': (False, False),
3996
'diff': (True, False),
3997
'bundle': (True, True),
3999
branch = Branch.open('.')
4000
stored_submit_branch = branch.get_submit_branch()
4001
if submit_branch is None:
4002
submit_branch = stored_submit_branch
4004
if stored_submit_branch is None:
4005
branch.set_submit_branch(submit_branch)
4006
if submit_branch is None:
4007
submit_branch = branch.get_parent()
4008
if submit_branch is None:
4009
raise errors.BzrCommandError('No submit branch specified or known')
4011
stored_public_branch = branch.get_public_branch()
4012
if public_branch is None:
4013
public_branch = stored_public_branch
4014
elif stored_public_branch is None:
4015
branch.set_public_branch(public_branch)
4016
if not include_bundle and public_branch is None:
4017
raise errors.BzrCommandError('No public branch specified or'
4019
base_revision_id = None
4020
if revision is not None:
4021
if len(revision) > 2:
4022
raise errors.BzrCommandError('bzr merge-directive takes '
4023
'at most two one revision identifiers')
4024
revision_id = revision[-1].as_revision_id(branch)
4025
if len(revision) == 2:
4026
base_revision_id = revision[0].as_revision_id(branch)
4028
revision_id = branch.last_revision()
4029
revision_id = ensure_null(revision_id)
4030
if revision_id == NULL_REVISION:
4031
raise errors.BzrCommandError('No revisions to bundle.')
4032
directive = merge_directive.MergeDirective2.from_objects(
4033
branch.repository, revision_id, time.time(),
4034
osutils.local_time_offset(), submit_branch,
4035
public_branch=public_branch, include_patch=include_patch,
4036
include_bundle=include_bundle, message=message,
4037
base_revision_id=base_revision_id)
4040
self.outf.write(directive.to_signed(branch))
4042
self.outf.writelines(directive.to_lines())
4044
message = directive.to_email(mail_to, branch, sign)
4045
s = SMTPConnection(branch.get_config())
4046
s.send_email(message)
4049
class cmd_send(Command):
4050
"""Mail or create a merge-directive for submiting changes.
4052
A merge directive provides many things needed for requesting merges:
4054
* A machine-readable description of the merge to perform
4056
* An optional patch that is a preview of the changes requested
4058
* An optional bundle of revision data, so that the changes can be applied
4059
directly from the merge directive, without retrieving data from a
4062
If --no-bundle is specified, then public_branch is needed (and must be
4063
up-to-date), so that the receiver can perform the merge using the
4064
public_branch. The public_branch is always included if known, so that
4065
people can check it later.
4067
The submit branch defaults to the parent, but can be overridden. Both
4068
submit branch and public branch will be remembered if supplied.
4070
If a public_branch is known for the submit_branch, that public submit
4071
branch is used in the merge instructions. This means that a local mirror
4072
can be used as your actual submit branch, once you have set public_branch
4075
Mail is sent using your preferred mail program. This should be transparent
4076
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
4077
If the preferred client can't be found (or used), your editor will be used.
4079
To use a specific mail program, set the mail_client configuration option.
4080
(For Thunderbird 1.5, this works around some bugs.) Supported values for
4081
specific clients are "evolution", "kmail", "mutt", and "thunderbird";
4082
generic options are "default", "editor", "mapi", and "xdg-email".
4084
If mail is being sent, a to address is required. This can be supplied
4085
either on the commandline, by setting the submit_to configuration
4086
option in the branch itself or the child_submit_to configuration option
4087
in the submit branch.
4089
Two formats are currently supported: "4" uses revision bundle format 4 and
4090
merge directive format 2. It is significantly faster and smaller than
4091
older formats. It is compatible with Bazaar 0.19 and later. It is the
4092
default. "0.9" uses revision bundle format 0.9 and merge directive
4093
format 1. It is compatible with Bazaar 0.12 - 0.18.
4095
Merge directives are applied using the merge command or the pull command.
4098
encoding_type = 'exact'
4100
_see_also = ['merge', 'pull']
4102
takes_args = ['submit_branch?', 'public_branch?']
4106
help='Do not include a bundle in the merge directive.'),
4107
Option('no-patch', help='Do not include a preview patch in the merge'
4110
help='Remember submit and public branch.'),
4112
help='Branch to generate the submission from, '
4113
'rather than the one containing the working directory.',
4116
Option('output', short_name='o',
4117
help='Write merge directive to this file; '
4118
'use - for stdout.',
4120
Option('mail-to', help='Mail the request to this address.',
4124
RegistryOption.from_kwargs('format',
4125
'Use the specified output format.',
4126
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4127
'0.9': 'Bundle format 0.9, Merge Directive 1',})
4130
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4131
no_patch=False, revision=None, remember=False, output=None,
4132
format='4', mail_to=None, message=None, **kwargs):
4133
return self._run(submit_branch, revision, public_branch, remember,
4134
format, no_bundle, no_patch, output,
4135
kwargs.get('from', '.'), mail_to, message)
4137
def _run(self, submit_branch, revision, public_branch, remember, format,
4138
no_bundle, no_patch, output, from_, mail_to, message):
4139
from bzrlib.revision import NULL_REVISION
4140
branch = Branch.open_containing(from_)[0]
4142
outfile = StringIO()
4146
outfile = open(output, 'wb')
4147
# we may need to write data into branch's repository to calculate
4152
config = branch.get_config()
4154
mail_to = config.get_user_option('submit_to')
4155
mail_client = config.get_mail_client()
4156
if remember and submit_branch is None:
4157
raise errors.BzrCommandError(
4158
'--remember requires a branch to be specified.')
4159
stored_submit_branch = branch.get_submit_branch()
4160
remembered_submit_branch = False
4161
if submit_branch is None:
4162
submit_branch = stored_submit_branch
4163
remembered_submit_branch = True
4165
if stored_submit_branch is None or remember:
4166
branch.set_submit_branch(submit_branch)
4167
if submit_branch is None:
4168
submit_branch = branch.get_parent()
4169
remembered_submit_branch = True
4170
if submit_branch is None:
4171
raise errors.BzrCommandError('No submit branch known or'
4173
if remembered_submit_branch:
4174
note('Using saved location: %s', submit_branch)
4177
submit_config = Branch.open(submit_branch).get_config()
4178
mail_to = submit_config.get_user_option("child_submit_to")
4180
stored_public_branch = branch.get_public_branch()
4181
if public_branch is None:
4182
public_branch = stored_public_branch
4183
elif stored_public_branch is None or remember:
4184
branch.set_public_branch(public_branch)
4185
if no_bundle and public_branch is None:
4186
raise errors.BzrCommandError('No public branch specified or'
4188
base_revision_id = None
4190
if revision is not None:
4191
if len(revision) > 2:
4192
raise errors.BzrCommandError('bzr send takes '
4193
'at most two one revision identifiers')
4194
revision_id = revision[-1].as_revision_id(branch)
4195
if len(revision) == 2:
4196
base_revision_id = revision[0].as_revision_id(branch)
4197
if revision_id is None:
4198
revision_id = branch.last_revision()
4199
if revision_id == NULL_REVISION:
4200
raise errors.BzrCommandError('No revisions to submit.')
4202
directive = merge_directive.MergeDirective2.from_objects(
4203
branch.repository, revision_id, time.time(),
4204
osutils.local_time_offset(), submit_branch,
4205
public_branch=public_branch, include_patch=not no_patch,
4206
include_bundle=not no_bundle, message=message,
4207
base_revision_id=base_revision_id)
4208
elif format == '0.9':
4211
patch_type = 'bundle'
4213
raise errors.BzrCommandError('Format 0.9 does not'
4214
' permit bundle with no patch')
4220
directive = merge_directive.MergeDirective.from_objects(
4221
branch.repository, revision_id, time.time(),
4222
osutils.local_time_offset(), submit_branch,
4223
public_branch=public_branch, patch_type=patch_type,
4226
outfile.writelines(directive.to_lines())
4228
subject = '[MERGE] '
4229
if message is not None:
4232
revision = branch.repository.get_revision(revision_id)
4233
subject += revision.get_summary()
4234
basename = directive.get_disk_name(branch)
4235
mail_client.compose_merge_request(mail_to, subject,
4236
outfile.getvalue(), basename)
4243
class cmd_bundle_revisions(cmd_send):
4245
"""Create a merge-directive for submiting changes.
4247
A merge directive provides many things needed for requesting merges:
4249
* A machine-readable description of the merge to perform
4251
* An optional patch that is a preview of the changes requested
4253
* An optional bundle of revision data, so that the changes can be applied
4254
directly from the merge directive, without retrieving data from a
4257
If --no-bundle is specified, then public_branch is needed (and must be
4258
up-to-date), so that the receiver can perform the merge using the
4259
public_branch. The public_branch is always included if known, so that
4260
people can check it later.
4262
The submit branch defaults to the parent, but can be overridden. Both
4263
submit branch and public branch will be remembered if supplied.
4265
If a public_branch is known for the submit_branch, that public submit
4266
branch is used in the merge instructions. This means that a local mirror
4267
can be used as your actual submit branch, once you have set public_branch
4270
Two formats are currently supported: "4" uses revision bundle format 4 and
4271
merge directive format 2. It is significantly faster and smaller than
4272
older formats. It is compatible with Bazaar 0.19 and later. It is the
4273
default. "0.9" uses revision bundle format 0.9 and merge directive
4274
format 1. It is compatible with Bazaar 0.12 - 0.18.
4279
help='Do not include a bundle in the merge directive.'),
4280
Option('no-patch', help='Do not include a preview patch in the merge'
4283
help='Remember submit and public branch.'),
4285
help='Branch to generate the submission from, '
4286
'rather than the one containing the working directory.',
4289
Option('output', short_name='o', help='Write directive to this file.',
4292
RegistryOption.from_kwargs('format',
4293
'Use the specified output format.',
4294
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4295
'0.9': 'Bundle format 0.9, Merge Directive 1',})
4297
aliases = ['bundle']
4299
_see_also = ['send', 'merge']
4303
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4304
no_patch=False, revision=None, remember=False, output=None,
4305
format='4', **kwargs):
4308
return self._run(submit_branch, revision, public_branch, remember,
4309
format, no_bundle, no_patch, output,
4310
kwargs.get('from', '.'), None, None)
4313
class cmd_tag(Command):
4314
"""Create, remove or modify a tag naming a revision.
4316
Tags give human-meaningful names to revisions. Commands that take a -r
4317
(--revision) option can be given -rtag:X, where X is any previously
4320
Tags are stored in the branch. Tags are copied from one branch to another
4321
along when you branch, push, pull or merge.
4323
It is an error to give a tag name that already exists unless you pass
4324
--force, in which case the tag is moved to point to the new revision.
4327
_see_also = ['commit', 'tags']
4328
takes_args = ['tag_name']
4331
help='Delete this tag rather than placing it.',
4334
help='Branch in which to place the tag.',
4339
help='Replace existing tags.',
4344
def run(self, tag_name,
4350
branch, relpath = Branch.open_containing(directory)
4354
branch.tags.delete_tag(tag_name)
4355
self.outf.write('Deleted tag %s.\n' % tag_name)
4358
if len(revision) != 1:
4359
raise errors.BzrCommandError(
4360
"Tags can only be placed on a single revision, "
4362
revision_id = revision[0].as_revision_id(branch)
4364
revision_id = branch.last_revision()
4365
if (not force) and branch.tags.has_tag(tag_name):
4366
raise errors.TagAlreadyExists(tag_name)
4367
branch.tags.set_tag(tag_name, revision_id)
4368
self.outf.write('Created tag %s.\n' % tag_name)
4373
class cmd_tags(Command):
4376
This command shows a table of tag names and the revisions they reference.
4382
help='Branch whose tags should be displayed.',
4386
RegistryOption.from_kwargs('sort',
4387
'Sort tags by different criteria.', title='Sorting',
4388
alpha='Sort tags lexicographically (default).',
4389
time='Sort tags chronologically.',
4400
branch, relpath = Branch.open_containing(directory)
4401
tags = branch.tags.get_tag_dict().items()
4404
elif sort == 'time':
4406
for tag, revid in tags:
4408
revobj = branch.repository.get_revision(revid)
4409
except errors.NoSuchRevision:
4410
timestamp = sys.maxint # place them at the end
4412
timestamp = revobj.timestamp
4413
timestamps[revid] = timestamp
4414
tags.sort(key=lambda x: timestamps[x[1]])
4416
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
4417
revno_map = branch.get_revision_id_to_revno_map()
4418
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
4419
for tag, revid in tags ]
4420
for tag, revspec in tags:
4421
self.outf.write('%-20s %s\n' % (tag, revspec))
4424
class cmd_reconfigure(Command):
4425
"""Reconfigure the type of a bzr directory.
4427
A target configuration must be specified.
4429
For checkouts, the bind-to location will be auto-detected if not specified.
4430
The order of preference is
4431
1. For a lightweight checkout, the current bound location.
4432
2. For branches that used to be checkouts, the previously-bound location.
4433
3. The push location.
4434
4. The parent location.
4435
If none of these is available, --bind-to must be specified.
4438
takes_args = ['location?']
4439
takes_options = [RegistryOption.from_kwargs('target_type',
4440
title='Target type',
4441
help='The type to reconfigure the directory to.',
4442
value_switches=True, enum_switch=False,
4443
branch='Reconfigure to a branch.',
4444
tree='Reconfigure to a tree.',
4445
checkout='Reconfigure to a checkout.',
4446
lightweight_checkout='Reconfigure to a lightweight'
4448
standalone='Reconfigure to be standalone.',
4449
use_shared='Reconfigure to use a shared repository.'),
4450
Option('bind-to', help='Branch to bind checkout to.',
4453
help='Perform reconfiguration even if local changes'
4457
def run(self, location=None, target_type=None, bind_to=None, force=False):
4458
directory = bzrdir.BzrDir.open(location)
4459
if target_type is None:
4460
raise errors.BzrCommandError('No target configuration specified')
4461
elif target_type == 'branch':
4462
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
4463
elif target_type == 'tree':
4464
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
4465
elif target_type == 'checkout':
4466
reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
4468
elif target_type == 'lightweight-checkout':
4469
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
4471
elif target_type == 'use-shared':
4472
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
4473
elif target_type == 'standalone':
4474
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
4475
reconfiguration.apply(force)
4478
class cmd_switch(Command):
4479
"""Set the branch of a checkout and update.
4481
For lightweight checkouts, this changes the branch being referenced.
4482
For heavyweight checkouts, this checks that there are no local commits
4483
versus the current bound branch, then it makes the local branch a mirror
4484
of the new location and binds to it.
4486
In both cases, the working tree is updated and uncommitted changes
4487
are merged. The user can commit or revert these as they desire.
4489
Pending merges need to be committed or reverted before using switch.
4491
The path to the branch to switch to can be specified relative to the parent
4492
directory of the current branch. For example, if you are currently in a
4493
checkout of /path/to/branch, specifying 'newbranch' will find a branch at
4497
takes_args = ['to_location']
4498
takes_options = [Option('force',
4499
help='Switch even if local commits will be lost.')
4502
def run(self, to_location, force=False):
4503
from bzrlib import switch
4505
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
4507
to_branch = Branch.open(to_location)
4508
except errors.NotBranchError:
4509
to_branch = Branch.open(
4510
control_dir.open_branch().base + '../' + to_location)
4511
switch.switch(control_dir, to_branch, force)
4512
note('Switched to branch: %s',
4513
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
4516
class cmd_hooks(Command):
4517
"""Show a branch's currently registered hooks.
4521
takes_args = ['path?']
4523
def run(self, path=None):
4526
branch_hooks = Branch.open(path).hooks
4527
for hook_type in branch_hooks:
4528
hooks = branch_hooks[hook_type]
4529
self.outf.write("%s:\n" % (hook_type,))
4532
self.outf.write(" %s\n" %
4533
(branch_hooks.get_hook_name(hook),))
4535
self.outf.write(" <no hooks installed>\n")
4538
def _create_prefix(cur_transport):
4539
needed = [cur_transport]
4540
# Recurse upwards until we can create a directory successfully
4542
new_transport = cur_transport.clone('..')
4543
if new_transport.base == cur_transport.base:
4544
raise errors.BzrCommandError(
4545
"Failed to create path prefix for %s."
4546
% cur_transport.base)
4548
new_transport.mkdir('.')
4549
except errors.NoSuchFile:
4550
needed.append(new_transport)
4551
cur_transport = new_transport
4554
# Now we only need to create child directories
4556
cur_transport = needed.pop()
4557
cur_transport.ensure_base()
4560
# these get imported and then picked up by the scan for cmd_*
4561
# TODO: Some more consistent way to split command definitions across files;
4562
# we do need to load at least some information about them to know of
4563
# aliases. ideally we would avoid loading the implementation until the
4564
# details were needed.
4565
from bzrlib.cmd_version_info import cmd_version_info
4566
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
4567
from bzrlib.bundle.commands import (
4570
from bzrlib.sign_my_commits import cmd_sign_my_commits
4571
from bzrlib.weave_commands import cmd_versionedfile_list, cmd_weave_join, \
4572
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
