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.',
171
aliases = ['st', 'stat']
173
encoding_type = 'replace'
174
_see_also = ['diff', 'revert', 'status-flags']
177
def run(self, show_ids=False, file_list=None, revision=None, short=False,
179
from bzrlib.status import show_tree_status
181
if revision and len(revision) > 2:
182
raise errors.BzrCommandError('bzr status --revision takes exactly'
183
' one or two revision specifiers')
185
tree, file_list = tree_files(file_list)
187
show_tree_status(tree, show_ids=show_ids,
188
specific_files=file_list, revision=revision,
189
to_file=self.outf, short=short, versioned=versioned)
192
class cmd_cat_revision(Command):
193
"""Write out metadata for a revision.
195
The revision to print can either be specified by a specific
196
revision identifier, or you can use --revision.
200
takes_args = ['revision_id?']
201
takes_options = ['revision']
202
# cat-revision is more for frontends so should be exact
206
def run(self, revision_id=None, revision=None):
207
if revision_id is not None and revision is not None:
208
raise errors.BzrCommandError('You can only supply one of'
209
' revision_id or --revision')
210
if revision_id is None and revision is None:
211
raise errors.BzrCommandError('You must supply either'
212
' --revision or a revision_id')
213
b = WorkingTree.open_containing(u'.')[0].branch
215
# TODO: jam 20060112 should cat-revision always output utf-8?
216
if revision_id is not None:
217
revision_id = osutils.safe_revision_id(revision_id, warn=False)
218
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
219
elif revision is not None:
222
raise errors.BzrCommandError('You cannot specify a NULL'
224
revno, rev_id = rev.in_history(b)
225
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
228
class cmd_remove_tree(Command):
229
"""Remove the working tree from a given branch/checkout.
231
Since a lightweight checkout is little more than a working tree
232
this will refuse to run against one.
234
To re-create the working tree, use "bzr checkout".
236
_see_also = ['checkout', 'working-trees']
238
takes_args = ['location?']
240
def run(self, location='.'):
241
d = bzrdir.BzrDir.open(location)
244
working = d.open_workingtree()
245
except errors.NoWorkingTree:
246
raise errors.BzrCommandError("No working tree to remove")
247
except errors.NotLocalUrl:
248
raise errors.BzrCommandError("You cannot remove the working tree of a "
251
working_path = working.bzrdir.root_transport.base
252
branch_path = working.branch.bzrdir.root_transport.base
253
if working_path != branch_path:
254
raise errors.BzrCommandError("You cannot remove the working tree from "
255
"a lightweight checkout")
257
d.destroy_workingtree()
260
class cmd_revno(Command):
261
"""Show current revision number.
263
This is equal to the number of revisions on this branch.
267
takes_args = ['location?']
270
def run(self, location=u'.'):
271
self.outf.write(str(Branch.open_containing(location)[0].revno()))
272
self.outf.write('\n')
275
class cmd_revision_info(Command):
276
"""Show revision number and revision id for a given revision identifier.
279
takes_args = ['revision_info*']
280
takes_options = ['revision']
283
def run(self, revision=None, revision_info_list=[]):
286
if revision is not None:
287
revs.extend(revision)
288
if revision_info_list is not None:
289
for rev in revision_info_list:
290
revs.append(RevisionSpec.from_string(rev))
292
b = Branch.open_containing(u'.')[0]
295
revs.append(RevisionSpec.from_string('-1'))
298
revinfo = rev.in_history(b)
299
if revinfo.revno is None:
300
dotted_map = b.get_revision_id_to_revno_map()
301
revno = '.'.join(str(i) for i in dotted_map[revinfo.rev_id])
302
print '%s %s' % (revno, revinfo.rev_id)
304
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
307
class cmd_add(Command):
308
"""Add specified files or directories.
310
In non-recursive mode, all the named items are added, regardless
311
of whether they were previously ignored. A warning is given if
312
any of the named files are already versioned.
314
In recursive mode (the default), files are treated the same way
315
but the behaviour for directories is different. Directories that
316
are already versioned do not give a warning. All directories,
317
whether already versioned or not, are searched for files or
318
subdirectories that are neither versioned or ignored, and these
319
are added. This search proceeds recursively into versioned
320
directories. If no names are given '.' is assumed.
322
Therefore simply saying 'bzr add' will version all files that
323
are currently unknown.
325
Adding a file whose parent directory is not versioned will
326
implicitly add the parent, and so on up to the root. This means
327
you should never need to explicitly add a directory, they'll just
328
get added when you add a file in the directory.
330
--dry-run will show which files would be added, but not actually
333
--file-ids-from will try to use the file ids from the supplied path.
334
It looks up ids trying to find a matching parent directory with the
335
same filename, and then by pure path. This option is rarely needed
336
but can be useful when adding the same logical file into two
337
branches that will be merged later (without showing the two different
338
adds as a conflict). It is also useful when merging another project
339
into a subdirectory of this one.
341
takes_args = ['file*']
344
help="Don't recursively add the contents of directories."),
346
help="Show what would be done, but don't actually do anything."),
348
Option('file-ids-from',
350
help='Lookup file ids from this tree.'),
352
encoding_type = 'replace'
353
_see_also = ['remove']
355
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
360
if file_ids_from is not None:
362
base_tree, base_path = WorkingTree.open_containing(
364
except errors.NoWorkingTree:
365
base_branch, base_path = Branch.open_containing(
367
base_tree = base_branch.basis_tree()
369
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
370
to_file=self.outf, should_print=(not is_quiet()))
372
action = bzrlib.add.AddAction(to_file=self.outf,
373
should_print=(not is_quiet()))
376
base_tree.lock_read()
378
file_list = self._maybe_expand_globs(file_list)
380
tree = WorkingTree.open_containing(file_list[0])[0]
382
tree = WorkingTree.open_containing(u'.')[0]
383
added, ignored = tree.smart_add(file_list, not
384
no_recurse, action=action, save=not dry_run)
386
if base_tree is not None:
390
for glob in sorted(ignored.keys()):
391
for path in ignored[glob]:
392
self.outf.write("ignored %s matching \"%s\"\n"
396
for glob, paths in ignored.items():
397
match_len += len(paths)
398
self.outf.write("ignored %d file(s).\n" % match_len)
399
self.outf.write("If you wish to add some of these files,"
400
" please add them by name.\n")
403
class cmd_mkdir(Command):
404
"""Create a new versioned directory.
406
This is equivalent to creating the directory and then adding it.
409
takes_args = ['dir+']
410
encoding_type = 'replace'
412
def run(self, dir_list):
415
wt, dd = WorkingTree.open_containing(d)
417
self.outf.write('added %s\n' % d)
420
class cmd_relpath(Command):
421
"""Show path of a file relative to root"""
423
takes_args = ['filename']
427
def run(self, filename):
428
# TODO: jam 20050106 Can relpath return a munged path if
429
# sys.stdout encoding cannot represent it?
430
tree, relpath = WorkingTree.open_containing(filename)
431
self.outf.write(relpath)
432
self.outf.write('\n')
435
class cmd_inventory(Command):
436
"""Show inventory of the current working copy or a revision.
438
It is possible to limit the output to a particular entry
439
type using the --kind option. For example: --kind file.
441
It is also possible to restrict the list of files to a specific
442
set. For example: bzr inventory --show-ids this/file
451
help='List entries of a particular kind: file, directory, symlink.',
454
takes_args = ['file*']
457
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
458
if kind and kind not in ['file', 'directory', 'symlink']:
459
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
461
work_tree, file_list = tree_files(file_list)
462
work_tree.lock_read()
464
if revision is not None:
465
if len(revision) > 1:
466
raise errors.BzrCommandError(
467
'bzr inventory --revision takes exactly one revision'
469
revision_id = revision[0].in_history(work_tree.branch).rev_id
470
tree = work_tree.branch.repository.revision_tree(revision_id)
472
extra_trees = [work_tree]
478
if file_list is not None:
479
file_ids = tree.paths2ids(file_list, trees=extra_trees,
480
require_versioned=True)
481
# find_ids_across_trees may include some paths that don't
483
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
484
for file_id in file_ids if file_id in tree)
486
entries = tree.inventory.entries()
489
if tree is not work_tree:
492
for path, entry in entries:
493
if kind and kind != entry.kind:
496
self.outf.write('%-50s %s\n' % (path, entry.file_id))
498
self.outf.write(path)
499
self.outf.write('\n')
502
class cmd_mv(Command):
503
"""Move or rename a file.
506
bzr mv OLDNAME NEWNAME
508
bzr mv SOURCE... DESTINATION
510
If the last argument is a versioned directory, all the other names
511
are moved into it. Otherwise, there must be exactly two arguments
512
and the file is changed to a new name.
514
If OLDNAME does not exist on the filesystem but is versioned and
515
NEWNAME does exist on the filesystem but is not versioned, mv
516
assumes that the file has been manually moved and only updates
517
its internal inventory to reflect that change.
518
The same is valid when moving many SOURCE files to a DESTINATION.
520
Files cannot be moved between branches.
523
takes_args = ['names*']
524
takes_options = [Option("after", help="Move only the bzr identifier"
525
" of the file, because the file has already been moved."),
527
aliases = ['move', 'rename']
528
encoding_type = 'replace'
530
def run(self, names_list, after=False):
531
if names_list is None:
534
if len(names_list) < 2:
535
raise errors.BzrCommandError("missing file argument")
536
tree, rel_names = tree_files(names_list)
538
if os.path.isdir(names_list[-1]):
539
# move into existing directory
540
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
541
self.outf.write("%s => %s\n" % pair)
543
if len(names_list) != 2:
544
raise errors.BzrCommandError('to mv multiple files the'
545
' destination must be a versioned'
547
tree.rename_one(rel_names[0], rel_names[1], after=after)
548
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
551
class cmd_pull(Command):
552
"""Turn this branch into a mirror of another branch.
554
This command only works on branches that have not diverged. Branches are
555
considered diverged if the destination branch's most recent commit is one
556
that has not been merged (directly or indirectly) into the parent.
558
If branches have diverged, you can use 'bzr merge' to integrate the changes
559
from one into the other. Once one branch has merged, the other should
560
be able to pull it again.
562
If you want to forget your local changes and just update your branch to
563
match the remote one, use pull --overwrite.
565
If there is no default location set, the first pull will set it. After
566
that, you can omit the location to use the default. To change the
567
default, use --remember. The value will only be saved if the remote
568
location can be accessed.
571
_see_also = ['push', 'update', 'status-flags']
572
takes_options = ['remember', 'overwrite', 'revision',
573
custom_help('verbose',
574
help='Show logs of pulled revisions.'),
576
help='Branch to pull into, '
577
'rather than the one containing the working directory.',
582
takes_args = ['location?']
583
encoding_type = 'replace'
585
def run(self, location=None, remember=False, overwrite=False,
586
revision=None, verbose=False,
588
# FIXME: too much stuff is in the command class
591
if directory is None:
594
tree_to = WorkingTree.open_containing(directory)[0]
595
branch_to = tree_to.branch
596
except errors.NoWorkingTree:
598
branch_to = Branch.open_containing(directory)[0]
600
possible_transports = []
601
if location is not None:
602
mergeable, location_transport = _get_mergeable_helper(location)
603
possible_transports.append(location_transport)
605
stored_loc = branch_to.get_parent()
607
if stored_loc is None:
608
raise errors.BzrCommandError("No pull location known or"
611
display_url = urlutils.unescape_for_display(stored_loc,
613
self.outf.write("Using saved location: %s\n" % display_url)
614
location = stored_loc
615
location_transport = transport.get_transport(
616
location, possible_transports=possible_transports)
618
if mergeable is not None:
619
if revision is not None:
620
raise errors.BzrCommandError(
621
'Cannot use -r with merge directives or bundles')
622
mergeable.install_revisions(branch_to.repository)
623
base_revision_id, revision_id, verified = \
624
mergeable.get_merge_request(branch_to.repository)
625
branch_from = branch_to
627
branch_from = Branch.open_from_transport(location_transport)
629
if branch_to.get_parent() is None or remember:
630
branch_to.set_parent(branch_from.base)
632
if revision is not None:
633
if len(revision) == 1:
634
revision_id = revision[0].in_history(branch_from).rev_id
636
raise errors.BzrCommandError(
637
'bzr pull --revision takes one value.')
640
old_rh = branch_to.revision_history()
641
if tree_to is not None:
642
change_reporter = delta._ChangeReporter(
643
unversioned_filter=tree_to.is_ignored)
644
result = tree_to.pull(branch_from, overwrite, revision_id,
646
possible_transports=possible_transports)
648
result = branch_to.pull(branch_from, overwrite, revision_id)
650
result.report(self.outf)
652
new_rh = branch_to.revision_history()
653
log.show_changed_revisions(branch_to, old_rh, new_rh,
657
class cmd_push(Command):
658
"""Update a mirror of this branch.
660
The target branch will not have its working tree populated because this
661
is both expensive, and is not supported on remote file systems.
663
Some smart servers or protocols *may* put the working tree in place in
666
This command only works on branches that have not diverged. Branches are
667
considered diverged if the destination branch's most recent commit is one
668
that has not been merged (directly or indirectly) by the source branch.
670
If branches have diverged, you can use 'bzr push --overwrite' to replace
671
the other branch completely, discarding its unmerged changes.
673
If you want to ensure you have the different changes in the other branch,
674
do a merge (see bzr help merge) from the other branch, and commit that.
675
After that you will be able to do a push without '--overwrite'.
677
If there is no default push location set, the first push will set it.
678
After that, you can omit the location to use the default. To change the
679
default, use --remember. The value will only be saved if the remote
680
location can be accessed.
683
_see_also = ['pull', 'update', 'working-trees']
684
takes_options = ['remember', 'overwrite', 'verbose',
685
Option('create-prefix',
686
help='Create the path leading up to the branch '
687
'if it does not already exist.'),
689
help='Branch to push from, '
690
'rather than the one containing the working directory.',
694
Option('use-existing-dir',
695
help='By default push will fail if the target'
696
' directory exists, but does not already'
697
' have a control directory. This flag will'
698
' allow push to proceed.'),
700
takes_args = ['location?']
701
encoding_type = 'replace'
703
def run(self, location=None, remember=False, overwrite=False,
704
create_prefix=False, verbose=False,
705
use_existing_dir=False,
707
# FIXME: Way too big! Put this into a function called from the
709
if directory is None:
711
br_from = Branch.open_containing(directory)[0]
712
stored_loc = br_from.get_push_location()
714
if stored_loc is None:
715
raise errors.BzrCommandError("No push location known or specified.")
717
display_url = urlutils.unescape_for_display(stored_loc,
719
self.outf.write("Using saved location: %s\n" % display_url)
720
location = stored_loc
722
to_transport = transport.get_transport(location)
724
br_to = repository_to = dir_to = None
726
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
727
except errors.NotBranchError:
728
pass # Didn't find anything
730
# If we can open a branch, use its direct repository, otherwise see
731
# if there is a repository without a branch.
733
br_to = dir_to.open_branch()
734
except errors.NotBranchError:
735
# Didn't find a branch, can we find a repository?
737
repository_to = dir_to.find_repository()
738
except errors.NoRepositoryPresent:
741
# Found a branch, so we must have found a repository
742
repository_to = br_to.repository
747
# The destination doesn't exist; create it.
748
# XXX: Refactor the create_prefix/no_create_prefix code into a
749
# common helper function
751
def make_directory(transport):
755
def redirected(redirected_transport, e, redirection_notice):
756
return transport.get_transport(e.get_target_url())
759
to_transport = transport.do_catching_redirections(
760
make_directory, to_transport, redirected)
761
except errors.FileExists:
762
if not use_existing_dir:
763
raise errors.BzrCommandError("Target directory %s"
764
" already exists, but does not have a valid .bzr"
765
" directory. Supply --use-existing-dir to push"
766
" there anyway." % location)
767
except errors.NoSuchFile:
768
if not create_prefix:
769
raise errors.BzrCommandError("Parent directory of %s"
771
"\nYou may supply --create-prefix to create all"
772
" leading parent directories."
774
_create_prefix(to_transport)
775
except errors.TooManyRedirections:
776
raise errors.BzrCommandError("Too many redirections trying "
777
"to make %s." % location)
779
# Now the target directory exists, but doesn't have a .bzr
780
# directory. So we need to create it, along with any work to create
781
# all of the dependent branches, etc.
782
dir_to = br_from.bzrdir.clone_on_transport(to_transport,
783
revision_id=br_from.last_revision())
784
br_to = dir_to.open_branch()
785
# TODO: Some more useful message about what was copied
786
note('Created new branch.')
787
# We successfully created the target, remember it
788
if br_from.get_push_location() is None or remember:
789
br_from.set_push_location(br_to.base)
790
elif repository_to is None:
791
# we have a bzrdir but no branch or repository
792
# XXX: Figure out what to do other than complain.
793
raise errors.BzrCommandError("At %s you have a valid .bzr control"
794
" directory, but not a branch or repository. This is an"
795
" unsupported configuration. Please move the target directory"
796
" out of the way and try again."
799
# We have a repository but no branch, copy the revisions, and then
801
last_revision_id = br_from.last_revision()
802
repository_to.fetch(br_from.repository,
803
revision_id=last_revision_id)
804
br_to = br_from.clone(dir_to, revision_id=last_revision_id)
805
note('Created new branch.')
806
if br_from.get_push_location() is None or remember:
807
br_from.set_push_location(br_to.base)
808
else: # We have a valid to branch
809
# We were able to connect to the remote location, so remember it
810
# we don't need to successfully push because of possible divergence.
811
if br_from.get_push_location() is None or remember:
812
br_from.set_push_location(br_to.base)
814
old_rh = br_to.revision_history()
817
tree_to = dir_to.open_workingtree()
818
except errors.NotLocalUrl:
819
warning("This transport does not update the working "
820
"tree of: %s. See 'bzr help working-trees' for "
821
"more information." % br_to.base)
822
push_result = br_from.push(br_to, overwrite)
823
except errors.NoWorkingTree:
824
push_result = br_from.push(br_to, overwrite)
828
push_result = br_from.push(tree_to.branch, overwrite)
832
except errors.DivergedBranches:
833
raise errors.BzrCommandError('These branches have diverged.'
834
' Try using "merge" and then "push".')
835
if push_result is not None:
836
push_result.report(self.outf)
838
new_rh = br_to.revision_history()
841
from bzrlib.log import show_changed_revisions
842
show_changed_revisions(br_to, old_rh, new_rh,
845
# we probably did a clone rather than a push, so a message was
850
class cmd_branch(Command):
851
"""Create a new copy of a branch.
853
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
854
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
855
If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
856
is derived from the FROM_LOCATION by stripping a leading scheme or drive
857
identifier, if any. For example, "branch lp:foo-bar" will attempt to
860
To retrieve the branch as of a particular revision, supply the --revision
861
parameter, as in "branch foo/bar -r 5".
864
_see_also = ['checkout']
865
takes_args = ['from_location', 'to_location?']
866
takes_options = ['revision']
867
aliases = ['get', 'clone']
869
def run(self, from_location, to_location=None, revision=None):
870
from bzrlib.tag import _merge_tags_if_possible
873
elif len(revision) > 1:
874
raise errors.BzrCommandError(
875
'bzr branch --revision takes exactly 1 revision value')
877
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
881
if len(revision) == 1 and revision[0] is not None:
882
revision_id = revision[0].in_history(br_from)[1]
884
# FIXME - wt.last_revision, fallback to branch, fall back to
885
# None or perhaps NULL_REVISION to mean copy nothing
887
revision_id = br_from.last_revision()
888
if to_location is None:
889
to_location = urlutils.derive_to_location(from_location)
892
name = os.path.basename(to_location) + '\n'
894
to_transport = transport.get_transport(to_location)
896
to_transport.mkdir('.')
897
except errors.FileExists:
898
raise errors.BzrCommandError('Target directory "%s" already'
899
' exists.' % to_location)
900
except errors.NoSuchFile:
901
raise errors.BzrCommandError('Parent of "%s" does not exist.'
904
# preserve whatever source format we have.
905
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
906
possible_transports=[to_transport],
907
accelerator_tree=accelerator_tree)
908
branch = dir.open_branch()
909
except errors.NoSuchRevision:
910
to_transport.delete_tree('.')
911
msg = "The branch %s has no revision %s." % (from_location, revision[0])
912
raise errors.BzrCommandError(msg)
914
branch.control_files.put_utf8('branch-name', name)
915
_merge_tags_if_possible(br_from, branch)
916
note('Branched %d revision(s).' % branch.revno())
921
class cmd_checkout(Command):
922
"""Create a new checkout of an existing branch.
924
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
925
the branch found in '.'. This is useful if you have removed the working tree
926
or if it was never created - i.e. if you pushed the branch to its current
929
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
930
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
931
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
932
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
933
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
936
To retrieve the branch as of a particular revision, supply the --revision
937
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
938
out of date [so you cannot commit] but it may be useful (i.e. to examine old
942
_see_also = ['checkouts', 'branch']
943
takes_args = ['branch_location?', 'to_location?']
944
takes_options = ['revision',
945
Option('lightweight',
946
help="Perform a lightweight checkout. Lightweight "
947
"checkouts depend on access to the branch for "
948
"every operation. Normal checkouts can perform "
949
"common operations like diff and status without "
950
"such access, and also support local commits."
953
help="Get file contents from this tree.", type=str)
957
def run(self, branch_location=None, to_location=None, revision=None,
958
lightweight=False, files_from=None):
961
elif len(revision) > 1:
962
raise errors.BzrCommandError(
963
'bzr checkout --revision takes exactly 1 revision value')
964
if branch_location is None:
965
branch_location = osutils.getcwd()
966
to_location = branch_location
967
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
969
if files_from is not None:
970
accelerator_tree = WorkingTree.open(files_from)
971
if len(revision) == 1 and revision[0] is not None:
972
revision_id = _mod_revision.ensure_null(
973
revision[0].in_history(source)[1])
976
if to_location is None:
977
to_location = urlutils.derive_to_location(branch_location)
978
# if the source and to_location are the same,
979
# and there is no working tree,
980
# then reconstitute a branch
981
if (osutils.abspath(to_location) ==
982
osutils.abspath(branch_location)):
984
source.bzrdir.open_workingtree()
985
except errors.NoWorkingTree:
986
source.bzrdir.create_workingtree(revision_id)
988
source.create_checkout(to_location, revision_id, lightweight,
992
class cmd_renames(Command):
993
"""Show list of renamed files.
995
# TODO: Option to show renames between two historical versions.
997
# TODO: Only show renames under dir, rather than in the whole branch.
998
_see_also = ['status']
999
takes_args = ['dir?']
1002
def run(self, dir=u'.'):
1003
tree = WorkingTree.open_containing(dir)[0]
1006
new_inv = tree.inventory
1007
old_tree = tree.basis_tree()
1008
old_tree.lock_read()
1010
old_inv = old_tree.inventory
1011
renames = list(_mod_tree.find_renames(old_inv, new_inv))
1013
for old_name, new_name in renames:
1014
self.outf.write("%s => %s\n" % (old_name, new_name))
1021
class cmd_update(Command):
1022
"""Update a tree to have the latest code committed to its branch.
1024
This will perform a merge into the working tree, and may generate
1025
conflicts. If you have any local changes, you will still
1026
need to commit them after the update for the update to be complete.
1028
If you want to discard your local changes, you can just do a
1029
'bzr revert' instead of 'bzr commit' after the update.
1032
_see_also = ['pull', 'working-trees', 'status-flags']
1033
takes_args = ['dir?']
1036
def run(self, dir='.'):
1037
tree = WorkingTree.open_containing(dir)[0]
1038
possible_transports = []
1039
master = tree.branch.get_master_branch(
1040
possible_transports=possible_transports)
1041
if master is not None:
1044
tree.lock_tree_write()
1046
existing_pending_merges = tree.get_parent_ids()[1:]
1047
last_rev = _mod_revision.ensure_null(tree.last_revision())
1048
if last_rev == _mod_revision.ensure_null(
1049
tree.branch.last_revision()):
1050
# may be up to date, check master too.
1051
if master is None or last_rev == _mod_revision.ensure_null(
1052
master.last_revision()):
1053
revno = tree.branch.revision_id_to_revno(last_rev)
1054
note("Tree is up to date at revision %d." % (revno,))
1056
conflicts = tree.update(
1057
delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1058
possible_transports=possible_transports)
1059
revno = tree.branch.revision_id_to_revno(
1060
_mod_revision.ensure_null(tree.last_revision()))
1061
note('Updated to revision %d.' % (revno,))
1062
if tree.get_parent_ids()[1:] != existing_pending_merges:
1063
note('Your local commits will now show as pending merges with '
1064
"'bzr status', and can be committed with 'bzr commit'.")
1073
class cmd_info(Command):
1074
"""Show information about a working tree, branch or repository.
1076
This command will show all known locations and formats associated to the
1077
tree, branch or repository. Statistical information is included with
1080
Branches and working trees will also report any missing revisions.
1082
_see_also = ['revno', 'working-trees', 'repositories']
1083
takes_args = ['location?']
1084
takes_options = ['verbose']
1085
encoding_type = 'replace'
1088
def run(self, location=None, verbose=False):
1093
from bzrlib.info import show_bzrdir_info
1094
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1095
verbose=noise_level, outfile=self.outf)
1098
class cmd_remove(Command):
1099
"""Remove files or directories.
1101
This makes bzr stop tracking changes to the specified files and
1102
delete them if they can easily be recovered using revert.
1104
You can specify one or more files, and/or --new. If you specify --new,
1105
only 'added' files will be removed. If you specify both, then new files
1106
in the specified directories will be removed. If the directories are
1107
also new, they will also be removed.
1109
takes_args = ['file*']
1110
takes_options = ['verbose',
1111
Option('new', help='Remove newly-added files.'),
1112
RegistryOption.from_kwargs('file-deletion-strategy',
1113
'The file deletion mode to be used.',
1114
title='Deletion Strategy', value_switches=True, enum_switch=False,
1115
safe='Only delete files if they can be'
1116
' safely recovered (default).',
1117
keep="Don't delete any files.",
1118
force='Delete all the specified files, even if they can not be '
1119
'recovered and even if they are non-empty directories.')]
1121
encoding_type = 'replace'
1123
def run(self, file_list, verbose=False, new=False,
1124
file_deletion_strategy='safe'):
1125
tree, file_list = tree_files(file_list)
1127
if file_list is not None:
1128
file_list = [f for f in file_list]
1130
raise errors.BzrCommandError('Specify one or more files to'
1131
' remove, or use --new.')
1134
added = tree.changes_from(tree.basis_tree(),
1135
specific_files=file_list).added
1136
file_list = sorted([f[0] for f in added], reverse=True)
1137
if len(file_list) == 0:
1138
raise errors.BzrCommandError('No matching files.')
1139
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1140
keep_files=file_deletion_strategy=='keep',
1141
force=file_deletion_strategy=='force')
1144
class cmd_file_id(Command):
1145
"""Print file_id of a particular file or directory.
1147
The file_id is assigned when the file is first added and remains the
1148
same through all revisions where the file exists, even when it is
1153
_see_also = ['inventory', 'ls']
1154
takes_args = ['filename']
1157
def run(self, filename):
1158
tree, relpath = WorkingTree.open_containing(filename)
1159
i = tree.path2id(relpath)
1161
raise errors.NotVersionedError(filename)
1163
self.outf.write(i + '\n')
1166
class cmd_file_path(Command):
1167
"""Print path of file_ids to a file or directory.
1169
This prints one line for each directory down to the target,
1170
starting at the branch root.
1174
takes_args = ['filename']
1177
def run(self, filename):
1178
tree, relpath = WorkingTree.open_containing(filename)
1179
fid = tree.path2id(relpath)
1181
raise errors.NotVersionedError(filename)
1182
segments = osutils.splitpath(relpath)
1183
for pos in range(1, len(segments) + 1):
1184
path = osutils.joinpath(segments[:pos])
1185
self.outf.write("%s\n" % tree.path2id(path))
1188
class cmd_reconcile(Command):
1189
"""Reconcile bzr metadata in a branch.
1191
This can correct data mismatches that may have been caused by
1192
previous ghost operations or bzr upgrades. You should only
1193
need to run this command if 'bzr check' or a bzr developer
1194
advises you to run it.
1196
If a second branch is provided, cross-branch reconciliation is
1197
also attempted, which will check that data like the tree root
1198
id which was not present in very early bzr versions is represented
1199
correctly in both branches.
1201
At the same time it is run it may recompress data resulting in
1202
a potential saving in disk space or performance gain.
1204
The branch *MUST* be on a listable system such as local disk or sftp.
1207
_see_also = ['check']
1208
takes_args = ['branch?']
1210
def run(self, branch="."):
1211
from bzrlib.reconcile import reconcile
1212
dir = bzrdir.BzrDir.open(branch)
1216
class cmd_revision_history(Command):
1217
"""Display the list of revision ids on a branch."""
1220
takes_args = ['location?']
1225
def run(self, location="."):
1226
branch = Branch.open_containing(location)[0]
1227
for revid in branch.revision_history():
1228
self.outf.write(revid)
1229
self.outf.write('\n')
1232
class cmd_ancestry(Command):
1233
"""List all revisions merged into this branch."""
1235
_see_also = ['log', 'revision-history']
1236
takes_args = ['location?']
1241
def run(self, location="."):
1243
wt = WorkingTree.open_containing(location)[0]
1244
except errors.NoWorkingTree:
1245
b = Branch.open(location)
1246
last_revision = b.last_revision()
1249
last_revision = wt.last_revision()
1251
revision_ids = b.repository.get_ancestry(last_revision)
1252
assert revision_ids[0] is None
1254
for revision_id in revision_ids:
1255
self.outf.write(revision_id + '\n')
1258
class cmd_init(Command):
1259
"""Make a directory into a versioned branch.
1261
Use this to create an empty branch, or before importing an
1264
If there is a repository in a parent directory of the location, then
1265
the history of the branch will be stored in the repository. Otherwise
1266
init creates a standalone branch which carries its own history
1267
in the .bzr directory.
1269
If there is already a branch at the location but it has no working tree,
1270
the tree can be populated with 'bzr checkout'.
1272
Recipe for importing a tree of files::
1278
bzr commit -m "imported project"
1281
_see_also = ['init-repository', 'branch', 'checkout']
1282
takes_args = ['location?']
1284
Option('create-prefix',
1285
help='Create the path leading up to the branch '
1286
'if it does not already exist.'),
1287
RegistryOption('format',
1288
help='Specify a format for this branch. '
1289
'See "help formats".',
1290
registry=bzrdir.format_registry,
1291
converter=bzrdir.format_registry.make_bzrdir,
1292
value_switches=True,
1293
title="Branch Format",
1295
Option('append-revisions-only',
1296
help='Never change revnos or the existing log.'
1297
' Append revisions to it only.')
1299
def run(self, location=None, format=None, append_revisions_only=False,
1300
create_prefix=False):
1302
format = bzrdir.format_registry.make_bzrdir('default')
1303
if location is None:
1306
to_transport = transport.get_transport(location)
1308
# The path has to exist to initialize a
1309
# branch inside of it.
1310
# Just using os.mkdir, since I don't
1311
# believe that we want to create a bunch of
1312
# locations if the user supplies an extended path
1314
to_transport.ensure_base()
1315
except errors.NoSuchFile:
1316
if not create_prefix:
1317
raise errors.BzrCommandError("Parent directory of %s"
1319
"\nYou may supply --create-prefix to create all"
1320
" leading parent directories."
1322
_create_prefix(to_transport)
1325
existing_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1326
except errors.NotBranchError:
1327
# really a NotBzrDir error...
1328
create_branch = bzrdir.BzrDir.create_branch_convenience
1329
branch = create_branch(to_transport.base, format=format,
1330
possible_transports=[to_transport])
1332
from bzrlib.transport.local import LocalTransport
1333
if existing_bzrdir.has_branch():
1334
if (isinstance(to_transport, LocalTransport)
1335
and not existing_bzrdir.has_workingtree()):
1336
raise errors.BranchExistsWithoutWorkingTree(location)
1337
raise errors.AlreadyBranchError(location)
1339
branch = existing_bzrdir.create_branch()
1340
existing_bzrdir.create_workingtree()
1341
if append_revisions_only:
1343
branch.set_append_revisions_only(True)
1344
except errors.UpgradeRequired:
1345
raise errors.BzrCommandError('This branch format cannot be set'
1346
' to append-revisions-only. Try --experimental-branch6')
1349
class cmd_init_repository(Command):
1350
"""Create a shared repository to hold branches.
1352
New branches created under the repository directory will store their
1353
revisions in the repository, not in the branch directory.
1355
If the --no-trees option is used then the branches in the repository
1356
will not have working trees by default.
1359
Create a shared repositories holding just branches::
1361
bzr init-repo --no-trees repo
1364
Make a lightweight checkout elsewhere::
1366
bzr checkout --lightweight repo/trunk trunk-checkout
1371
_see_also = ['init', 'branch', 'checkout', 'repositories']
1372
takes_args = ["location"]
1373
takes_options = [RegistryOption('format',
1374
help='Specify a format for this repository. See'
1375
' "bzr help formats" for details.',
1376
registry=bzrdir.format_registry,
1377
converter=bzrdir.format_registry.make_bzrdir,
1378
value_switches=True, title='Repository format'),
1380
help='Branches in the repository will default to'
1381
' not having a working tree.'),
1383
aliases = ["init-repo"]
1385
def run(self, location, format=None, no_trees=False):
1387
format = bzrdir.format_registry.make_bzrdir('default')
1389
if location is None:
1392
to_transport = transport.get_transport(location)
1393
to_transport.ensure_base()
1395
newdir = format.initialize_on_transport(to_transport)
1396
repo = newdir.create_repository(shared=True)
1397
repo.set_make_working_trees(not no_trees)
1400
class cmd_diff(Command):
1401
"""Show differences in the working tree, between revisions or branches.
1403
If no arguments are given, all changes for the current tree are listed.
1404
If files are given, only the changes in those files are listed.
1405
Remote and multiple branches can be compared by using the --old and
1406
--new options. If not provided, the default for both is derived from
1407
the first argument, if any, or the current tree if no arguments are
1410
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1411
produces patches suitable for "patch -p1".
1415
2 - unrepresentable changes
1420
Shows the difference in the working tree versus the last commit::
1424
Difference between the working tree and revision 1::
1428
Difference between revision 2 and revision 1::
1432
Difference between revision 2 and revision 1 for branch xxx::
1436
Show just the differences for file NEWS::
1440
Show the differences in working tree xxx for file NEWS::
1444
Show the differences from branch xxx to this working tree:
1448
Show the differences between two branches for file NEWS::
1450
bzr diff --old xxx --new yyy NEWS
1452
Same as 'bzr diff' but prefix paths with old/ and new/::
1454
bzr diff --prefix old/:new/
1456
_see_also = ['status']
1457
takes_args = ['file*']
1459
Option('diff-options', type=str,
1460
help='Pass these options to the external diff program.'),
1461
Option('prefix', type=str,
1463
help='Set prefixes added to old and new filenames, as '
1464
'two values separated by a colon. (eg "old/:new/").'),
1466
help='Branch/tree to compare from.',
1470
help='Branch/tree to compare to.',
1476
help='Use this command to compare files.',
1480
aliases = ['di', 'dif']
1481
encoding_type = 'exact'
1484
def run(self, revision=None, file_list=None, diff_options=None,
1485
prefix=None, old=None, new=None, using=None):
1486
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1488
if (prefix is None) or (prefix == '0'):
1496
old_label, new_label = prefix.split(":")
1498
raise errors.BzrCommandError(
1499
'--prefix expects two values separated by a colon'
1500
' (eg "old/:new/")')
1502
if revision and len(revision) > 2:
1503
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1504
' one or two revision specifiers')
1506
old_tree, new_tree, specific_files, extra_trees = \
1507
_get_trees_to_diff(file_list, revision, old, new)
1508
return show_diff_trees(old_tree, new_tree, sys.stdout,
1509
specific_files=specific_files,
1510
external_diff_options=diff_options,
1511
old_label=old_label, new_label=new_label,
1512
extra_trees=extra_trees, using=using)
1515
class cmd_deleted(Command):
1516
"""List files deleted in the working tree.
1518
# TODO: Show files deleted since a previous revision, or
1519
# between two revisions.
1520
# TODO: Much more efficient way to do this: read in new
1521
# directories with readdir, rather than stating each one. Same
1522
# level of effort but possibly much less IO. (Or possibly not,
1523
# if the directories are very large...)
1524
_see_also = ['status', 'ls']
1525
takes_options = ['show-ids']
1528
def run(self, show_ids=False):
1529
tree = WorkingTree.open_containing(u'.')[0]
1532
old = tree.basis_tree()
1535
for path, ie in old.inventory.iter_entries():
1536
if not tree.has_id(ie.file_id):
1537
self.outf.write(path)
1539
self.outf.write(' ')
1540
self.outf.write(ie.file_id)
1541
self.outf.write('\n')
1548
class cmd_modified(Command):
1549
"""List files modified in working tree.
1553
_see_also = ['status', 'ls']
1557
tree = WorkingTree.open_containing(u'.')[0]
1558
td = tree.changes_from(tree.basis_tree())
1559
for path, id, kind, text_modified, meta_modified in td.modified:
1560
self.outf.write(path + '\n')
1563
class cmd_added(Command):
1564
"""List files added in working tree.
1568
_see_also = ['status', 'ls']
1572
wt = WorkingTree.open_containing(u'.')[0]
1575
basis = wt.basis_tree()
1578
basis_inv = basis.inventory
1581
if file_id in basis_inv:
1583
if inv.is_root(file_id) and len(basis_inv) == 0:
1585
path = inv.id2path(file_id)
1586
if not os.access(osutils.abspath(path), os.F_OK):
1588
self.outf.write(path + '\n')
1595
class cmd_root(Command):
1596
"""Show the tree root directory.
1598
The root is the nearest enclosing directory with a .bzr control
1601
takes_args = ['filename?']
1603
def run(self, filename=None):
1604
"""Print the branch root."""
1605
tree = WorkingTree.open_containing(filename)[0]
1606
self.outf.write(tree.basedir + '\n')
1609
def _parse_limit(limitstring):
1611
return int(limitstring)
1613
msg = "The limit argument must be an integer."
1614
raise errors.BzrCommandError(msg)
1617
class cmd_log(Command):
1618
"""Show log of a branch, file, or directory.
1620
By default show the log of the branch containing the working directory.
1622
To request a range of logs, you can use the command -r begin..end
1623
-r revision requests a specific revision, -r ..end or -r begin.. are
1627
Log the current branch::
1635
Log the last 10 revisions of a branch::
1637
bzr log -r -10.. http://server/branch
1640
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1642
takes_args = ['location?']
1645
help='Show from oldest to newest.'),
1648
help='Display timezone as local, original, or utc.'),
1649
custom_help('verbose',
1650
help='Show files changed in each revision.'),
1656
help='Show revisions whose message matches this '
1657
'regular expression.',
1661
help='Limit the output to the first N revisions.',
1665
encoding_type = 'replace'
1668
def run(self, location=None, timezone='original',
1676
from bzrlib.log import show_log
1677
assert message is None or isinstance(message, basestring), \
1678
"invalid message argument %r" % message
1679
direction = (forward and 'forward') or 'reverse'
1684
# find the file id to log:
1686
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1690
tree = b.basis_tree()
1691
file_id = tree.path2id(fp)
1693
raise errors.BzrCommandError(
1694
"Path does not have any revision history: %s" %
1698
# FIXME ? log the current subdir only RBC 20060203
1699
if revision is not None \
1700
and len(revision) > 0 and revision[0].get_branch():
1701
location = revision[0].get_branch()
1704
dir, relpath = bzrdir.BzrDir.open_containing(location)
1705
b = dir.open_branch()
1709
if revision is None:
1712
elif len(revision) == 1:
1713
rev1 = rev2 = revision[0].in_history(b)
1714
elif len(revision) == 2:
1715
if revision[1].get_branch() != revision[0].get_branch():
1716
# b is taken from revision[0].get_branch(), and
1717
# show_log will use its revision_history. Having
1718
# different branches will lead to weird behaviors.
1719
raise errors.BzrCommandError(
1720
"Log doesn't accept two revisions in different"
1722
rev1 = revision[0].in_history(b)
1723
rev2 = revision[1].in_history(b)
1725
raise errors.BzrCommandError(
1726
'bzr log --revision takes one or two values.')
1728
if log_format is None:
1729
log_format = log.log_formatter_registry.get_default(b)
1731
lf = log_format(show_ids=show_ids, to_file=self.outf,
1732
show_timezone=timezone)
1738
direction=direction,
1739
start_revision=rev1,
1747
def get_log_format(long=False, short=False, line=False, default='long'):
1748
log_format = default
1752
log_format = 'short'
1758
class cmd_touching_revisions(Command):
1759
"""Return revision-ids which affected a particular file.
1761
A more user-friendly interface is "bzr log FILE".
1765
takes_args = ["filename"]
1768
def run(self, filename):
1769
tree, relpath = WorkingTree.open_containing(filename)
1771
file_id = tree.path2id(relpath)
1772
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1773
self.outf.write("%6d %s\n" % (revno, what))
1776
class cmd_ls(Command):
1777
"""List files in a tree.
1780
_see_also = ['status', 'cat']
1781
takes_args = ['path?']
1782
# TODO: Take a revision or remote path and list that tree instead.
1786
Option('non-recursive',
1787
help='Don\'t recurse into subdirectories.'),
1789
help='Print paths relative to the root of the branch.'),
1790
Option('unknown', help='Print unknown files.'),
1791
Option('versioned', help='Print versioned files.'),
1792
Option('ignored', help='Print ignored files.'),
1794
help='Write an ascii NUL (\\0) separator '
1795
'between files rather than a newline.'),
1797
help='List entries of a particular kind: file, directory, symlink.',
1802
def run(self, revision=None, verbose=False,
1803
non_recursive=False, from_root=False,
1804
unknown=False, versioned=False, ignored=False,
1805
null=False, kind=None, show_ids=False, path=None):
1807
if kind and kind not in ('file', 'directory', 'symlink'):
1808
raise errors.BzrCommandError('invalid kind specified')
1810
if verbose and null:
1811
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1812
all = not (unknown or versioned or ignored)
1814
selection = {'I':ignored, '?':unknown, 'V':versioned}
1821
raise errors.BzrCommandError('cannot specify both --from-root'
1825
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1831
if revision is not None:
1832
tree = branch.repository.revision_tree(
1833
revision[0].in_history(branch).rev_id)
1835
tree = branch.basis_tree()
1839
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1840
if fp.startswith(relpath):
1841
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1842
if non_recursive and '/' in fp:
1844
if not all and not selection[fc]:
1846
if kind is not None and fkind != kind:
1849
kindch = entry.kind_character()
1850
outstring = '%-8s %s%s' % (fc, fp, kindch)
1851
if show_ids and fid is not None:
1852
outstring = "%-50s %s" % (outstring, fid)
1853
self.outf.write(outstring + '\n')
1855
self.outf.write(fp + '\0')
1858
self.outf.write(fid)
1859
self.outf.write('\0')
1867
self.outf.write('%-50s %s\n' % (fp, my_id))
1869
self.outf.write(fp + '\n')
1874
class cmd_unknowns(Command):
1875
"""List unknown files.
1883
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1884
self.outf.write(osutils.quotefn(f) + '\n')
1887
class cmd_ignore(Command):
1888
"""Ignore specified files or patterns.
1890
To remove patterns from the ignore list, edit the .bzrignore file.
1892
Trailing slashes on patterns are ignored.
1893
If the pattern contains a slash or is a regular expression, it is compared
1894
to the whole path from the branch root. Otherwise, it is compared to only
1895
the last component of the path. To match a file only in the root
1896
directory, prepend './'.
1898
Ignore patterns specifying absolute paths are not allowed.
1900
Ignore patterns may include globbing wildcards such as::
1902
? - Matches any single character except '/'
1903
* - Matches 0 or more characters except '/'
1904
/**/ - Matches 0 or more directories in a path
1905
[a-z] - Matches a single character from within a group of characters
1907
Ignore patterns may also be Python regular expressions.
1908
Regular expression ignore patterns are identified by a 'RE:' prefix
1909
followed by the regular expression. Regular expression ignore patterns
1910
may not include named or numbered groups.
1912
Note: ignore patterns containing shell wildcards must be quoted from
1916
Ignore the top level Makefile::
1918
bzr ignore ./Makefile
1920
Ignore class files in all directories::
1922
bzr ignore "*.class"
1924
Ignore .o files under the lib directory::
1926
bzr ignore "lib/**/*.o"
1928
Ignore .o files under the lib directory::
1930
bzr ignore "RE:lib/.*\.o"
1933
_see_also = ['status', 'ignored']
1934
takes_args = ['name_pattern*']
1936
Option('old-default-rules',
1937
help='Write out the ignore rules bzr < 0.9 always used.')
1940
def run(self, name_pattern_list=None, old_default_rules=None):
1941
from bzrlib.atomicfile import AtomicFile
1942
if old_default_rules is not None:
1943
# dump the rules and exit
1944
for pattern in ignores.OLD_DEFAULTS:
1947
if not name_pattern_list:
1948
raise errors.BzrCommandError("ignore requires at least one "
1949
"NAME_PATTERN or --old-default-rules")
1950
name_pattern_list = [globbing.normalize_pattern(p)
1951
for p in name_pattern_list]
1952
for name_pattern in name_pattern_list:
1953
if (name_pattern[0] == '/' or
1954
(len(name_pattern) > 1 and name_pattern[1] == ':')):
1955
raise errors.BzrCommandError(
1956
"NAME_PATTERN should not be an absolute path")
1957
tree, relpath = WorkingTree.open_containing(u'.')
1958
ifn = tree.abspath('.bzrignore')
1959
if os.path.exists(ifn):
1962
igns = f.read().decode('utf-8')
1968
# TODO: If the file already uses crlf-style termination, maybe
1969
# we should use that for the newly added lines?
1971
if igns and igns[-1] != '\n':
1973
for name_pattern in name_pattern_list:
1974
igns += name_pattern + '\n'
1976
f = AtomicFile(ifn, 'wb')
1978
f.write(igns.encode('utf-8'))
1983
if not tree.path2id('.bzrignore'):
1984
tree.add(['.bzrignore'])
1986
ignored = globbing.Globster(name_pattern_list)
1989
for entry in tree.list_files():
1993
if ignored.match(filename):
1994
matches.append(filename.encode('utf-8'))
1996
if len(matches) > 0:
1997
print "Warning: the following files are version controlled and" \
1998
" match your ignore pattern:\n%s" % ("\n".join(matches),)
2000
class cmd_ignored(Command):
2001
"""List ignored files and the patterns that matched them.
2004
encoding_type = 'replace'
2005
_see_also = ['ignore']
2009
tree = WorkingTree.open_containing(u'.')[0]
2012
for path, file_class, kind, file_id, entry in tree.list_files():
2013
if file_class != 'I':
2015
## XXX: Slightly inefficient since this was already calculated
2016
pat = tree.is_ignored(path)
2017
self.outf.write('%-50s %s\n' % (path, pat))
2022
class cmd_lookup_revision(Command):
2023
"""Lookup the revision-id from a revision-number
2026
bzr lookup-revision 33
2029
takes_args = ['revno']
2032
def run(self, revno):
2036
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2038
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2041
class cmd_export(Command):
2042
"""Export current or past revision to a destination directory or archive.
2044
If no revision is specified this exports the last committed revision.
2046
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
2047
given, try to find the format with the extension. If no extension
2048
is found exports to a directory (equivalent to --format=dir).
2050
If root is supplied, it will be used as the root directory inside
2051
container formats (tar, zip, etc). If it is not supplied it will default
2052
to the exported filename. The root option has no effect for 'dir' format.
2054
If branch is omitted then the branch containing the current working
2055
directory will be used.
2057
Note: Export of tree with non-ASCII filenames to zip is not supported.
2059
================= =========================
2060
Supported formats Autodetected by extension
2061
================= =========================
2064
tbz2 .tar.bz2, .tbz2
2067
================= =========================
2069
takes_args = ['dest', 'branch?']
2072
help="Type of file to export to.",
2077
help="Name of the root directory inside the exported file."),
2079
def run(self, dest, branch=None, revision=None, format=None, root=None):
2080
from bzrlib.export import export
2083
tree = WorkingTree.open_containing(u'.')[0]
2086
b = Branch.open(branch)
2088
if revision is None:
2089
# should be tree.last_revision FIXME
2090
rev_id = b.last_revision()
2092
if len(revision) != 1:
2093
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
2094
rev_id = revision[0].in_history(b).rev_id
2095
t = b.repository.revision_tree(rev_id)
2097
export(t, dest, format, root)
2098
except errors.NoSuchExportFormat, e:
2099
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2102
class cmd_cat(Command):
2103
"""Write the contents of a file as of a given revision to standard output.
2105
If no revision is nominated, the last revision is used.
2107
Note: Take care to redirect standard output when using this command on a
2113
Option('name-from-revision', help='The path name in the old tree.'),
2116
takes_args = ['filename']
2117
encoding_type = 'exact'
2120
def run(self, filename, revision=None, name_from_revision=False):
2121
if revision is not None and len(revision) != 1:
2122
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2123
" one revision specifier")
2124
tree, branch, relpath = \
2125
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2128
return self._run(tree, branch, relpath, filename, revision,
2133
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
2135
tree = b.basis_tree()
2136
if revision is None:
2137
revision_id = b.last_revision()
2139
revision_id = revision[0].in_history(b).rev_id
2141
cur_file_id = tree.path2id(relpath)
2142
rev_tree = b.repository.revision_tree(revision_id)
2143
old_file_id = rev_tree.path2id(relpath)
2145
if name_from_revision:
2146
if old_file_id is None:
2147
raise errors.BzrCommandError("%r is not present in revision %s"
2148
% (filename, revision_id))
2150
rev_tree.print_file(old_file_id)
2151
elif cur_file_id is not None:
2152
rev_tree.print_file(cur_file_id)
2153
elif old_file_id is not None:
2154
rev_tree.print_file(old_file_id)
2156
raise errors.BzrCommandError("%r is not present in revision %s" %
2157
(filename, revision_id))
2160
class cmd_local_time_offset(Command):
2161
"""Show the offset in seconds from GMT to local time."""
2165
print osutils.local_time_offset()
2169
class cmd_commit(Command):
2170
"""Commit changes into a new revision.
2172
If no arguments are given, the entire tree is committed.
2174
If selected files are specified, only changes to those files are
2175
committed. If a directory is specified then the directory and everything
2176
within it is committed.
2178
If author of the change is not the same person as the committer, you can
2179
specify the author's name using the --author option. The name should be
2180
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2182
A selected-file commit may fail in some cases where the committed
2183
tree would be invalid. Consider::
2188
bzr commit foo -m "committing foo"
2189
bzr mv foo/bar foo/baz
2192
bzr commit foo/bar -m "committing bar but not baz"
2194
In the example above, the last commit will fail by design. This gives
2195
the user the opportunity to decide whether they want to commit the
2196
rename at the same time, separately first, or not at all. (As a general
2197
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2199
Note: A selected-file commit after a merge is not yet supported.
2201
# TODO: Run hooks on tree to-be-committed, and after commit.
2203
# TODO: Strict commit that fails if there are deleted files.
2204
# (what does "deleted files" mean ??)
2206
# TODO: Give better message for -s, --summary, used by tla people
2208
# XXX: verbose currently does nothing
2210
_see_also = ['bugs', 'uncommit']
2211
takes_args = ['selected*']
2213
Option('message', type=unicode,
2215
help="Description of the new revision."),
2218
help='Commit even if nothing has changed.'),
2219
Option('file', type=str,
2222
help='Take commit message from this file.'),
2224
help="Refuse to commit if there are unknown "
2225
"files in the working tree."),
2226
ListOption('fixes', type=str,
2227
help="Mark a bug as being fixed by this revision."),
2228
Option('author', type=unicode,
2229
help="Set the author's name, if it's different "
2230
"from the committer."),
2232
help="Perform a local commit in a bound "
2233
"branch. Local commits are not pushed to "
2234
"the master branch until a normal commit "
2238
help='When no message is supplied, show the diff along'
2239
' with the status summary in the message editor.'),
2241
aliases = ['ci', 'checkin']
2243
def _get_bug_fix_properties(self, fixes, branch):
2245
# Configure the properties for bug fixing attributes.
2246
for fixed_bug in fixes:
2247
tokens = fixed_bug.split(':')
2248
if len(tokens) != 2:
2249
raise errors.BzrCommandError(
2250
"Invalid bug %s. Must be in the form of 'tag:id'. "
2251
"Commit refused." % fixed_bug)
2252
tag, bug_id = tokens
2254
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
2255
except errors.UnknownBugTrackerAbbreviation:
2256
raise errors.BzrCommandError(
2257
'Unrecognized bug %s. Commit refused.' % fixed_bug)
2258
except errors.MalformedBugIdentifier:
2259
raise errors.BzrCommandError(
2260
"Invalid bug identifier for %s. Commit refused."
2262
properties.append('%s fixed' % bug_url)
2263
return '\n'.join(properties)
2265
def run(self, message=None, file=None, verbose=False, selected_list=None,
2266
unchanged=False, strict=False, local=False, fixes=None,
2267
author=None, show_diff=False):
2268
from bzrlib.errors import (
2273
from bzrlib.msgeditor import (
2274
edit_commit_message_encoded,
2275
make_commit_message_template_encoded
2278
# TODO: Need a blackbox test for invoking the external editor; may be
2279
# slightly problematic to run this cross-platform.
2281
# TODO: do more checks that the commit will succeed before
2282
# spending the user's valuable time typing a commit message.
2286
tree, selected_list = tree_files(selected_list)
2287
if selected_list == ['']:
2288
# workaround - commit of root of tree should be exactly the same
2289
# as just default commit in that tree, and succeed even though
2290
# selected-file merge commit is not done yet
2295
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
2297
properties['bugs'] = bug_property
2299
if local and not tree.branch.get_bound_location():
2300
raise errors.LocalRequiresBoundBranch()
2302
def get_message(commit_obj):
2303
"""Callback to get commit message"""
2304
my_message = message
2305
if my_message is None and not file:
2306
t = make_commit_message_template_encoded(tree,
2307
selected_list, diff=show_diff,
2308
output_encoding=bzrlib.user_encoding)
2309
my_message = edit_commit_message_encoded(t)
2310
if my_message is None:
2311
raise errors.BzrCommandError("please specify a commit"
2312
" message with either --message or --file")
2313
elif my_message and file:
2314
raise errors.BzrCommandError(
2315
"please specify either --message or --file")
2317
my_message = codecs.open(file, 'rt',
2318
bzrlib.user_encoding).read()
2319
if my_message == "":
2320
raise errors.BzrCommandError("empty commit message specified")
2324
tree.commit(message_callback=get_message,
2325
specific_files=selected_list,
2326
allow_pointless=unchanged, strict=strict, local=local,
2327
reporter=None, verbose=verbose, revprops=properties,
2329
except PointlessCommit:
2330
# FIXME: This should really happen before the file is read in;
2331
# perhaps prepare the commit; get the message; then actually commit
2332
raise errors.BzrCommandError("no changes to commit."
2333
" use --unchanged to commit anyhow")
2334
except ConflictsInTree:
2335
raise errors.BzrCommandError('Conflicts detected in working '
2336
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2338
except StrictCommitFailed:
2339
raise errors.BzrCommandError("Commit refused because there are"
2340
" unknown files in the working tree.")
2341
except errors.BoundBranchOutOfDate, e:
2342
raise errors.BzrCommandError(str(e) + "\n"
2343
'To commit to master branch, run update and then commit.\n'
2344
'You can also pass --local to commit to continue working '
2348
class cmd_check(Command):
2349
"""Validate consistency of branch history.
2351
This command checks various invariants about the branch storage to
2352
detect data corruption or bzr bugs.
2356
revisions: This is just the number of revisions checked. It doesn't
2358
versionedfiles: This is just the number of versionedfiles checked. It
2359
doesn't indicate a problem.
2360
unreferenced ancestors: Texts that are ancestors of other texts, but
2361
are not properly referenced by the revision ancestry. This is a
2362
subtle problem that Bazaar can work around.
2363
unique file texts: This is the total number of unique file contents
2364
seen in the checked revisions. It does not indicate a problem.
2365
repeated file texts: This is the total number of repeated texts seen
2366
in the checked revisions. Texts can be repeated when their file
2367
entries are modified, but the file contents are not. It does not
2371
_see_also = ['reconcile']
2372
takes_args = ['branch?']
2373
takes_options = ['verbose']
2375
def run(self, branch=None, verbose=False):
2376
from bzrlib.check import check
2378
branch_obj = Branch.open_containing('.')[0]
2380
branch_obj = Branch.open(branch)
2381
check(branch_obj, verbose)
2382
# bit hacky, check the tree parent is accurate
2385
tree = WorkingTree.open_containing('.')[0]
2387
tree = WorkingTree.open(branch)
2388
except (errors.NoWorkingTree, errors.NotLocalUrl):
2391
# This is a primitive 'check' for tree state. Currently this is not
2392
# integrated into the main check logic as yet.
2395
tree_basis = tree.basis_tree()
2396
tree_basis.lock_read()
2398
repo_basis = tree.branch.repository.revision_tree(
2399
tree.last_revision())
2400
if len(list(repo_basis._iter_changes(tree_basis))):
2401
raise errors.BzrCheckError(
2402
"Mismatched basis inventory content.")
2410
class cmd_upgrade(Command):
2411
"""Upgrade branch storage to current format.
2413
The check command or bzr developers may sometimes advise you to run
2414
this command. When the default format has changed you may also be warned
2415
during other operations to upgrade.
2418
_see_also = ['check']
2419
takes_args = ['url?']
2421
RegistryOption('format',
2422
help='Upgrade to a specific format. See "bzr help'
2423
' formats" for details.',
2424
registry=bzrdir.format_registry,
2425
converter=bzrdir.format_registry.make_bzrdir,
2426
value_switches=True, title='Branch format'),
2429
def run(self, url='.', format=None):
2430
from bzrlib.upgrade import upgrade
2432
format = bzrdir.format_registry.make_bzrdir('default')
2433
upgrade(url, format)
2436
class cmd_whoami(Command):
2437
"""Show or set bzr user id.
2440
Show the email of the current user::
2444
Set the current user::
2446
bzr whoami "Frank Chu <fchu@example.com>"
2448
takes_options = [ Option('email',
2449
help='Display email address only.'),
2451
help='Set identity for the current branch instead of '
2454
takes_args = ['name?']
2455
encoding_type = 'replace'
2458
def run(self, email=False, branch=False, name=None):
2460
# use branch if we're inside one; otherwise global config
2462
c = Branch.open_containing('.')[0].get_config()
2463
except errors.NotBranchError:
2464
c = config.GlobalConfig()
2466
self.outf.write(c.user_email() + '\n')
2468
self.outf.write(c.username() + '\n')
2471
# display a warning if an email address isn't included in the given name.
2473
config.extract_email_address(name)
2474
except errors.NoEmailInUsername, e:
2475
warning('"%s" does not seem to contain an email address. '
2476
'This is allowed, but not recommended.', name)
2478
# use global config unless --branch given
2480
c = Branch.open_containing('.')[0].get_config()
2482
c = config.GlobalConfig()
2483
c.set_user_option('email', name)
2486
class cmd_nick(Command):
2487
"""Print or set the branch nickname.
2489
If unset, the tree root directory name is used as the nickname
2490
To print the current nickname, execute with no argument.
2493
_see_also = ['info']
2494
takes_args = ['nickname?']
2495
def run(self, nickname=None):
2496
branch = Branch.open_containing(u'.')[0]
2497
if nickname is None:
2498
self.printme(branch)
2500
branch.nick = nickname
2503
def printme(self, branch):
2507
class cmd_selftest(Command):
2508
"""Run internal test suite.
2510
If arguments are given, they are regular expressions that say which tests
2511
should run. Tests matching any expression are run, and other tests are
2514
Alternatively if --first is given, matching tests are run first and then
2515
all other tests are run. This is useful if you have been working in a
2516
particular area, but want to make sure nothing else was broken.
2518
If --exclude is given, tests that match that regular expression are
2519
excluded, regardless of whether they match --first or not.
2521
To help catch accidential dependencies between tests, the --randomize
2522
option is useful. In most cases, the argument used is the word 'now'.
2523
Note that the seed used for the random number generator is displayed
2524
when this option is used. The seed can be explicitly passed as the
2525
argument to this option if required. This enables reproduction of the
2526
actual ordering used if and when an order sensitive problem is encountered.
2528
If --list-only is given, the tests that would be run are listed. This is
2529
useful when combined with --first, --exclude and/or --randomize to
2530
understand their impact. The test harness reports "Listed nn tests in ..."
2531
instead of "Ran nn tests in ..." when list mode is enabled.
2533
If the global option '--no-plugins' is given, plugins are not loaded
2534
before running the selftests. This has two effects: features provided or
2535
modified by plugins will not be tested, and tests provided by plugins will
2538
Tests that need working space on disk use a common temporary directory,
2539
typically inside $TMPDIR or /tmp.
2542
Run only tests relating to 'ignore'::
2546
Disable plugins and list tests as they're run::
2548
bzr --no-plugins selftest -v
2550
# NB: this is used from the class without creating an instance, which is
2551
# why it does not have a self parameter.
2552
def get_transport_type(typestring):
2553
"""Parse and return a transport specifier."""
2554
if typestring == "sftp":
2555
from bzrlib.transport.sftp import SFTPAbsoluteServer
2556
return SFTPAbsoluteServer
2557
if typestring == "memory":
2558
from bzrlib.transport.memory import MemoryServer
2560
if typestring == "fakenfs":
2561
from bzrlib.transport.fakenfs import FakeNFSServer
2562
return FakeNFSServer
2563
msg = "No known transport type %s. Supported types are: sftp\n" %\
2565
raise errors.BzrCommandError(msg)
2568
takes_args = ['testspecs*']
2569
takes_options = ['verbose',
2571
help='Stop when one test fails.',
2575
help='Use a different transport by default '
2576
'throughout the test suite.',
2577
type=get_transport_type),
2579
help='Run the benchmarks rather than selftests.'),
2580
Option('lsprof-timed',
2581
help='Generate lsprof output for benchmarked'
2582
' sections of code.'),
2583
Option('cache-dir', type=str,
2584
help='Cache intermediate benchmark output in this '
2587
help='Run all tests, but run specified tests first.',
2591
help='List the tests instead of running them.'),
2592
Option('randomize', type=str, argname="SEED",
2593
help='Randomize the order of tests using the given'
2594
' seed or "now" for the current time.'),
2595
Option('exclude', type=str, argname="PATTERN",
2597
help='Exclude tests that match this regular'
2599
Option('strict', help='Fail on missing dependencies or '
2601
Option('load-list', type=str, argname='TESTLISTFILE',
2602
help='Load a test id list from a text file.'),
2604
encoding_type = 'replace'
2606
def run(self, testspecs_list=None, verbose=False, one=False,
2607
transport=None, benchmark=None,
2608
lsprof_timed=None, cache_dir=None,
2609
first=False, list_only=False,
2610
randomize=None, exclude=None, strict=False,
2613
from bzrlib.tests import selftest
2614
import bzrlib.benchmarks as benchmarks
2615
from bzrlib.benchmarks import tree_creator
2617
if cache_dir is not None:
2618
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2620
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
2621
print ' %s (%s python%s)' % (
2623
bzrlib.version_string,
2624
'.'.join(map(str, sys.version_info)),
2627
if testspecs_list is not None:
2628
pattern = '|'.join(testspecs_list)
2632
test_suite_factory = benchmarks.test_suite
2633
# Unless user explicitly asks for quiet, be verbose in benchmarks
2634
verbose = not is_quiet()
2635
# TODO: should possibly lock the history file...
2636
benchfile = open(".perf_history", "at", buffering=1)
2638
test_suite_factory = None
2641
result = selftest(verbose=verbose,
2643
stop_on_failure=one,
2644
transport=transport,
2645
test_suite_factory=test_suite_factory,
2646
lsprof_timed=lsprof_timed,
2647
bench_history=benchfile,
2648
matching_tests_first=first,
2649
list_only=list_only,
2650
random_seed=randomize,
2651
exclude_pattern=exclude,
2653
load_list=load_list,
2656
if benchfile is not None:
2659
info('tests passed')
2661
info('tests failed')
2662
return int(not result)
2665
class cmd_version(Command):
2666
"""Show version of bzr."""
2668
encoding_type = 'replace'
2672
from bzrlib.version import show_version
2673
show_version(to_file=self.outf)
2676
class cmd_rocks(Command):
2677
"""Statement of optimism."""
2683
print "It sure does!"
2686
class cmd_find_merge_base(Command):
2687
"""Find and print a base revision for merging two branches."""
2688
# TODO: Options to specify revisions on either side, as if
2689
# merging only part of the history.
2690
takes_args = ['branch', 'other']
2694
def run(self, branch, other):
2695
from bzrlib.revision import ensure_null
2697
branch1 = Branch.open_containing(branch)[0]
2698
branch2 = Branch.open_containing(other)[0]
2703
last1 = ensure_null(branch1.last_revision())
2704
last2 = ensure_null(branch2.last_revision())
2706
graph = branch1.repository.get_graph(branch2.repository)
2707
base_rev_id = graph.find_unique_lca(last1, last2)
2709
print 'merge base is revision %s' % base_rev_id
2716
class cmd_merge(Command):
2717
"""Perform a three-way merge.
2719
The branch is the branch you will merge from. By default, it will merge
2720
the latest revision. If you specify a revision, that revision will be
2721
merged. If you specify two revisions, the first will be used as a BASE,
2722
and the second one as OTHER. Revision numbers are always relative to the
2725
By default, bzr will try to merge in all new work from the other
2726
branch, automatically determining an appropriate base. If this
2727
fails, you may need to give an explicit base.
2729
Merge will do its best to combine the changes in two branches, but there
2730
are some kinds of problems only a human can fix. When it encounters those,
2731
it will mark a conflict. A conflict means that you need to fix something,
2732
before you should commit.
2734
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2736
If there is no default branch set, the first merge will set it. After
2737
that, you can omit the branch to use the default. To change the
2738
default, use --remember. The value will only be saved if the remote
2739
location can be accessed.
2741
The results of the merge are placed into the destination working
2742
directory, where they can be reviewed (with bzr diff), tested, and then
2743
committed to record the result of the merge.
2745
merge refuses to run if there are any uncommitted changes, unless
2749
To merge the latest revision from bzr.dev::
2751
bzr merge ../bzr.dev
2753
To merge changes up to and including revision 82 from bzr.dev::
2755
bzr merge -r 82 ../bzr.dev
2757
To merge the changes introduced by 82, without previous changes::
2759
bzr merge -r 81..82 ../bzr.dev
2762
encoding_type = 'exact'
2763
_see_also = ['update', 'remerge', 'status-flags']
2764
takes_args = ['branch?']
2769
help='Merge even if the destination tree has uncommitted changes.'),
2773
Option('show-base', help="Show base revision text in "
2775
Option('uncommitted', help='Apply uncommitted changes'
2776
' from a working copy, instead of branch changes.'),
2777
Option('pull', help='If the destination is already'
2778
' completely merged into the source, pull from the'
2779
' source rather than merging. When this happens,'
2780
' you do not need to commit the result.'),
2782
help='Branch to merge into, '
2783
'rather than the one containing the working directory.',
2787
Option('preview', help='Instead of merging, show a diff of the merge.')
2790
def run(self, branch=None, revision=None, force=False, merge_type=None,
2791
show_base=False, reprocess=False, remember=False,
2792
uncommitted=False, pull=False,
2796
# This is actually a branch (or merge-directive) *location*.
2800
if merge_type is None:
2801
merge_type = _mod_merge.Merge3Merger
2803
if directory is None: directory = u'.'
2804
possible_transports = []
2806
allow_pending = True
2807
verified = 'inapplicable'
2808
tree = WorkingTree.open_containing(directory)[0]
2809
change_reporter = delta._ChangeReporter(
2810
unversioned_filter=tree.is_ignored)
2813
pb = ui.ui_factory.nested_progress_bar()
2814
cleanups.append(pb.finished)
2816
cleanups.append(tree.unlock)
2817
if location is not None:
2818
mergeable, other_transport = _get_mergeable_helper(location)
2821
raise errors.BzrCommandError('Cannot use --uncommitted'
2822
' with bundles or merge directives.')
2824
if revision is not None:
2825
raise errors.BzrCommandError(
2826
'Cannot use -r with merge directives or bundles')
2827
merger, verified = _mod_merge.Merger.from_mergeable(tree,
2829
possible_transports.append(other_transport)
2831
if merger is None and uncommitted:
2832
if revision is not None and len(revision) > 0:
2833
raise errors.BzrCommandError('Cannot use --uncommitted and'
2834
' --revision at the same time.')
2835
location = self._select_branch_location(tree, location)[0]
2836
other_tree, other_path = WorkingTree.open_containing(location)
2837
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
2839
allow_pending = False
2840
if other_path != '':
2841
merger.interesting_files = [other_path]
2844
merger, allow_pending = self._get_merger_from_branch(tree,
2845
location, revision, remember, possible_transports, pb)
2847
merger.merge_type = merge_type
2848
merger.reprocess = reprocess
2849
merger.show_base = show_base
2850
self.sanity_check_merger(merger)
2851
if (merger.base_rev_id == merger.other_rev_id and
2852
merger.other_rev_id != None):
2853
note('Nothing to do.')
2856
if merger.interesting_files is not None:
2857
raise errors.BzrCommandError('Cannot pull individual files')
2858
if (merger.base_rev_id == tree.last_revision()):
2859
result = tree.pull(merger.other_branch, False,
2860
merger.other_rev_id)
2861
result.report(self.outf)
2863
merger.check_basis(not force)
2865
return self._do_preview(merger)
2867
return self._do_merge(merger, change_reporter, allow_pending,
2870
for cleanup in reversed(cleanups):
2873
def _do_preview(self, merger):
2874
from bzrlib.diff import show_diff_trees
2875
tree_merger = merger.make_merger()
2876
tt = tree_merger.make_preview_transform()
2877
result_tree = tt.get_preview_tree()
2878
show_diff_trees(merger.this_tree, result_tree, self.outf, old_label='',
2882
def _do_merge(self, merger, change_reporter, allow_pending, verified):
2883
merger.change_reporter = change_reporter
2884
conflict_count = merger.do_merge()
2886
merger.set_pending()
2887
if verified == 'failed':
2888
warning('Preview patch does not match changes')
2889
if conflict_count != 0:
2894
def sanity_check_merger(self, merger):
2895
if (merger.show_base and
2896
not merger.merge_type is _mod_merge.Merge3Merger):
2897
raise errors.BzrCommandError("Show-base is not supported for this"
2898
" merge type. %s" % merger.merge_type)
2899
if merger.reprocess and not merger.merge_type.supports_reprocess:
2900
raise errors.BzrCommandError("Conflict reduction is not supported"
2901
" for merge type %s." %
2903
if merger.reprocess and merger.show_base:
2904
raise errors.BzrCommandError("Cannot do conflict reduction and"
2907
def _get_merger_from_branch(self, tree, location, revision, remember,
2908
possible_transports, pb):
2909
"""Produce a merger from a location, assuming it refers to a branch."""
2910
from bzrlib.tag import _merge_tags_if_possible
2911
assert revision is None or len(revision) < 3
2912
# find the branch locations
2913
other_loc, user_location = self._select_branch_location(tree, location,
2915
if revision is not None and len(revision) == 2:
2916
base_loc, _unused = self._select_branch_location(tree,
2917
location, revision, 0)
2919
base_loc = other_loc
2921
other_branch, other_path = Branch.open_containing(other_loc,
2922
possible_transports)
2923
if base_loc == other_loc:
2924
base_branch = other_branch
2926
base_branch, base_path = Branch.open_containing(base_loc,
2927
possible_transports)
2928
# Find the revision ids
2929
if revision is None or len(revision) < 1 or revision[-1] is None:
2930
other_revision_id = _mod_revision.ensure_null(
2931
other_branch.last_revision())
2933
other_revision_id = \
2934
_mod_revision.ensure_null(
2935
revision[-1].in_history(other_branch).rev_id)
2936
if (revision is not None and len(revision) == 2
2937
and revision[0] is not None):
2938
base_revision_id = \
2939
_mod_revision.ensure_null(
2940
revision[0].in_history(base_branch).rev_id)
2942
base_revision_id = None
2943
# Remember where we merge from
2944
if ((remember or tree.branch.get_submit_branch() is None) and
2945
user_location is not None):
2946
tree.branch.set_submit_branch(other_branch.base)
2947
_merge_tags_if_possible(other_branch, tree.branch)
2948
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
2949
other_revision_id, base_revision_id, other_branch, base_branch)
2950
if other_path != '':
2951
allow_pending = False
2952
merger.interesting_files = [other_path]
2954
allow_pending = True
2955
return merger, allow_pending
2957
def _select_branch_location(self, tree, user_location, revision=None,
2959
"""Select a branch location, according to possible inputs.
2961
If provided, branches from ``revision`` are preferred. (Both
2962
``revision`` and ``index`` must be supplied.)
2964
Otherwise, the ``location`` parameter is used. If it is None, then the
2965
``submit`` or ``parent`` location is used, and a note is printed.
2967
:param tree: The working tree to select a branch for merging into
2968
:param location: The location entered by the user
2969
:param revision: The revision parameter to the command
2970
:param index: The index to use for the revision parameter. Negative
2971
indices are permitted.
2972
:return: (selected_location, user_location). The default location
2973
will be the user-entered location.
2975
if (revision is not None and index is not None
2976
and revision[index] is not None):
2977
branch = revision[index].get_branch()
2978
if branch is not None:
2979
return branch, branch
2980
if user_location is None:
2981
location = self._get_remembered(tree, 'Merging from')
2983
location = user_location
2984
return location, user_location
2986
def _get_remembered(self, tree, verb_string):
2987
"""Use tree.branch's parent if none was supplied.
2989
Report if the remembered location was used.
2991
stored_location = tree.branch.get_submit_branch()
2992
if stored_location is None:
2993
stored_location = tree.branch.get_parent()
2994
mutter("%s", stored_location)
2995
if stored_location is None:
2996
raise errors.BzrCommandError("No location specified or remembered")
2997
display_url = urlutils.unescape_for_display(stored_location,
2999
self.outf.write("%s remembered location %s\n" % (verb_string,
3001
return stored_location
3004
class cmd_remerge(Command):
3007
Use this if you want to try a different merge technique while resolving
3008
conflicts. Some merge techniques are better than others, and remerge
3009
lets you try different ones on different files.
3011
The options for remerge have the same meaning and defaults as the ones for
3012
merge. The difference is that remerge can (only) be run when there is a
3013
pending merge, and it lets you specify particular files.
3016
Re-do the merge of all conflicted files, and show the base text in
3017
conflict regions, in addition to the usual THIS and OTHER texts::
3019
bzr remerge --show-base
3021
Re-do the merge of "foobar", using the weave merge algorithm, with
3022
additional processing to reduce the size of conflict regions::
3024
bzr remerge --merge-type weave --reprocess foobar
3026
takes_args = ['file*']
3031
help="Show base revision text in conflicts."),
3034
def run(self, file_list=None, merge_type=None, show_base=False,
3036
if merge_type is None:
3037
merge_type = _mod_merge.Merge3Merger
3038
tree, file_list = tree_files(file_list)
3041
parents = tree.get_parent_ids()
3042
if len(parents) != 2:
3043
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3044
" merges. Not cherrypicking or"
3046
repository = tree.branch.repository
3047
interesting_ids = None
3049
conflicts = tree.conflicts()
3050
if file_list is not None:
3051
interesting_ids = set()
3052
for filename in file_list:
3053
file_id = tree.path2id(filename)
3055
raise errors.NotVersionedError(filename)
3056
interesting_ids.add(file_id)
3057
if tree.kind(file_id) != "directory":
3060
for name, ie in tree.inventory.iter_entries(file_id):
3061
interesting_ids.add(ie.file_id)
3062
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3064
# Remerge only supports resolving contents conflicts
3065
allowed_conflicts = ('text conflict', 'contents conflict')
3066
restore_files = [c.path for c in conflicts
3067
if c.typestring in allowed_conflicts]
3068
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3069
tree.set_conflicts(ConflictList(new_conflicts))
3070
if file_list is not None:
3071
restore_files = file_list
3072
for filename in restore_files:
3074
restore(tree.abspath(filename))
3075
except errors.NotConflicted:
3077
# Disable pending merges, because the file texts we are remerging
3078
# have not had those merges performed. If we use the wrong parents
3079
# list, we imply that the working tree text has seen and rejected
3080
# all the changes from the other tree, when in fact those changes
3081
# have not yet been seen.
3082
pb = ui.ui_factory.nested_progress_bar()
3083
tree.set_parent_ids(parents[:1])
3085
merger = _mod_merge.Merger.from_revision_ids(pb,
3087
merger.interesting_ids = interesting_ids
3088
merger.merge_type = merge_type
3089
merger.show_base = show_base
3090
merger.reprocess = reprocess
3091
conflicts = merger.do_merge()
3093
tree.set_parent_ids(parents)
3103
class cmd_revert(Command):
3104
"""Revert files to a previous revision.
3106
Giving a list of files will revert only those files. Otherwise, all files
3107
will be reverted. If the revision is not specified with '--revision', the
3108
last committed revision is used.
3110
To remove only some changes, without reverting to a prior version, use
3111
merge instead. For example, "merge . --revision -2..-3" will remove the
3112
changes introduced by -2, without affecting the changes introduced by -1.
3113
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
3115
By default, any files that have been manually changed will be backed up
3116
first. (Files changed only by merge are not backed up.) Backup files have
3117
'.~#~' appended to their name, where # is a number.
3119
When you provide files, you can use their current pathname or the pathname
3120
from the target revision. So you can use revert to "undelete" a file by
3121
name. If you name a directory, all the contents of that directory will be
3124
Any files that have been newly added since that revision will be deleted,
3125
with a backup kept if appropriate. Directories containing unknown files
3126
will not be deleted.
3128
The working tree contains a list of pending merged revisions, which will
3129
be included as parents in the next commit. Normally, revert clears that
3130
list as well as reverting the files. If any files are specified, revert
3131
leaves the pending merge list alone and reverts only the files. Use "bzr
3132
revert ." in the tree root to revert all files but keep the merge record,
3133
and "bzr revert --forget-merges" to clear the pending merge list without
3134
reverting any files.
3137
_see_also = ['cat', 'export']
3140
Option('no-backup', "Do not save backups of reverted files."),
3141
Option('forget-merges',
3142
'Remove pending merge marker, without changing any files.'),
3144
takes_args = ['file*']
3146
def run(self, revision=None, no_backup=False, file_list=None,
3147
forget_merges=None):
3148
tree, file_list = tree_files(file_list)
3150
tree.set_parent_ids(tree.get_parent_ids()[:1])
3152
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3155
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
3156
if revision is None:
3157
rev_id = tree.last_revision()
3158
elif len(revision) != 1:
3159
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
3161
rev_id = revision[0].in_history(tree.branch).rev_id
3162
pb = ui.ui_factory.nested_progress_bar()
3164
tree.revert(file_list,
3165
tree.branch.repository.revision_tree(rev_id),
3166
not no_backup, pb, report_changes=True)
3171
class cmd_assert_fail(Command):
3172
"""Test reporting of assertion failures"""
3173
# intended just for use in testing
3178
raise AssertionError("always fails")
3181
class cmd_help(Command):
3182
"""Show help on a command or other topic.
3185
_see_also = ['topics']
3187
Option('long', 'Show help on all commands.'),
3189
takes_args = ['topic?']
3190
aliases = ['?', '--help', '-?', '-h']
3193
def run(self, topic=None, long=False):
3195
if topic is None and long:
3197
bzrlib.help.help(topic)
3200
class cmd_shell_complete(Command):
3201
"""Show appropriate completions for context.
3203
For a list of all available commands, say 'bzr shell-complete'.
3205
takes_args = ['context?']
3210
def run(self, context=None):
3211
import shellcomplete
3212
shellcomplete.shellcomplete(context)
3215
class cmd_fetch(Command):
3216
"""Copy in history from another branch but don't merge it.
3218
This is an internal method used for pull and merge.
3221
takes_args = ['from_branch', 'to_branch']
3222
def run(self, from_branch, to_branch):
3223
from bzrlib.fetch import Fetcher
3224
from_b = Branch.open(from_branch)
3225
to_b = Branch.open(to_branch)
3226
Fetcher(to_b, from_b)
3229
class cmd_missing(Command):
3230
"""Show unmerged/unpulled revisions between two branches.
3232
OTHER_BRANCH may be local or remote.
3235
_see_also = ['merge', 'pull']
3236
takes_args = ['other_branch?']
3238
Option('reverse', 'Reverse the order of revisions.'),
3240
'Display changes in the local branch only.'),
3241
Option('this' , 'Same as --mine-only.'),
3242
Option('theirs-only',
3243
'Display changes in the remote branch only.'),
3244
Option('other', 'Same as --theirs-only.'),
3249
encoding_type = 'replace'
3252
def run(self, other_branch=None, reverse=False, mine_only=False,
3253
theirs_only=False, log_format=None, long=False, short=False, line=False,
3254
show_ids=False, verbose=False, this=False, other=False):
3255
from bzrlib.missing import find_unmerged, iter_log_revisions
3262
local_branch = Branch.open_containing(u".")[0]
3263
parent = local_branch.get_parent()
3264
if other_branch is None:
3265
other_branch = parent
3266
if other_branch is None:
3267
raise errors.BzrCommandError("No peer location known"
3269
display_url = urlutils.unescape_for_display(parent,
3271
self.outf.write("Using last location: " + display_url + "\n")
3273
remote_branch = Branch.open(other_branch)
3274
if remote_branch.base == local_branch.base:
3275
remote_branch = local_branch
3276
local_branch.lock_read()
3278
remote_branch.lock_read()
3280
local_extra, remote_extra = find_unmerged(local_branch,
3282
if log_format is None:
3283
registry = log.log_formatter_registry
3284
log_format = registry.get_default(local_branch)
3285
lf = log_format(to_file=self.outf,
3287
show_timezone='original')
3288
if reverse is False:
3289
local_extra.reverse()
3290
remote_extra.reverse()
3291
if local_extra and not theirs_only:
3292
self.outf.write("You have %d extra revision(s):\n" %
3294
for revision in iter_log_revisions(local_extra,
3295
local_branch.repository,
3297
lf.log_revision(revision)
3298
printed_local = True
3300
printed_local = False
3301
if remote_extra and not mine_only:
3302
if printed_local is True:
3303
self.outf.write("\n\n\n")
3304
self.outf.write("You are missing %d revision(s):\n" %
3306
for revision in iter_log_revisions(remote_extra,
3307
remote_branch.repository,
3309
lf.log_revision(revision)
3310
if not remote_extra and not local_extra:
3312
self.outf.write("Branches are up to date.\n")
3316
remote_branch.unlock()
3318
local_branch.unlock()
3319
if not status_code and parent is None and other_branch is not None:
3320
local_branch.lock_write()
3322
# handle race conditions - a parent might be set while we run.
3323
if local_branch.get_parent() is None:
3324
local_branch.set_parent(remote_branch.base)
3326
local_branch.unlock()
3330
class cmd_pack(Command):
3331
"""Compress the data within a repository."""
3333
_see_also = ['repositories']
3334
takes_args = ['branch_or_repo?']
3336
def run(self, branch_or_repo='.'):
3337
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
3339
branch = dir.open_branch()
3340
repository = branch.repository
3341
except errors.NotBranchError:
3342
repository = dir.open_repository()
3346
class cmd_plugins(Command):
3347
"""List the installed plugins.
3349
This command displays the list of installed plugins including the
3350
path where each one is located and a short description of each.
3352
A plugin is an external component for Bazaar that extends the
3353
revision control system, by adding or replacing code in Bazaar.
3354
Plugins can do a variety of things, including overriding commands,
3355
adding new commands, providing additional network transports and
3356
customizing log output.
3358
See the Bazaar web site, http://bazaar-vcs.org, for further
3359
information on plugins including where to find them and how to
3360
install them. Instructions are also provided there on how to
3361
write new plugins using the Python programming language.
3366
import bzrlib.plugin
3367
from inspect import getdoc
3368
for name, plugin in bzrlib.plugin.plugins().items():
3369
print plugin.path(), "[%s]" % plugin.__version__
3370
d = getdoc(plugin.module)
3372
print '\t', d.split('\n')[0]
3375
class cmd_testament(Command):
3376
"""Show testament (signing-form) of a revision."""
3379
Option('long', help='Produce long-format testament.'),
3381
help='Produce a strict-format testament.')]
3382
takes_args = ['branch?']
3384
def run(self, branch=u'.', revision=None, long=False, strict=False):
3385
from bzrlib.testament import Testament, StrictTestament
3387
testament_class = StrictTestament
3389
testament_class = Testament
3390
b = WorkingTree.open_containing(branch)[0].branch
3393
if revision is None:
3394
rev_id = b.last_revision()
3396
rev_id = revision[0].in_history(b).rev_id
3397
t = testament_class.from_revision(b.repository, rev_id)
3399
sys.stdout.writelines(t.as_text_lines())
3401
sys.stdout.write(t.as_short_text())
3406
class cmd_annotate(Command):
3407
"""Show the origin of each line in a file.
3409
This prints out the given file with an annotation on the left side
3410
indicating which revision, author and date introduced the change.
3412
If the origin is the same for a run of consecutive lines, it is
3413
shown only at the top, unless the --all option is given.
3415
# TODO: annotate directories; showing when each file was last changed
3416
# TODO: if the working copy is modified, show annotations on that
3417
# with new uncommitted lines marked
3418
aliases = ['ann', 'blame', 'praise']
3419
takes_args = ['filename']
3420
takes_options = [Option('all', help='Show annotations on all lines.'),
3421
Option('long', help='Show commit date in annotations.'),
3425
encoding_type = 'exact'
3428
def run(self, filename, all=False, long=False, revision=None,
3430
from bzrlib.annotate import annotate_file
3431
wt, branch, relpath = \
3432
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
3438
if revision is None:
3439
revision_id = branch.last_revision()
3440
elif len(revision) != 1:
3441
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
3443
revision_id = revision[0].in_history(branch).rev_id
3444
tree = branch.repository.revision_tree(revision_id)
3446
file_id = wt.path2id(relpath)
3448
file_id = tree.path2id(relpath)
3450
raise errors.NotVersionedError(filename)
3451
file_version = tree.inventory[file_id].revision
3452
annotate_file(branch, file_version, file_id, long, all, self.outf,
3461
class cmd_re_sign(Command):
3462
"""Create a digital signature for an existing revision."""
3463
# TODO be able to replace existing ones.
3465
hidden = True # is this right ?
3466
takes_args = ['revision_id*']
3467
takes_options = ['revision']
3469
def run(self, revision_id_list=None, revision=None):
3470
if revision_id_list is not None and revision is not None:
3471
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
3472
if revision_id_list is None and revision is None:
3473
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
3474
b = WorkingTree.open_containing(u'.')[0].branch
3477
return self._run(b, revision_id_list, revision)
3481
def _run(self, b, revision_id_list, revision):
3482
import bzrlib.gpg as gpg
3483
gpg_strategy = gpg.GPGStrategy(b.get_config())
3484
if revision_id_list is not None:
3485
b.repository.start_write_group()
3487
for revision_id in revision_id_list:
3488
b.repository.sign_revision(revision_id, gpg_strategy)
3490
b.repository.abort_write_group()
3493
b.repository.commit_write_group()
3494
elif revision is not None:
3495
if len(revision) == 1:
3496
revno, rev_id = revision[0].in_history(b)
3497
b.repository.start_write_group()
3499
b.repository.sign_revision(rev_id, gpg_strategy)
3501
b.repository.abort_write_group()
3504
b.repository.commit_write_group()
3505
elif len(revision) == 2:
3506
# are they both on rh- if so we can walk between them
3507
# might be nice to have a range helper for arbitrary
3508
# revision paths. hmm.
3509
from_revno, from_revid = revision[0].in_history(b)
3510
to_revno, to_revid = revision[1].in_history(b)
3511
if to_revid is None:
3512
to_revno = b.revno()
3513
if from_revno is None or to_revno is None:
3514
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
3515
b.repository.start_write_group()
3517
for revno in range(from_revno, to_revno + 1):
3518
b.repository.sign_revision(b.get_rev_id(revno),
3521
b.repository.abort_write_group()
3524
b.repository.commit_write_group()
3526
raise errors.BzrCommandError('Please supply either one revision, or a range.')
3529
class cmd_bind(Command):
3530
"""Convert the current branch into a checkout of the supplied branch.
3532
Once converted into a checkout, commits must succeed on the master branch
3533
before they will be applied to the local branch.
3536
_see_also = ['checkouts', 'unbind']
3537
takes_args = ['location?']
3540
def run(self, location=None):
3541
b, relpath = Branch.open_containing(u'.')
3542
if location is None:
3544
location = b.get_old_bound_location()
3545
except errors.UpgradeRequired:
3546
raise errors.BzrCommandError('No location supplied. '
3547
'This format does not remember old locations.')
3549
if location is None:
3550
raise errors.BzrCommandError('No location supplied and no '
3551
'previous location known')
3552
b_other = Branch.open(location)
3555
except errors.DivergedBranches:
3556
raise errors.BzrCommandError('These branches have diverged.'
3557
' Try merging, and then bind again.')
3560
class cmd_unbind(Command):
3561
"""Convert the current checkout into a regular branch.
3563
After unbinding, the local branch is considered independent and subsequent
3564
commits will be local only.
3567
_see_also = ['checkouts', 'bind']
3572
b, relpath = Branch.open_containing(u'.')
3574
raise errors.BzrCommandError('Local branch is not bound')
3577
class cmd_uncommit(Command):
3578
"""Remove the last committed revision.
3580
--verbose will print out what is being removed.
3581
--dry-run will go through all the motions, but not actually
3584
If --revision is specified, uncommit revisions to leave the branch at the
3585
specified revision. For example, "bzr uncommit -r 15" will leave the
3586
branch at revision 15.
3588
In the future, uncommit will create a revision bundle, which can then
3592
# TODO: jam 20060108 Add an option to allow uncommit to remove
3593
# unreferenced information in 'branch-as-repository' branches.
3594
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
3595
# information in shared branches as well.
3596
_see_also = ['commit']
3597
takes_options = ['verbose', 'revision',
3598
Option('dry-run', help='Don\'t actually make changes.'),
3599
Option('force', help='Say yes to all questions.')]
3600
takes_args = ['location?']
3602
encoding_type = 'replace'
3604
def run(self, location=None,
3605
dry_run=False, verbose=False,
3606
revision=None, force=False):
3607
if location is None:
3609
control, relpath = bzrdir.BzrDir.open_containing(location)
3611
tree = control.open_workingtree()
3613
except (errors.NoWorkingTree, errors.NotLocalUrl):
3615
b = control.open_branch()
3617
if tree is not None:
3622
return self._run(b, tree, dry_run, verbose, revision, force)
3624
if tree is not None:
3629
def _run(self, b, tree, dry_run, verbose, revision, force):
3630
from bzrlib.log import log_formatter, show_log
3631
from bzrlib.uncommit import uncommit
3633
last_revno, last_rev_id = b.last_revision_info()
3636
if revision is None:
3638
rev_id = last_rev_id
3640
# 'bzr uncommit -r 10' actually means uncommit
3641
# so that the final tree is at revno 10.
3642
# but bzrlib.uncommit.uncommit() actually uncommits
3643
# the revisions that are supplied.
3644
# So we need to offset it by one
3645
revno = revision[0].in_history(b).revno + 1
3646
if revno <= last_revno:
3647
rev_id = b.get_rev_id(revno)
3649
if rev_id is None or _mod_revision.is_null(rev_id):
3650
self.outf.write('No revisions to uncommit.\n')
3653
lf = log_formatter('short',
3655
show_timezone='original')
3660
direction='forward',
3661
start_revision=revno,
3662
end_revision=last_revno)
3665
print 'Dry-run, pretending to remove the above revisions.'
3667
val = raw_input('Press <enter> to continue')
3669
print 'The above revision(s) will be removed.'
3671
val = raw_input('Are you sure [y/N]? ')
3672
if val.lower() not in ('y', 'yes'):
3676
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
3680
class cmd_break_lock(Command):
3681
"""Break a dead lock on a repository, branch or working directory.
3683
CAUTION: Locks should only be broken when you are sure that the process
3684
holding the lock has been stopped.
3686
You can get information on what locks are open via the 'bzr info' command.
3691
takes_args = ['location?']
3693
def run(self, location=None, show=False):
3694
if location is None:
3696
control, relpath = bzrdir.BzrDir.open_containing(location)
3698
control.break_lock()
3699
except NotImplementedError:
3703
class cmd_wait_until_signalled(Command):
3704
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3706
This just prints a line to signal when it is ready, then blocks on stdin.
3712
sys.stdout.write("running\n")
3714
sys.stdin.readline()
3717
class cmd_serve(Command):
3718
"""Run the bzr server."""
3720
aliases = ['server']
3724
help='Serve on stdin/out for use from inetd or sshd.'),
3726
help='Listen for connections on nominated port of the form '
3727
'[hostname:]portnumber. Passing 0 as the port number will '
3728
'result in a dynamically allocated port. The default port is '
3732
help='Serve contents of this directory.',
3734
Option('allow-writes',
3735
help='By default the server is a readonly server. Supplying '
3736
'--allow-writes enables write access to the contents of '
3737
'the served directory and below.'
3741
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3742
from bzrlib import lockdir
3743
from bzrlib.smart import medium, server
3744
from bzrlib.transport import get_transport
3745
from bzrlib.transport.chroot import ChrootServer
3746
if directory is None:
3747
directory = os.getcwd()
3748
url = urlutils.local_path_to_url(directory)
3749
if not allow_writes:
3750
url = 'readonly+' + url
3751
chroot_server = ChrootServer(get_transport(url))
3752
chroot_server.setUp()
3753
t = get_transport(chroot_server.get_url())
3755
smart_server = medium.SmartServerPipeStreamMedium(
3756
sys.stdin, sys.stdout, t)
3758
host = medium.BZR_DEFAULT_INTERFACE
3760
port = medium.BZR_DEFAULT_PORT
3763
host, port = port.split(':')
3765
smart_server = server.SmartTCPServer(t, host=host, port=port)
3766
print 'listening on port: ', smart_server.port
3768
# for the duration of this server, no UI output is permitted.
3769
# note that this may cause problems with blackbox tests. This should
3770
# be changed with care though, as we dont want to use bandwidth sending
3771
# progress over stderr to smart server clients!
3772
old_factory = ui.ui_factory
3773
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
3775
ui.ui_factory = ui.SilentUIFactory()
3776
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
3777
smart_server.serve()
3779
ui.ui_factory = old_factory
3780
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
3783
class cmd_join(Command):
3784
"""Combine a subtree into its containing tree.
3786
This command is for experimental use only. It requires the target tree
3787
to be in dirstate-with-subtree format, which cannot be converted into
3790
The TREE argument should be an independent tree, inside another tree, but
3791
not part of it. (Such trees can be produced by "bzr split", but also by
3792
running "bzr branch" with the target inside a tree.)
3794
The result is a combined tree, with the subtree no longer an independant
3795
part. This is marked as a merge of the subtree into the containing tree,
3796
and all history is preserved.
3798
If --reference is specified, the subtree retains its independence. It can
3799
be branched by itself, and can be part of multiple projects at the same
3800
time. But operations performed in the containing tree, such as commit
3801
and merge, will recurse into the subtree.
3804
_see_also = ['split']
3805
takes_args = ['tree']
3807
Option('reference', help='Join by reference.'),
3811
def run(self, tree, reference=False):
3812
sub_tree = WorkingTree.open(tree)
3813
parent_dir = osutils.dirname(sub_tree.basedir)
3814
containing_tree = WorkingTree.open_containing(parent_dir)[0]
3815
repo = containing_tree.branch.repository
3816
if not repo.supports_rich_root():
3817
raise errors.BzrCommandError(
3818
"Can't join trees because %s doesn't support rich root data.\n"
3819
"You can use bzr upgrade on the repository."
3823
containing_tree.add_reference(sub_tree)
3824
except errors.BadReferenceTarget, e:
3825
# XXX: Would be better to just raise a nicely printable
3826
# exception from the real origin. Also below. mbp 20070306
3827
raise errors.BzrCommandError("Cannot join %s. %s" %
3831
containing_tree.subsume(sub_tree)
3832
except errors.BadSubsumeSource, e:
3833
raise errors.BzrCommandError("Cannot join %s. %s" %
3837
class cmd_split(Command):
3838
"""Split a subdirectory of a tree into a separate tree.
3840
This command will produce a target tree in a format that supports
3841
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
3842
converted into earlier formats like 'dirstate-tags'.
3844
The TREE argument should be a subdirectory of a working tree. That
3845
subdirectory will be converted into an independent tree, with its own
3846
branch. Commits in the top-level tree will not apply to the new subtree.
3849
# join is not un-hidden yet
3850
#_see_also = ['join']
3851
takes_args = ['tree']
3853
def run(self, tree):
3854
containing_tree, subdir = WorkingTree.open_containing(tree)
3855
sub_id = containing_tree.path2id(subdir)
3857
raise errors.NotVersionedError(subdir)
3859
containing_tree.extract(sub_id)
3860
except errors.RootNotRich:
3861
raise errors.UpgradeRequired(containing_tree.branch.base)
3864
class cmd_merge_directive(Command):
3865
"""Generate a merge directive for auto-merge tools.
3867
A directive requests a merge to be performed, and also provides all the
3868
information necessary to do so. This means it must either include a
3869
revision bundle, or the location of a branch containing the desired
3872
A submit branch (the location to merge into) must be supplied the first
3873
time the command is issued. After it has been supplied once, it will
3874
be remembered as the default.
3876
A public branch is optional if a revision bundle is supplied, but required
3877
if --diff or --plain is specified. It will be remembered as the default
3878
after the first use.
3881
takes_args = ['submit_branch?', 'public_branch?']
3885
_see_also = ['send']
3888
RegistryOption.from_kwargs('patch-type',
3889
'The type of patch to include in the directive.',
3891
value_switches=True,
3893
bundle='Bazaar revision bundle (default).',
3894
diff='Normal unified diff.',
3895
plain='No patch, just directive.'),
3896
Option('sign', help='GPG-sign the directive.'), 'revision',
3897
Option('mail-to', type=str,
3898
help='Instead of printing the directive, email to this address.'),
3899
Option('message', type=str, short_name='m',
3900
help='Message to use when committing this merge.')
3903
encoding_type = 'exact'
3905
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
3906
sign=False, revision=None, mail_to=None, message=None):
3907
from bzrlib.revision import ensure_null, NULL_REVISION
3908
include_patch, include_bundle = {
3909
'plain': (False, False),
3910
'diff': (True, False),
3911
'bundle': (True, True),
3913
branch = Branch.open('.')
3914
stored_submit_branch = branch.get_submit_branch()
3915
if submit_branch is None:
3916
submit_branch = stored_submit_branch
3918
if stored_submit_branch is None:
3919
branch.set_submit_branch(submit_branch)
3920
if submit_branch is None:
3921
submit_branch = branch.get_parent()
3922
if submit_branch is None:
3923
raise errors.BzrCommandError('No submit branch specified or known')
3925
stored_public_branch = branch.get_public_branch()
3926
if public_branch is None:
3927
public_branch = stored_public_branch
3928
elif stored_public_branch is None:
3929
branch.set_public_branch(public_branch)
3930
if not include_bundle and public_branch is None:
3931
raise errors.BzrCommandError('No public branch specified or'
3933
base_revision_id = None
3934
if revision is not None:
3935
if len(revision) > 2:
3936
raise errors.BzrCommandError('bzr merge-directive takes '
3937
'at most two one revision identifiers')
3938
revision_id = revision[-1].in_history(branch).rev_id
3939
if len(revision) == 2:
3940
base_revision_id = revision[0].in_history(branch).rev_id
3941
base_revision_id = ensure_null(base_revision_id)
3943
revision_id = branch.last_revision()
3944
revision_id = ensure_null(revision_id)
3945
if revision_id == NULL_REVISION:
3946
raise errors.BzrCommandError('No revisions to bundle.')
3947
directive = merge_directive.MergeDirective2.from_objects(
3948
branch.repository, revision_id, time.time(),
3949
osutils.local_time_offset(), submit_branch,
3950
public_branch=public_branch, include_patch=include_patch,
3951
include_bundle=include_bundle, message=message,
3952
base_revision_id=base_revision_id)
3955
self.outf.write(directive.to_signed(branch))
3957
self.outf.writelines(directive.to_lines())
3959
message = directive.to_email(mail_to, branch, sign)
3960
s = SMTPConnection(branch.get_config())
3961
s.send_email(message)
3964
class cmd_send(Command):
3965
"""Mail or create a merge-directive for submiting changes.
3967
A merge directive provides many things needed for requesting merges:
3969
* A machine-readable description of the merge to perform
3971
* An optional patch that is a preview of the changes requested
3973
* An optional bundle of revision data, so that the changes can be applied
3974
directly from the merge directive, without retrieving data from a
3977
If --no-bundle is specified, then public_branch is needed (and must be
3978
up-to-date), so that the receiver can perform the merge using the
3979
public_branch. The public_branch is always included if known, so that
3980
people can check it later.
3982
The submit branch defaults to the parent, but can be overridden. Both
3983
submit branch and public branch will be remembered if supplied.
3985
If a public_branch is known for the submit_branch, that public submit
3986
branch is used in the merge instructions. This means that a local mirror
3987
can be used as your actual submit branch, once you have set public_branch
3990
Mail is sent using your preferred mail program. This should be transparent
3991
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
3992
If the preferred client can't be found (or used), your editor will be used.
3994
To use a specific mail program, set the mail_client configuration option.
3995
(For Thunderbird 1.5, this works around some bugs.) Supported values for
3996
specific clients are "evolution", "kmail", "mutt", and "thunderbird";
3997
generic options are "default", "editor", "mapi", and "xdg-email".
3999
If mail is being sent, a to address is required. This can be supplied
4000
either on the commandline, or by setting the submit_to configuration
4003
Two formats are currently supported: "4" uses revision bundle format 4 and
4004
merge directive format 2. It is significantly faster and smaller than
4005
older formats. It is compatible with Bazaar 0.19 and later. It is the
4006
default. "0.9" uses revision bundle format 0.9 and merge directive
4007
format 1. It is compatible with Bazaar 0.12 - 0.18.
4010
encoding_type = 'exact'
4012
_see_also = ['merge']
4014
takes_args = ['submit_branch?', 'public_branch?']
4018
help='Do not include a bundle in the merge directive.'),
4019
Option('no-patch', help='Do not include a preview patch in the merge'
4022
help='Remember submit and public branch.'),
4024
help='Branch to generate the submission from, '
4025
'rather than the one containing the working directory.',
4028
Option('output', short_name='o', help='Write directive to this file.',
4030
Option('mail-to', help='Mail the request to this address.',
4034
RegistryOption.from_kwargs('format',
4035
'Use the specified output format.',
4036
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4037
'0.9': 'Bundle format 0.9, Merge Directive 1',})
4040
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4041
no_patch=False, revision=None, remember=False, output=None,
4042
format='4', mail_to=None, message=None, **kwargs):
4043
return self._run(submit_branch, revision, public_branch, remember,
4044
format, no_bundle, no_patch, output,
4045
kwargs.get('from', '.'), mail_to, message)
4047
def _run(self, submit_branch, revision, public_branch, remember, format,
4048
no_bundle, no_patch, output, from_, mail_to, message):
4049
from bzrlib.revision import NULL_REVISION
4050
branch = Branch.open_containing(from_)[0]
4052
outfile = StringIO()
4056
outfile = open(output, 'wb')
4057
# we may need to write data into branch's repository to calculate
4062
config = branch.get_config()
4064
mail_to = config.get_user_option('submit_to')
4065
mail_client = config.get_mail_client()
4066
if remember and submit_branch is None:
4067
raise errors.BzrCommandError(
4068
'--remember requires a branch to be specified.')
4069
stored_submit_branch = branch.get_submit_branch()
4070
remembered_submit_branch = False
4071
if submit_branch is None:
4072
submit_branch = stored_submit_branch
4073
remembered_submit_branch = True
4075
if stored_submit_branch is None or remember:
4076
branch.set_submit_branch(submit_branch)
4077
if submit_branch is None:
4078
submit_branch = branch.get_parent()
4079
remembered_submit_branch = True
4080
if submit_branch is None:
4081
raise errors.BzrCommandError('No submit branch known or'
4083
if remembered_submit_branch:
4084
note('Using saved location: %s', submit_branch)
4086
stored_public_branch = branch.get_public_branch()
4087
if public_branch is None:
4088
public_branch = stored_public_branch
4089
elif stored_public_branch is None or remember:
4090
branch.set_public_branch(public_branch)
4091
if no_bundle and public_branch is None:
4092
raise errors.BzrCommandError('No public branch specified or'
4094
base_revision_id = None
4096
if revision is not None:
4097
if len(revision) > 2:
4098
raise errors.BzrCommandError('bzr send takes '
4099
'at most two one revision identifiers')
4100
revision_id = revision[-1].in_history(branch).rev_id
4101
if len(revision) == 2:
4102
base_revision_id = revision[0].in_history(branch).rev_id
4103
if revision_id is None:
4104
revision_id = branch.last_revision()
4105
if revision_id == NULL_REVISION:
4106
raise errors.BzrCommandError('No revisions to submit.')
4108
directive = merge_directive.MergeDirective2.from_objects(
4109
branch.repository, revision_id, time.time(),
4110
osutils.local_time_offset(), submit_branch,
4111
public_branch=public_branch, include_patch=not no_patch,
4112
include_bundle=not no_bundle, message=message,
4113
base_revision_id=base_revision_id)
4114
elif format == '0.9':
4117
patch_type = 'bundle'
4119
raise errors.BzrCommandError('Format 0.9 does not'
4120
' permit bundle with no patch')
4126
directive = merge_directive.MergeDirective.from_objects(
4127
branch.repository, revision_id, time.time(),
4128
osutils.local_time_offset(), submit_branch,
4129
public_branch=public_branch, patch_type=patch_type,
4132
outfile.writelines(directive.to_lines())
4134
subject = '[MERGE] '
4135
if message is not None:
4138
revision = branch.repository.get_revision(revision_id)
4139
subject += revision.get_summary()
4140
mail_client.compose_merge_request(mail_to, subject,
4148
class cmd_bundle_revisions(cmd_send):
4150
"""Create a merge-directive for submiting changes.
4152
A merge directive provides many things needed for requesting merges:
4154
* A machine-readable description of the merge to perform
4156
* An optional patch that is a preview of the changes requested
4158
* An optional bundle of revision data, so that the changes can be applied
4159
directly from the merge directive, without retrieving data from a
4162
If --no-bundle is specified, then public_branch is needed (and must be
4163
up-to-date), so that the receiver can perform the merge using the
4164
public_branch. The public_branch is always included if known, so that
4165
people can check it later.
4167
The submit branch defaults to the parent, but can be overridden. Both
4168
submit branch and public branch will be remembered if supplied.
4170
If a public_branch is known for the submit_branch, that public submit
4171
branch is used in the merge instructions. This means that a local mirror
4172
can be used as your actual submit branch, once you have set public_branch
4175
Two formats are currently supported: "4" uses revision bundle format 4 and
4176
merge directive format 2. It is significantly faster and smaller than
4177
older formats. It is compatible with Bazaar 0.19 and later. It is the
4178
default. "0.9" uses revision bundle format 0.9 and merge directive
4179
format 1. It is compatible with Bazaar 0.12 - 0.18.
4184
help='Do not include a bundle in the merge directive.'),
4185
Option('no-patch', help='Do not include a preview patch in the merge'
4188
help='Remember submit and public branch.'),
4190
help='Branch to generate the submission from, '
4191
'rather than the one containing the working directory.',
4194
Option('output', short_name='o', help='Write directive to this file.',
4197
RegistryOption.from_kwargs('format',
4198
'Use the specified output format.',
4199
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4200
'0.9': 'Bundle format 0.9, Merge Directive 1',})
4202
aliases = ['bundle']
4204
_see_also = ['send', 'merge']
4208
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4209
no_patch=False, revision=None, remember=False, output=None,
4210
format='4', **kwargs):
4213
return self._run(submit_branch, revision, public_branch, remember,
4214
format, no_bundle, no_patch, output,
4215
kwargs.get('from', '.'), None, None)
4218
class cmd_tag(Command):
4219
"""Create, remove or modify a tag naming a revision.
4221
Tags give human-meaningful names to revisions. Commands that take a -r
4222
(--revision) option can be given -rtag:X, where X is any previously
4225
Tags are stored in the branch. Tags are copied from one branch to another
4226
along when you branch, push, pull or merge.
4228
It is an error to give a tag name that already exists unless you pass
4229
--force, in which case the tag is moved to point to the new revision.
4232
_see_also = ['commit', 'tags']
4233
takes_args = ['tag_name']
4236
help='Delete this tag rather than placing it.',
4239
help='Branch in which to place the tag.',
4244
help='Replace existing tags.',
4249
def run(self, tag_name,
4255
branch, relpath = Branch.open_containing(directory)
4259
branch.tags.delete_tag(tag_name)
4260
self.outf.write('Deleted tag %s.\n' % tag_name)
4263
if len(revision) != 1:
4264
raise errors.BzrCommandError(
4265
"Tags can only be placed on a single revision, "
4267
revision_id = revision[0].in_history(branch).rev_id
4269
revision_id = branch.last_revision()
4270
if (not force) and branch.tags.has_tag(tag_name):
4271
raise errors.TagAlreadyExists(tag_name)
4272
branch.tags.set_tag(tag_name, revision_id)
4273
self.outf.write('Created tag %s.\n' % tag_name)
4278
class cmd_tags(Command):
4281
This command shows a table of tag names and the revisions they reference.
4287
help='Branch whose tags should be displayed.',
4291
RegistryOption.from_kwargs('sort',
4292
'Sort tags by different criteria.', title='Sorting',
4293
alpha='Sort tags lexicographically (default).',
4294
time='Sort tags chronologically.',
4305
branch, relpath = Branch.open_containing(directory)
4306
tags = branch.tags.get_tag_dict().items()
4309
elif sort == 'time':
4311
for tag, revid in tags:
4313
revobj = branch.repository.get_revision(revid)
4314
except errors.NoSuchRevision:
4315
timestamp = sys.maxint # place them at the end
4317
timestamp = revobj.timestamp
4318
timestamps[revid] = timestamp
4319
tags.sort(key=lambda x: timestamps[x[1]])
4321
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
4322
revno_map = branch.get_revision_id_to_revno_map()
4323
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
4324
for tag, revid in tags ]
4325
for tag, revspec in tags:
4326
self.outf.write('%-20s %s\n' % (tag, revspec))
4329
class cmd_reconfigure(Command):
4330
"""Reconfigure the type of a bzr directory.
4332
A target configuration must be specified.
4334
For checkouts, the bind-to location will be auto-detected if not specified.
4335
The order of preference is
4336
1. For a lightweight checkout, the current bound location.
4337
2. For branches that used to be checkouts, the previously-bound location.
4338
3. The push location.
4339
4. The parent location.
4340
If none of these is available, --bind-to must be specified.
4343
takes_args = ['location?']
4344
takes_options = [RegistryOption.from_kwargs('target_type',
4345
title='Target type',
4346
help='The type to reconfigure the directory to.',
4347
value_switches=True, enum_switch=False,
4348
branch='Reconfigure to a branch.',
4349
tree='Reconfigure to a tree.',
4350
checkout='Reconfigure to a checkout.',
4351
lightweight_checkout='Reconfigure to a lightweight'
4353
Option('bind-to', help='Branch to bind checkout to.',
4356
help='Perform reconfiguration even if local changes'
4360
def run(self, location=None, target_type=None, bind_to=None, force=False):
4361
directory = bzrdir.BzrDir.open(location)
4362
if target_type is None:
4363
raise errors.BzrCommandError('No target configuration specified')
4364
elif target_type == 'branch':
4365
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
4366
elif target_type == 'tree':
4367
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
4368
elif target_type == 'checkout':
4369
reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
4371
elif target_type == 'lightweight-checkout':
4372
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
4374
reconfiguration.apply(force)
4377
class cmd_switch(Command):
4378
"""Set the branch of a checkout and update.
4380
For lightweight checkouts, this changes the branch being referenced.
4381
For heavyweight checkouts, this checks that there are no local commits
4382
versus the current bound branch, then it makes the local branch a mirror
4383
of the new location and binds to it.
4385
In both cases, the working tree is updated and uncommitted changes
4386
are merged. The user can commit or revert these as they desire.
4388
Pending merges need to be committed or reverted before using switch.
4391
takes_args = ['to_location']
4392
takes_options = [Option('force',
4393
help='Switch even if local commits will be lost.')
4396
def run(self, to_location, force=False):
4397
from bzrlib import switch
4398
to_branch = Branch.open(to_location)
4400
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
4401
switch.switch(control_dir, to_branch, force)
4402
note('Switched to branch: %s',
4403
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
4406
def _create_prefix(cur_transport):
4407
needed = [cur_transport]
4408
# Recurse upwards until we can create a directory successfully
4410
new_transport = cur_transport.clone('..')
4411
if new_transport.base == cur_transport.base:
4412
raise errors.BzrCommandError(
4413
"Failed to create path prefix for %s."
4414
% cur_transport.base)
4416
new_transport.mkdir('.')
4417
except errors.NoSuchFile:
4418
needed.append(new_transport)
4419
cur_transport = new_transport
4422
# Now we only need to create child directories
4424
cur_transport = needed.pop()
4425
cur_transport.ensure_base()
4428
def _get_mergeable_helper(location):
4429
"""Get a merge directive or bundle if 'location' points to one.
4431
Try try to identify a bundle and returns its mergeable form. If it's not,
4432
we return the tried transport anyway so that it can reused to access the
4435
:param location: can point to a bundle or a branch.
4437
:return: mergeable, transport
4440
url = urlutils.normalize_url(location)
4441
url, filename = urlutils.split(url, exclude_trailing_slash=False)
4442
location_transport = transport.get_transport(url)
4445
# There may be redirections but we ignore the intermediate
4446
# and final transports used
4447
read = bundle.read_mergeable_from_transport
4448
mergeable, t = read(location_transport, filename)
4449
except errors.NotABundle:
4450
# Continue on considering this url a Branch but adjust the
4451
# location_transport
4452
location_transport = location_transport.clone(filename)
4453
return mergeable, location_transport
4456
# these get imported and then picked up by the scan for cmd_*
4457
# TODO: Some more consistent way to split command definitions across files;
4458
# we do need to load at least some information about them to know of
4459
# aliases. ideally we would avoid loading the implementation until the
4460
# details were needed.
4461
from bzrlib.cmd_version_info import cmd_version_info
4462
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
4463
from bzrlib.bundle.commands import (
4466
from bzrlib.sign_my_commits import cmd_sign_my_commits
4467
from bzrlib.weave_commands import cmd_versionedfile_list, cmd_weave_join, \
4468
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
