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(), """
53
from bzrlib.branch import Branch
54
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
55
from bzrlib.conflicts import ConflictList
56
from bzrlib.revision import common_ancestor
57
from bzrlib.revisionspec import RevisionSpec
58
from bzrlib.workingtree import WorkingTree
61
from bzrlib.commands import Command, display_command
62
from bzrlib.option import Option, RegistryOption
63
from bzrlib.progress import DummyProgress, ProgressPhase
64
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
67
def tree_files(file_list, default_branch=u'.'):
69
return internal_tree_files(file_list, default_branch)
70
except errors.FileInWrongBranch, e:
71
raise errors.BzrCommandError("%s is not in the same branch as %s" %
72
(e.path, file_list[0]))
75
# XXX: Bad function name; should possibly also be a class method of
76
# WorkingTree rather than a function.
77
def internal_tree_files(file_list, default_branch=u'.'):
78
"""Convert command-line paths to a WorkingTree and relative paths.
80
This is typically used for command-line processors that take one or
81
more filenames, and infer the workingtree that contains them.
83
The filenames given are not required to exist.
85
:param file_list: Filenames to convert.
87
:param default_branch: Fallback tree path to use if file_list is empty or
90
:return: workingtree, [relative_paths]
92
if file_list is None or len(file_list) == 0:
93
return WorkingTree.open_containing(default_branch)[0], file_list
94
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
96
for filename in file_list:
98
new_list.append(tree.relpath(osutils.dereference_path(filename)))
99
except errors.PathNotChild:
100
raise errors.FileInWrongBranch(tree.branch, filename)
101
return tree, new_list
104
@symbol_versioning.deprecated_function(symbol_versioning.zero_fifteen)
105
def get_format_type(typestring):
106
"""Parse and return a format specifier."""
107
# Have to use BzrDirMetaFormat1 directly, so that
108
# RepositoryFormat.set_default_format works
109
if typestring == "default":
110
return bzrdir.BzrDirMetaFormat1()
112
return bzrdir.format_registry.make_bzrdir(typestring)
114
msg = 'Unknown bzr format "%s". See "bzr help formats".' % typestring
115
raise errors.BzrCommandError(msg)
118
# TODO: Make sure no commands unconditionally use the working directory as a
119
# branch. If a filename argument is used, the first of them should be used to
120
# specify the branch. (Perhaps this can be factored out into some kind of
121
# Argument class, representing a file in a branch, where the first occurrence
124
class cmd_status(Command):
125
"""Display status summary.
127
This reports on versioned and unknown files, reporting them
128
grouped by state. Possible states are:
131
Versioned in the working copy but not in the previous revision.
134
Versioned in the previous revision but removed or deleted
138
Path of this file changed from the previous revision;
139
the text may also have changed. This includes files whose
140
parent directory was renamed.
143
Text has changed since the previous revision.
146
File kind has been changed (e.g. from file to directory).
149
Not versioned and not matching an ignore pattern.
151
To see ignored files use 'bzr ignored'. For details on the
152
changes to file texts, use 'bzr diff'.
154
--short gives a status flags for each item, similar to the SVN's status
157
Column 1: versioning / renames
163
P Entry for a pending merge (not a file)
172
* The execute bit was changed
174
If no arguments are specified, the status of the entire working
175
directory is shown. Otherwise, only the status of the specified
176
files or directories is reported. If a directory is given, status
177
is reported for everything inside that directory.
179
If a revision argument is given, the status is calculated against
180
that revision, or between two revisions if two are provided.
183
# TODO: --no-recurse, --recurse options
185
takes_args = ['file*']
186
takes_options = ['show-ids', 'revision',
187
Option('short', help='Give short SVN-style status lines'),
188
Option('versioned', help='Only show versioned files')]
189
aliases = ['st', 'stat']
191
encoding_type = 'replace'
194
def run(self, show_ids=False, file_list=None, revision=None, short=False,
196
from bzrlib.status import show_tree_status
198
tree, file_list = tree_files(file_list)
200
show_tree_status(tree, show_ids=show_ids,
201
specific_files=file_list, revision=revision,
202
to_file=self.outf, short=short, versioned=versioned)
205
class cmd_cat_revision(Command):
206
"""Write out metadata for a revision.
208
The revision to print can either be specified by a specific
209
revision identifier, or you can use --revision.
213
takes_args = ['revision_id?']
214
takes_options = ['revision']
215
# cat-revision is more for frontends so should be exact
219
def run(self, revision_id=None, revision=None):
221
if revision_id is not None and revision is not None:
222
raise errors.BzrCommandError('You can only supply one of'
223
' revision_id or --revision')
224
if revision_id is None and revision is None:
225
raise errors.BzrCommandError('You must supply either'
226
' --revision or a revision_id')
227
b = WorkingTree.open_containing(u'.')[0].branch
229
# TODO: jam 20060112 should cat-revision always output utf-8?
230
if revision_id is not None:
231
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
232
elif revision is not None:
235
raise errors.BzrCommandError('You cannot specify a NULL'
237
revno, rev_id = rev.in_history(b)
238
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
241
class cmd_remove_tree(Command):
242
"""Remove the working tree from a given branch/checkout.
244
Since a lightweight checkout is little more than a working tree
245
this will refuse to run against one.
248
takes_args = ['location?']
250
def run(self, location='.'):
251
d = bzrdir.BzrDir.open(location)
254
working = d.open_workingtree()
255
except errors.NoWorkingTree:
256
raise errors.BzrCommandError("No working tree to remove")
257
except errors.NotLocalUrl:
258
raise errors.BzrCommandError("You cannot remove the working tree of a "
261
working_path = working.bzrdir.root_transport.base
262
branch_path = working.branch.bzrdir.root_transport.base
263
if working_path != branch_path:
264
raise errors.BzrCommandError("You cannot remove the working tree from "
265
"a lightweight checkout")
267
d.destroy_workingtree()
270
class cmd_revno(Command):
271
"""Show current revision number.
273
This is equal to the number of revisions on this branch.
276
takes_args = ['location?']
279
def run(self, location=u'.'):
280
self.outf.write(str(Branch.open_containing(location)[0].revno()))
281
self.outf.write('\n')
284
class cmd_revision_info(Command):
285
"""Show revision number and revision id for a given revision identifier.
288
takes_args = ['revision_info*']
289
takes_options = ['revision']
292
def run(self, revision=None, revision_info_list=[]):
295
if revision is not None:
296
revs.extend(revision)
297
if revision_info_list is not None:
298
for rev in revision_info_list:
299
revs.append(RevisionSpec.from_string(rev))
301
raise errors.BzrCommandError('You must supply a revision identifier')
303
b = WorkingTree.open_containing(u'.')[0].branch
306
revinfo = rev.in_history(b)
307
if revinfo.revno is None:
308
print ' %s' % revinfo.rev_id
310
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
313
class cmd_add(Command):
314
"""Add specified files or directories.
316
In non-recursive mode, all the named items are added, regardless
317
of whether they were previously ignored. A warning is given if
318
any of the named files are already versioned.
320
In recursive mode (the default), files are treated the same way
321
but the behaviour for directories is different. Directories that
322
are already versioned do not give a warning. All directories,
323
whether already versioned or not, are searched for files or
324
subdirectories that are neither versioned or ignored, and these
325
are added. This search proceeds recursively into versioned
326
directories. If no names are given '.' is assumed.
328
Therefore simply saying 'bzr add' will version all files that
329
are currently unknown.
331
Adding a file whose parent directory is not versioned will
332
implicitly add the parent, and so on up to the root. This means
333
you should never need to explicitly add a directory, they'll just
334
get added when you add a file in the directory.
336
--dry-run will show which files would be added, but not actually
339
--file-ids-from will try to use the file ids from the supplied path.
340
It looks up ids trying to find a matching parent directory with the
341
same filename, and then by pure path.
343
takes_args = ['file*']
344
takes_options = ['no-recurse', 'dry-run', 'verbose',
345
Option('file-ids-from', type=unicode,
346
help='Lookup file ids from here')]
347
encoding_type = 'replace'
349
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
354
if file_ids_from is not None:
356
base_tree, base_path = WorkingTree.open_containing(
358
except errors.NoWorkingTree:
359
base_branch, base_path = Branch.open_containing(
361
base_tree = base_branch.basis_tree()
363
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
364
to_file=self.outf, should_print=(not is_quiet()))
366
action = bzrlib.add.AddAction(to_file=self.outf,
367
should_print=(not is_quiet()))
370
base_tree.lock_read()
372
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
373
action=action, save=not dry_run)
375
if base_tree is not None:
379
for glob in sorted(ignored.keys()):
380
for path in ignored[glob]:
381
self.outf.write("ignored %s matching \"%s\"\n"
385
for glob, paths in ignored.items():
386
match_len += len(paths)
387
self.outf.write("ignored %d file(s).\n" % match_len)
388
self.outf.write("If you wish to add some of these files,"
389
" please add them by name.\n")
392
class cmd_mkdir(Command):
393
"""Create a new versioned directory.
395
This is equivalent to creating the directory and then adding it.
398
takes_args = ['dir+']
399
encoding_type = 'replace'
401
def run(self, dir_list):
404
wt, dd = WorkingTree.open_containing(d)
406
self.outf.write('added %s\n' % d)
409
class cmd_relpath(Command):
410
"""Show path of a file relative to root"""
412
takes_args = ['filename']
416
def run(self, filename):
417
# TODO: jam 20050106 Can relpath return a munged path if
418
# sys.stdout encoding cannot represent it?
419
tree, relpath = WorkingTree.open_containing(filename)
420
self.outf.write(relpath)
421
self.outf.write('\n')
424
class cmd_inventory(Command):
425
"""Show inventory of the current working copy or a revision.
427
It is possible to limit the output to a particular entry
428
type using the --kind option. For example: --kind file.
430
It is also possible to restrict the list of files to a specific
431
set. For example: bzr inventory --show-ids this/file
438
takes_options = ['revision', 'show-ids', 'kind']
440
takes_args = ['file*']
443
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
444
if kind and kind not in ['file', 'directory', 'symlink']:
445
raise errors.BzrCommandError('invalid kind specified')
447
work_tree, file_list = tree_files(file_list)
448
work_tree.lock_read()
450
if revision is not None:
451
if len(revision) > 1:
452
raise errors.BzrCommandError(
453
'bzr inventory --revision takes exactly one revision'
455
revision_id = revision[0].in_history(work_tree.branch).rev_id
456
tree = work_tree.branch.repository.revision_tree(revision_id)
458
extra_trees = [work_tree]
464
if file_list is not None:
465
file_ids = tree.paths2ids(file_list, trees=extra_trees,
466
require_versioned=True)
467
# find_ids_across_trees may include some paths that don't
469
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
470
for file_id in file_ids if file_id in tree)
472
entries = tree.inventory.entries()
475
if tree is not work_tree:
478
for path, entry in entries:
479
if kind and kind != entry.kind:
482
self.outf.write('%-50s %s\n' % (path, entry.file_id))
484
self.outf.write(path)
485
self.outf.write('\n')
488
class cmd_mv(Command):
489
"""Move or rename a file.
492
bzr mv OLDNAME NEWNAME
493
bzr mv SOURCE... DESTINATION
495
If the last argument is a versioned directory, all the other names
496
are moved into it. Otherwise, there must be exactly two arguments
497
and the file is changed to a new name.
499
If OLDNAME does not exist on the filesystem but is versioned and
500
NEWNAME does exist on the filesystem but is not versioned, mv
501
assumes that the file has been manually moved and only updates
502
its internal inventory to reflect that change.
503
The same is valid when moving many SOURCE files to a DESTINATION.
505
Files cannot be moved between branches.
508
takes_args = ['names*']
509
takes_options = [Option("after", help="move only the bzr identifier"
510
" of the file (file has already been moved). Use this flag if"
511
" bzr is not able to detect this itself.")]
512
aliases = ['move', 'rename']
513
encoding_type = 'replace'
515
def run(self, names_list, after=False):
516
if names_list is None:
519
if len(names_list) < 2:
520
raise errors.BzrCommandError("missing file argument")
521
tree, rel_names = tree_files(names_list)
523
if os.path.isdir(names_list[-1]):
524
# move into existing directory
525
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
526
self.outf.write("%s => %s\n" % pair)
528
if len(names_list) != 2:
529
raise errors.BzrCommandError('to mv multiple files the'
530
' destination must be a versioned'
532
tree.rename_one(rel_names[0], rel_names[1], after=after)
533
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
536
class cmd_pull(Command):
537
"""Turn this branch into a mirror of another branch.
539
This command only works on branches that have not diverged. Branches are
540
considered diverged if the destination branch's most recent commit is one
541
that has not been merged (directly or indirectly) into the parent.
543
If branches have diverged, you can use 'bzr merge' to integrate the changes
544
from one into the other. Once one branch has merged, the other should
545
be able to pull it again.
547
If you want to forget your local changes and just update your branch to
548
match the remote one, use pull --overwrite.
550
If there is no default location set, the first pull will set it. After
551
that, you can omit the location to use the default. To change the
552
default, use --remember. The value will only be saved if the remote
553
location can be accessed.
556
takes_options = ['remember', 'overwrite', 'revision', 'verbose',
558
help='branch to pull into, '
559
'rather than the one containing the working directory',
564
takes_args = ['location?']
565
encoding_type = 'replace'
567
def run(self, location=None, remember=False, overwrite=False,
568
revision=None, verbose=False,
570
from bzrlib.tag import _merge_tags_if_possible
571
# FIXME: too much stuff is in the command class
572
if directory is None:
575
tree_to = WorkingTree.open_containing(directory)[0]
576
branch_to = tree_to.branch
577
except errors.NoWorkingTree:
579
branch_to = Branch.open_containing(directory)[0]
582
if location is not None:
584
reader = bundle.read_bundle_from_url(location)
585
except errors.NotABundle:
586
pass # Continue on considering this url a Branch
588
stored_loc = branch_to.get_parent()
590
if stored_loc is None:
591
raise errors.BzrCommandError("No pull location known or"
594
display_url = urlutils.unescape_for_display(stored_loc,
596
self.outf.write("Using saved location: %s\n" % display_url)
597
location = stored_loc
599
if reader is not None:
600
install_bundle(branch_to.repository, reader)
601
branch_from = branch_to
603
branch_from = Branch.open(location)
605
if branch_to.get_parent() is None or remember:
606
branch_to.set_parent(branch_from.base)
610
if reader is not None:
611
rev_id = reader.target
612
elif len(revision) == 1:
613
rev_id = revision[0].in_history(branch_from).rev_id
615
raise errors.BzrCommandError('bzr pull --revision takes one value.')
617
old_rh = branch_to.revision_history()
618
if tree_to is not None:
619
result = tree_to.pull(branch_from, overwrite, rev_id,
620
delta._ChangeReporter(unversioned_filter=tree_to.is_ignored))
622
result = branch_to.pull(branch_from, overwrite, rev_id)
624
result.report(self.outf)
626
from bzrlib.log import show_changed_revisions
627
new_rh = branch_to.revision_history()
628
show_changed_revisions(branch_to, old_rh, new_rh, to_file=self.outf)
631
class cmd_push(Command):
632
"""Update a mirror of this branch.
634
The target branch will not have its working tree populated because this
635
is both expensive, and is not supported on remote file systems.
637
Some smart servers or protocols *may* put the working tree in place in
640
This command only works on branches that have not diverged. Branches are
641
considered diverged if the destination branch's most recent commit is one
642
that has not been merged (directly or indirectly) by the source branch.
644
If branches have diverged, you can use 'bzr push --overwrite' to replace
645
the other branch completely, discarding its unmerged changes.
647
If you want to ensure you have the different changes in the other branch,
648
do a merge (see bzr help merge) from the other branch, and commit that.
649
After that you will be able to do a push without '--overwrite'.
651
If there is no default push location set, the first push will set it.
652
After that, you can omit the location to use the default. To change the
653
default, use --remember. The value will only be saved if the remote
654
location can be accessed.
657
takes_options = ['remember', 'overwrite', 'verbose',
658
Option('create-prefix',
659
help='Create the path leading up to the branch '
660
'if it does not already exist'),
662
help='branch to push from, '
663
'rather than the one containing the working directory',
667
Option('use-existing-dir',
668
help='By default push will fail if the target'
669
' directory exists, but does not already'
670
' have a control directory. This flag will'
671
' allow push to proceed.'),
673
takes_args = ['location?']
674
encoding_type = 'replace'
676
def run(self, location=None, remember=False, overwrite=False,
677
create_prefix=False, verbose=False,
678
use_existing_dir=False,
680
# FIXME: Way too big! Put this into a function called from the
682
if directory is None:
684
br_from = Branch.open_containing(directory)[0]
685
stored_loc = br_from.get_push_location()
687
if stored_loc is None:
688
raise errors.BzrCommandError("No push location known or specified.")
690
display_url = urlutils.unescape_for_display(stored_loc,
692
self.outf.write("Using saved location: %s\n" % display_url)
693
location = stored_loc
695
to_transport = transport.get_transport(location)
696
location_url = to_transport.base
698
br_to = repository_to = dir_to = None
700
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
701
except errors.NotBranchError:
702
pass # Didn't find anything
704
# If we can open a branch, use its direct repository, otherwise see
705
# if there is a repository without a branch.
707
br_to = dir_to.open_branch()
708
except errors.NotBranchError:
709
# Didn't find a branch, can we find a repository?
711
repository_to = dir_to.find_repository()
712
except errors.NoRepositoryPresent:
715
# Found a branch, so we must have found a repository
716
repository_to = br_to.repository
720
# The destination doesn't exist; create it.
721
# XXX: Refactor the create_prefix/no_create_prefix code into a
722
# common helper function
724
to_transport.mkdir('.')
725
except errors.FileExists:
726
if not use_existing_dir:
727
raise errors.BzrCommandError("Target directory %s"
728
" already exists, but does not have a valid .bzr"
729
" directory. Supply --use-existing-dir to push"
730
" there anyway." % location)
731
except errors.NoSuchFile:
732
if not create_prefix:
733
raise errors.BzrCommandError("Parent directory of %s"
735
"\nYou may supply --create-prefix to create all"
736
" leading parent directories."
739
cur_transport = to_transport
740
needed = [cur_transport]
741
# Recurse upwards until we can create a directory successfully
743
new_transport = cur_transport.clone('..')
744
if new_transport.base == cur_transport.base:
745
raise errors.BzrCommandError("Failed to create path"
749
new_transport.mkdir('.')
750
except errors.NoSuchFile:
751
needed.append(new_transport)
752
cur_transport = new_transport
756
# Now we only need to create child directories
758
cur_transport = needed.pop()
759
cur_transport.mkdir('.')
761
# Now the target directory exists, but doesn't have a .bzr
762
# directory. So we need to create it, along with any work to create
763
# all of the dependent branches, etc.
764
dir_to = br_from.bzrdir.clone(location_url,
765
revision_id=br_from.last_revision())
766
br_to = dir_to.open_branch()
767
# TODO: Some more useful message about what was copied
768
note('Created new branch.')
769
# We successfully created the target, remember it
770
if br_from.get_push_location() is None or remember:
771
br_from.set_push_location(br_to.base)
772
elif repository_to is None:
773
# we have a bzrdir but no branch or repository
774
# XXX: Figure out what to do other than complain.
775
raise errors.BzrCommandError("At %s you have a valid .bzr control"
776
" directory, but not a branch or repository. This is an"
777
" unsupported configuration. Please move the target directory"
778
" out of the way and try again."
781
# We have a repository but no branch, copy the revisions, and then
783
last_revision_id = br_from.last_revision()
784
repository_to.fetch(br_from.repository,
785
revision_id=last_revision_id)
786
br_to = br_from.clone(dir_to, revision_id=last_revision_id)
787
note('Created new branch.')
788
if br_from.get_push_location() is None or remember:
789
br_from.set_push_location(br_to.base)
790
else: # We have a valid to branch
791
# We were able to connect to the remote location, so remember it
792
# we don't need to successfully push because of possible divergence.
793
if br_from.get_push_location() is None or remember:
794
br_from.set_push_location(br_to.base)
795
old_rh = br_to.revision_history()
798
tree_to = dir_to.open_workingtree()
799
except errors.NotLocalUrl:
800
warning('This transport does not update the working '
801
'tree of: %s' % (br_to.base,))
802
push_result = br_from.push(br_to, overwrite)
803
except errors.NoWorkingTree:
804
push_result = br_from.push(br_to, overwrite)
808
push_result = br_from.push(tree_to.branch, overwrite)
812
except errors.DivergedBranches:
813
raise errors.BzrCommandError('These branches have diverged.'
814
' Try using "merge" and then "push".')
815
if push_result is not None:
816
push_result.report(self.outf)
818
new_rh = br_to.revision_history()
821
from bzrlib.log import show_changed_revisions
822
show_changed_revisions(br_to, old_rh, new_rh,
825
# we probably did a clone rather than a push, so a message was
830
class cmd_branch(Command):
831
"""Create a new copy of a branch.
833
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
834
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
836
To retrieve the branch as of a particular revision, supply the --revision
837
parameter, as in "branch foo/bar -r 5".
839
--basis is to speed up branching from remote branches. When specified, it
840
copies all the file-contents, inventory and revision data from the basis
841
branch before copying anything from the remote branch.
843
takes_args = ['from_location', 'to_location?']
844
takes_options = ['revision', 'basis']
845
aliases = ['get', 'clone']
847
def run(self, from_location, to_location=None, revision=None, basis=None):
848
from bzrlib.tag import _merge_tags_if_possible
851
elif len(revision) > 1:
852
raise errors.BzrCommandError(
853
'bzr branch --revision takes exactly 1 revision value')
855
br_from = Branch.open(from_location)
858
if basis is not None:
859
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
862
if len(revision) == 1 and revision[0] is not None:
863
revision_id = revision[0].in_history(br_from)[1]
865
# FIXME - wt.last_revision, fallback to branch, fall back to
866
# None or perhaps NULL_REVISION to mean copy nothing
868
revision_id = br_from.last_revision()
869
if to_location is None:
870
to_location = os.path.basename(from_location.rstrip("/\\"))
873
name = os.path.basename(to_location) + '\n'
875
to_transport = transport.get_transport(to_location)
877
to_transport.mkdir('.')
878
except errors.FileExists:
879
raise errors.BzrCommandError('Target directory "%s" already'
880
' exists.' % to_location)
881
except errors.NoSuchFile:
882
raise errors.BzrCommandError('Parent of "%s" does not exist.'
885
# preserve whatever source format we have.
886
dir = br_from.bzrdir.sprout(to_transport.base,
887
revision_id, basis_dir)
888
branch = dir.open_branch()
889
except errors.NoSuchRevision:
890
to_transport.delete_tree('.')
891
msg = "The branch %s has no revision %s." % (from_location, revision[0])
892
raise errors.BzrCommandError(msg)
893
except errors.UnlistableBranch:
894
osutils.rmtree(to_location)
895
msg = "The branch %s cannot be used as a --basis" % (basis,)
896
raise errors.BzrCommandError(msg)
898
branch.control_files.put_utf8('branch-name', name)
899
_merge_tags_if_possible(br_from, branch)
900
note('Branched %d revision(s).' % branch.revno())
905
class cmd_checkout(Command):
906
"""Create a new checkout of an existing branch.
908
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
909
the branch found in '.'. This is useful if you have removed the working tree
910
or if it was never created - i.e. if you pushed the branch to its current
913
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
914
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
916
To retrieve the branch as of a particular revision, supply the --revision
917
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
918
out of date [so you cannot commit] but it may be useful (i.e. to examine old
921
See "help checkouts" for more information on checkouts.
923
takes_args = ['branch_location?', 'to_location?']
924
takes_options = ['revision', # , 'basis']
925
Option('lightweight',
926
help="perform a lightweight checkout. Lightweight "
927
"checkouts depend on access to the branch for "
928
"every operation. Normal checkouts can perform "
929
"common operations like diff and status without "
930
"such access, and also support local commits."
935
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
939
elif len(revision) > 1:
940
raise errors.BzrCommandError(
941
'bzr checkout --revision takes exactly 1 revision value')
942
if branch_location is None:
943
branch_location = osutils.getcwd()
944
to_location = branch_location
945
source = Branch.open(branch_location)
946
if len(revision) == 1 and revision[0] is not None:
947
revision_id = revision[0].in_history(source)[1]
950
if to_location is None:
951
to_location = os.path.basename(branch_location.rstrip("/\\"))
952
# if the source and to_location are the same,
953
# and there is no working tree,
954
# then reconstitute a branch
955
if (osutils.abspath(to_location) ==
956
osutils.abspath(branch_location)):
958
source.bzrdir.open_workingtree()
959
except errors.NoWorkingTree:
960
source.bzrdir.create_workingtree()
963
os.mkdir(to_location)
965
if e.errno == errno.EEXIST:
966
raise errors.BzrCommandError('Target directory "%s" already'
967
' exists.' % to_location)
968
if e.errno == errno.ENOENT:
969
raise errors.BzrCommandError('Parent of "%s" does not exist.'
973
source.create_checkout(to_location, revision_id, lightweight)
976
class cmd_renames(Command):
977
"""Show list of renamed files.
979
# TODO: Option to show renames between two historical versions.
981
# TODO: Only show renames under dir, rather than in the whole branch.
982
takes_args = ['dir?']
985
def run(self, dir=u'.'):
986
tree = WorkingTree.open_containing(dir)[0]
989
new_inv = tree.inventory
990
old_tree = tree.basis_tree()
993
old_inv = old_tree.inventory
994
renames = list(_mod_tree.find_renames(old_inv, new_inv))
996
for old_name, new_name in renames:
997
self.outf.write("%s => %s\n" % (old_name, new_name))
1004
class cmd_update(Command):
1005
"""Update a tree to have the latest code committed to its branch.
1007
This will perform a merge into the working tree, and may generate
1008
conflicts. If you have any local changes, you will still
1009
need to commit them after the update for the update to be complete.
1011
If you want to discard your local changes, you can just do a
1012
'bzr revert' instead of 'bzr commit' after the update.
1014
takes_args = ['dir?']
1017
def run(self, dir='.'):
1018
tree = WorkingTree.open_containing(dir)[0]
1019
master = tree.branch.get_master_branch()
1020
if master is not None:
1023
tree.lock_tree_write()
1025
existing_pending_merges = tree.get_parent_ids()[1:]
1026
last_rev = tree.last_revision()
1027
if last_rev == tree.branch.last_revision():
1028
# may be up to date, check master too.
1029
master = tree.branch.get_master_branch()
1030
if master is None or last_rev == master.last_revision():
1031
revno = tree.branch.revision_id_to_revno(last_rev)
1032
note("Tree is up to date at revision %d." % (revno,))
1034
conflicts = tree.update()
1035
revno = tree.branch.revision_id_to_revno(tree.last_revision())
1036
note('Updated to revision %d.' % (revno,))
1037
if tree.get_parent_ids()[1:] != existing_pending_merges:
1038
note('Your local commits will now show as pending merges with '
1039
"'bzr status', and can be committed with 'bzr commit'.")
1048
class cmd_info(Command):
1049
"""Show information about a working tree, branch or repository.
1051
This command will show all known locations and formats associated to the
1052
tree, branch or repository. Statistical information is included with
1055
Branches and working trees will also report any missing revisions.
1057
takes_args = ['location?']
1058
takes_options = ['verbose']
1061
def run(self, location=None, verbose=False):
1062
from bzrlib.info import show_bzrdir_info
1063
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1067
class cmd_remove(Command):
1068
"""Make a file unversioned.
1070
This makes bzr stop tracking changes to a versioned file. It does
1071
not delete the working copy.
1073
You can specify one or more files, and/or --new. If you specify --new,
1074
only 'added' files will be removed. If you specify both, then new files
1075
in the specified directories will be removed. If the directories are
1076
also new, they will also be removed.
1078
takes_args = ['file*']
1079
takes_options = ['verbose', Option('new', help='remove newly-added files')]
1081
encoding_type = 'replace'
1083
def run(self, file_list, verbose=False, new=False):
1084
tree, file_list = tree_files(file_list)
1086
if file_list is None:
1087
raise errors.BzrCommandError('Specify one or more files to'
1088
' remove, or use --new.')
1090
added = tree.changes_from(tree.basis_tree(),
1091
specific_files=file_list).added
1092
file_list = sorted([f[0] for f in added], reverse=True)
1093
if len(file_list) == 0:
1094
raise errors.BzrCommandError('No matching files.')
1095
tree.remove(file_list, verbose=verbose, to_file=self.outf)
1098
class cmd_file_id(Command):
1099
"""Print file_id of a particular file or directory.
1101
The file_id is assigned when the file is first added and remains the
1102
same through all revisions where the file exists, even when it is
1107
takes_args = ['filename']
1110
def run(self, filename):
1111
tree, relpath = WorkingTree.open_containing(filename)
1112
i = tree.path2id(relpath)
1114
raise errors.NotVersionedError(filename)
1116
self.outf.write(i + '\n')
1119
class cmd_file_path(Command):
1120
"""Print path of file_ids to a file or directory.
1122
This prints one line for each directory down to the target,
1123
starting at the branch root.
1127
takes_args = ['filename']
1130
def run(self, filename):
1131
tree, relpath = WorkingTree.open_containing(filename)
1132
fid = tree.path2id(relpath)
1134
raise errors.NotVersionedError(filename)
1135
segments = osutils.splitpath(relpath)
1136
for pos in range(1, len(segments) + 1):
1137
path = osutils.joinpath(segments[:pos])
1138
self.outf.write("%s\n" % tree.path2id(path))
1141
class cmd_reconcile(Command):
1142
"""Reconcile bzr metadata in a branch.
1144
This can correct data mismatches that may have been caused by
1145
previous ghost operations or bzr upgrades. You should only
1146
need to run this command if 'bzr check' or a bzr developer
1147
advises you to run it.
1149
If a second branch is provided, cross-branch reconciliation is
1150
also attempted, which will check that data like the tree root
1151
id which was not present in very early bzr versions is represented
1152
correctly in both branches.
1154
At the same time it is run it may recompress data resulting in
1155
a potential saving in disk space or performance gain.
1157
The branch *MUST* be on a listable system such as local disk or sftp.
1159
takes_args = ['branch?']
1161
def run(self, branch="."):
1162
from bzrlib.reconcile import reconcile
1163
dir = bzrdir.BzrDir.open(branch)
1167
class cmd_revision_history(Command):
1168
"""Display the list of revision ids on a branch."""
1169
takes_args = ['location?']
1174
def run(self, location="."):
1175
branch = Branch.open_containing(location)[0]
1176
for revid in branch.revision_history():
1177
self.outf.write(revid)
1178
self.outf.write('\n')
1181
class cmd_ancestry(Command):
1182
"""List all revisions merged into this branch."""
1183
takes_args = ['location?']
1188
def run(self, location="."):
1190
wt = WorkingTree.open_containing(location)[0]
1191
except errors.NoWorkingTree:
1192
b = Branch.open(location)
1193
last_revision = b.last_revision()
1196
last_revision = wt.last_revision()
1198
revision_ids = b.repository.get_ancestry(last_revision)
1199
assert revision_ids[0] is None
1201
for revision_id in revision_ids:
1202
self.outf.write(revision_id + '\n')
1205
class cmd_init(Command):
1206
"""Make a directory into a versioned branch.
1208
Use this to create an empty branch, or before importing an
1211
If there is a repository in a parent directory of the location, then
1212
the history of the branch will be stored in the repository. Otherwise
1213
init creates a standalone branch which carries its own history in
1216
If there is already a branch at the location but it has no working tree,
1217
the tree can be populated with 'bzr checkout'.
1219
Recipe for importing a tree of files:
1224
bzr commit -m 'imported project'
1226
takes_args = ['location?']
1228
RegistryOption('format',
1229
help='Specify a format for this branch. '
1230
'See "help formats".',
1231
registry=bzrdir.format_registry,
1232
converter=bzrdir.format_registry.make_bzrdir,
1233
value_switches=True,
1234
title="Branch Format",
1236
Option('append-revisions-only',
1237
help='Never change revnos or the existing log.'
1238
' Append revisions to it only.')
1240
def run(self, location=None, format=None, append_revisions_only=False):
1242
format = bzrdir.format_registry.make_bzrdir('default')
1243
if location is None:
1246
to_transport = transport.get_transport(location)
1248
# The path has to exist to initialize a
1249
# branch inside of it.
1250
# Just using os.mkdir, since I don't
1251
# believe that we want to create a bunch of
1252
# locations if the user supplies an extended path
1253
# TODO: create-prefix
1255
to_transport.mkdir('.')
1256
except errors.FileExists:
1260
existing_bzrdir = bzrdir.BzrDir.open(location)
1261
except errors.NotBranchError:
1262
# really a NotBzrDir error...
1263
branch = bzrdir.BzrDir.create_branch_convenience(to_transport.base,
1266
from bzrlib.transport.local import LocalTransport
1267
if existing_bzrdir.has_branch():
1268
if (isinstance(to_transport, LocalTransport)
1269
and not existing_bzrdir.has_workingtree()):
1270
raise errors.BranchExistsWithoutWorkingTree(location)
1271
raise errors.AlreadyBranchError(location)
1273
branch = existing_bzrdir.create_branch()
1274
existing_bzrdir.create_workingtree()
1275
if append_revisions_only:
1277
branch.set_append_revisions_only(True)
1278
except errors.UpgradeRequired:
1279
raise errors.BzrCommandError('This branch format cannot be set'
1280
' to append-revisions-only. Try --experimental-branch6')
1283
class cmd_init_repository(Command):
1284
"""Create a shared repository to hold branches.
1286
New branches created under the repository directory will store their revisions
1287
in the repository, not in the branch directory.
1290
bzr init-repo --no-trees repo
1292
bzr checkout --lightweight repo/trunk trunk-checkout
1297
takes_args = ["location"]
1298
takes_options = [RegistryOption('format',
1299
help='Specify a format for this repository. See'
1300
' "bzr help formats" for details',
1301
registry=bzrdir.format_registry,
1302
converter=bzrdir.format_registry.make_bzrdir,
1303
value_switches=True, title='Repository format'),
1305
help='Branches in the repository will default to'
1306
' not having a working tree'),
1308
aliases = ["init-repo"]
1310
def run(self, location, format=None, no_trees=False):
1312
format = bzrdir.format_registry.make_bzrdir('default')
1314
if location is None:
1317
to_transport = transport.get_transport(location)
1319
to_transport.mkdir('.')
1320
except errors.FileExists:
1323
newdir = format.initialize_on_transport(to_transport)
1324
repo = newdir.create_repository(shared=True)
1325
repo.set_make_working_trees(not no_trees)
1328
class cmd_diff(Command):
1329
"""Show differences in the working tree or between revisions.
1331
If files are listed, only the changes in those files are listed.
1332
Otherwise, all changes for the tree are listed.
1334
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1335
produces patches suitable for "patch -p1".
1339
Shows the difference in the working tree versus the last commit
1341
Difference between the working tree and revision 1
1343
Difference between revision 2 and revision 1
1344
bzr diff --prefix old/:new/
1345
Same as 'bzr diff' but prefix paths with old/ and new/
1346
bzr diff bzr.mine bzr.dev
1347
Show the differences between the two working trees
1349
Show just the differences for 'foo.c'
1351
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1352
# or a graphical diff.
1354
# TODO: Python difflib is not exactly the same as unidiff; should
1355
# either fix it up or prefer to use an external diff.
1357
# TODO: Selected-file diff is inefficient and doesn't show you
1360
# TODO: This probably handles non-Unix newlines poorly.
1362
takes_args = ['file*']
1363
takes_options = ['revision', 'diff-options',
1364
Option('prefix', type=str,
1366
help='Set prefixes to added to old and new filenames, as '
1367
'two values separated by a colon. (eg "old/:new/")'),
1369
aliases = ['di', 'dif']
1370
encoding_type = 'exact'
1373
def run(self, revision=None, file_list=None, diff_options=None,
1375
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1377
if (prefix is None) or (prefix == '0'):
1385
old_label, new_label = prefix.split(":")
1387
raise errors.BzrCommandError(
1388
'--prefix expects two values separated by a colon'
1389
' (eg "old/:new/")')
1391
if revision and len(revision) > 2:
1392
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1393
' one or two revision specifiers')
1396
tree1, file_list = internal_tree_files(file_list)
1400
except errors.FileInWrongBranch:
1401
if len(file_list) != 2:
1402
raise errors.BzrCommandError("Files are in different branches")
1404
tree1, file1 = WorkingTree.open_containing(file_list[0])
1405
tree2, file2 = WorkingTree.open_containing(file_list[1])
1406
if file1 != "" or file2 != "":
1407
# FIXME diff those two files. rbc 20051123
1408
raise errors.BzrCommandError("Files are in different branches")
1410
except errors.NotBranchError:
1411
if (revision is not None and len(revision) == 2
1412
and not revision[0].needs_branch()
1413
and not revision[1].needs_branch()):
1414
# If both revision specs include a branch, we can
1415
# diff them without needing a local working tree
1416
tree1, tree2 = None, None
1420
if tree2 is not None:
1421
if revision is not None:
1422
# FIXME: but there should be a clean way to diff between
1423
# non-default versions of two trees, it's not hard to do
1425
raise errors.BzrCommandError(
1426
"Sorry, diffing arbitrary revisions across branches "
1427
"is not implemented yet")
1428
return show_diff_trees(tree1, tree2, sys.stdout,
1429
specific_files=file_list,
1430
external_diff_options=diff_options,
1431
old_label=old_label, new_label=new_label)
1433
return diff_cmd_helper(tree1, file_list, diff_options,
1434
revision_specs=revision,
1435
old_label=old_label, new_label=new_label)
1438
class cmd_deleted(Command):
1439
"""List files deleted in the working tree.
1441
# TODO: Show files deleted since a previous revision, or
1442
# between two revisions.
1443
# TODO: Much more efficient way to do this: read in new
1444
# directories with readdir, rather than stating each one. Same
1445
# level of effort but possibly much less IO. (Or possibly not,
1446
# if the directories are very large...)
1447
takes_options = ['show-ids']
1450
def run(self, show_ids=False):
1451
tree = WorkingTree.open_containing(u'.')[0]
1454
old = tree.basis_tree()
1457
for path, ie in old.inventory.iter_entries():
1458
if not tree.has_id(ie.file_id):
1459
self.outf.write(path)
1461
self.outf.write(' ')
1462
self.outf.write(ie.file_id)
1463
self.outf.write('\n')
1470
class cmd_modified(Command):
1471
"""List files modified in working tree.
1473
See also: "bzr status".
1480
tree = WorkingTree.open_containing(u'.')[0]
1481
td = tree.changes_from(tree.basis_tree())
1482
for path, id, kind, text_modified, meta_modified in td.modified:
1483
self.outf.write(path + '\n')
1486
class cmd_added(Command):
1487
"""List files added in working tree.
1489
See also: "bzr status".
1496
wt = WorkingTree.open_containing(u'.')[0]
1499
basis = wt.basis_tree()
1502
basis_inv = basis.inventory
1505
if file_id in basis_inv:
1507
if inv.is_root(file_id) and len(basis_inv) == 0:
1509
path = inv.id2path(file_id)
1510
if not os.access(osutils.abspath(path), os.F_OK):
1512
self.outf.write(path + '\n')
1519
class cmd_root(Command):
1520
"""Show the tree root directory.
1522
The root is the nearest enclosing directory with a .bzr control
1524
takes_args = ['filename?']
1526
def run(self, filename=None):
1527
"""Print the branch root."""
1528
tree = WorkingTree.open_containing(filename)[0]
1529
self.outf.write(tree.basedir + '\n')
1532
class cmd_log(Command):
1533
"""Show log of a branch, file, or directory.
1535
By default show the log of the branch containing the working directory.
1537
To request a range of logs, you can use the command -r begin..end
1538
-r revision requests a specific revision, -r ..end or -r begin.. are
1544
bzr log -r -10.. http://server/branch
1547
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1549
takes_args = ['location?']
1550
takes_options = [Option('forward',
1551
help='show from oldest to newest'),
1555
help='show files changed in each revision'),
1556
'show-ids', 'revision',
1560
help='show revisions whose message matches this regexp',
1563
encoding_type = 'replace'
1566
def run(self, location=None, timezone='original',
1573
from bzrlib.log import show_log
1574
assert message is None or isinstance(message, basestring), \
1575
"invalid message argument %r" % message
1576
direction = (forward and 'forward') or 'reverse'
1581
# find the file id to log:
1583
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1587
tree = b.basis_tree()
1588
file_id = tree.path2id(fp)
1590
raise errors.BzrCommandError(
1591
"Path does not have any revision history: %s" %
1595
# FIXME ? log the current subdir only RBC 20060203
1596
if revision is not None \
1597
and len(revision) > 0 and revision[0].get_branch():
1598
location = revision[0].get_branch()
1601
dir, relpath = bzrdir.BzrDir.open_containing(location)
1602
b = dir.open_branch()
1606
if revision is None:
1609
elif len(revision) == 1:
1610
rev1 = rev2 = revision[0].in_history(b).revno
1611
elif len(revision) == 2:
1612
if revision[1].get_branch() != revision[0].get_branch():
1613
# b is taken from revision[0].get_branch(), and
1614
# show_log will use its revision_history. Having
1615
# different branches will lead to weird behaviors.
1616
raise errors.BzrCommandError(
1617
"Log doesn't accept two revisions in different"
1619
if revision[0].spec is None:
1620
# missing begin-range means first revision
1623
rev1 = revision[0].in_history(b).revno
1625
if revision[1].spec is None:
1626
# missing end-range means last known revision
1629
rev2 = revision[1].in_history(b).revno
1631
raise errors.BzrCommandError(
1632
'bzr log --revision takes one or two values.')
1634
# By this point, the revision numbers are converted to the +ve
1635
# form if they were supplied in the -ve form, so we can do
1636
# this comparison in relative safety
1638
(rev2, rev1) = (rev1, rev2)
1640
if log_format is None:
1641
log_format = log.log_formatter_registry.get_default(b)
1643
lf = log_format(show_ids=show_ids, to_file=self.outf,
1644
show_timezone=timezone)
1650
direction=direction,
1651
start_revision=rev1,
1658
def get_log_format(long=False, short=False, line=False, default='long'):
1659
log_format = default
1663
log_format = 'short'
1669
class cmd_touching_revisions(Command):
1670
"""Return revision-ids which affected a particular file.
1672
A more user-friendly interface is "bzr log FILE".
1676
takes_args = ["filename"]
1679
def run(self, filename):
1680
tree, relpath = WorkingTree.open_containing(filename)
1682
file_id = tree.path2id(relpath)
1683
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1684
self.outf.write("%6d %s\n" % (revno, what))
1687
class cmd_ls(Command):
1688
"""List files in a tree.
1691
takes_args = ['path?']
1692
# TODO: Take a revision or remote path and list that tree instead.
1693
takes_options = ['verbose', 'revision',
1694
Option('non-recursive',
1695
help='don\'t recurse into sub-directories'),
1697
help='Print all paths from the root of the branch.'),
1698
Option('unknown', help='Print unknown files'),
1699
Option('versioned', help='Print versioned files'),
1700
Option('ignored', help='Print ignored files'),
1702
Option('null', help='Null separate the files'),
1706
def run(self, revision=None, verbose=False,
1707
non_recursive=False, from_root=False,
1708
unknown=False, versioned=False, ignored=False,
1709
null=False, kind=None, show_ids=False, path=None):
1711
if kind and kind not in ('file', 'directory', 'symlink'):
1712
raise errors.BzrCommandError('invalid kind specified')
1714
if verbose and null:
1715
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1716
all = not (unknown or versioned or ignored)
1718
selection = {'I':ignored, '?':unknown, 'V':versioned}
1725
raise errors.BzrCommandError('cannot specify both --from-root'
1729
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1735
if revision is not None:
1736
tree = branch.repository.revision_tree(
1737
revision[0].in_history(branch).rev_id)
1739
tree = branch.basis_tree()
1743
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1744
if fp.startswith(relpath):
1745
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1746
if non_recursive and '/' in fp:
1748
if not all and not selection[fc]:
1750
if kind is not None and fkind != kind:
1753
kindch = entry.kind_character()
1754
outstring = '%-8s %s%s' % (fc, fp, kindch)
1755
if show_ids and fid is not None:
1756
outstring = "%-50s %s" % (outstring, fid)
1757
self.outf.write(outstring + '\n')
1759
self.outf.write(fp + '\0')
1762
self.outf.write(fid)
1763
self.outf.write('\0')
1771
self.outf.write('%-50s %s\n' % (fp, my_id))
1773
self.outf.write(fp + '\n')
1778
class cmd_unknowns(Command):
1779
"""List unknown files.
1781
See also: "bzr ls --unknown".
1788
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1789
self.outf.write(osutils.quotefn(f) + '\n')
1792
class cmd_ignore(Command):
1793
"""Ignore specified files or patterns.
1795
To remove patterns from the ignore list, edit the .bzrignore file.
1797
Trailing slashes on patterns are ignored.
1798
If the pattern contains a slash or is a regular expression, it is compared
1799
to the whole path from the branch root. Otherwise, it is compared to only
1800
the last component of the path. To match a file only in the root
1801
directory, prepend './'.
1803
Ignore patterns specifying absolute paths are not allowed.
1805
Ignore patterns may include globbing wildcards such as:
1806
? - Matches any single character except '/'
1807
* - Matches 0 or more characters except '/'
1808
/**/ - Matches 0 or more directories in a path
1809
[a-z] - Matches a single character from within a group of characters
1811
Ignore patterns may also be Python regular expressions.
1812
Regular expression ignore patterns are identified by a 'RE:' prefix
1813
followed by the regular expression. Regular expression ignore patterns
1814
may not include named or numbered groups.
1816
Note: ignore patterns containing shell wildcards must be quoted from
1820
bzr ignore ./Makefile
1821
bzr ignore '*.class'
1822
bzr ignore 'lib/**/*.o'
1823
bzr ignore 'RE:lib/.*\.o'
1825
takes_args = ['name_pattern*']
1827
Option('old-default-rules',
1828
help='Out the ignore rules bzr < 0.9 always used.')
1831
def run(self, name_pattern_list=None, old_default_rules=None):
1832
from bzrlib.atomicfile import AtomicFile
1833
if old_default_rules is not None:
1834
# dump the rules and exit
1835
for pattern in ignores.OLD_DEFAULTS:
1838
if not name_pattern_list:
1839
raise errors.BzrCommandError("ignore requires at least one "
1840
"NAME_PATTERN or --old-default-rules")
1841
name_pattern_list = [globbing.normalize_pattern(p)
1842
for p in name_pattern_list]
1843
for name_pattern in name_pattern_list:
1844
if (name_pattern[0] == '/' or
1845
(len(name_pattern) > 1 and name_pattern[1] == ':')):
1846
raise errors.BzrCommandError(
1847
"NAME_PATTERN should not be an absolute path")
1848
tree, relpath = WorkingTree.open_containing(u'.')
1849
ifn = tree.abspath('.bzrignore')
1850
if os.path.exists(ifn):
1853
igns = f.read().decode('utf-8')
1859
# TODO: If the file already uses crlf-style termination, maybe
1860
# we should use that for the newly added lines?
1862
if igns and igns[-1] != '\n':
1864
for name_pattern in name_pattern_list:
1865
igns += name_pattern + '\n'
1867
f = AtomicFile(ifn, 'wb')
1869
f.write(igns.encode('utf-8'))
1874
if not tree.path2id('.bzrignore'):
1875
tree.add(['.bzrignore'])
1878
class cmd_ignored(Command):
1879
"""List ignored files and the patterns that matched them.
1881
See also: bzr ignore"""
1884
tree = WorkingTree.open_containing(u'.')[0]
1887
for path, file_class, kind, file_id, entry in tree.list_files():
1888
if file_class != 'I':
1890
## XXX: Slightly inefficient since this was already calculated
1891
pat = tree.is_ignored(path)
1892
print '%-50s %s' % (path, pat)
1897
class cmd_lookup_revision(Command):
1898
"""Lookup the revision-id from a revision-number
1901
bzr lookup-revision 33
1904
takes_args = ['revno']
1907
def run(self, revno):
1911
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1913
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1916
class cmd_export(Command):
1917
"""Export current or past revision to a destination directory or archive.
1919
If no revision is specified this exports the last committed revision.
1921
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1922
given, try to find the format with the extension. If no extension
1923
is found exports to a directory (equivalent to --format=dir).
1925
Root may be the top directory for tar, tgz and tbz2 formats. If none
1926
is given, the top directory will be the root name of the file.
1928
If branch is omitted then the branch containing the current working directory will be used.
1930
Note: export of tree with non-ascii filenames to zip is not supported.
1932
Supported formats Autodetected by extension
1933
----------------- -------------------------
1936
tbz2 .tar.bz2, .tbz2
1940
takes_args = ['dest', 'branch?']
1941
takes_options = ['revision', 'format', 'root']
1942
def run(self, dest, branch=None, revision=None, format=None, root=None):
1943
from bzrlib.export import export
1946
tree = WorkingTree.open_containing(u'.')[0]
1949
b = Branch.open(branch)
1951
if revision is None:
1952
# should be tree.last_revision FIXME
1953
rev_id = b.last_revision()
1955
if len(revision) != 1:
1956
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
1957
rev_id = revision[0].in_history(b).rev_id
1958
t = b.repository.revision_tree(rev_id)
1960
export(t, dest, format, root)
1961
except errors.NoSuchExportFormat, e:
1962
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1965
class cmd_cat(Command):
1966
"""Write the contents of a file as of a given revision to standard output.
1968
If no revision is nominated, the last revision is used.
1970
Take care to redirect standard output when using this command on a binary file.
1973
takes_options = ['revision', 'name-from-revision']
1974
takes_args = ['filename']
1975
encoding_type = 'exact'
1978
def run(self, filename, revision=None, name_from_revision=False):
1979
if revision is not None and len(revision) != 1:
1980
raise errors.BzrCommandError("bzr cat --revision takes exactly"
1985
tree, b, relpath = \
1986
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
1987
except errors.NotBranchError:
1990
if revision is not None and revision[0].get_branch() is not None:
1991
b = Branch.open(revision[0].get_branch())
1993
tree = b.basis_tree()
1994
if revision is None:
1995
revision_id = b.last_revision()
1997
revision_id = revision[0].in_history(b).rev_id
1999
cur_file_id = tree.path2id(relpath)
2000
rev_tree = b.repository.revision_tree(revision_id)
2001
old_file_id = rev_tree.path2id(relpath)
2003
if name_from_revision:
2004
if old_file_id is None:
2005
raise errors.BzrCommandError("%r is not present in revision %s"
2006
% (filename, revision_id))
2008
rev_tree.print_file(old_file_id)
2009
elif cur_file_id is not None:
2010
rev_tree.print_file(cur_file_id)
2011
elif old_file_id is not None:
2012
rev_tree.print_file(old_file_id)
2014
raise errors.BzrCommandError("%r is not present in revision %s" %
2015
(filename, revision_id))
2018
class cmd_local_time_offset(Command):
2019
"""Show the offset in seconds from GMT to local time."""
2023
print osutils.local_time_offset()
2027
class cmd_commit(Command):
2028
"""Commit changes into a new revision.
2030
If no arguments are given, the entire tree is committed.
2032
If selected files are specified, only changes to those files are
2033
committed. If a directory is specified then the directory and everything
2034
within it is committed.
2036
A selected-file commit may fail in some cases where the committed
2037
tree would be invalid, such as trying to commit a file in a
2038
newly-added directory that is not itself committed.
2040
# TODO: Run hooks on tree to-be-committed, and after commit.
2042
# TODO: Strict commit that fails if there are deleted files.
2043
# (what does "deleted files" mean ??)
2045
# TODO: Give better message for -s, --summary, used by tla people
2047
# XXX: verbose currently does nothing
2049
takes_args = ['selected*']
2050
takes_options = ['message', 'verbose',
2052
help='commit even if nothing has changed'),
2053
Option('file', type=str,
2056
help='file containing commit message'),
2058
help="refuse to commit if there are unknown "
2059
"files in the working tree."),
2061
help="perform a local only commit in a bound "
2062
"branch. Such commits are not pushed to "
2063
"the master branch until a normal commit "
2067
aliases = ['ci', 'checkin']
2069
def run(self, message=None, file=None, verbose=True, selected_list=None,
2070
unchanged=False, strict=False, local=False):
2071
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
2072
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
2074
from bzrlib.msgeditor import edit_commit_message, \
2075
make_commit_message_template
2077
# TODO: Need a blackbox test for invoking the external editor; may be
2078
# slightly problematic to run this cross-platform.
2080
# TODO: do more checks that the commit will succeed before
2081
# spending the user's valuable time typing a commit message.
2082
tree, selected_list = tree_files(selected_list)
2083
if selected_list == ['']:
2084
# workaround - commit of root of tree should be exactly the same
2085
# as just default commit in that tree, and succeed even though
2086
# selected-file merge commit is not done yet
2089
if local and not tree.branch.get_bound_location():
2090
raise errors.LocalRequiresBoundBranch()
2092
def get_message(commit_obj):
2093
"""Callback to get commit message"""
2094
my_message = message
2095
if my_message is None and not file:
2096
template = make_commit_message_template(tree, selected_list)
2097
my_message = edit_commit_message(template)
2098
if my_message is None:
2099
raise errors.BzrCommandError("please specify a commit"
2100
" message with either --message or --file")
2101
elif my_message and file:
2102
raise errors.BzrCommandError(
2103
"please specify either --message or --file")
2105
my_message = codecs.open(file, 'rt',
2106
bzrlib.user_encoding).read()
2107
if my_message == "":
2108
raise errors.BzrCommandError("empty commit message specified")
2112
reporter = ReportCommitToLog()
2114
reporter = NullCommitReporter()
2117
tree.commit(message_callback=get_message,
2118
specific_files=selected_list,
2119
allow_pointless=unchanged, strict=strict, local=local,
2121
except PointlessCommit:
2122
# FIXME: This should really happen before the file is read in;
2123
# perhaps prepare the commit; get the message; then actually commit
2124
raise errors.BzrCommandError("no changes to commit."
2125
" use --unchanged to commit anyhow")
2126
except ConflictsInTree:
2127
raise errors.BzrCommandError('Conflicts detected in working '
2128
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2130
except StrictCommitFailed:
2131
raise errors.BzrCommandError("Commit refused because there are"
2132
" unknown files in the working tree.")
2133
except errors.BoundBranchOutOfDate, e:
2134
raise errors.BzrCommandError(str(e) + "\n"
2135
'To commit to master branch, run update and then commit.\n'
2136
'You can also pass --local to commit to continue working '
2140
class cmd_check(Command):
2141
"""Validate consistency of branch history.
2143
This command checks various invariants about the branch storage to
2144
detect data corruption or bzr bugs.
2146
takes_args = ['branch?']
2147
takes_options = ['verbose']
2149
def run(self, branch=None, verbose=False):
2150
from bzrlib.check import check
2152
tree = WorkingTree.open_containing()[0]
2153
branch = tree.branch
2155
branch = Branch.open(branch)
2156
check(branch, verbose)
2159
class cmd_upgrade(Command):
2160
"""Upgrade branch storage to current format.
2162
The check command or bzr developers may sometimes advise you to run
2163
this command. When the default format has changed you may also be warned
2164
during other operations to upgrade.
2166
takes_args = ['url?']
2168
RegistryOption('format',
2169
help='Upgrade to a specific format. See "bzr help'
2170
' formats" for details',
2171
registry=bzrdir.format_registry,
2172
converter=bzrdir.format_registry.make_bzrdir,
2173
value_switches=True, title='Branch format'),
2176
def run(self, url='.', format=None):
2177
from bzrlib.upgrade import upgrade
2179
format = bzrdir.format_registry.make_bzrdir('default')
2180
upgrade(url, format)
2183
class cmd_whoami(Command):
2184
"""Show or set bzr user id.
2188
bzr whoami 'Frank Chu <fchu@example.com>'
2190
takes_options = [ Option('email',
2191
help='display email address only'),
2193
help='set identity for the current branch instead of '
2196
takes_args = ['name?']
2197
encoding_type = 'replace'
2200
def run(self, email=False, branch=False, name=None):
2202
# use branch if we're inside one; otherwise global config
2204
c = Branch.open_containing('.')[0].get_config()
2205
except errors.NotBranchError:
2206
c = config.GlobalConfig()
2208
self.outf.write(c.user_email() + '\n')
2210
self.outf.write(c.username() + '\n')
2213
# display a warning if an email address isn't included in the given name.
2215
config.extract_email_address(name)
2216
except errors.NoEmailInUsername, e:
2217
warning('"%s" does not seem to contain an email address. '
2218
'This is allowed, but not recommended.', name)
2220
# use global config unless --branch given
2222
c = Branch.open_containing('.')[0].get_config()
2224
c = config.GlobalConfig()
2225
c.set_user_option('email', name)
2228
class cmd_nick(Command):
2229
"""Print or set the branch nickname.
2231
If unset, the tree root directory name is used as the nickname
2232
To print the current nickname, execute with no argument.
2234
takes_args = ['nickname?']
2235
def run(self, nickname=None):
2236
branch = Branch.open_containing(u'.')[0]
2237
if nickname is None:
2238
self.printme(branch)
2240
branch.nick = nickname
2243
def printme(self, branch):
2247
class cmd_selftest(Command):
2248
"""Run internal test suite.
2250
This creates temporary test directories in the working directory, but not
2251
existing data is affected. These directories are deleted if the tests
2252
pass, or left behind to help in debugging if they fail and --keep-output
2255
If arguments are given, they are regular expressions that say which tests
2256
should run. Tests matching any expression are run, and other tests are
2259
Alternatively if --first is given, matching tests are run first and then
2260
all other tests are run. This is useful if you have been working in a
2261
particular area, but want to make sure nothing else was broken.
2263
If the global option '--no-plugins' is given, plugins are not loaded
2264
before running the selftests. This has two effects: features provided or
2265
modified by plugins will not be tested, and tests provided by plugins will
2270
run only tests relating to 'ignore'
2271
bzr --no-plugins selftest -v
2272
disable plugins and list tests as they're run
2274
For each test, that needs actual disk access, bzr create their own
2275
subdirectory in the temporary testing directory (testXXXX.tmp).
2276
By default the name of such subdirectory is based on the name of the test.
2277
If option '--numbered-dirs' is given, bzr will use sequent numbers
2278
of running tests to create such subdirectories. This is default behavior
2279
on Windows because of path length limitation.
2281
# TODO: --list should give a list of all available tests
2283
# NB: this is used from the class without creating an instance, which is
2284
# why it does not have a self parameter.
2285
def get_transport_type(typestring):
2286
"""Parse and return a transport specifier."""
2287
if typestring == "sftp":
2288
from bzrlib.transport.sftp import SFTPAbsoluteServer
2289
return SFTPAbsoluteServer
2290
if typestring == "memory":
2291
from bzrlib.transport.memory import MemoryServer
2293
if typestring == "fakenfs":
2294
from bzrlib.transport.fakenfs import FakeNFSServer
2295
return FakeNFSServer
2296
msg = "No known transport type %s. Supported types are: sftp\n" %\
2298
raise errors.BzrCommandError(msg)
2301
takes_args = ['testspecs*']
2302
takes_options = ['verbose',
2303
Option('one', help='stop when one test fails'),
2304
Option('keep-output',
2305
help='keep output directories when tests fail'),
2307
help='Use a different transport by default '
2308
'throughout the test suite.',
2309
type=get_transport_type),
2310
Option('benchmark', help='run the bzr benchmarks.'),
2311
Option('lsprof-timed',
2312
help='generate lsprof output for benchmarked'
2313
' sections of code.'),
2314
Option('cache-dir', type=str,
2315
help='a directory to cache intermediate'
2316
' benchmark steps'),
2317
Option('clean-output',
2318
help='clean temporary tests directories'
2319
' without running tests'),
2321
help='run all tests, but run specified tests first'
2323
Option('numbered-dirs',
2324
help='use numbered dirs for TestCaseInTempDir'),
2326
encoding_type = 'replace'
2328
def run(self, testspecs_list=None, verbose=None, one=False,
2329
keep_output=False, transport=None, benchmark=None,
2330
lsprof_timed=None, cache_dir=None, clean_output=False,
2331
first=False, numbered_dirs=None):
2333
from bzrlib.tests import selftest
2334
import bzrlib.benchmarks as benchmarks
2335
from bzrlib.benchmarks import tree_creator
2338
from bzrlib.tests import clean_selftest_output
2339
clean_selftest_output()
2342
if numbered_dirs is None and sys.platform == 'win32':
2343
numbered_dirs = True
2345
if cache_dir is not None:
2346
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2347
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
2348
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2350
if testspecs_list is not None:
2351
pattern = '|'.join(testspecs_list)
2355
test_suite_factory = benchmarks.test_suite
2358
# TODO: should possibly lock the history file...
2359
benchfile = open(".perf_history", "at", buffering=1)
2361
test_suite_factory = None
2366
result = selftest(verbose=verbose,
2368
stop_on_failure=one,
2369
keep_output=keep_output,
2370
transport=transport,
2371
test_suite_factory=test_suite_factory,
2372
lsprof_timed=lsprof_timed,
2373
bench_history=benchfile,
2374
matching_tests_first=first,
2375
numbered_dirs=numbered_dirs,
2378
if benchfile is not None:
2381
info('tests passed')
2383
info('tests failed')
2384
return int(not result)
2387
class cmd_version(Command):
2388
"""Show version of bzr."""
2392
from bzrlib.version import show_version
2396
class cmd_rocks(Command):
2397
"""Statement of optimism."""
2403
print "It sure does!"
2406
class cmd_find_merge_base(Command):
2407
"""Find and print a base revision for merging two branches."""
2408
# TODO: Options to specify revisions on either side, as if
2409
# merging only part of the history.
2410
takes_args = ['branch', 'other']
2414
def run(self, branch, other):
2415
from bzrlib.revision import MultipleRevisionSources
2417
branch1 = Branch.open_containing(branch)[0]
2418
branch2 = Branch.open_containing(other)[0]
2420
last1 = branch1.last_revision()
2421
last2 = branch2.last_revision()
2423
source = MultipleRevisionSources(branch1.repository,
2426
base_rev_id = common_ancestor(last1, last2, source)
2428
print 'merge base is revision %s' % base_rev_id
2431
class cmd_merge(Command):
2432
"""Perform a three-way merge.
2434
The branch is the branch you will merge from. By default, it will merge
2435
the latest revision. If you specify a revision, that revision will be
2436
merged. If you specify two revisions, the first will be used as a BASE,
2437
and the second one as OTHER. Revision numbers are always relative to the
2440
By default, bzr will try to merge in all new work from the other
2441
branch, automatically determining an appropriate base. If this
2442
fails, you may need to give an explicit base.
2444
Merge will do its best to combine the changes in two branches, but there
2445
are some kinds of problems only a human can fix. When it encounters those,
2446
it will mark a conflict. A conflict means that you need to fix something,
2447
before you should commit.
2449
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2451
If there is no default branch set, the first merge will set it. After
2452
that, you can omit the branch to use the default. To change the
2453
default, use --remember. The value will only be saved if the remote
2454
location can be accessed.
2456
The results of the merge are placed into the destination working
2457
directory, where they can be reviewed (with bzr diff), tested, and then
2458
committed to record the result of the merge.
2462
To merge the latest revision from bzr.dev
2463
bzr merge ../bzr.dev
2465
To merge changes up to and including revision 82 from bzr.dev
2466
bzr merge -r 82 ../bzr.dev
2468
To merge the changes introduced by 82, without previous changes:
2469
bzr merge -r 81..82 ../bzr.dev
2471
merge refuses to run if there are any uncommitted changes, unless
2474
takes_args = ['branch?']
2475
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2476
Option('show-base', help="Show base revision text in "
2478
Option('uncommitted', help='Apply uncommitted changes'
2479
' from a working copy, instead of branch changes'),
2480
Option('pull', help='If the destination is already'
2481
' completely merged into the source, pull from the'
2482
' source rather than merging. When this happens,'
2483
' you do not need to commit the result.'),
2485
help='Branch to merge into, '
2486
'rather than the one containing the working directory',
2492
def run(self, branch=None, revision=None, force=False, merge_type=None,
2493
show_base=False, reprocess=False, remember=False,
2494
uncommitted=False, pull=False,
2497
from bzrlib.tag import _merge_tags_if_possible
2498
if merge_type is None:
2499
merge_type = _mod_merge.Merge3Merger
2501
if directory is None: directory = u'.'
2502
# XXX: jam 20070225 WorkingTree should be locked before you extract its
2503
# inventory. Because merge is a mutating operation, it really
2504
# should be a lock_write() for the whole cmd_merge operation.
2505
# However, cmd_merge open's its own tree in _merge_helper, which
2506
# means if we lock here, the later lock_write() will always block.
2507
# Either the merge helper code should be updated to take a tree,
2508
# (What about tree.merge_from_branch?)
2509
tree = WorkingTree.open_containing(directory)[0]
2510
change_reporter = delta._ChangeReporter(
2511
unversioned_filter=tree.is_ignored)
2513
if branch is not None:
2515
reader = bundle.read_bundle_from_url(branch)
2516
except errors.NotABundle:
2517
pass # Continue on considering this url a Branch
2519
conflicts = merge_bundle(reader, tree, not force, merge_type,
2520
reprocess, show_base, change_reporter)
2526
if revision is None \
2527
or len(revision) < 1 or revision[0].needs_branch():
2528
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2530
if revision is None or len(revision) < 1:
2533
other = [branch, None]
2536
other = [branch, -1]
2537
other_branch, path = Branch.open_containing(branch)
2540
raise errors.BzrCommandError('Cannot use --uncommitted and'
2541
' --revision at the same time.')
2542
branch = revision[0].get_branch() or branch
2543
if len(revision) == 1:
2545
other_branch, path = Branch.open_containing(branch)
2546
revno = revision[0].in_history(other_branch).revno
2547
other = [branch, revno]
2549
assert len(revision) == 2
2550
if None in revision:
2551
raise errors.BzrCommandError(
2552
"Merge doesn't permit empty revision specifier.")
2553
base_branch, path = Branch.open_containing(branch)
2554
branch1 = revision[1].get_branch() or branch
2555
other_branch, path1 = Branch.open_containing(branch1)
2556
if revision[0].get_branch() is not None:
2557
# then path was obtained from it, and is None.
2560
base = [branch, revision[0].in_history(base_branch).revno]
2561
other = [branch1, revision[1].in_history(other_branch).revno]
2563
if tree.branch.get_parent() is None or remember:
2564
tree.branch.set_parent(other_branch.base)
2566
# pull tags now... it's a bit inconsistent to do it ahead of copying
2567
# the history but that's done inside the merge code
2568
_merge_tags_if_possible(other_branch, tree.branch)
2571
interesting_files = [path]
2573
interesting_files = None
2574
pb = ui.ui_factory.nested_progress_bar()
2577
conflict_count = _merge_helper(
2578
other, base, check_clean=(not force),
2579
merge_type=merge_type,
2580
reprocess=reprocess,
2581
show_base=show_base,
2584
pb=pb, file_list=interesting_files,
2585
change_reporter=change_reporter)
2588
if conflict_count != 0:
2592
except errors.AmbiguousBase, e:
2593
m = ("sorry, bzr can't determine the right merge base yet\n"
2594
"candidates are:\n "
2595
+ "\n ".join(e.bases)
2597
"please specify an explicit base with -r,\n"
2598
"and (if you want) report this to the bzr developers\n")
2601
# TODO: move up to common parent; this isn't merge-specific anymore.
2602
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2603
"""Use tree.branch's parent if none was supplied.
2605
Report if the remembered location was used.
2607
if supplied_location is not None:
2608
return supplied_location
2609
stored_location = tree.branch.get_parent()
2610
mutter("%s", stored_location)
2611
if stored_location is None:
2612
raise errors.BzrCommandError("No location specified or remembered")
2613
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2614
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2615
return stored_location
2618
class cmd_remerge(Command):
2621
Use this if you want to try a different merge technique while resolving
2622
conflicts. Some merge techniques are better than others, and remerge
2623
lets you try different ones on different files.
2625
The options for remerge have the same meaning and defaults as the ones for
2626
merge. The difference is that remerge can (only) be run when there is a
2627
pending merge, and it lets you specify particular files.
2630
$ bzr remerge --show-base
2631
Re-do the merge of all conflicted files, and show the base text in
2632
conflict regions, in addition to the usual THIS and OTHER texts.
2634
$ bzr remerge --merge-type weave --reprocess foobar
2635
Re-do the merge of "foobar", using the weave merge algorithm, with
2636
additional processing to reduce the size of conflict regions.
2638
takes_args = ['file*']
2639
takes_options = ['merge-type', 'reprocess',
2640
Option('show-base', help="Show base revision text in "
2643
def run(self, file_list=None, merge_type=None, show_base=False,
2645
if merge_type is None:
2646
merge_type = _mod_merge.Merge3Merger
2647
tree, file_list = tree_files(file_list)
2650
parents = tree.get_parent_ids()
2651
if len(parents) != 2:
2652
raise errors.BzrCommandError("Sorry, remerge only works after normal"
2653
" merges. Not cherrypicking or"
2655
repository = tree.branch.repository
2656
base_revision = common_ancestor(parents[0],
2657
parents[1], repository)
2658
base_tree = repository.revision_tree(base_revision)
2659
other_tree = repository.revision_tree(parents[1])
2660
interesting_ids = None
2662
conflicts = tree.conflicts()
2663
if file_list is not None:
2664
interesting_ids = set()
2665
for filename in file_list:
2666
file_id = tree.path2id(filename)
2668
raise errors.NotVersionedError(filename)
2669
interesting_ids.add(file_id)
2670
if tree.kind(file_id) != "directory":
2673
for name, ie in tree.inventory.iter_entries(file_id):
2674
interesting_ids.add(ie.file_id)
2675
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2677
# Remerge only supports resolving contents conflicts
2678
allowed_conflicts = ('text conflict', 'contents conflict')
2679
restore_files = [c.path for c in conflicts
2680
if c.typestring in allowed_conflicts]
2681
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2682
tree.set_conflicts(ConflictList(new_conflicts))
2683
if file_list is not None:
2684
restore_files = file_list
2685
for filename in restore_files:
2687
restore(tree.abspath(filename))
2688
except errors.NotConflicted:
2690
conflicts = _mod_merge.merge_inner(
2691
tree.branch, other_tree, base_tree,
2693
interesting_ids=interesting_ids,
2694
other_rev_id=parents[1],
2695
merge_type=merge_type,
2696
show_base=show_base,
2697
reprocess=reprocess)
2706
class cmd_revert(Command):
2707
"""Revert files to a previous revision.
2709
Giving a list of files will revert only those files. Otherwise, all files
2710
will be reverted. If the revision is not specified with '--revision', the
2711
last committed revision is used.
2713
To remove only some changes, without reverting to a prior version, use
2714
merge instead. For example, "merge . --r-2..-3" will remove the changes
2715
introduced by -2, without affecting the changes introduced by -1. Or
2716
to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
2718
By default, any files that have been manually changed will be backed up
2719
first. (Files changed only by merge are not backed up.) Backup files have
2720
'.~#~' appended to their name, where # is a number.
2722
When you provide files, you can use their current pathname or the pathname
2723
from the target revision. So you can use revert to "undelete" a file by
2724
name. If you name a directory, all the contents of that directory will be
2727
takes_options = ['revision', 'no-backup']
2728
takes_args = ['file*']
2730
def run(self, revision=None, no_backup=False, file_list=None):
2731
if file_list is not None:
2732
if len(file_list) == 0:
2733
raise errors.BzrCommandError("No files specified")
2737
tree, file_list = tree_files(file_list)
2738
if revision is None:
2739
# FIXME should be tree.last_revision
2740
rev_id = tree.last_revision()
2741
elif len(revision) != 1:
2742
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
2744
rev_id = revision[0].in_history(tree.branch).rev_id
2745
pb = ui.ui_factory.nested_progress_bar()
2747
tree.revert(file_list,
2748
tree.branch.repository.revision_tree(rev_id),
2749
not no_backup, pb, report_changes=True)
2754
class cmd_assert_fail(Command):
2755
"""Test reporting of assertion failures"""
2756
# intended just for use in testing
2761
raise AssertionError("always fails")
2764
class cmd_help(Command):
2765
"""Show help on a command or other topic.
2767
For a list of all available commands, say 'bzr help commands'.
2769
takes_options = [Option('long', 'show help on all commands')]
2770
takes_args = ['topic?']
2771
aliases = ['?', '--help', '-?', '-h']
2774
def run(self, topic=None, long=False):
2776
if topic is None and long:
2778
bzrlib.help.help(topic)
2781
class cmd_shell_complete(Command):
2782
"""Show appropriate completions for context.
2784
For a list of all available commands, say 'bzr shell-complete'.
2786
takes_args = ['context?']
2791
def run(self, context=None):
2792
import shellcomplete
2793
shellcomplete.shellcomplete(context)
2796
class cmd_fetch(Command):
2797
"""Copy in history from another branch but don't merge it.
2799
This is an internal method used for pull and merge.
2802
takes_args = ['from_branch', 'to_branch']
2803
def run(self, from_branch, to_branch):
2804
from bzrlib.fetch import Fetcher
2805
from_b = Branch.open(from_branch)
2806
to_b = Branch.open(to_branch)
2807
Fetcher(to_b, from_b)
2810
class cmd_missing(Command):
2811
"""Show unmerged/unpulled revisions between two branches.
2813
OTHER_BRANCH may be local or remote.
2815
takes_args = ['other_branch?']
2816
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2818
'Display changes in the local branch only'),
2819
Option('theirs-only',
2820
'Display changes in the remote branch only'),
2825
encoding_type = 'replace'
2828
def run(self, other_branch=None, reverse=False, mine_only=False,
2829
theirs_only=False, log_format=None, long=False, short=False, line=False,
2830
show_ids=False, verbose=False):
2831
from bzrlib.missing import find_unmerged, iter_log_data
2832
from bzrlib.log import log_formatter
2833
local_branch = Branch.open_containing(u".")[0]
2834
parent = local_branch.get_parent()
2835
if other_branch is None:
2836
other_branch = parent
2837
if other_branch is None:
2838
raise errors.BzrCommandError("No peer location known or specified.")
2839
display_url = urlutils.unescape_for_display(parent,
2841
print "Using last location: " + display_url
2843
remote_branch = Branch.open(other_branch)
2844
if remote_branch.base == local_branch.base:
2845
remote_branch = local_branch
2846
local_branch.lock_read()
2848
remote_branch.lock_read()
2850
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2851
if (log_format is None):
2852
log_format = log.log_formatter_registry.get_default(
2854
lf = log_format(to_file=self.outf,
2856
show_timezone='original')
2857
if reverse is False:
2858
local_extra.reverse()
2859
remote_extra.reverse()
2860
if local_extra and not theirs_only:
2861
print "You have %d extra revision(s):" % len(local_extra)
2862
for data in iter_log_data(local_extra, local_branch.repository,
2865
printed_local = True
2867
printed_local = False
2868
if remote_extra and not mine_only:
2869
if printed_local is True:
2871
print "You are missing %d revision(s):" % len(remote_extra)
2872
for data in iter_log_data(remote_extra, remote_branch.repository,
2875
if not remote_extra and not local_extra:
2877
print "Branches are up to date."
2881
remote_branch.unlock()
2883
local_branch.unlock()
2884
if not status_code and parent is None and other_branch is not None:
2885
local_branch.lock_write()
2887
# handle race conditions - a parent might be set while we run.
2888
if local_branch.get_parent() is None:
2889
local_branch.set_parent(remote_branch.base)
2891
local_branch.unlock()
2895
class cmd_plugins(Command):
2900
import bzrlib.plugin
2901
from inspect import getdoc
2902
for name, plugin in bzrlib.plugin.all_plugins().items():
2903
if getattr(plugin, '__path__', None) is not None:
2904
print plugin.__path__[0]
2905
elif getattr(plugin, '__file__', None) is not None:
2906
print plugin.__file__
2912
print '\t', d.split('\n')[0]
2915
class cmd_testament(Command):
2916
"""Show testament (signing-form) of a revision."""
2917
takes_options = ['revision',
2918
Option('long', help='Produce long-format testament'),
2919
Option('strict', help='Produce a strict-format'
2921
takes_args = ['branch?']
2923
def run(self, branch=u'.', revision=None, long=False, strict=False):
2924
from bzrlib.testament import Testament, StrictTestament
2926
testament_class = StrictTestament
2928
testament_class = Testament
2929
b = WorkingTree.open_containing(branch)[0].branch
2932
if revision is None:
2933
rev_id = b.last_revision()
2935
rev_id = revision[0].in_history(b).rev_id
2936
t = testament_class.from_revision(b.repository, rev_id)
2938
sys.stdout.writelines(t.as_text_lines())
2940
sys.stdout.write(t.as_short_text())
2945
class cmd_annotate(Command):
2946
"""Show the origin of each line in a file.
2948
This prints out the given file with an annotation on the left side
2949
indicating which revision, author and date introduced the change.
2951
If the origin is the same for a run of consecutive lines, it is
2952
shown only at the top, unless the --all option is given.
2954
# TODO: annotate directories; showing when each file was last changed
2955
# TODO: if the working copy is modified, show annotations on that
2956
# with new uncommitted lines marked
2957
aliases = ['ann', 'blame', 'praise']
2958
takes_args = ['filename']
2959
takes_options = [Option('all', help='show annotations on all lines'),
2960
Option('long', help='show date in annotations'),
2966
def run(self, filename, all=False, long=False, revision=None,
2968
from bzrlib.annotate import annotate_file
2969
tree, relpath = WorkingTree.open_containing(filename)
2970
branch = tree.branch
2973
if revision is None:
2974
revision_id = branch.last_revision()
2975
elif len(revision) != 1:
2976
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2978
revision_id = revision[0].in_history(branch).rev_id
2979
file_id = tree.path2id(relpath)
2980
tree = branch.repository.revision_tree(revision_id)
2981
file_version = tree.inventory[file_id].revision
2982
annotate_file(branch, file_version, file_id, long, all, sys.stdout,
2988
class cmd_re_sign(Command):
2989
"""Create a digital signature for an existing revision."""
2990
# TODO be able to replace existing ones.
2992
hidden = True # is this right ?
2993
takes_args = ['revision_id*']
2994
takes_options = ['revision']
2996
def run(self, revision_id_list=None, revision=None):
2997
import bzrlib.gpg as gpg
2998
if revision_id_list is not None and revision is not None:
2999
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
3000
if revision_id_list is None and revision is None:
3001
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
3002
b = WorkingTree.open_containing(u'.')[0].branch
3003
gpg_strategy = gpg.GPGStrategy(b.get_config())
3004
if revision_id_list is not None:
3005
for revision_id in revision_id_list:
3006
b.repository.sign_revision(revision_id, gpg_strategy)
3007
elif revision is not None:
3008
if len(revision) == 1:
3009
revno, rev_id = revision[0].in_history(b)
3010
b.repository.sign_revision(rev_id, gpg_strategy)
3011
elif len(revision) == 2:
3012
# are they both on rh- if so we can walk between them
3013
# might be nice to have a range helper for arbitrary
3014
# revision paths. hmm.
3015
from_revno, from_revid = revision[0].in_history(b)
3016
to_revno, to_revid = revision[1].in_history(b)
3017
if to_revid is None:
3018
to_revno = b.revno()
3019
if from_revno is None or to_revno is None:
3020
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
3021
for revno in range(from_revno, to_revno + 1):
3022
b.repository.sign_revision(b.get_rev_id(revno),
3025
raise errors.BzrCommandError('Please supply either one revision, or a range.')
3028
class cmd_bind(Command):
3029
"""Convert the current branch into a checkout of the supplied branch.
3031
Once converted into a checkout, commits must succeed on the master branch
3032
before they will be applied to the local branch.
3034
See "help checkouts" for more information on checkouts.
3037
takes_args = ['location?']
3040
def run(self, location=None):
3041
b, relpath = Branch.open_containing(u'.')
3042
if location is None:
3044
location = b.get_old_bound_location()
3045
except errors.UpgradeRequired:
3046
raise errors.BzrCommandError('No location supplied. '
3047
'This format does not remember old locations.')
3049
if location is None:
3050
raise errors.BzrCommandError('No location supplied and no '
3051
'previous location known')
3052
b_other = Branch.open(location)
3055
except errors.DivergedBranches:
3056
raise errors.BzrCommandError('These branches have diverged.'
3057
' Try merging, and then bind again.')
3060
class cmd_unbind(Command):
3061
"""Convert the current checkout into a regular branch.
3063
After unbinding, the local branch is considered independent and subsequent
3064
commits will be local only.
3066
See "help checkouts" for more information on checkouts.
3073
b, relpath = Branch.open_containing(u'.')
3075
raise errors.BzrCommandError('Local branch is not bound')
3078
class cmd_uncommit(Command):
3079
"""Remove the last committed revision.
3081
--verbose will print out what is being removed.
3082
--dry-run will go through all the motions, but not actually
3085
In the future, uncommit will create a revision bundle, which can then
3089
# TODO: jam 20060108 Add an option to allow uncommit to remove
3090
# unreferenced information in 'branch-as-repository' branches.
3091
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
3092
# information in shared branches as well.
3093
takes_options = ['verbose', 'revision',
3094
Option('dry-run', help='Don\'t actually make changes'),
3095
Option('force', help='Say yes to all questions.')]
3096
takes_args = ['location?']
3099
def run(self, location=None,
3100
dry_run=False, verbose=False,
3101
revision=None, force=False):
3102
from bzrlib.log import log_formatter, show_log
3104
from bzrlib.uncommit import uncommit
3106
if location is None:
3108
control, relpath = bzrdir.BzrDir.open_containing(location)
3110
tree = control.open_workingtree()
3112
except (errors.NoWorkingTree, errors.NotLocalUrl):
3114
b = control.open_branch()
3117
if revision is None:
3120
# 'bzr uncommit -r 10' actually means uncommit
3121
# so that the final tree is at revno 10.
3122
# but bzrlib.uncommit.uncommit() actually uncommits
3123
# the revisions that are supplied.
3124
# So we need to offset it by one
3125
revno = revision[0].in_history(b).revno+1
3127
if revno <= b.revno():
3128
rev_id = b.get_rev_id(revno)
3130
self.outf.write('No revisions to uncommit.\n')
3133
lf = log_formatter('short',
3135
show_timezone='original')
3140
direction='forward',
3141
start_revision=revno,
3142
end_revision=b.revno())
3145
print 'Dry-run, pretending to remove the above revisions.'
3147
val = raw_input('Press <enter> to continue')
3149
print 'The above revision(s) will be removed.'
3151
val = raw_input('Are you sure [y/N]? ')
3152
if val.lower() not in ('y', 'yes'):
3156
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
3160
class cmd_break_lock(Command):
3161
"""Break a dead lock on a repository, branch or working directory.
3163
CAUTION: Locks should only be broken when you are sure that the process
3164
holding the lock has been stopped.
3166
You can get information on what locks are open via the 'bzr info' command.
3171
takes_args = ['location?']
3173
def run(self, location=None, show=False):
3174
if location is None:
3176
control, relpath = bzrdir.BzrDir.open_containing(location)
3178
control.break_lock()
3179
except NotImplementedError:
3183
class cmd_wait_until_signalled(Command):
3184
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3186
This just prints a line to signal when it is ready, then blocks on stdin.
3192
sys.stdout.write("running\n")
3194
sys.stdin.readline()
3197
class cmd_serve(Command):
3198
"""Run the bzr server."""
3200
aliases = ['server']
3204
help='serve on stdin/out for use from inetd or sshd'),
3206
help='listen for connections on nominated port of the form '
3207
'[hostname:]portnumber. Passing 0 as the port number will '
3208
'result in a dynamically allocated port. Default port is '
3212
help='serve contents of directory',
3214
Option('allow-writes',
3215
help='By default the server is a readonly server. Supplying '
3216
'--allow-writes enables write access to the contents of '
3217
'the served directory and below. '
3221
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3222
from bzrlib.transport import smart
3223
from bzrlib.transport import get_transport
3224
if directory is None:
3225
directory = os.getcwd()
3226
url = urlutils.local_path_to_url(directory)
3227
if not allow_writes:
3228
url = 'readonly+' + url
3229
t = get_transport(url)
3231
server = smart.SmartServerPipeStreamMedium(sys.stdin, sys.stdout, t)
3234
port = smart.BZR_DEFAULT_PORT
3238
host, port = port.split(':')
3242
server = smart.SmartTCPServer(t, host=host, port=port)
3243
print 'listening on port: ', server.port
3247
class cmd_join(Command):
3248
"""Combine a subtree into its containing tree.
3250
This command is for experimental use only. It requires the target tree
3251
to be in dirstate-with-subtree format, which cannot be converted into
3254
The TREE argument should be an independent tree, inside another tree, but
3255
not part of it. (Such trees can be produced by "bzr split", but also by
3256
running "bzr branch" with the target inside a tree.)
3258
The result is a combined tree, with the subtree no longer an independant
3259
part. This is marked as a merge of the subtree into the containing tree,
3260
and all history is preserved.
3262
If --reference is specified, the subtree retains its independence. It can
3263
be branched by itself, and can be part of multiple projects at the same
3264
time. But operations performed in the containing tree, such as commit
3265
and merge, will recurse into the subtree.
3268
takes_args = ['tree']
3269
takes_options = [Option('reference', 'join by reference')]
3272
def run(self, tree, reference=False):
3273
sub_tree = WorkingTree.open(tree)
3274
parent_dir = osutils.dirname(sub_tree.basedir)
3275
containing_tree = WorkingTree.open_containing(parent_dir)[0]
3276
repo = containing_tree.branch.repository
3277
if not repo.supports_rich_root():
3278
raise errors.BzrCommandError(
3279
"Can't join trees because %s doesn't support rich root data.\n"
3280
"You can use bzr upgrade on the repository."
3284
containing_tree.add_reference(sub_tree)
3285
except errors.BadReferenceTarget, e:
3286
# XXX: Would be better to just raise a nicely printable
3287
# exception from the real origin. Also below. mbp 20070306
3288
raise errors.BzrCommandError("Cannot join %s. %s" %
3292
containing_tree.subsume(sub_tree)
3293
except errors.BadSubsumeSource, e:
3294
raise errors.BzrCommandError("Cannot join %s. %s" %
3298
class cmd_split(Command):
3299
"""Split a tree into two trees.
3301
This command is for experimental use only. It requires the target tree
3302
to be in dirstate-with-subtree format, which cannot be converted into
3305
The TREE argument should be a subdirectory of a working tree. That
3306
subdirectory will be converted into an independent tree, with its own
3307
branch. Commits in the top-level tree will not apply to the new subtree.
3308
If you want that behavior, do "bzr join --reference TREE".
3310
To undo this operation, do "bzr join TREE".
3313
takes_args = ['tree']
3317
def run(self, tree):
3318
containing_tree, subdir = WorkingTree.open_containing(tree)
3319
sub_id = containing_tree.path2id(subdir)
3321
raise errors.NotVersionedError(subdir)
3323
containing_tree.extract(sub_id)
3324
except errors.RootNotRich:
3325
raise errors.UpgradeRequired(containing_tree.branch.base)
3329
class cmd_merge_directive(Command):
3330
"""Generate a merge directive for auto-merge tools.
3332
A directive requests a merge to be performed, and also provides all the
3333
information necessary to do so. This means it must either include a
3334
revision bundle, or the location of a branch containing the desired
3337
A submit branch (the location to merge into) must be supplied the first
3338
time the command is issued. After it has been supplied once, it will
3339
be remembered as the default.
3341
A public branch is optional if a revision bundle is supplied, but required
3342
if --diff or --plain is specified. It will be remembered as the default
3343
after the first use.
3346
takes_args = ['submit_branch?', 'public_branch?']
3349
RegistryOption.from_kwargs('patch-type',
3350
'The type of patch to include in the directive',
3351
title='Patch type', value_switches=True, enum_switch=False,
3352
bundle='Bazaar revision bundle (default)',
3353
diff='Normal unified diff',
3354
plain='No patch, just directive'),
3355
Option('sign', help='GPG-sign the directive'), 'revision',
3356
Option('mail-to', type=str,
3357
help='Instead of printing the directive, email to this address'),
3358
Option('message', type=str, short_name='m',
3359
help='Message to use when committing this merge')
3362
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
3363
sign=False, revision=None, mail_to=None, message=None):
3364
if patch_type == 'plain':
3366
branch = Branch.open('.')
3367
stored_submit_branch = branch.get_submit_branch()
3368
if submit_branch is None:
3369
submit_branch = stored_submit_branch
3371
if stored_submit_branch is None:
3372
branch.set_submit_branch(submit_branch)
3373
if submit_branch is None:
3374
submit_branch = branch.get_parent()
3375
if submit_branch is None:
3376
raise errors.BzrCommandError('No submit branch specified or known')
3378
stored_public_branch = branch.get_public_branch()
3379
if public_branch is None:
3380
public_branch = stored_public_branch
3381
elif stored_public_branch is None:
3382
branch.set_public_branch(public_branch)
3383
if patch_type != "bundle" and public_branch is None:
3384
raise errors.BzrCommandError('No public branch specified or'
3386
if revision is not None:
3387
if len(revision) != 1:
3388
raise errors.BzrCommandError('bzr merge-directive takes '
3389
'exactly one revision identifier')
3391
revision_id = revision[0].in_history(branch).rev_id
3393
revision_id = branch.last_revision()
3394
directive = merge_directive.MergeDirective.from_objects(
3395
branch.repository, revision_id, time.time(),
3396
osutils.local_time_offset(), submit_branch,
3397
public_branch=public_branch, patch_type=patch_type,
3401
self.outf.write(directive.to_signed(branch))
3403
self.outf.writelines(directive.to_lines())
3405
message = directive.to_email(mail_to, branch, sign)
3407
server = branch.get_config().get_user_option('smtp_server')
3409
server = 'localhost'
3411
s.sendmail(message['From'], message['To'], message.as_string())
3414
class cmd_tag(Command):
3415
"""Create a tag naming a revision.
3417
Tags give human-meaningful names to revisions. Commands that take a -r
3418
(--revision) option can be given -rtag:X, where X is any previously
3421
Tags are stored in the branch. Tags are copied from one branch to another
3422
along when you branch, push, pull or merge.
3424
It is an error to give a tag name that already exists unless you pass
3425
--force, in which case the tag is moved to point to the new revision.
3428
takes_args = ['tag_name']
3431
help='Delete this tag rather than placing it.',
3434
help='Branch in which to place the tag.',
3439
help='Replace existing tags',
3444
def run(self, tag_name,
3450
branch, relpath = Branch.open_containing(directory)
3454
branch.tags.delete_tag(tag_name)
3455
self.outf.write('Deleted tag %s.\n' % tag_name)
3458
if len(revision) != 1:
3459
raise errors.BzrCommandError(
3460
"Tags can only be placed on a single revision, "
3462
revision_id = revision[0].in_history(branch).rev_id
3464
revision_id = branch.last_revision()
3465
if (not force) and branch.tags.has_tag(tag_name):
3466
raise errors.TagAlreadyExists(tag_name)
3467
branch.tags.set_tag(tag_name, revision_id)
3468
self.outf.write('Created tag %s.\n' % tag_name)
3473
class cmd_tags(Command):
3476
This tag shows a table of tag names and the revisions they reference.
3481
help='Branch whose tags should be displayed',
3491
branch, relpath = Branch.open_containing(directory)
3492
for tag_name, target in sorted(branch.tags.get_tag_dict().items()):
3493
self.outf.write('%-20s %s\n' % (tag_name, target))
3496
# command-line interpretation helper for merge-related commands
3497
def _merge_helper(other_revision, base_revision,
3498
check_clean=True, ignore_zero=False,
3499
this_dir=None, backup_files=False,
3501
file_list=None, show_base=False, reprocess=False,
3504
change_reporter=None):
3505
"""Merge changes into a tree.
3508
list(path, revno) Base for three-way merge.
3509
If [None, None] then a base will be automatically determined.
3511
list(path, revno) Other revision for three-way merge.
3513
Directory to merge changes into; '.' by default.
3515
If true, this_dir must have no uncommitted changes before the
3517
ignore_zero - If true, suppress the "zero conflicts" message when
3518
there are no conflicts; should be set when doing something we expect
3519
to complete perfectly.
3520
file_list - If supplied, merge only changes to selected files.
3522
All available ancestors of other_revision and base_revision are
3523
automatically pulled into the branch.
3525
The revno may be -1 to indicate the last revision on the branch, which is
3528
This function is intended for use from the command line; programmatic
3529
clients might prefer to call merge.merge_inner(), which has less magic
3532
# Loading it late, so that we don't always have to import bzrlib.merge
3533
if merge_type is None:
3534
merge_type = _mod_merge.Merge3Merger
3535
if this_dir is None:
3537
this_tree = WorkingTree.open_containing(this_dir)[0]
3538
if show_base and not merge_type is _mod_merge.Merge3Merger:
3539
raise errors.BzrCommandError("Show-base is not supported for this merge"
3540
" type. %s" % merge_type)
3541
if reprocess and not merge_type.supports_reprocess:
3542
raise errors.BzrCommandError("Conflict reduction is not supported for merge"
3543
" type %s." % merge_type)
3544
if reprocess and show_base:
3545
raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
3546
# TODO: jam 20070226 We should really lock these trees earlier. However, we
3547
# only want to take out a lock_tree_write() if we don't have to pull
3548
# any ancestry. But merge might fetch ancestry in the middle, in
3549
# which case we would need a lock_write().
3550
# Because we cannot upgrade locks, for now we live with the fact that
3551
# the tree will be locked multiple times during a merge. (Maybe
3552
# read-only some of the time, but it means things will get read
3555
merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
3556
pb=pb, change_reporter=change_reporter)
3557
merger.pp = ProgressPhase("Merge phase", 5, pb)
3558
merger.pp.next_phase()
3559
merger.check_basis(check_clean)
3560
merger.set_other(other_revision)
3561
merger.pp.next_phase()
3562
merger.set_base(base_revision)
3563
if merger.base_rev_id == merger.other_rev_id:
3564
note('Nothing to do.')
3566
if file_list is None:
3567
if pull and merger.base_rev_id == merger.this_rev_id:
3568
# FIXME: deduplicate with pull
3569
result = merger.this_tree.pull(merger.this_branch,
3570
False, merger.other_rev_id)
3571
if result.old_revid == result.new_revid:
3572
note('No revisions to pull.')
3574
note('Now on revision %d.' % result.new_revno)
3576
merger.backup_files = backup_files
3577
merger.merge_type = merge_type
3578
merger.set_interesting_files(file_list)
3579
merger.show_base = show_base
3580
merger.reprocess = reprocess
3581
conflicts = merger.do_merge()
3582
if file_list is None:
3583
merger.set_pending()
3590
merge = _merge_helper
3593
# these get imported and then picked up by the scan for cmd_*
3594
# TODO: Some more consistent way to split command definitions across files;
3595
# we do need to load at least some information about them to know of
3596
# aliases. ideally we would avoid loading the implementation until the
3597
# details were needed.
3598
from bzrlib.cmd_version_info import cmd_version_info
3599
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
3600
from bzrlib.bundle.commands import cmd_bundle_revisions
3601
from bzrlib.sign_my_commits import cmd_sign_my_commits
3602
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
3603
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
