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 in 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', 'short',
187
Option('versioned', help='Only show versioned files')]
188
aliases = ['st', 'stat']
190
encoding_type = 'replace'
193
def run(self, show_ids=False, file_list=None, revision=None, short=False,
195
from bzrlib.status import show_tree_status
197
tree, file_list = tree_files(file_list)
199
show_tree_status(tree, show_ids=show_ids,
200
specific_files=file_list, revision=revision,
201
to_file=self.outf, short=short, versioned=versioned)
204
class cmd_cat_revision(Command):
205
"""Write out metadata for a revision.
207
The revision to print can either be specified by a specific
208
revision identifier, or you can use --revision.
212
takes_args = ['revision_id?']
213
takes_options = ['revision']
214
# cat-revision is more for frontends so should be exact
218
def run(self, revision_id=None, revision=None):
220
if revision_id is not None and revision is not None:
221
raise errors.BzrCommandError('You can only supply one of'
222
' revision_id or --revision')
223
if revision_id is None and revision is None:
224
raise errors.BzrCommandError('You must supply either'
225
' --revision or a revision_id')
226
b = WorkingTree.open_containing(u'.')[0].branch
228
# TODO: jam 20060112 should cat-revision always output utf-8?
229
if revision_id is not None:
230
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
231
elif revision is not None:
234
raise errors.BzrCommandError('You cannot specify a NULL'
236
revno, rev_id = rev.in_history(b)
237
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
240
class cmd_remove_tree(Command):
241
"""Remove the working tree from a given branch/checkout.
243
Since a lightweight checkout is little more than a working tree
244
this will refuse to run against one.
247
takes_args = ['location?']
249
def run(self, location='.'):
250
d = bzrdir.BzrDir.open(location)
253
working = d.open_workingtree()
254
except errors.NoWorkingTree:
255
raise errors.BzrCommandError("No working tree to remove")
256
except errors.NotLocalUrl:
257
raise errors.BzrCommandError("You cannot remove the working tree of a "
260
working_path = working.bzrdir.root_transport.base
261
branch_path = working.branch.bzrdir.root_transport.base
262
if working_path != branch_path:
263
raise errors.BzrCommandError("You cannot remove the working tree from "
264
"a lightweight checkout")
266
d.destroy_workingtree()
269
class cmd_revno(Command):
270
"""Show current revision number.
272
This is equal to the number of revisions on this branch.
275
takes_args = ['location?']
278
def run(self, location=u'.'):
279
self.outf.write(str(Branch.open_containing(location)[0].revno()))
280
self.outf.write('\n')
283
class cmd_revision_info(Command):
284
"""Show revision number and revision id for a given revision identifier.
287
takes_args = ['revision_info*']
288
takes_options = ['revision']
291
def run(self, revision=None, revision_info_list=[]):
294
if revision is not None:
295
revs.extend(revision)
296
if revision_info_list is not None:
297
for rev in revision_info_list:
298
revs.append(RevisionSpec.from_string(rev))
300
raise errors.BzrCommandError('You must supply a revision identifier')
302
b = WorkingTree.open_containing(u'.')[0].branch
305
revinfo = rev.in_history(b)
306
if revinfo.revno is None:
307
print ' %s' % revinfo.rev_id
309
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
312
class cmd_add(Command):
313
"""Add specified files or directories.
315
In non-recursive mode, all the named items are added, regardless
316
of whether they were previously ignored. A warning is given if
317
any of the named files are already versioned.
319
In recursive mode (the default), files are treated the same way
320
but the behaviour for directories is different. Directories that
321
are already versioned do not give a warning. All directories,
322
whether already versioned or not, are searched for files or
323
subdirectories that are neither versioned or ignored, and these
324
are added. This search proceeds recursively into versioned
325
directories. If no names are given '.' is assumed.
327
Therefore simply saying 'bzr add' will version all files that
328
are currently unknown.
330
Adding a file whose parent directory is not versioned will
331
implicitly add the parent, and so on up to the root. This means
332
you should never need to explicitly add a directory, they'll just
333
get added when you add a file in the directory.
335
--dry-run will show which files would be added, but not actually
338
--file-ids-from will try to use the file ids from the supplied path.
339
It looks up ids trying to find a matching parent directory with the
340
same filename, and then by pure path.
342
takes_args = ['file*']
343
takes_options = ['no-recurse', 'dry-run', 'verbose',
344
Option('file-ids-from', type=unicode,
345
help='Lookup file ids from here')]
346
encoding_type = 'replace'
348
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
353
if file_ids_from is not None:
355
base_tree, base_path = WorkingTree.open_containing(
357
except errors.NoWorkingTree:
358
base_branch, base_path = Branch.open_containing(
360
base_tree = base_branch.basis_tree()
362
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
363
to_file=self.outf, should_print=(not is_quiet()))
365
action = bzrlib.add.AddAction(to_file=self.outf,
366
should_print=(not is_quiet()))
369
base_tree.lock_read()
371
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
372
action=action, save=not dry_run)
374
if base_tree is not None:
378
for glob in sorted(ignored.keys()):
379
for path in ignored[glob]:
380
self.outf.write("ignored %s matching \"%s\"\n"
384
for glob, paths in ignored.items():
385
match_len += len(paths)
386
self.outf.write("ignored %d file(s).\n" % match_len)
387
self.outf.write("If you wish to add some of these files,"
388
" please add them by name.\n")
391
class cmd_mkdir(Command):
392
"""Create a new versioned directory.
394
This is equivalent to creating the directory and then adding it.
397
takes_args = ['dir+']
398
encoding_type = 'replace'
400
def run(self, dir_list):
403
wt, dd = WorkingTree.open_containing(d)
405
self.outf.write('added %s\n' % d)
408
class cmd_relpath(Command):
409
"""Show path of a file relative to root"""
411
takes_args = ['filename']
415
def run(self, filename):
416
# TODO: jam 20050106 Can relpath return a munged path if
417
# sys.stdout encoding cannot represent it?
418
tree, relpath = WorkingTree.open_containing(filename)
419
self.outf.write(relpath)
420
self.outf.write('\n')
423
class cmd_inventory(Command):
424
"""Show inventory of the current working copy or a revision.
426
It is possible to limit the output to a particular entry
427
type using the --kind option. For example: --kind file.
429
It is also possible to restrict the list of files to a specific
430
set. For example: bzr inventory --show-ids this/file
437
takes_options = ['revision', 'show-ids', 'kind']
439
takes_args = ['file*']
442
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
443
if kind and kind not in ['file', 'directory', 'symlink']:
444
raise errors.BzrCommandError('invalid kind specified')
446
work_tree, file_list = tree_files(file_list)
447
work_tree.lock_read()
449
if revision is not None:
450
if len(revision) > 1:
451
raise errors.BzrCommandError(
452
'bzr inventory --revision takes exactly one revision'
454
revision_id = revision[0].in_history(work_tree.branch).rev_id
455
tree = work_tree.branch.repository.revision_tree(revision_id)
457
extra_trees = [work_tree]
463
if file_list is not None:
464
file_ids = tree.paths2ids(file_list, trees=extra_trees,
465
require_versioned=True)
466
# find_ids_across_trees may include some paths that don't
468
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
469
for file_id in file_ids if file_id in tree)
471
entries = tree.inventory.entries()
474
if tree is not work_tree:
477
for path, entry in entries:
478
if kind and kind != entry.kind:
481
self.outf.write('%-50s %s\n' % (path, entry.file_id))
483
self.outf.write(path)
484
self.outf.write('\n')
487
class cmd_mv(Command):
488
"""Move or rename a file.
491
bzr mv OLDNAME NEWNAME
492
bzr mv SOURCE... DESTINATION
494
If the last argument is a versioned directory, all the other names
495
are moved into it. Otherwise, there must be exactly two arguments
496
and the file is changed to a new name.
498
If OLDNAME does not exist on the filesystem but is versioned and
499
NEWNAME does exist on the filesystem but is not versioned, mv
500
assumes that the file has been manually moved and only updates
501
its internal inventory to reflect that change.
502
The same is valid when moving many SOURCE files to a DESTINATION.
504
Files cannot be moved between branches.
507
takes_args = ['names*']
508
takes_options = [Option("after", help="move only the bzr identifier"
509
" of the file (file has already been moved). Use this flag if"
510
" bzr is not able to detect this itself.")]
511
aliases = ['move', 'rename']
512
encoding_type = 'replace'
514
def run(self, names_list, after=False):
515
if names_list is None:
518
if len(names_list) < 2:
519
raise errors.BzrCommandError("missing file argument")
520
tree, rel_names = tree_files(names_list)
522
if os.path.isdir(names_list[-1]):
523
# move into existing directory
524
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
525
self.outf.write("%s => %s\n" % pair)
527
if len(names_list) != 2:
528
raise errors.BzrCommandError('to mv multiple files the'
529
' destination must be a versioned'
531
tree.rename_one(rel_names[0], rel_names[1], after=after)
532
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
535
class cmd_pull(Command):
536
"""Turn this branch into a mirror of another branch.
538
This command only works on branches that have not diverged. Branches are
539
considered diverged if the destination branch's most recent commit is one
540
that has not been merged (directly or indirectly) into the parent.
542
If branches have diverged, you can use 'bzr merge' to integrate the changes
543
from one into the other. Once one branch has merged, the other should
544
be able to pull it again.
546
If you want to forget your local changes and just update your branch to
547
match the remote one, use pull --overwrite.
549
If there is no default location set, the first pull will set it. After
550
that, you can omit the location to use the default. To change the
551
default, use --remember. The value will only be saved if the remote
552
location can be accessed.
555
takes_options = ['remember', 'overwrite', 'revision', 'verbose',
557
help='branch to pull into, '
558
'rather than the one containing the working directory',
563
takes_args = ['location?']
564
encoding_type = 'replace'
566
def run(self, location=None, remember=False, overwrite=False,
567
revision=None, verbose=False,
569
from bzrlib.tag import _merge_tags_if_possible
570
# FIXME: too much stuff is in the command class
571
if directory is None:
574
tree_to = WorkingTree.open_containing(directory)[0]
575
branch_to = tree_to.branch
576
except errors.NoWorkingTree:
578
branch_to = Branch.open_containing(directory)[0]
581
if location is not None:
583
reader = bundle.read_bundle_from_url(location)
584
except errors.NotABundle:
585
pass # Continue on considering this url a Branch
587
stored_loc = branch_to.get_parent()
589
if stored_loc is None:
590
raise errors.BzrCommandError("No pull location known or"
593
display_url = urlutils.unescape_for_display(stored_loc,
595
self.outf.write("Using saved location: %s\n" % display_url)
596
location = stored_loc
598
if reader is not None:
599
install_bundle(branch_to.repository, reader)
600
branch_from = branch_to
602
branch_from = Branch.open(location)
604
if branch_to.get_parent() is None or remember:
605
branch_to.set_parent(branch_from.base)
609
if reader is not None:
610
rev_id = reader.target
611
elif len(revision) == 1:
612
rev_id = revision[0].in_history(branch_from).rev_id
614
raise errors.BzrCommandError('bzr pull --revision takes one value.')
616
old_rh = branch_to.revision_history()
617
if tree_to is not None:
618
result = tree_to.pull(branch_from, overwrite, rev_id,
619
delta._ChangeReporter(unversioned_filter=tree_to.is_ignored))
621
result = branch_to.pull(branch_from, overwrite, rev_id)
623
result.report(self.outf)
625
from bzrlib.log import show_changed_revisions
626
new_rh = branch_to.revision_history()
627
show_changed_revisions(branch_to, old_rh, new_rh, to_file=self.outf)
630
class cmd_push(Command):
631
"""Update a mirror of this branch.
633
The target branch will not have its working tree populated because this
634
is both expensive, and is not supported on remote file systems.
636
Some smart servers or protocols *may* put the working tree in place in
639
This command only works on branches that have not diverged. Branches are
640
considered diverged if the destination branch's most recent commit is one
641
that has not been merged (directly or indirectly) by the source branch.
643
If branches have diverged, you can use 'bzr push --overwrite' to replace
644
the other branch completely, discarding its unmerged changes.
646
If you want to ensure you have the different changes in the other branch,
647
do a merge (see bzr help merge) from the other branch, and commit that.
648
After that you will be able to do a push without '--overwrite'.
650
If there is no default push location set, the first push will set it.
651
After that, you can omit the location to use the default. To change the
652
default, use --remember. The value will only be saved if the remote
653
location can be accessed.
656
takes_options = ['remember', 'overwrite', 'verbose',
657
Option('create-prefix',
658
help='Create the path leading up to the branch '
659
'if it does not already exist'),
661
help='branch to push from, '
662
'rather than the one containing the working directory',
666
Option('use-existing-dir',
667
help='By default push will fail if the target'
668
' directory exists, but does not already'
669
' have a control directory. This flag will'
670
' allow push to proceed.'),
672
takes_args = ['location?']
673
encoding_type = 'replace'
675
def run(self, location=None, remember=False, overwrite=False,
676
create_prefix=False, verbose=False,
677
use_existing_dir=False,
679
# FIXME: Way too big! Put this into a function called from the
681
if directory is None:
683
br_from = Branch.open_containing(directory)[0]
684
stored_loc = br_from.get_push_location()
686
if stored_loc is None:
687
raise errors.BzrCommandError("No push location known or specified.")
689
display_url = urlutils.unescape_for_display(stored_loc,
691
self.outf.write("Using saved location: %s\n" % display_url)
692
location = stored_loc
694
to_transport = transport.get_transport(location)
695
location_url = to_transport.base
697
br_to = repository_to = dir_to = None
699
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
700
except errors.NotBranchError:
701
pass # Didn't find anything
703
# If we can open a branch, use its direct repository, otherwise see
704
# if there is a repository without a branch.
706
br_to = dir_to.open_branch()
707
except errors.NotBranchError:
708
# Didn't find a branch, can we find a repository?
710
repository_to = dir_to.find_repository()
711
except errors.NoRepositoryPresent:
714
# Found a branch, so we must have found a repository
715
repository_to = br_to.repository
719
# The destination doesn't exist; create it.
720
# XXX: Refactor the create_prefix/no_create_prefix code into a
721
# common helper function
723
to_transport.mkdir('.')
724
except errors.FileExists:
725
if not use_existing_dir:
726
raise errors.BzrCommandError("Target directory %s"
727
" already exists, but does not have a valid .bzr"
728
" directory. Supply --use-existing-dir to push"
729
" there anyway." % location)
730
except errors.NoSuchFile:
731
if not create_prefix:
732
raise errors.BzrCommandError("Parent directory of %s"
734
"\nYou may supply --create-prefix to create all"
735
" leading parent directories."
738
cur_transport = to_transport
739
needed = [cur_transport]
740
# Recurse upwards until we can create a directory successfully
742
new_transport = cur_transport.clone('..')
743
if new_transport.base == cur_transport.base:
744
raise errors.BzrCommandError("Failed to create path"
748
new_transport.mkdir('.')
749
except errors.NoSuchFile:
750
needed.append(new_transport)
751
cur_transport = new_transport
755
# Now we only need to create child directories
757
cur_transport = needed.pop()
758
cur_transport.mkdir('.')
760
# Now the target directory exists, but doesn't have a .bzr
761
# directory. So we need to create it, along with any work to create
762
# all of the dependent branches, etc.
763
dir_to = br_from.bzrdir.clone(location_url,
764
revision_id=br_from.last_revision())
765
br_to = dir_to.open_branch()
766
# TODO: Some more useful message about what was copied
767
note('Created new branch.')
768
# We successfully created the target, remember it
769
if br_from.get_push_location() is None or remember:
770
br_from.set_push_location(br_to.base)
771
elif repository_to is None:
772
# we have a bzrdir but no branch or repository
773
# XXX: Figure out what to do other than complain.
774
raise errors.BzrCommandError("At %s you have a valid .bzr control"
775
" directory, but not a branch or repository. This is an"
776
" unsupported configuration. Please move the target directory"
777
" out of the way and try again."
780
# We have a repository but no branch, copy the revisions, and then
782
last_revision_id = br_from.last_revision()
783
repository_to.fetch(br_from.repository,
784
revision_id=last_revision_id)
785
br_to = br_from.clone(dir_to, revision_id=last_revision_id)
786
note('Created new branch.')
787
if br_from.get_push_location() is None or remember:
788
br_from.set_push_location(br_to.base)
789
else: # We have a valid to branch
790
# We were able to connect to the remote location, so remember it
791
# we don't need to successfully push because of possible divergence.
792
if br_from.get_push_location() is None or remember:
793
br_from.set_push_location(br_to.base)
794
old_rh = br_to.revision_history()
797
tree_to = dir_to.open_workingtree()
798
except errors.NotLocalUrl:
799
warning('This transport does not update the working '
800
'tree of: %s' % (br_to.base,))
801
push_result = br_from.push(br_to, overwrite)
802
except errors.NoWorkingTree:
803
push_result = br_from.push(br_to, overwrite)
807
push_result = br_from.push(tree_to.branch, overwrite)
811
except errors.DivergedBranches:
812
raise errors.BzrCommandError('These branches have diverged.'
813
' Try using "merge" and then "push".')
814
if push_result is not None:
815
push_result.report(self.outf)
817
new_rh = br_to.revision_history()
820
from bzrlib.log import show_changed_revisions
821
show_changed_revisions(br_to, old_rh, new_rh,
824
# we probably did a clone rather than a push, so a message was
829
class cmd_branch(Command):
830
"""Create a new copy of a branch.
832
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
833
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
835
To retrieve the branch as of a particular revision, supply the --revision
836
parameter, as in "branch foo/bar -r 5".
838
--basis is to speed up branching from remote branches. When specified, it
839
copies all the file-contents, inventory and revision data from the basis
840
branch before copying anything from the remote branch.
842
takes_args = ['from_location', 'to_location?']
843
takes_options = ['revision', 'basis']
844
aliases = ['get', 'clone']
846
def run(self, from_location, to_location=None, revision=None, basis=None):
847
from bzrlib.tag import _merge_tags_if_possible
850
elif len(revision) > 1:
851
raise errors.BzrCommandError(
852
'bzr branch --revision takes exactly 1 revision value')
854
br_from = Branch.open(from_location)
857
if basis is not None:
858
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
861
if len(revision) == 1 and revision[0] is not None:
862
revision_id = revision[0].in_history(br_from)[1]
864
# FIXME - wt.last_revision, fallback to branch, fall back to
865
# None or perhaps NULL_REVISION to mean copy nothing
867
revision_id = br_from.last_revision()
868
if to_location is None:
869
to_location = os.path.basename(from_location.rstrip("/\\"))
872
name = os.path.basename(to_location) + '\n'
874
to_transport = transport.get_transport(to_location)
876
to_transport.mkdir('.')
877
except errors.FileExists:
878
raise errors.BzrCommandError('Target directory "%s" already'
879
' exists.' % to_location)
880
except errors.NoSuchFile:
881
raise errors.BzrCommandError('Parent of "%s" does not exist.'
884
# preserve whatever source format we have.
885
dir = br_from.bzrdir.sprout(to_transport.base,
886
revision_id, basis_dir)
887
branch = dir.open_branch()
888
except errors.NoSuchRevision:
889
to_transport.delete_tree('.')
890
msg = "The branch %s has no revision %s." % (from_location, revision[0])
891
raise errors.BzrCommandError(msg)
892
except errors.UnlistableBranch:
893
osutils.rmtree(to_location)
894
msg = "The branch %s cannot be used as a --basis" % (basis,)
895
raise errors.BzrCommandError(msg)
897
branch.control_files.put_utf8('branch-name', name)
898
_merge_tags_if_possible(br_from, branch)
899
note('Branched %d revision(s).' % branch.revno())
904
class cmd_checkout(Command):
905
"""Create a new checkout of an existing branch.
907
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
908
the branch found in '.'. This is useful if you have removed the working tree
909
or if it was never created - i.e. if you pushed the branch to its current
912
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
913
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
915
To retrieve the branch as of a particular revision, supply the --revision
916
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
917
out of date [so you cannot commit] but it may be useful (i.e. to examine old
920
--basis is to speed up checking out from remote branches. When specified, it
921
uses the inventory and file contents from the basis branch in preference to the
922
branch being checked out.
924
See "help checkouts" for more information on checkouts.
926
takes_args = ['branch_location?', 'to_location?']
927
takes_options = ['revision', # , 'basis']
928
Option('lightweight',
929
help="perform a lightweight checkout. Lightweight "
930
"checkouts depend on access to the branch for "
931
"every operation. Normal checkouts can perform "
932
"common operations like diff and status without "
933
"such access, and also support local commits."
938
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
942
elif len(revision) > 1:
943
raise errors.BzrCommandError(
944
'bzr checkout --revision takes exactly 1 revision value')
945
if branch_location is None:
946
branch_location = osutils.getcwd()
947
to_location = branch_location
948
source = Branch.open(branch_location)
949
if len(revision) == 1 and revision[0] is not None:
950
revision_id = revision[0].in_history(source)[1]
953
if to_location is None:
954
to_location = os.path.basename(branch_location.rstrip("/\\"))
955
# if the source and to_location are the same,
956
# and there is no working tree,
957
# then reconstitute a branch
958
if (osutils.abspath(to_location) ==
959
osutils.abspath(branch_location)):
961
source.bzrdir.open_workingtree()
962
except errors.NoWorkingTree:
963
source.bzrdir.create_workingtree()
966
os.mkdir(to_location)
968
if e.errno == errno.EEXIST:
969
raise errors.BzrCommandError('Target directory "%s" already'
970
' exists.' % to_location)
971
if e.errno == errno.ENOENT:
972
raise errors.BzrCommandError('Parent of "%s" does not exist.'
976
source.create_checkout(to_location, revision_id, lightweight)
979
class cmd_renames(Command):
980
"""Show list of renamed files.
982
# TODO: Option to show renames between two historical versions.
984
# TODO: Only show renames under dir, rather than in the whole branch.
985
takes_args = ['dir?']
988
def run(self, dir=u'.'):
989
tree = WorkingTree.open_containing(dir)[0]
992
new_inv = tree.inventory
993
old_tree = tree.basis_tree()
996
old_inv = old_tree.inventory
997
renames = list(_mod_tree.find_renames(old_inv, new_inv))
999
for old_name, new_name in renames:
1000
self.outf.write("%s => %s\n" % (old_name, new_name))
1007
class cmd_update(Command):
1008
"""Update a tree to have the latest code committed to its branch.
1010
This will perform a merge into the working tree, and may generate
1011
conflicts. If you have any local changes, you will still
1012
need to commit them after the update for the update to be complete.
1014
If you want to discard your local changes, you can just do a
1015
'bzr revert' instead of 'bzr commit' after the update.
1017
takes_args = ['dir?']
1020
def run(self, dir='.'):
1021
tree = WorkingTree.open_containing(dir)[0]
1022
master = tree.branch.get_master_branch()
1023
if master is not None:
1026
tree.lock_tree_write()
1028
existing_pending_merges = tree.get_parent_ids()[1:]
1029
last_rev = tree.last_revision()
1030
if last_rev == tree.branch.last_revision():
1031
# may be up to date, check master too.
1032
master = tree.branch.get_master_branch()
1033
if master is None or last_rev == master.last_revision():
1034
revno = tree.branch.revision_id_to_revno(last_rev)
1035
note("Tree is up to date at revision %d." % (revno,))
1037
conflicts = tree.update()
1038
revno = tree.branch.revision_id_to_revno(tree.last_revision())
1039
note('Updated to revision %d.' % (revno,))
1040
if tree.get_parent_ids()[1:] != existing_pending_merges:
1041
note('Your local commits will now show as pending merges with '
1042
"'bzr status', and can be committed with 'bzr commit'.")
1051
class cmd_info(Command):
1052
"""Show information about a working tree, branch or repository.
1054
This command will show all known locations and formats associated to the
1055
tree, branch or repository. Statistical information is included with
1058
Branches and working trees will also report any missing revisions.
1060
takes_args = ['location?']
1061
takes_options = ['verbose']
1064
def run(self, location=None, verbose=False):
1065
from bzrlib.info import show_bzrdir_info
1066
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1070
class cmd_remove(Command):
1071
"""Make a file unversioned.
1073
This makes bzr stop tracking changes to a versioned file. It does
1074
not delete the working copy.
1076
You can specify one or more files, and/or --new. If you specify --new,
1077
only 'added' files will be removed. If you specify both, then new files
1078
in the specified directories will be removed. If the directories are
1079
also new, they will also be removed.
1081
takes_args = ['file*']
1082
takes_options = ['verbose', Option('new', help='remove newly-added files')]
1084
encoding_type = 'replace'
1086
def run(self, file_list, verbose=False, new=False):
1087
tree, file_list = tree_files(file_list)
1089
if file_list is None:
1090
raise errors.BzrCommandError('Specify one or more files to'
1091
' remove, or use --new.')
1093
added = tree.changes_from(tree.basis_tree(),
1094
specific_files=file_list).added
1095
file_list = sorted([f[0] for f in added], reverse=True)
1096
if len(file_list) == 0:
1097
raise errors.BzrCommandError('No matching files.')
1098
tree.remove(file_list, verbose=verbose, to_file=self.outf)
1101
class cmd_file_id(Command):
1102
"""Print file_id of a particular file or directory.
1104
The file_id is assigned when the file is first added and remains the
1105
same through all revisions where the file exists, even when it is
1110
takes_args = ['filename']
1113
def run(self, filename):
1114
tree, relpath = WorkingTree.open_containing(filename)
1115
i = tree.path2id(relpath)
1117
raise errors.NotVersionedError(filename)
1119
self.outf.write(i + '\n')
1122
class cmd_file_path(Command):
1123
"""Print path of file_ids to a file or directory.
1125
This prints one line for each directory down to the target,
1126
starting at the branch root.
1130
takes_args = ['filename']
1133
def run(self, filename):
1134
tree, relpath = WorkingTree.open_containing(filename)
1135
fid = tree.path2id(relpath)
1137
raise errors.NotVersionedError(filename)
1138
segments = osutils.splitpath(relpath)
1139
for pos in range(1, len(segments) + 1):
1140
path = osutils.joinpath(segments[:pos])
1141
self.outf.write("%s\n" % tree.path2id(path))
1144
class cmd_reconcile(Command):
1145
"""Reconcile bzr metadata in a branch.
1147
This can correct data mismatches that may have been caused by
1148
previous ghost operations or bzr upgrades. You should only
1149
need to run this command if 'bzr check' or a bzr developer
1150
advises you to run it.
1152
If a second branch is provided, cross-branch reconciliation is
1153
also attempted, which will check that data like the tree root
1154
id which was not present in very early bzr versions is represented
1155
correctly in both branches.
1157
At the same time it is run it may recompress data resulting in
1158
a potential saving in disk space or performance gain.
1160
The branch *MUST* be on a listable system such as local disk or sftp.
1162
takes_args = ['branch?']
1164
def run(self, branch="."):
1165
from bzrlib.reconcile import reconcile
1166
dir = bzrdir.BzrDir.open(branch)
1170
class cmd_revision_history(Command):
1171
"""Display the list of revision ids on a branch."""
1172
takes_args = ['location?']
1177
def run(self, location="."):
1178
branch = Branch.open_containing(location)[0]
1179
for revid in branch.revision_history():
1180
self.outf.write(revid)
1181
self.outf.write('\n')
1184
class cmd_ancestry(Command):
1185
"""List all revisions merged into this branch."""
1186
takes_args = ['location?']
1191
def run(self, location="."):
1193
wt = WorkingTree.open_containing(location)[0]
1194
except errors.NoWorkingTree:
1195
b = Branch.open(location)
1196
last_revision = b.last_revision()
1199
last_revision = wt.last_revision()
1201
revision_ids = b.repository.get_ancestry(last_revision)
1202
assert revision_ids[0] is None
1204
for revision_id in revision_ids:
1205
self.outf.write(revision_id + '\n')
1208
class cmd_init(Command):
1209
"""Make a directory into a versioned branch.
1211
Use this to create an empty branch, or before importing an
1214
If there is a repository in a parent directory of the location, then
1215
the history of the branch will be stored in the repository. Otherwise
1216
init creates a standalone branch which carries its own history in
1219
If there is already a branch at the location but it has no working tree,
1220
the tree can be populated with 'bzr checkout'.
1222
Recipe for importing a tree of files:
1227
bzr commit -m 'imported project'
1229
takes_args = ['location?']
1231
RegistryOption('format',
1232
help='Specify a format for this branch. '
1233
'See "help formats".',
1234
registry=bzrdir.format_registry,
1235
converter=bzrdir.format_registry.make_bzrdir,
1236
value_switches=True,
1237
title="Branch Format",
1239
Option('append-revisions-only',
1240
help='Never change revnos or the existing log.'
1241
' Append revisions to it only.')
1243
def run(self, location=None, format=None, append_revisions_only=False):
1245
format = bzrdir.format_registry.make_bzrdir('default')
1246
if location is None:
1249
to_transport = transport.get_transport(location)
1251
# The path has to exist to initialize a
1252
# branch inside of it.
1253
# Just using os.mkdir, since I don't
1254
# believe that we want to create a bunch of
1255
# locations if the user supplies an extended path
1256
# TODO: create-prefix
1258
to_transport.mkdir('.')
1259
except errors.FileExists:
1263
existing_bzrdir = bzrdir.BzrDir.open(location)
1264
except errors.NotBranchError:
1265
# really a NotBzrDir error...
1266
branch = bzrdir.BzrDir.create_branch_convenience(to_transport.base,
1269
from bzrlib.transport.local import LocalTransport
1270
if existing_bzrdir.has_branch():
1271
if (isinstance(to_transport, LocalTransport)
1272
and not existing_bzrdir.has_workingtree()):
1273
raise errors.BranchExistsWithoutWorkingTree(location)
1274
raise errors.AlreadyBranchError(location)
1276
branch = existing_bzrdir.create_branch()
1277
existing_bzrdir.create_workingtree()
1278
if append_revisions_only:
1280
branch.set_append_revisions_only(True)
1281
except errors.UpgradeRequired:
1282
raise errors.BzrCommandError('This branch format cannot be set'
1283
' to append-revisions-only. Try --experimental-branch6')
1286
class cmd_init_repository(Command):
1287
"""Create a shared repository to hold branches.
1289
New branches created under the repository directory will store their revisions
1290
in the repository, not in the branch directory, if the branch format supports
1296
bzr checkout --lightweight repo/trunk trunk-checkout
1300
takes_args = ["location"]
1301
takes_options = [RegistryOption('format',
1302
help='Specify a format for this repository. See'
1303
' "bzr help formats" for details',
1304
registry=bzrdir.format_registry,
1305
converter=bzrdir.format_registry.make_bzrdir,
1306
value_switches=True, title='Repository format'),
1308
help='Allows branches in repository to have'
1310
aliases = ["init-repo"]
1311
def run(self, location, format=None, trees=False):
1313
format = bzrdir.format_registry.make_bzrdir('default')
1315
if location is None:
1318
to_transport = transport.get_transport(location)
1320
to_transport.mkdir('.')
1321
except errors.FileExists:
1324
newdir = format.initialize_on_transport(to_transport)
1325
repo = newdir.create_repository(shared=True)
1326
repo.set_make_working_trees(trees)
1329
class cmd_diff(Command):
1330
"""Show differences in the working tree or between revisions.
1332
If files are listed, only the changes in those files are listed.
1333
Otherwise, all changes for the tree are listed.
1335
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1336
produces patches suitable for "patch -p1".
1340
Shows the difference in the working tree versus the last commit
1342
Difference between the working tree and revision 1
1344
Difference between revision 2 and revision 1
1345
bzr diff --prefix old/:new/
1346
Same as 'bzr diff' but prefix paths with old/ and new/
1347
bzr diff bzr.mine bzr.dev
1348
Show the differences between the two working trees
1350
Show just the differences for 'foo.c'
1352
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1353
# or a graphical diff.
1355
# TODO: Python difflib is not exactly the same as unidiff; should
1356
# either fix it up or prefer to use an external diff.
1358
# TODO: Selected-file diff is inefficient and doesn't show you
1361
# TODO: This probably handles non-Unix newlines poorly.
1363
takes_args = ['file*']
1364
takes_options = ['revision', 'diff-options',
1365
Option('prefix', type=str,
1367
help='Set prefixes to added to old and new filenames, as '
1368
'two values separated by a colon. (eg "old/:new/")'),
1370
aliases = ['di', 'dif']
1371
encoding_type = 'exact'
1374
def run(self, revision=None, file_list=None, diff_options=None,
1376
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1378
if (prefix is None) or (prefix == '0'):
1386
old_label, new_label = prefix.split(":")
1388
raise errors.BzrCommandError(
1389
'--prefix expects two values separated by a colon'
1390
' (eg "old/:new/")')
1392
if revision and len(revision) > 2:
1393
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1394
' one or two revision specifiers')
1397
tree1, file_list = internal_tree_files(file_list)
1401
except errors.FileInWrongBranch:
1402
if len(file_list) != 2:
1403
raise errors.BzrCommandError("Files are in different branches")
1405
tree1, file1 = WorkingTree.open_containing(file_list[0])
1406
tree2, file2 = WorkingTree.open_containing(file_list[1])
1407
if file1 != "" or file2 != "":
1408
# FIXME diff those two files. rbc 20051123
1409
raise errors.BzrCommandError("Files are in different branches")
1411
except errors.NotBranchError:
1412
if (revision is not None and len(revision) == 2
1413
and not revision[0].needs_branch()
1414
and not revision[1].needs_branch()):
1415
# If both revision specs include a branch, we can
1416
# diff them without needing a local working tree
1417
tree1, tree2 = None, None
1421
if tree2 is not None:
1422
if revision is not None:
1423
# FIXME: but there should be a clean way to diff between
1424
# non-default versions of two trees, it's not hard to do
1426
raise errors.BzrCommandError(
1427
"Sorry, diffing arbitrary revisions across branches "
1428
"is not implemented yet")
1429
return show_diff_trees(tree1, tree2, sys.stdout,
1430
specific_files=file_list,
1431
external_diff_options=diff_options,
1432
old_label=old_label, new_label=new_label)
1434
return diff_cmd_helper(tree1, file_list, diff_options,
1435
revision_specs=revision,
1436
old_label=old_label, new_label=new_label)
1439
class cmd_deleted(Command):
1440
"""List files deleted in the working tree.
1442
# TODO: Show files deleted since a previous revision, or
1443
# between two revisions.
1444
# TODO: Much more efficient way to do this: read in new
1445
# directories with readdir, rather than stating each one. Same
1446
# level of effort but possibly much less IO. (Or possibly not,
1447
# if the directories are very large...)
1448
takes_options = ['show-ids']
1451
def run(self, show_ids=False):
1452
tree = WorkingTree.open_containing(u'.')[0]
1455
old = tree.basis_tree()
1458
for path, ie in old.inventory.iter_entries():
1459
if not tree.has_id(ie.file_id):
1460
self.outf.write(path)
1462
self.outf.write(' ')
1463
self.outf.write(ie.file_id)
1464
self.outf.write('\n')
1471
class cmd_modified(Command):
1472
"""List files modified in working tree.
1474
See also: "bzr status".
1481
tree = WorkingTree.open_containing(u'.')[0]
1482
td = tree.changes_from(tree.basis_tree())
1483
for path, id, kind, text_modified, meta_modified in td.modified:
1484
self.outf.write(path + '\n')
1487
class cmd_added(Command):
1488
"""List files added in working tree.
1490
See also: "bzr status".
1497
wt = WorkingTree.open_containing(u'.')[0]
1500
basis = wt.basis_tree()
1503
basis_inv = basis.inventory
1506
if file_id in basis_inv:
1508
if inv.is_root(file_id) and len(basis_inv) == 0:
1510
path = inv.id2path(file_id)
1511
if not os.access(osutils.abspath(path), os.F_OK):
1513
self.outf.write(path + '\n')
1520
class cmd_root(Command):
1521
"""Show the tree root directory.
1523
The root is the nearest enclosing directory with a .bzr control
1525
takes_args = ['filename?']
1527
def run(self, filename=None):
1528
"""Print the branch root."""
1529
tree = WorkingTree.open_containing(filename)[0]
1530
self.outf.write(tree.basedir + '\n')
1533
class cmd_log(Command):
1534
"""Show log of a branch, file, or directory.
1536
By default show the log of the branch containing the working directory.
1538
To request a range of logs, you can use the command -r begin..end
1539
-r revision requests a specific revision, -r ..end or -r begin.. are
1545
bzr log -r -10.. http://server/branch
1548
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1550
takes_args = ['location?']
1551
takes_options = [Option('forward',
1552
help='show from oldest to newest'),
1556
help='show files changed in each revision'),
1557
'show-ids', 'revision',
1561
help='show revisions whose message matches this regexp',
1564
encoding_type = 'replace'
1567
def run(self, location=None, timezone='original',
1574
from bzrlib.log import show_log
1575
assert message is None or isinstance(message, basestring), \
1576
"invalid message argument %r" % message
1577
direction = (forward and 'forward') or 'reverse'
1582
# find the file id to log:
1584
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1588
tree = b.basis_tree()
1589
file_id = tree.path2id(fp)
1591
raise errors.BzrCommandError(
1592
"Path does not have any revision history: %s" %
1596
# FIXME ? log the current subdir only RBC 20060203
1597
if revision is not None \
1598
and len(revision) > 0 and revision[0].get_branch():
1599
location = revision[0].get_branch()
1602
dir, relpath = bzrdir.BzrDir.open_containing(location)
1603
b = dir.open_branch()
1607
if revision is None:
1610
elif len(revision) == 1:
1611
rev1 = rev2 = revision[0].in_history(b).revno
1612
elif len(revision) == 2:
1613
if revision[1].get_branch() != revision[0].get_branch():
1614
# b is taken from revision[0].get_branch(), and
1615
# show_log will use its revision_history. Having
1616
# different branches will lead to weird behaviors.
1617
raise errors.BzrCommandError(
1618
"Log doesn't accept two revisions in different"
1620
if revision[0].spec is None:
1621
# missing begin-range means first revision
1624
rev1 = revision[0].in_history(b).revno
1626
if revision[1].spec is None:
1627
# missing end-range means last known revision
1630
rev2 = revision[1].in_history(b).revno
1632
raise errors.BzrCommandError(
1633
'bzr log --revision takes one or two values.')
1635
# By this point, the revision numbers are converted to the +ve
1636
# form if they were supplied in the -ve form, so we can do
1637
# this comparison in relative safety
1639
(rev2, rev1) = (rev1, rev2)
1641
if log_format is None:
1642
log_format = log.log_formatter_registry.get_default(b)
1644
lf = log_format(show_ids=show_ids, to_file=self.outf,
1645
show_timezone=timezone)
1651
direction=direction,
1652
start_revision=rev1,
1659
def get_log_format(long=False, short=False, line=False, default='long'):
1660
log_format = default
1664
log_format = 'short'
1670
class cmd_touching_revisions(Command):
1671
"""Return revision-ids which affected a particular file.
1673
A more user-friendly interface is "bzr log FILE".
1677
takes_args = ["filename"]
1680
def run(self, filename):
1681
tree, relpath = WorkingTree.open_containing(filename)
1683
file_id = tree.path2id(relpath)
1684
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1685
self.outf.write("%6d %s\n" % (revno, what))
1688
class cmd_ls(Command):
1689
"""List files in a tree.
1692
takes_args = ['path?']
1693
# TODO: Take a revision or remote path and list that tree instead.
1694
takes_options = ['verbose', 'revision',
1695
Option('non-recursive',
1696
help='don\'t recurse into sub-directories'),
1698
help='Print all paths from the root of the branch.'),
1699
Option('unknown', help='Print unknown files'),
1700
Option('versioned', help='Print versioned files'),
1701
Option('ignored', help='Print ignored files'),
1703
Option('null', help='Null separate the files'),
1707
def run(self, revision=None, verbose=False,
1708
non_recursive=False, from_root=False,
1709
unknown=False, versioned=False, ignored=False,
1710
null=False, kind=None, show_ids=False, path=None):
1712
if kind and kind not in ('file', 'directory', 'symlink'):
1713
raise errors.BzrCommandError('invalid kind specified')
1715
if verbose and null:
1716
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1717
all = not (unknown or versioned or ignored)
1719
selection = {'I':ignored, '?':unknown, 'V':versioned}
1726
raise errors.BzrCommandError('cannot specify both --from-root'
1730
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1736
if revision is not None:
1737
tree = branch.repository.revision_tree(
1738
revision[0].in_history(branch).rev_id)
1740
tree = branch.basis_tree()
1744
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1745
if fp.startswith(relpath):
1746
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1747
if non_recursive and '/' in fp:
1749
if not all and not selection[fc]:
1751
if kind is not None and fkind != kind:
1754
kindch = entry.kind_character()
1755
outstring = '%-8s %s%s' % (fc, fp, kindch)
1756
if show_ids and fid is not None:
1757
outstring = "%-50s %s" % (outstring, fid)
1758
self.outf.write(outstring + '\n')
1760
self.outf.write(fp + '\0')
1763
self.outf.write(fid)
1764
self.outf.write('\0')
1772
self.outf.write('%-50s %s\n' % (fp, my_id))
1774
self.outf.write(fp + '\n')
1779
class cmd_unknowns(Command):
1780
"""List unknown files.
1782
See also: "bzr ls --unknown".
1789
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1790
self.outf.write(osutils.quotefn(f) + '\n')
1793
class cmd_ignore(Command):
1794
"""Ignore specified files or patterns.
1796
To remove patterns from the ignore list, edit the .bzrignore file.
1798
Trailing slashes on patterns are ignored.
1799
If the pattern contains a slash or is a regular expression, it is compared
1800
to the whole path from the branch root. Otherwise, it is compared to only
1801
the last component of the path. To match a file only in the root
1802
directory, prepend './'.
1804
Ignore patterns specifying absolute paths are not allowed.
1806
Ignore patterns may include globbing wildcards such as:
1807
? - Matches any single character except '/'
1808
* - Matches 0 or more characters except '/'
1809
/**/ - Matches 0 or more directories in a path
1810
[a-z] - Matches a single character from within a group of characters
1812
Ignore patterns may also be Python regular expressions.
1813
Regular expression ignore patterns are identified by a 'RE:' prefix
1814
followed by the regular expression. Regular expression ignore patterns
1815
may not include named or numbered groups.
1817
Note: ignore patterns containing shell wildcards must be quoted from
1821
bzr ignore ./Makefile
1822
bzr ignore '*.class'
1823
bzr ignore 'lib/**/*.o'
1824
bzr ignore 'RE:lib/.*\.o'
1826
takes_args = ['name_pattern*']
1828
Option('old-default-rules',
1829
help='Out the ignore rules bzr < 0.9 always used.')
1832
def run(self, name_pattern_list=None, old_default_rules=None):
1833
from bzrlib.atomicfile import AtomicFile
1834
if old_default_rules is not None:
1835
# dump the rules and exit
1836
for pattern in ignores.OLD_DEFAULTS:
1839
if not name_pattern_list:
1840
raise errors.BzrCommandError("ignore requires at least one "
1841
"NAME_PATTERN or --old-default-rules")
1842
name_pattern_list = [globbing.normalize_pattern(p)
1843
for p in name_pattern_list]
1844
for name_pattern in name_pattern_list:
1845
if (name_pattern[0] == '/' or
1846
(len(name_pattern) > 1 and name_pattern[1] == ':')):
1847
raise errors.BzrCommandError(
1848
"NAME_PATTERN should not be an absolute path")
1849
tree, relpath = WorkingTree.open_containing(u'.')
1850
ifn = tree.abspath('.bzrignore')
1851
if os.path.exists(ifn):
1854
igns = f.read().decode('utf-8')
1860
# TODO: If the file already uses crlf-style termination, maybe
1861
# we should use that for the newly added lines?
1863
if igns and igns[-1] != '\n':
1865
for name_pattern in name_pattern_list:
1866
igns += name_pattern + '\n'
1868
f = AtomicFile(ifn, 'wb')
1870
f.write(igns.encode('utf-8'))
1875
if not tree.path2id('.bzrignore'):
1876
tree.add(['.bzrignore'])
1879
class cmd_ignored(Command):
1880
"""List ignored files and the patterns that matched them.
1882
See also: bzr ignore"""
1885
tree = WorkingTree.open_containing(u'.')[0]
1888
for path, file_class, kind, file_id, entry in tree.list_files():
1889
if file_class != 'I':
1891
## XXX: Slightly inefficient since this was already calculated
1892
pat = tree.is_ignored(path)
1893
print '%-50s %s' % (path, pat)
1898
class cmd_lookup_revision(Command):
1899
"""Lookup the revision-id from a revision-number
1902
bzr lookup-revision 33
1905
takes_args = ['revno']
1908
def run(self, revno):
1912
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1914
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1917
class cmd_export(Command):
1918
"""Export past revision to destination directory.
1920
If no revision is specified this exports the last committed revision.
1922
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1923
given, try to find the format with the extension. If no extension
1924
is found exports to a directory (equivalent to --format=dir).
1926
Root may be the top directory for tar, tgz and tbz2 formats. If none
1927
is given, the top directory will be the root name of the file.
1929
If branch is omitted then the branch containing the CWD will be used.
1931
Note: export of tree with non-ascii filenames to zip is not supported.
1933
Supported formats Autodetected by extension
1934
----------------- -------------------------
1937
tbz2 .tar.bz2, .tbz2
1941
takes_args = ['dest', 'branch?']
1942
takes_options = ['revision', 'format', 'root']
1943
def run(self, dest, branch=None, revision=None, format=None, root=None):
1944
from bzrlib.export import export
1947
tree = WorkingTree.open_containing(u'.')[0]
1950
b = Branch.open(branch)
1952
if revision is None:
1953
# should be tree.last_revision FIXME
1954
rev_id = b.last_revision()
1956
if len(revision) != 1:
1957
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
1958
rev_id = revision[0].in_history(b).rev_id
1959
t = b.repository.revision_tree(rev_id)
1961
export(t, dest, format, root)
1962
except errors.NoSuchExportFormat, e:
1963
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1966
class cmd_cat(Command):
1967
"""Write a file's text from a previous revision."""
1969
takes_options = ['revision', 'name-from-revision']
1970
takes_args = ['filename']
1971
encoding_type = 'exact'
1974
def run(self, filename, revision=None, name_from_revision=False):
1975
if revision is not None and len(revision) != 1:
1976
raise errors.BzrCommandError("bzr cat --revision takes exactly"
1981
tree, b, relpath = \
1982
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
1983
except errors.NotBranchError:
1986
if revision is not None and revision[0].get_branch() is not None:
1987
b = Branch.open(revision[0].get_branch())
1989
tree = b.basis_tree()
1990
if revision is None:
1991
revision_id = b.last_revision()
1993
revision_id = revision[0].in_history(b).rev_id
1995
cur_file_id = tree.path2id(relpath)
1996
rev_tree = b.repository.revision_tree(revision_id)
1997
old_file_id = rev_tree.path2id(relpath)
1999
if name_from_revision:
2000
if old_file_id is None:
2001
raise errors.BzrCommandError("%r is not present in revision %s"
2002
% (filename, revision_id))
2004
rev_tree.print_file(old_file_id)
2005
elif cur_file_id is not None:
2006
rev_tree.print_file(cur_file_id)
2007
elif old_file_id is not None:
2008
rev_tree.print_file(old_file_id)
2010
raise errors.BzrCommandError("%r is not present in revision %s" %
2011
(filename, revision_id))
2014
class cmd_local_time_offset(Command):
2015
"""Show the offset in seconds from GMT to local time."""
2019
print osutils.local_time_offset()
2023
class cmd_commit(Command):
2024
"""Commit changes into a new revision.
2026
If no arguments are given, the entire tree is committed.
2028
If selected files are specified, only changes to those files are
2029
committed. If a directory is specified then the directory and everything
2030
within it is committed.
2032
A selected-file commit may fail in some cases where the committed
2033
tree would be invalid, such as trying to commit a file in a
2034
newly-added directory that is not itself committed.
2036
# TODO: Run hooks on tree to-be-committed, and after commit.
2038
# TODO: Strict commit that fails if there are deleted files.
2039
# (what does "deleted files" mean ??)
2041
# TODO: Give better message for -s, --summary, used by tla people
2043
# XXX: verbose currently does nothing
2045
takes_args = ['selected*']
2046
takes_options = ['message', 'verbose',
2048
help='commit even if nothing has changed'),
2049
Option('file', type=str,
2052
help='file containing commit message'),
2054
help="refuse to commit if there are unknown "
2055
"files in the working tree."),
2057
help="perform a local only commit in a bound "
2058
"branch. Such commits are not pushed to "
2059
"the master branch until a normal commit "
2063
aliases = ['ci', 'checkin']
2065
def run(self, message=None, file=None, verbose=True, selected_list=None,
2066
unchanged=False, strict=False, local=False):
2067
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
2068
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
2070
from bzrlib.msgeditor import edit_commit_message, \
2071
make_commit_message_template
2073
# TODO: Need a blackbox test for invoking the external editor; may be
2074
# slightly problematic to run this cross-platform.
2076
# TODO: do more checks that the commit will succeed before
2077
# spending the user's valuable time typing a commit message.
2078
tree, selected_list = tree_files(selected_list)
2079
if selected_list == ['']:
2080
# workaround - commit of root of tree should be exactly the same
2081
# as just default commit in that tree, and succeed even though
2082
# selected-file merge commit is not done yet
2085
if local and not tree.branch.get_bound_location():
2086
raise errors.LocalRequiresBoundBranch()
2088
def get_message(commit_obj):
2089
"""Callback to get commit message"""
2090
my_message = message
2091
if my_message is None and not file:
2092
template = make_commit_message_template(tree, selected_list)
2093
my_message = edit_commit_message(template)
2094
if my_message is None:
2095
raise errors.BzrCommandError("please specify a commit"
2096
" message with either --message or --file")
2097
elif my_message and file:
2098
raise errors.BzrCommandError(
2099
"please specify either --message or --file")
2101
my_message = codecs.open(file, 'rt',
2102
bzrlib.user_encoding).read()
2103
if my_message == "":
2104
raise errors.BzrCommandError("empty commit message specified")
2108
reporter = ReportCommitToLog()
2110
reporter = NullCommitReporter()
2113
tree.commit(message_callback=get_message,
2114
specific_files=selected_list,
2115
allow_pointless=unchanged, strict=strict, local=local,
2117
except PointlessCommit:
2118
# FIXME: This should really happen before the file is read in;
2119
# perhaps prepare the commit; get the message; then actually commit
2120
raise errors.BzrCommandError("no changes to commit."
2121
" use --unchanged to commit anyhow")
2122
except ConflictsInTree:
2123
raise errors.BzrCommandError('Conflicts detected in working '
2124
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2126
except StrictCommitFailed:
2127
raise errors.BzrCommandError("Commit refused because there are"
2128
" unknown files in the working tree.")
2129
except errors.BoundBranchOutOfDate, e:
2130
raise errors.BzrCommandError(str(e) + "\n"
2131
'To commit to master branch, run update and then commit.\n'
2132
'You can also pass --local to commit to continue working '
2136
class cmd_check(Command):
2137
"""Validate consistency of branch history.
2139
This command checks various invariants about the branch storage to
2140
detect data corruption or bzr bugs.
2142
takes_args = ['branch?']
2143
takes_options = ['verbose']
2145
def run(self, branch=None, verbose=False):
2146
from bzrlib.check import check
2148
tree = WorkingTree.open_containing()[0]
2149
branch = tree.branch
2151
branch = Branch.open(branch)
2152
check(branch, verbose)
2155
class cmd_upgrade(Command):
2156
"""Upgrade branch storage to current format.
2158
The check command or bzr developers may sometimes advise you to run
2159
this command. When the default format has changed you may also be warned
2160
during other operations to upgrade.
2162
takes_args = ['url?']
2164
RegistryOption('format',
2165
help='Upgrade to a specific format. See "bzr help'
2166
' formats" for details',
2167
registry=bzrdir.format_registry,
2168
converter=bzrdir.format_registry.make_bzrdir,
2169
value_switches=True, title='Branch format'),
2172
def run(self, url='.', format=None):
2173
from bzrlib.upgrade import upgrade
2175
format = bzrdir.format_registry.make_bzrdir('default')
2176
upgrade(url, format)
2179
class cmd_whoami(Command):
2180
"""Show or set bzr user id.
2184
bzr whoami 'Frank Chu <fchu@example.com>'
2186
takes_options = [ Option('email',
2187
help='display email address only'),
2189
help='set identity for the current branch instead of '
2192
takes_args = ['name?']
2193
encoding_type = 'replace'
2196
def run(self, email=False, branch=False, name=None):
2198
# use branch if we're inside one; otherwise global config
2200
c = Branch.open_containing('.')[0].get_config()
2201
except errors.NotBranchError:
2202
c = config.GlobalConfig()
2204
self.outf.write(c.user_email() + '\n')
2206
self.outf.write(c.username() + '\n')
2209
# display a warning if an email address isn't included in the given name.
2211
config.extract_email_address(name)
2212
except errors.NoEmailInUsername, e:
2213
warning('"%s" does not seem to contain an email address. '
2214
'This is allowed, but not recommended.', name)
2216
# use global config unless --branch given
2218
c = Branch.open_containing('.')[0].get_config()
2220
c = config.GlobalConfig()
2221
c.set_user_option('email', name)
2224
class cmd_nick(Command):
2225
"""Print or set the branch nickname.
2227
If unset, the tree root directory name is used as the nickname
2228
To print the current nickname, execute with no argument.
2230
takes_args = ['nickname?']
2231
def run(self, nickname=None):
2232
branch = Branch.open_containing(u'.')[0]
2233
if nickname is None:
2234
self.printme(branch)
2236
branch.nick = nickname
2239
def printme(self, branch):
2243
class cmd_selftest(Command):
2244
"""Run internal test suite.
2246
This creates temporary test directories in the working directory, but not
2247
existing data is affected. These directories are deleted if the tests
2248
pass, or left behind to help in debugging if they fail and --keep-output
2251
If arguments are given, they are regular expressions that say which tests
2252
should run. Tests matching any expression are run, and other tests are
2255
Alternatively if --first is given, matching tests are run first and then
2256
all other tests are run. This is useful if you have been working in a
2257
particular area, but want to make sure nothing else was broken.
2259
If the global option '--no-plugins' is given, plugins are not loaded
2260
before running the selftests. This has two effects: features provided or
2261
modified by plugins will not be tested, and tests provided by plugins will
2266
run only tests relating to 'ignore'
2267
bzr --no-plugins selftest -v
2268
disable plugins and list tests as they're run
2270
For each test, that needs actual disk access, bzr create their own
2271
subdirectory in the temporary testing directory (testXXXX.tmp).
2272
By default the name of such subdirectory is based on the name of the test.
2273
If option '--numbered-dirs' is given, bzr will use sequent numbers
2274
of running tests to create such subdirectories. This is default behavior
2275
on Windows because of path length limitation.
2277
# TODO: --list should give a list of all available tests
2279
# NB: this is used from the class without creating an instance, which is
2280
# why it does not have a self parameter.
2281
def get_transport_type(typestring):
2282
"""Parse and return a transport specifier."""
2283
if typestring == "sftp":
2284
from bzrlib.transport.sftp import SFTPAbsoluteServer
2285
return SFTPAbsoluteServer
2286
if typestring == "memory":
2287
from bzrlib.transport.memory import MemoryServer
2289
if typestring == "fakenfs":
2290
from bzrlib.transport.fakenfs import FakeNFSServer
2291
return FakeNFSServer
2292
msg = "No known transport type %s. Supported types are: sftp\n" %\
2294
raise errors.BzrCommandError(msg)
2297
takes_args = ['testspecs*']
2298
takes_options = ['verbose',
2299
Option('one', help='stop when one test fails'),
2300
Option('keep-output',
2301
help='keep output directories when tests fail'),
2303
help='Use a different transport by default '
2304
'throughout the test suite.',
2305
type=get_transport_type),
2306
Option('benchmark', help='run the bzr benchmarks.'),
2307
Option('lsprof-timed',
2308
help='generate lsprof output for benchmarked'
2309
' sections of code.'),
2310
Option('cache-dir', type=str,
2311
help='a directory to cache intermediate'
2312
' benchmark steps'),
2313
Option('clean-output',
2314
help='clean temporary tests directories'
2315
' without running tests'),
2317
help='run all tests, but run specified tests first'
2319
Option('numbered-dirs',
2320
help='use numbered dirs for TestCaseInTempDir'),
2322
encoding_type = 'replace'
2324
def run(self, testspecs_list=None, verbose=None, one=False,
2325
keep_output=False, transport=None, benchmark=None,
2326
lsprof_timed=None, cache_dir=None, clean_output=False,
2327
first=False, numbered_dirs=None):
2329
from bzrlib.tests import selftest
2330
import bzrlib.benchmarks as benchmarks
2331
from bzrlib.benchmarks import tree_creator
2334
from bzrlib.tests import clean_selftest_output
2335
clean_selftest_output()
2338
if numbered_dirs is None and sys.platform == 'win32':
2339
numbered_dirs = True
2341
if cache_dir is not None:
2342
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2343
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
2344
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2346
if testspecs_list is not None:
2347
pattern = '|'.join(testspecs_list)
2351
test_suite_factory = benchmarks.test_suite
2354
# TODO: should possibly lock the history file...
2355
benchfile = open(".perf_history", "at", buffering=1)
2357
test_suite_factory = None
2362
result = selftest(verbose=verbose,
2364
stop_on_failure=one,
2365
keep_output=keep_output,
2366
transport=transport,
2367
test_suite_factory=test_suite_factory,
2368
lsprof_timed=lsprof_timed,
2369
bench_history=benchfile,
2370
matching_tests_first=first,
2371
numbered_dirs=numbered_dirs,
2374
if benchfile is not None:
2377
info('tests passed')
2379
info('tests failed')
2380
return int(not result)
2383
class cmd_version(Command):
2384
"""Show version of bzr."""
2388
from bzrlib.version import show_version
2392
class cmd_rocks(Command):
2393
"""Statement of optimism."""
2399
print "It sure does!"
2402
class cmd_find_merge_base(Command):
2403
"""Find and print a base revision for merging two branches."""
2404
# TODO: Options to specify revisions on either side, as if
2405
# merging only part of the history.
2406
takes_args = ['branch', 'other']
2410
def run(self, branch, other):
2411
from bzrlib.revision import MultipleRevisionSources
2413
branch1 = Branch.open_containing(branch)[0]
2414
branch2 = Branch.open_containing(other)[0]
2416
last1 = branch1.last_revision()
2417
last2 = branch2.last_revision()
2419
source = MultipleRevisionSources(branch1.repository,
2422
base_rev_id = common_ancestor(last1, last2, source)
2424
print 'merge base is revision %s' % base_rev_id
2427
class cmd_merge(Command):
2428
"""Perform a three-way merge.
2430
The branch is the branch you will merge from. By default, it will merge
2431
the latest revision. If you specify a revision, that revision will be
2432
merged. If you specify two revisions, the first will be used as a BASE,
2433
and the second one as OTHER. Revision numbers are always relative to the
2436
By default, bzr will try to merge in all new work from the other
2437
branch, automatically determining an appropriate base. If this
2438
fails, you may need to give an explicit base.
2440
Merge will do its best to combine the changes in two branches, but there
2441
are some kinds of problems only a human can fix. When it encounters those,
2442
it will mark a conflict. A conflict means that you need to fix something,
2443
before you should commit.
2445
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2447
If there is no default branch set, the first merge will set it. After
2448
that, you can omit the branch to use the default. To change the
2449
default, use --remember. The value will only be saved if the remote
2450
location can be accessed.
2452
The results of the merge are placed into the destination working
2453
directory, where they can be reviewed (with bzr diff), tested, and then
2454
committed to record the result of the merge.
2458
To merge the latest revision from bzr.dev
2459
bzr merge ../bzr.dev
2461
To merge changes up to and including revision 82 from bzr.dev
2462
bzr merge -r 82 ../bzr.dev
2464
To merge the changes introduced by 82, without previous changes:
2465
bzr merge -r 81..82 ../bzr.dev
2467
merge refuses to run if there are any uncommitted changes, unless
2470
The following merge types are available:
2472
takes_args = ['branch?']
2473
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2474
Option('show-base', help="Show base revision text in "
2476
Option('uncommitted', help='Apply uncommitted changes'
2477
' from a working copy, instead of branch changes'),
2478
Option('pull', help='If the destination is already'
2479
' completely merged into the source, pull from the'
2480
' source rather than merging. When this happens,'
2481
' you do not need to commit the result.'),
2483
help='Branch to merge into, '
2484
'rather than the one containing the working directory',
2490
def run(self, branch=None, revision=None, force=False, merge_type=None,
2491
show_base=False, reprocess=False, remember=False,
2492
uncommitted=False, pull=False,
2495
from bzrlib.tag import _merge_tags_if_possible
2496
if merge_type is None:
2497
merge_type = _mod_merge.Merge3Merger
2499
if directory is None: directory = u'.'
2500
# XXX: jam 20070225 WorkingTree should be locked before you extract its
2501
# inventory. Because merge is a mutating operation, it really
2502
# should be a lock_write() for the whole cmd_merge operation.
2503
# However, cmd_merge open's its own tree in _merge_helper, which
2504
# means if we lock here, the later lock_write() will always block.
2505
# Either the merge helper code should be updated to take a tree,
2506
# (What about tree.merge_from_branch?)
2507
tree = WorkingTree.open_containing(directory)[0]
2508
change_reporter = delta._ChangeReporter(
2509
unversioned_filter=tree.is_ignored)
2511
if branch is not None:
2513
reader = bundle.read_bundle_from_url(branch)
2514
except errors.NotABundle:
2515
pass # Continue on considering this url a Branch
2517
conflicts = merge_bundle(reader, tree, not force, merge_type,
2518
reprocess, show_base, change_reporter)
2524
if revision is None \
2525
or len(revision) < 1 or revision[0].needs_branch():
2526
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2528
if revision is None or len(revision) < 1:
2531
other = [branch, None]
2534
other = [branch, -1]
2535
other_branch, path = Branch.open_containing(branch)
2538
raise errors.BzrCommandError('Cannot use --uncommitted and'
2539
' --revision at the same time.')
2540
branch = revision[0].get_branch() or branch
2541
if len(revision) == 1:
2543
other_branch, path = Branch.open_containing(branch)
2544
revno = revision[0].in_history(other_branch).revno
2545
other = [branch, revno]
2547
assert len(revision) == 2
2548
if None in revision:
2549
raise errors.BzrCommandError(
2550
"Merge doesn't permit empty revision specifier.")
2551
base_branch, path = Branch.open_containing(branch)
2552
branch1 = revision[1].get_branch() or branch
2553
other_branch, path1 = Branch.open_containing(branch1)
2554
if revision[0].get_branch() is not None:
2555
# then path was obtained from it, and is None.
2558
base = [branch, revision[0].in_history(base_branch).revno]
2559
other = [branch1, revision[1].in_history(other_branch).revno]
2561
if tree.branch.get_parent() is None or remember:
2562
tree.branch.set_parent(other_branch.base)
2564
# pull tags now... it's a bit inconsistent to do it ahead of copying
2565
# the history but that's done inside the merge code
2566
_merge_tags_if_possible(other_branch, tree.branch)
2569
interesting_files = [path]
2571
interesting_files = None
2572
pb = ui.ui_factory.nested_progress_bar()
2575
conflict_count = _merge_helper(
2576
other, base, check_clean=(not force),
2577
merge_type=merge_type,
2578
reprocess=reprocess,
2579
show_base=show_base,
2582
pb=pb, file_list=interesting_files,
2583
change_reporter=change_reporter)
2586
if conflict_count != 0:
2590
except errors.AmbiguousBase, e:
2591
m = ("sorry, bzr can't determine the right merge base yet\n"
2592
"candidates are:\n "
2593
+ "\n ".join(e.bases)
2595
"please specify an explicit base with -r,\n"
2596
"and (if you want) report this to the bzr developers\n")
2599
# TODO: move up to common parent; this isn't merge-specific anymore.
2600
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2601
"""Use tree.branch's parent if none was supplied.
2603
Report if the remembered location was used.
2605
if supplied_location is not None:
2606
return supplied_location
2607
stored_location = tree.branch.get_parent()
2608
mutter("%s", stored_location)
2609
if stored_location is None:
2610
raise errors.BzrCommandError("No location specified or remembered")
2611
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2612
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2613
return stored_location
2616
class cmd_remerge(Command):
2619
Use this if you want to try a different merge technique while resolving
2620
conflicts. Some merge techniques are better than others, and remerge
2621
lets you try different ones on different files.
2623
The options for remerge have the same meaning and defaults as the ones for
2624
merge. The difference is that remerge can (only) be run when there is a
2625
pending merge, and it lets you specify particular files.
2628
$ bzr remerge --show-base
2629
Re-do the merge of all conflicted files, and show the base text in
2630
conflict regions, in addition to the usual THIS and OTHER texts.
2632
$ bzr remerge --merge-type weave --reprocess foobar
2633
Re-do the merge of "foobar", using the weave merge algorithm, with
2634
additional processing to reduce the size of conflict regions.
2636
The following merge types are available:"""
2637
takes_args = ['file*']
2638
takes_options = ['merge-type', 'reprocess',
2639
Option('show-base', help="Show base revision text in "
2642
def run(self, file_list=None, merge_type=None, show_base=False,
2644
if merge_type is None:
2645
merge_type = _mod_merge.Merge3Merger
2646
tree, file_list = tree_files(file_list)
2649
parents = tree.get_parent_ids()
2650
if len(parents) != 2:
2651
raise errors.BzrCommandError("Sorry, remerge only works after normal"
2652
" merges. Not cherrypicking or"
2654
repository = tree.branch.repository
2655
base_revision = common_ancestor(parents[0],
2656
parents[1], repository)
2657
base_tree = repository.revision_tree(base_revision)
2658
other_tree = repository.revision_tree(parents[1])
2659
interesting_ids = None
2661
conflicts = tree.conflicts()
2662
if file_list is not None:
2663
interesting_ids = set()
2664
for filename in file_list:
2665
file_id = tree.path2id(filename)
2667
raise errors.NotVersionedError(filename)
2668
interesting_ids.add(file_id)
2669
if tree.kind(file_id) != "directory":
2672
for name, ie in tree.inventory.iter_entries(file_id):
2673
interesting_ids.add(ie.file_id)
2674
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2676
# Remerge only supports resolving contents conflicts
2677
allowed_conflicts = ('text conflict', 'contents conflict')
2678
restore_files = [c.path for c in conflicts
2679
if c.typestring in allowed_conflicts]
2680
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2681
tree.set_conflicts(ConflictList(new_conflicts))
2682
if file_list is not None:
2683
restore_files = file_list
2684
for filename in restore_files:
2686
restore(tree.abspath(filename))
2687
except errors.NotConflicted:
2689
conflicts = _mod_merge.merge_inner(
2690
tree.branch, other_tree, base_tree,
2692
interesting_ids=interesting_ids,
2693
other_rev_id=parents[1],
2694
merge_type=merge_type,
2695
show_base=show_base,
2696
reprocess=reprocess)
2705
class cmd_revert(Command):
2706
"""Revert files to a previous revision.
2708
Giving a list of files will revert only those files. Otherwise, all files
2709
will be reverted. If the revision is not specified with '--revision', the
2710
last committed revision is used.
2712
To remove only some changes, without reverting to a prior version, use
2713
merge instead. For example, "merge . --r-2..-3" will remove the changes
2714
introduced by -2, without affecting the changes introduced by -1. Or
2715
to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
2717
By default, any files that have been manually changed will be backed up
2718
first. (Files changed only by merge are not backed up.) Backup files have
2719
'.~#~' appended to their name, where # is a number.
2721
When you provide files, you can use their current pathname or the pathname
2722
from the target revision. So you can use revert to "undelete" a file by
2723
name. If you name a directory, all the contents of that directory will be
2726
takes_options = ['revision', 'no-backup']
2727
takes_args = ['file*']
2728
aliases = ['merge-revert']
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
