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
573
if directory is None:
576
tree_to = WorkingTree.open_containing(directory)[0]
577
branch_to = tree_to.branch
578
except errors.NoWorkingTree:
580
branch_to = Branch.open_containing(directory)[0]
583
if location is not None:
585
mergeable = bundle.read_mergeable_from_url(
587
except errors.NotABundle:
588
pass # Continue on considering this url a Branch
590
stored_loc = branch_to.get_parent()
592
if stored_loc is None:
593
raise errors.BzrCommandError("No pull location known or"
596
display_url = urlutils.unescape_for_display(stored_loc,
598
self.outf.write("Using saved location: %s\n" % display_url)
599
location = stored_loc
601
if mergeable is not None:
602
if revision is not None:
603
raise errors.BzrCommandError(
604
'Cannot use -r with merge directives or bundles')
605
rev_id = mergeable.get_target_revision(
606
branch_to.repository)
607
branch_from = branch_to
609
branch_from = Branch.open(location)
611
if branch_to.get_parent() is None or remember:
612
branch_to.set_parent(branch_from.base)
614
if revision is not None:
615
if len(revision) == 1:
616
rev_id = revision[0].in_history(branch_from).rev_id
618
raise errors.BzrCommandError(
619
'bzr pull --revision takes one value.')
621
old_rh = branch_to.revision_history()
622
if tree_to is not None:
623
result = tree_to.pull(branch_from, overwrite, rev_id,
624
delta._ChangeReporter(unversioned_filter=tree_to.is_ignored))
626
result = branch_to.pull(branch_from, overwrite, rev_id)
628
result.report(self.outf)
630
from bzrlib.log import show_changed_revisions
631
new_rh = branch_to.revision_history()
632
show_changed_revisions(branch_to, old_rh, new_rh,
636
class cmd_push(Command):
637
"""Update a mirror of this branch.
639
The target branch will not have its working tree populated because this
640
is both expensive, and is not supported on remote file systems.
642
Some smart servers or protocols *may* put the working tree in place in
645
This command only works on branches that have not diverged. Branches are
646
considered diverged if the destination branch's most recent commit is one
647
that has not been merged (directly or indirectly) by the source branch.
649
If branches have diverged, you can use 'bzr push --overwrite' to replace
650
the other branch completely, discarding its unmerged changes.
652
If you want to ensure you have the different changes in the other branch,
653
do a merge (see bzr help merge) from the other branch, and commit that.
654
After that you will be able to do a push without '--overwrite'.
656
If there is no default push location set, the first push will set it.
657
After that, you can omit the location to use the default. To change the
658
default, use --remember. The value will only be saved if the remote
659
location can be accessed.
662
takes_options = ['remember', 'overwrite', 'verbose',
663
Option('create-prefix',
664
help='Create the path leading up to the branch '
665
'if it does not already exist'),
667
help='branch to push from, '
668
'rather than the one containing the working directory',
672
Option('use-existing-dir',
673
help='By default push will fail if the target'
674
' directory exists, but does not already'
675
' have a control directory. This flag will'
676
' allow push to proceed.'),
678
takes_args = ['location?']
679
encoding_type = 'replace'
681
def run(self, location=None, remember=False, overwrite=False,
682
create_prefix=False, verbose=False,
683
use_existing_dir=False,
685
# FIXME: Way too big! Put this into a function called from the
687
if directory is None:
689
br_from = Branch.open_containing(directory)[0]
690
stored_loc = br_from.get_push_location()
692
if stored_loc is None:
693
raise errors.BzrCommandError("No push location known or specified.")
695
display_url = urlutils.unescape_for_display(stored_loc,
697
self.outf.write("Using saved location: %s\n" % display_url)
698
location = stored_loc
700
to_transport = transport.get_transport(location)
701
location_url = to_transport.base
703
br_to = repository_to = dir_to = None
705
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
706
except errors.NotBranchError:
707
pass # Didn't find anything
709
# If we can open a branch, use its direct repository, otherwise see
710
# if there is a repository without a branch.
712
br_to = dir_to.open_branch()
713
except errors.NotBranchError:
714
# Didn't find a branch, can we find a repository?
716
repository_to = dir_to.find_repository()
717
except errors.NoRepositoryPresent:
720
# Found a branch, so we must have found a repository
721
repository_to = br_to.repository
725
# The destination doesn't exist; create it.
726
# XXX: Refactor the create_prefix/no_create_prefix code into a
727
# common helper function
729
to_transport.mkdir('.')
730
except errors.FileExists:
731
if not use_existing_dir:
732
raise errors.BzrCommandError("Target directory %s"
733
" already exists, but does not have a valid .bzr"
734
" directory. Supply --use-existing-dir to push"
735
" there anyway." % location)
736
except errors.NoSuchFile:
737
if not create_prefix:
738
raise errors.BzrCommandError("Parent directory of %s"
740
"\nYou may supply --create-prefix to create all"
741
" leading parent directories."
744
cur_transport = to_transport
745
needed = [cur_transport]
746
# Recurse upwards until we can create a directory successfully
748
new_transport = cur_transport.clone('..')
749
if new_transport.base == cur_transport.base:
750
raise errors.BzrCommandError("Failed to create path"
754
new_transport.mkdir('.')
755
except errors.NoSuchFile:
756
needed.append(new_transport)
757
cur_transport = new_transport
761
# Now we only need to create child directories
763
cur_transport = needed.pop()
764
cur_transport.mkdir('.')
766
# Now the target directory exists, but doesn't have a .bzr
767
# directory. So we need to create it, along with any work to create
768
# all of the dependent branches, etc.
769
dir_to = br_from.bzrdir.clone(location_url,
770
revision_id=br_from.last_revision())
771
br_to = dir_to.open_branch()
772
# TODO: Some more useful message about what was copied
773
note('Created new branch.')
774
# We successfully created the target, remember it
775
if br_from.get_push_location() is None or remember:
776
br_from.set_push_location(br_to.base)
777
elif repository_to is None:
778
# we have a bzrdir but no branch or repository
779
# XXX: Figure out what to do other than complain.
780
raise errors.BzrCommandError("At %s you have a valid .bzr control"
781
" directory, but not a branch or repository. This is an"
782
" unsupported configuration. Please move the target directory"
783
" out of the way and try again."
786
# We have a repository but no branch, copy the revisions, and then
788
last_revision_id = br_from.last_revision()
789
repository_to.fetch(br_from.repository,
790
revision_id=last_revision_id)
791
br_to = br_from.clone(dir_to, revision_id=last_revision_id)
792
note('Created new branch.')
793
if br_from.get_push_location() is None or remember:
794
br_from.set_push_location(br_to.base)
795
else: # We have a valid to branch
796
# We were able to connect to the remote location, so remember it
797
# we don't need to successfully push because of possible divergence.
798
if br_from.get_push_location() is None or remember:
799
br_from.set_push_location(br_to.base)
800
old_rh = br_to.revision_history()
803
tree_to = dir_to.open_workingtree()
804
except errors.NotLocalUrl:
805
warning('This transport does not update the working '
806
'tree of: %s' % (br_to.base,))
807
push_result = br_from.push(br_to, overwrite)
808
except errors.NoWorkingTree:
809
push_result = br_from.push(br_to, overwrite)
813
push_result = br_from.push(tree_to.branch, overwrite)
817
except errors.DivergedBranches:
818
raise errors.BzrCommandError('These branches have diverged.'
819
' Try using "merge" and then "push".')
820
if push_result is not None:
821
push_result.report(self.outf)
823
new_rh = br_to.revision_history()
826
from bzrlib.log import show_changed_revisions
827
show_changed_revisions(br_to, old_rh, new_rh,
830
# we probably did a clone rather than a push, so a message was
835
class cmd_branch(Command):
836
"""Create a new copy of a branch.
838
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
839
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
841
To retrieve the branch as of a particular revision, supply the --revision
842
parameter, as in "branch foo/bar -r 5".
844
--basis is to speed up branching from remote branches. When specified, it
845
copies all the file-contents, inventory and revision data from the basis
846
branch before copying anything from the remote branch.
848
takes_args = ['from_location', 'to_location?']
849
takes_options = ['revision', 'basis']
850
aliases = ['get', 'clone']
852
def run(self, from_location, to_location=None, revision=None, basis=None):
853
from bzrlib.tag import _merge_tags_if_possible
856
elif len(revision) > 1:
857
raise errors.BzrCommandError(
858
'bzr branch --revision takes exactly 1 revision value')
860
br_from = Branch.open(from_location)
863
if basis is not None:
864
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
867
if len(revision) == 1 and revision[0] is not None:
868
revision_id = revision[0].in_history(br_from)[1]
870
# FIXME - wt.last_revision, fallback to branch, fall back to
871
# None or perhaps NULL_REVISION to mean copy nothing
873
revision_id = br_from.last_revision()
874
if to_location is None:
875
to_location = os.path.basename(from_location.rstrip("/\\"))
878
name = os.path.basename(to_location) + '\n'
880
to_transport = transport.get_transport(to_location)
882
to_transport.mkdir('.')
883
except errors.FileExists:
884
raise errors.BzrCommandError('Target directory "%s" already'
885
' exists.' % to_location)
886
except errors.NoSuchFile:
887
raise errors.BzrCommandError('Parent of "%s" does not exist.'
890
# preserve whatever source format we have.
891
dir = br_from.bzrdir.sprout(to_transport.base,
892
revision_id, basis_dir)
893
branch = dir.open_branch()
894
except errors.NoSuchRevision:
895
to_transport.delete_tree('.')
896
msg = "The branch %s has no revision %s." % (from_location, revision[0])
897
raise errors.BzrCommandError(msg)
898
except errors.UnlistableBranch:
899
osutils.rmtree(to_location)
900
msg = "The branch %s cannot be used as a --basis" % (basis,)
901
raise errors.BzrCommandError(msg)
903
branch.control_files.put_utf8('branch-name', name)
904
_merge_tags_if_possible(br_from, branch)
905
note('Branched %d revision(s).' % branch.revno())
910
class cmd_checkout(Command):
911
"""Create a new checkout of an existing branch.
913
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
914
the branch found in '.'. This is useful if you have removed the working tree
915
or if it was never created - i.e. if you pushed the branch to its current
918
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
919
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
921
To retrieve the branch as of a particular revision, supply the --revision
922
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
923
out of date [so you cannot commit] but it may be useful (i.e. to examine old
926
--basis is to speed up checking out from remote branches. When specified, it
927
uses the inventory and file contents from the basis branch in preference to the
928
branch being checked out.
930
See "help checkouts" for more information on checkouts.
932
takes_args = ['branch_location?', 'to_location?']
933
takes_options = ['revision', # , 'basis']
934
Option('lightweight',
935
help="perform a lightweight checkout. Lightweight "
936
"checkouts depend on access to the branch for "
937
"every operation. Normal checkouts can perform "
938
"common operations like diff and status without "
939
"such access, and also support local commits."
944
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
948
elif len(revision) > 1:
949
raise errors.BzrCommandError(
950
'bzr checkout --revision takes exactly 1 revision value')
951
if branch_location is None:
952
branch_location = osutils.getcwd()
953
to_location = branch_location
954
source = Branch.open(branch_location)
955
if len(revision) == 1 and revision[0] is not None:
956
revision_id = revision[0].in_history(source)[1]
959
if to_location is None:
960
to_location = os.path.basename(branch_location.rstrip("/\\"))
961
# if the source and to_location are the same,
962
# and there is no working tree,
963
# then reconstitute a branch
964
if (osutils.abspath(to_location) ==
965
osutils.abspath(branch_location)):
967
source.bzrdir.open_workingtree()
968
except errors.NoWorkingTree:
969
source.bzrdir.create_workingtree()
972
os.mkdir(to_location)
974
if e.errno == errno.EEXIST:
975
raise errors.BzrCommandError('Target directory "%s" already'
976
' exists.' % to_location)
977
if e.errno == errno.ENOENT:
978
raise errors.BzrCommandError('Parent of "%s" does not exist.'
982
source.create_checkout(to_location, revision_id, lightweight)
985
class cmd_renames(Command):
986
"""Show list of renamed files.
988
# TODO: Option to show renames between two historical versions.
990
# TODO: Only show renames under dir, rather than in the whole branch.
991
takes_args = ['dir?']
994
def run(self, dir=u'.'):
995
tree = WorkingTree.open_containing(dir)[0]
998
new_inv = tree.inventory
999
old_tree = tree.basis_tree()
1000
old_tree.lock_read()
1002
old_inv = old_tree.inventory
1003
renames = list(_mod_tree.find_renames(old_inv, new_inv))
1005
for old_name, new_name in renames:
1006
self.outf.write("%s => %s\n" % (old_name, new_name))
1013
class cmd_update(Command):
1014
"""Update a tree to have the latest code committed to its branch.
1016
This will perform a merge into the working tree, and may generate
1017
conflicts. If you have any local changes, you will still
1018
need to commit them after the update for the update to be complete.
1020
If you want to discard your local changes, you can just do a
1021
'bzr revert' instead of 'bzr commit' after the update.
1023
takes_args = ['dir?']
1026
def run(self, dir='.'):
1027
tree = WorkingTree.open_containing(dir)[0]
1028
master = tree.branch.get_master_branch()
1029
if master is not None:
1032
tree.lock_tree_write()
1034
existing_pending_merges = tree.get_parent_ids()[1:]
1035
last_rev = tree.last_revision()
1036
if last_rev == tree.branch.last_revision():
1037
# may be up to date, check master too.
1038
master = tree.branch.get_master_branch()
1039
if master is None or last_rev == master.last_revision():
1040
revno = tree.branch.revision_id_to_revno(last_rev)
1041
note("Tree is up to date at revision %d." % (revno,))
1043
conflicts = tree.update()
1044
revno = tree.branch.revision_id_to_revno(tree.last_revision())
1045
note('Updated to revision %d.' % (revno,))
1046
if tree.get_parent_ids()[1:] != existing_pending_merges:
1047
note('Your local commits will now show as pending merges with '
1048
"'bzr status', and can be committed with 'bzr commit'.")
1057
class cmd_info(Command):
1058
"""Show information about a working tree, branch or repository.
1060
This command will show all known locations and formats associated to the
1061
tree, branch or repository. Statistical information is included with
1064
Branches and working trees will also report any missing revisions.
1066
takes_args = ['location?']
1067
takes_options = ['verbose']
1070
def run(self, location=None, verbose=False):
1071
from bzrlib.info import show_bzrdir_info
1072
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1076
class cmd_remove(Command):
1077
"""Make a file unversioned.
1079
This makes bzr stop tracking changes to a versioned file. It does
1080
not delete the working copy.
1082
You can specify one or more files, and/or --new. If you specify --new,
1083
only 'added' files will be removed. If you specify both, then new files
1084
in the specified directories will be removed. If the directories are
1085
also new, they will also be removed.
1087
takes_args = ['file*']
1088
takes_options = ['verbose', Option('new', help='remove newly-added files')]
1090
encoding_type = 'replace'
1092
def run(self, file_list, verbose=False, new=False):
1093
tree, file_list = tree_files(file_list)
1095
if file_list is None:
1096
raise errors.BzrCommandError('Specify one or more files to'
1097
' remove, or use --new.')
1099
added = tree.changes_from(tree.basis_tree(),
1100
specific_files=file_list).added
1101
file_list = sorted([f[0] for f in added], reverse=True)
1102
if len(file_list) == 0:
1103
raise errors.BzrCommandError('No matching files.')
1104
tree.remove(file_list, verbose=verbose, to_file=self.outf)
1107
class cmd_file_id(Command):
1108
"""Print file_id of a particular file or directory.
1110
The file_id is assigned when the file is first added and remains the
1111
same through all revisions where the file exists, even when it is
1116
takes_args = ['filename']
1119
def run(self, filename):
1120
tree, relpath = WorkingTree.open_containing(filename)
1121
i = tree.path2id(relpath)
1123
raise errors.NotVersionedError(filename)
1125
self.outf.write(i + '\n')
1128
class cmd_file_path(Command):
1129
"""Print path of file_ids to a file or directory.
1131
This prints one line for each directory down to the target,
1132
starting at the branch root.
1136
takes_args = ['filename']
1139
def run(self, filename):
1140
tree, relpath = WorkingTree.open_containing(filename)
1141
fid = tree.path2id(relpath)
1143
raise errors.NotVersionedError(filename)
1144
segments = osutils.splitpath(relpath)
1145
for pos in range(1, len(segments) + 1):
1146
path = osutils.joinpath(segments[:pos])
1147
self.outf.write("%s\n" % tree.path2id(path))
1150
class cmd_reconcile(Command):
1151
"""Reconcile bzr metadata in a branch.
1153
This can correct data mismatches that may have been caused by
1154
previous ghost operations or bzr upgrades. You should only
1155
need to run this command if 'bzr check' or a bzr developer
1156
advises you to run it.
1158
If a second branch is provided, cross-branch reconciliation is
1159
also attempted, which will check that data like the tree root
1160
id which was not present in very early bzr versions is represented
1161
correctly in both branches.
1163
At the same time it is run it may recompress data resulting in
1164
a potential saving in disk space or performance gain.
1166
The branch *MUST* be on a listable system such as local disk or sftp.
1168
takes_args = ['branch?']
1170
def run(self, branch="."):
1171
from bzrlib.reconcile import reconcile
1172
dir = bzrdir.BzrDir.open(branch)
1176
class cmd_revision_history(Command):
1177
"""Display the list of revision ids on a branch."""
1178
takes_args = ['location?']
1183
def run(self, location="."):
1184
branch = Branch.open_containing(location)[0]
1185
for revid in branch.revision_history():
1186
self.outf.write(revid)
1187
self.outf.write('\n')
1190
class cmd_ancestry(Command):
1191
"""List all revisions merged into this branch."""
1192
takes_args = ['location?']
1197
def run(self, location="."):
1199
wt = WorkingTree.open_containing(location)[0]
1200
except errors.NoWorkingTree:
1201
b = Branch.open(location)
1202
last_revision = b.last_revision()
1205
last_revision = wt.last_revision()
1207
revision_ids = b.repository.get_ancestry(last_revision)
1208
assert revision_ids[0] is None
1210
for revision_id in revision_ids:
1211
self.outf.write(revision_id + '\n')
1214
class cmd_init(Command):
1215
"""Make a directory into a versioned branch.
1217
Use this to create an empty branch, or before importing an
1220
If there is a repository in a parent directory of the location, then
1221
the history of the branch will be stored in the repository. Otherwise
1222
init creates a standalone branch which carries its own history in
1225
If there is already a branch at the location but it has no working tree,
1226
the tree can be populated with 'bzr checkout'.
1228
Recipe for importing a tree of files:
1233
bzr commit -m 'imported project'
1235
takes_args = ['location?']
1237
RegistryOption('format',
1238
help='Specify a format for this branch. '
1239
'See "help formats".',
1240
registry=bzrdir.format_registry,
1241
converter=bzrdir.format_registry.make_bzrdir,
1242
value_switches=True,
1243
title="Branch Format",
1245
Option('append-revisions-only',
1246
help='Never change revnos or the existing log.'
1247
' Append revisions to it only.')
1249
def run(self, location=None, format=None, append_revisions_only=False):
1251
format = bzrdir.format_registry.make_bzrdir('default')
1252
if location is None:
1255
to_transport = transport.get_transport(location)
1257
# The path has to exist to initialize a
1258
# branch inside of it.
1259
# Just using os.mkdir, since I don't
1260
# believe that we want to create a bunch of
1261
# locations if the user supplies an extended path
1262
# TODO: create-prefix
1264
to_transport.mkdir('.')
1265
except errors.FileExists:
1269
existing_bzrdir = bzrdir.BzrDir.open(location)
1270
except errors.NotBranchError:
1271
# really a NotBzrDir error...
1272
branch = bzrdir.BzrDir.create_branch_convenience(to_transport.base,
1275
from bzrlib.transport.local import LocalTransport
1276
if existing_bzrdir.has_branch():
1277
if (isinstance(to_transport, LocalTransport)
1278
and not existing_bzrdir.has_workingtree()):
1279
raise errors.BranchExistsWithoutWorkingTree(location)
1280
raise errors.AlreadyBranchError(location)
1282
branch = existing_bzrdir.create_branch()
1283
existing_bzrdir.create_workingtree()
1284
if append_revisions_only:
1286
branch.set_append_revisions_only(True)
1287
except errors.UpgradeRequired:
1288
raise errors.BzrCommandError('This branch format cannot be set'
1289
' to append-revisions-only. Try --experimental-branch6')
1292
class cmd_init_repository(Command):
1293
"""Create a shared repository to hold branches.
1295
New branches created under the repository directory will store their revisions
1296
in the repository, not in the branch directory, if the branch format supports
1300
bzr init-repo --no-trees repo
1302
bzr checkout --lightweight repo/trunk trunk-checkout
1307
takes_args = ["location"]
1308
takes_options = [RegistryOption('format',
1309
help='Specify a format for this repository. See'
1310
' "bzr help formats" for details',
1311
registry=bzrdir.format_registry,
1312
converter=bzrdir.format_registry.make_bzrdir,
1313
value_switches=True, title='Repository format'),
1315
help='Branches in the repository will default to'
1316
'not having a working tree'),
1318
aliases = ["init-repo"]
1320
def run(self, location, format=None, no_trees=False):
1322
format = bzrdir.format_registry.make_bzrdir('default')
1324
if location is None:
1327
to_transport = transport.get_transport(location)
1329
to_transport.mkdir('.')
1330
except errors.FileExists:
1333
newdir = format.initialize_on_transport(to_transport)
1334
repo = newdir.create_repository(shared=True)
1335
repo.set_make_working_trees(not no_trees)
1338
class cmd_diff(Command):
1339
"""Show differences in the working tree or between revisions.
1341
If files are listed, only the changes in those files are listed.
1342
Otherwise, all changes for the tree are listed.
1344
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1345
produces patches suitable for "patch -p1".
1349
Shows the difference in the working tree versus the last commit
1351
Difference between the working tree and revision 1
1353
Difference between revision 2 and revision 1
1354
bzr diff --prefix old/:new/
1355
Same as 'bzr diff' but prefix paths with old/ and new/
1356
bzr diff bzr.mine bzr.dev
1357
Show the differences between the two working trees
1359
Show just the differences for 'foo.c'
1361
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1362
# or a graphical diff.
1364
# TODO: Python difflib is not exactly the same as unidiff; should
1365
# either fix it up or prefer to use an external diff.
1367
# TODO: Selected-file diff is inefficient and doesn't show you
1370
# TODO: This probably handles non-Unix newlines poorly.
1372
takes_args = ['file*']
1373
takes_options = ['revision', 'diff-options',
1374
Option('prefix', type=str,
1376
help='Set prefixes to added to old and new filenames, as '
1377
'two values separated by a colon. (eg "old/:new/")'),
1379
aliases = ['di', 'dif']
1380
encoding_type = 'exact'
1383
def run(self, revision=None, file_list=None, diff_options=None,
1385
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1387
if (prefix is None) or (prefix == '0'):
1395
old_label, new_label = prefix.split(":")
1397
raise errors.BzrCommandError(
1398
'--prefix expects two values separated by a colon'
1399
' (eg "old/:new/")')
1401
if revision and len(revision) > 2:
1402
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1403
' one or two revision specifiers')
1406
tree1, file_list = internal_tree_files(file_list)
1410
except errors.FileInWrongBranch:
1411
if len(file_list) != 2:
1412
raise errors.BzrCommandError("Files are in different branches")
1414
tree1, file1 = WorkingTree.open_containing(file_list[0])
1415
tree2, file2 = WorkingTree.open_containing(file_list[1])
1416
if file1 != "" or file2 != "":
1417
# FIXME diff those two files. rbc 20051123
1418
raise errors.BzrCommandError("Files are in different branches")
1420
except errors.NotBranchError:
1421
if (revision is not None and len(revision) == 2
1422
and not revision[0].needs_branch()
1423
and not revision[1].needs_branch()):
1424
# If both revision specs include a branch, we can
1425
# diff them without needing a local working tree
1426
tree1, tree2 = None, None
1430
if tree2 is not None:
1431
if revision is not None:
1432
# FIXME: but there should be a clean way to diff between
1433
# non-default versions of two trees, it's not hard to do
1435
raise errors.BzrCommandError(
1436
"Sorry, diffing arbitrary revisions across branches "
1437
"is not implemented yet")
1438
return show_diff_trees(tree1, tree2, sys.stdout,
1439
specific_files=file_list,
1440
external_diff_options=diff_options,
1441
old_label=old_label, new_label=new_label)
1443
return diff_cmd_helper(tree1, file_list, diff_options,
1444
revision_specs=revision,
1445
old_label=old_label, new_label=new_label)
1448
class cmd_deleted(Command):
1449
"""List files deleted in the working tree.
1451
# TODO: Show files deleted since a previous revision, or
1452
# between two revisions.
1453
# TODO: Much more efficient way to do this: read in new
1454
# directories with readdir, rather than stating each one. Same
1455
# level of effort but possibly much less IO. (Or possibly not,
1456
# if the directories are very large...)
1457
takes_options = ['show-ids']
1460
def run(self, show_ids=False):
1461
tree = WorkingTree.open_containing(u'.')[0]
1464
old = tree.basis_tree()
1467
for path, ie in old.inventory.iter_entries():
1468
if not tree.has_id(ie.file_id):
1469
self.outf.write(path)
1471
self.outf.write(' ')
1472
self.outf.write(ie.file_id)
1473
self.outf.write('\n')
1480
class cmd_modified(Command):
1481
"""List files modified in working tree.
1483
See also: "bzr status".
1490
tree = WorkingTree.open_containing(u'.')[0]
1491
td = tree.changes_from(tree.basis_tree())
1492
for path, id, kind, text_modified, meta_modified in td.modified:
1493
self.outf.write(path + '\n')
1496
class cmd_added(Command):
1497
"""List files added in working tree.
1499
See also: "bzr status".
1506
wt = WorkingTree.open_containing(u'.')[0]
1509
basis = wt.basis_tree()
1512
basis_inv = basis.inventory
1515
if file_id in basis_inv:
1517
if inv.is_root(file_id) and len(basis_inv) == 0:
1519
path = inv.id2path(file_id)
1520
if not os.access(osutils.abspath(path), os.F_OK):
1522
self.outf.write(path + '\n')
1529
class cmd_root(Command):
1530
"""Show the tree root directory.
1532
The root is the nearest enclosing directory with a .bzr control
1534
takes_args = ['filename?']
1536
def run(self, filename=None):
1537
"""Print the branch root."""
1538
tree = WorkingTree.open_containing(filename)[0]
1539
self.outf.write(tree.basedir + '\n')
1542
class cmd_log(Command):
1543
"""Show log of a branch, file, or directory.
1545
By default show the log of the branch containing the working directory.
1547
To request a range of logs, you can use the command -r begin..end
1548
-r revision requests a specific revision, -r ..end or -r begin.. are
1554
bzr log -r -10.. http://server/branch
1557
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1559
takes_args = ['location?']
1560
takes_options = [Option('forward',
1561
help='show from oldest to newest'),
1565
help='show files changed in each revision'),
1566
'show-ids', 'revision',
1570
help='show revisions whose message matches this regexp',
1573
encoding_type = 'replace'
1576
def run(self, location=None, timezone='original',
1583
from bzrlib.log import show_log
1584
assert message is None or isinstance(message, basestring), \
1585
"invalid message argument %r" % message
1586
direction = (forward and 'forward') or 'reverse'
1591
# find the file id to log:
1593
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1597
tree = b.basis_tree()
1598
file_id = tree.path2id(fp)
1600
raise errors.BzrCommandError(
1601
"Path does not have any revision history: %s" %
1605
# FIXME ? log the current subdir only RBC 20060203
1606
if revision is not None \
1607
and len(revision) > 0 and revision[0].get_branch():
1608
location = revision[0].get_branch()
1611
dir, relpath = bzrdir.BzrDir.open_containing(location)
1612
b = dir.open_branch()
1616
if revision is None:
1619
elif len(revision) == 1:
1620
rev1 = rev2 = revision[0].in_history(b).revno
1621
elif len(revision) == 2:
1622
if revision[1].get_branch() != revision[0].get_branch():
1623
# b is taken from revision[0].get_branch(), and
1624
# show_log will use its revision_history. Having
1625
# different branches will lead to weird behaviors.
1626
raise errors.BzrCommandError(
1627
"Log doesn't accept two revisions in different"
1629
if revision[0].spec is None:
1630
# missing begin-range means first revision
1633
rev1 = revision[0].in_history(b).revno
1635
if revision[1].spec is None:
1636
# missing end-range means last known revision
1639
rev2 = revision[1].in_history(b).revno
1641
raise errors.BzrCommandError(
1642
'bzr log --revision takes one or two values.')
1644
# By this point, the revision numbers are converted to the +ve
1645
# form if they were supplied in the -ve form, so we can do
1646
# this comparison in relative safety
1648
(rev2, rev1) = (rev1, rev2)
1650
if log_format is None:
1651
log_format = log.log_formatter_registry.get_default(b)
1653
lf = log_format(show_ids=show_ids, to_file=self.outf,
1654
show_timezone=timezone)
1660
direction=direction,
1661
start_revision=rev1,
1668
def get_log_format(long=False, short=False, line=False, default='long'):
1669
log_format = default
1673
log_format = 'short'
1679
class cmd_touching_revisions(Command):
1680
"""Return revision-ids which affected a particular file.
1682
A more user-friendly interface is "bzr log FILE".
1686
takes_args = ["filename"]
1689
def run(self, filename):
1690
tree, relpath = WorkingTree.open_containing(filename)
1692
file_id = tree.path2id(relpath)
1693
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1694
self.outf.write("%6d %s\n" % (revno, what))
1697
class cmd_ls(Command):
1698
"""List files in a tree.
1701
takes_args = ['path?']
1702
# TODO: Take a revision or remote path and list that tree instead.
1703
takes_options = ['verbose', 'revision',
1704
Option('non-recursive',
1705
help='don\'t recurse into sub-directories'),
1707
help='Print all paths from the root of the branch.'),
1708
Option('unknown', help='Print unknown files'),
1709
Option('versioned', help='Print versioned files'),
1710
Option('ignored', help='Print ignored files'),
1712
Option('null', help='Null separate the files'),
1716
def run(self, revision=None, verbose=False,
1717
non_recursive=False, from_root=False,
1718
unknown=False, versioned=False, ignored=False,
1719
null=False, kind=None, show_ids=False, path=None):
1721
if kind and kind not in ('file', 'directory', 'symlink'):
1722
raise errors.BzrCommandError('invalid kind specified')
1724
if verbose and null:
1725
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1726
all = not (unknown or versioned or ignored)
1728
selection = {'I':ignored, '?':unknown, 'V':versioned}
1735
raise errors.BzrCommandError('cannot specify both --from-root'
1739
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1745
if revision is not None:
1746
tree = branch.repository.revision_tree(
1747
revision[0].in_history(branch).rev_id)
1749
tree = branch.basis_tree()
1753
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1754
if fp.startswith(relpath):
1755
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1756
if non_recursive and '/' in fp:
1758
if not all and not selection[fc]:
1760
if kind is not None and fkind != kind:
1763
kindch = entry.kind_character()
1764
outstring = '%-8s %s%s' % (fc, fp, kindch)
1765
if show_ids and fid is not None:
1766
outstring = "%-50s %s" % (outstring, fid)
1767
self.outf.write(outstring + '\n')
1769
self.outf.write(fp + '\0')
1772
self.outf.write(fid)
1773
self.outf.write('\0')
1781
self.outf.write('%-50s %s\n' % (fp, my_id))
1783
self.outf.write(fp + '\n')
1788
class cmd_unknowns(Command):
1789
"""List unknown files.
1791
See also: "bzr ls --unknown".
1798
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1799
self.outf.write(osutils.quotefn(f) + '\n')
1802
class cmd_ignore(Command):
1803
"""Ignore specified files or patterns.
1805
To remove patterns from the ignore list, edit the .bzrignore file.
1807
Trailing slashes on patterns are ignored.
1808
If the pattern contains a slash or is a regular expression, it is compared
1809
to the whole path from the branch root. Otherwise, it is compared to only
1810
the last component of the path. To match a file only in the root
1811
directory, prepend './'.
1813
Ignore patterns specifying absolute paths are not allowed.
1815
Ignore patterns may include globbing wildcards such as:
1816
? - Matches any single character except '/'
1817
* - Matches 0 or more characters except '/'
1818
/**/ - Matches 0 or more directories in a path
1819
[a-z] - Matches a single character from within a group of characters
1821
Ignore patterns may also be Python regular expressions.
1822
Regular expression ignore patterns are identified by a 'RE:' prefix
1823
followed by the regular expression. Regular expression ignore patterns
1824
may not include named or numbered groups.
1826
Note: ignore patterns containing shell wildcards must be quoted from
1830
bzr ignore ./Makefile
1831
bzr ignore '*.class'
1832
bzr ignore 'lib/**/*.o'
1833
bzr ignore 'RE:lib/.*\.o'
1835
takes_args = ['name_pattern*']
1837
Option('old-default-rules',
1838
help='Out the ignore rules bzr < 0.9 always used.')
1841
def run(self, name_pattern_list=None, old_default_rules=None):
1842
from bzrlib.atomicfile import AtomicFile
1843
if old_default_rules is not None:
1844
# dump the rules and exit
1845
for pattern in ignores.OLD_DEFAULTS:
1848
if not name_pattern_list:
1849
raise errors.BzrCommandError("ignore requires at least one "
1850
"NAME_PATTERN or --old-default-rules")
1851
name_pattern_list = [globbing.normalize_pattern(p)
1852
for p in name_pattern_list]
1853
for name_pattern in name_pattern_list:
1854
if (name_pattern[0] == '/' or
1855
(len(name_pattern) > 1 and name_pattern[1] == ':')):
1856
raise errors.BzrCommandError(
1857
"NAME_PATTERN should not be an absolute path")
1858
tree, relpath = WorkingTree.open_containing(u'.')
1859
ifn = tree.abspath('.bzrignore')
1860
if os.path.exists(ifn):
1863
igns = f.read().decode('utf-8')
1869
# TODO: If the file already uses crlf-style termination, maybe
1870
# we should use that for the newly added lines?
1872
if igns and igns[-1] != '\n':
1874
for name_pattern in name_pattern_list:
1875
igns += name_pattern + '\n'
1877
f = AtomicFile(ifn, 'wb')
1879
f.write(igns.encode('utf-8'))
1884
if not tree.path2id('.bzrignore'):
1885
tree.add(['.bzrignore'])
1888
class cmd_ignored(Command):
1889
"""List ignored files and the patterns that matched them.
1891
See also: bzr ignore"""
1894
tree = WorkingTree.open_containing(u'.')[0]
1897
for path, file_class, kind, file_id, entry in tree.list_files():
1898
if file_class != 'I':
1900
## XXX: Slightly inefficient since this was already calculated
1901
pat = tree.is_ignored(path)
1902
print '%-50s %s' % (path, pat)
1907
class cmd_lookup_revision(Command):
1908
"""Lookup the revision-id from a revision-number
1911
bzr lookup-revision 33
1914
takes_args = ['revno']
1917
def run(self, revno):
1921
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1923
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1926
class cmd_export(Command):
1927
"""Export past revision to destination directory.
1929
If no revision is specified this exports the last committed revision.
1931
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1932
given, try to find the format with the extension. If no extension
1933
is found exports to a directory (equivalent to --format=dir).
1935
Root may be the top directory for tar, tgz and tbz2 formats. If none
1936
is given, the top directory will be the root name of the file.
1938
If branch is omitted then the branch containing the CWD will be used.
1940
Note: export of tree with non-ascii filenames to zip is not supported.
1942
Supported formats Autodetected by extension
1943
----------------- -------------------------
1946
tbz2 .tar.bz2, .tbz2
1950
takes_args = ['dest', 'branch?']
1951
takes_options = ['revision', 'format', 'root']
1952
def run(self, dest, branch=None, revision=None, format=None, root=None):
1953
from bzrlib.export import export
1956
tree = WorkingTree.open_containing(u'.')[0]
1959
b = Branch.open(branch)
1961
if revision is None:
1962
# should be tree.last_revision FIXME
1963
rev_id = b.last_revision()
1965
if len(revision) != 1:
1966
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
1967
rev_id = revision[0].in_history(b).rev_id
1968
t = b.repository.revision_tree(rev_id)
1970
export(t, dest, format, root)
1971
except errors.NoSuchExportFormat, e:
1972
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1975
class cmd_cat(Command):
1976
"""Write a file's text from a previous revision."""
1978
takes_options = ['revision', 'name-from-revision']
1979
takes_args = ['filename']
1980
encoding_type = 'exact'
1983
def run(self, filename, revision=None, name_from_revision=False):
1984
if revision is not None and len(revision) != 1:
1985
raise errors.BzrCommandError("bzr cat --revision takes exactly"
1990
tree, b, relpath = \
1991
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
1992
except errors.NotBranchError:
1995
if revision is not None and revision[0].get_branch() is not None:
1996
b = Branch.open(revision[0].get_branch())
1998
tree = b.basis_tree()
1999
if revision is None:
2000
revision_id = b.last_revision()
2002
revision_id = revision[0].in_history(b).rev_id
2004
cur_file_id = tree.path2id(relpath)
2005
rev_tree = b.repository.revision_tree(revision_id)
2006
old_file_id = rev_tree.path2id(relpath)
2008
if name_from_revision:
2009
if old_file_id is None:
2010
raise errors.BzrCommandError("%r is not present in revision %s"
2011
% (filename, revision_id))
2013
rev_tree.print_file(old_file_id)
2014
elif cur_file_id is not None:
2015
rev_tree.print_file(cur_file_id)
2016
elif old_file_id is not None:
2017
rev_tree.print_file(old_file_id)
2019
raise errors.BzrCommandError("%r is not present in revision %s" %
2020
(filename, revision_id))
2023
class cmd_local_time_offset(Command):
2024
"""Show the offset in seconds from GMT to local time."""
2028
print osutils.local_time_offset()
2032
class cmd_commit(Command):
2033
"""Commit changes into a new revision.
2035
If no arguments are given, the entire tree is committed.
2037
If selected files are specified, only changes to those files are
2038
committed. If a directory is specified then the directory and everything
2039
within it is committed.
2041
A selected-file commit may fail in some cases where the committed
2042
tree would be invalid, such as trying to commit a file in a
2043
newly-added directory that is not itself committed.
2045
# TODO: Run hooks on tree to-be-committed, and after commit.
2047
# TODO: Strict commit that fails if there are deleted files.
2048
# (what does "deleted files" mean ??)
2050
# TODO: Give better message for -s, --summary, used by tla people
2052
# XXX: verbose currently does nothing
2054
takes_args = ['selected*']
2055
takes_options = ['message', 'verbose',
2057
help='commit even if nothing has changed'),
2058
Option('file', type=str,
2061
help='file containing commit message'),
2063
help="refuse to commit if there are unknown "
2064
"files in the working tree."),
2066
help="perform a local only commit in a bound "
2067
"branch. Such commits are not pushed to "
2068
"the master branch until a normal commit "
2072
aliases = ['ci', 'checkin']
2074
def run(self, message=None, file=None, verbose=True, selected_list=None,
2075
unchanged=False, strict=False, local=False):
2076
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
2077
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
2079
from bzrlib.msgeditor import edit_commit_message, \
2080
make_commit_message_template
2082
# TODO: Need a blackbox test for invoking the external editor; may be
2083
# slightly problematic to run this cross-platform.
2085
# TODO: do more checks that the commit will succeed before
2086
# spending the user's valuable time typing a commit message.
2087
tree, selected_list = tree_files(selected_list)
2088
if selected_list == ['']:
2089
# workaround - commit of root of tree should be exactly the same
2090
# as just default commit in that tree, and succeed even though
2091
# selected-file merge commit is not done yet
2094
if local and not tree.branch.get_bound_location():
2095
raise errors.LocalRequiresBoundBranch()
2097
def get_message(commit_obj):
2098
"""Callback to get commit message"""
2099
my_message = message
2100
if my_message is None and not file:
2101
template = make_commit_message_template(tree, selected_list)
2102
my_message = edit_commit_message(template)
2103
if my_message is None:
2104
raise errors.BzrCommandError("please specify a commit"
2105
" message with either --message or --file")
2106
elif my_message and file:
2107
raise errors.BzrCommandError(
2108
"please specify either --message or --file")
2110
my_message = codecs.open(file, 'rt',
2111
bzrlib.user_encoding).read()
2112
if my_message == "":
2113
raise errors.BzrCommandError("empty commit message specified")
2117
reporter = ReportCommitToLog()
2119
reporter = NullCommitReporter()
2122
tree.commit(message_callback=get_message,
2123
specific_files=selected_list,
2124
allow_pointless=unchanged, strict=strict, local=local,
2126
except PointlessCommit:
2127
# FIXME: This should really happen before the file is read in;
2128
# perhaps prepare the commit; get the message; then actually commit
2129
raise errors.BzrCommandError("no changes to commit."
2130
" use --unchanged to commit anyhow")
2131
except ConflictsInTree:
2132
raise errors.BzrCommandError('Conflicts detected in working '
2133
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2135
except StrictCommitFailed:
2136
raise errors.BzrCommandError("Commit refused because there are"
2137
" unknown files in the working tree.")
2138
except errors.BoundBranchOutOfDate, e:
2139
raise errors.BzrCommandError(str(e) + "\n"
2140
'To commit to master branch, run update and then commit.\n'
2141
'You can also pass --local to commit to continue working '
2145
class cmd_check(Command):
2146
"""Validate consistency of branch history.
2148
This command checks various invariants about the branch storage to
2149
detect data corruption or bzr bugs.
2151
takes_args = ['branch?']
2152
takes_options = ['verbose']
2154
def run(self, branch=None, verbose=False):
2155
from bzrlib.check import check
2157
tree = WorkingTree.open_containing()[0]
2158
branch = tree.branch
2160
branch = Branch.open(branch)
2161
check(branch, verbose)
2164
class cmd_upgrade(Command):
2165
"""Upgrade branch storage to current format.
2167
The check command or bzr developers may sometimes advise you to run
2168
this command. When the default format has changed you may also be warned
2169
during other operations to upgrade.
2171
takes_args = ['url?']
2173
RegistryOption('format',
2174
help='Upgrade to a specific format. See "bzr help'
2175
' formats" for details',
2176
registry=bzrdir.format_registry,
2177
converter=bzrdir.format_registry.make_bzrdir,
2178
value_switches=True, title='Branch format'),
2181
def run(self, url='.', format=None):
2182
from bzrlib.upgrade import upgrade
2184
format = bzrdir.format_registry.make_bzrdir('default')
2185
upgrade(url, format)
2188
class cmd_whoami(Command):
2189
"""Show or set bzr user id.
2193
bzr whoami 'Frank Chu <fchu@example.com>'
2195
takes_options = [ Option('email',
2196
help='display email address only'),
2198
help='set identity for the current branch instead of '
2201
takes_args = ['name?']
2202
encoding_type = 'replace'
2205
def run(self, email=False, branch=False, name=None):
2207
# use branch if we're inside one; otherwise global config
2209
c = Branch.open_containing('.')[0].get_config()
2210
except errors.NotBranchError:
2211
c = config.GlobalConfig()
2213
self.outf.write(c.user_email() + '\n')
2215
self.outf.write(c.username() + '\n')
2218
# display a warning if an email address isn't included in the given name.
2220
config.extract_email_address(name)
2221
except errors.NoEmailInUsername, e:
2222
warning('"%s" does not seem to contain an email address. '
2223
'This is allowed, but not recommended.', name)
2225
# use global config unless --branch given
2227
c = Branch.open_containing('.')[0].get_config()
2229
c = config.GlobalConfig()
2230
c.set_user_option('email', name)
2233
class cmd_nick(Command):
2234
"""Print or set the branch nickname.
2236
If unset, the tree root directory name is used as the nickname
2237
To print the current nickname, execute with no argument.
2239
takes_args = ['nickname?']
2240
def run(self, nickname=None):
2241
branch = Branch.open_containing(u'.')[0]
2242
if nickname is None:
2243
self.printme(branch)
2245
branch.nick = nickname
2248
def printme(self, branch):
2252
class cmd_selftest(Command):
2253
"""Run internal test suite.
2255
This creates temporary test directories in the working directory, but not
2256
existing data is affected. These directories are deleted if the tests
2257
pass, or left behind to help in debugging if they fail and --keep-output
2260
If arguments are given, they are regular expressions that say which tests
2261
should run. Tests matching any expression are run, and other tests are
2264
Alternatively if --first is given, matching tests are run first and then
2265
all other tests are run. This is useful if you have been working in a
2266
particular area, but want to make sure nothing else was broken.
2268
If the global option '--no-plugins' is given, plugins are not loaded
2269
before running the selftests. This has two effects: features provided or
2270
modified by plugins will not be tested, and tests provided by plugins will
2275
run only tests relating to 'ignore'
2276
bzr --no-plugins selftest -v
2277
disable plugins and list tests as they're run
2279
For each test, that needs actual disk access, bzr create their own
2280
subdirectory in the temporary testing directory (testXXXX.tmp).
2281
By default the name of such subdirectory is based on the name of the test.
2282
If option '--numbered-dirs' is given, bzr will use sequent numbers
2283
of running tests to create such subdirectories. This is default behavior
2284
on Windows because of path length limitation.
2286
# TODO: --list should give a list of all available tests
2288
# NB: this is used from the class without creating an instance, which is
2289
# why it does not have a self parameter.
2290
def get_transport_type(typestring):
2291
"""Parse and return a transport specifier."""
2292
if typestring == "sftp":
2293
from bzrlib.transport.sftp import SFTPAbsoluteServer
2294
return SFTPAbsoluteServer
2295
if typestring == "memory":
2296
from bzrlib.transport.memory import MemoryServer
2298
if typestring == "fakenfs":
2299
from bzrlib.transport.fakenfs import FakeNFSServer
2300
return FakeNFSServer
2301
msg = "No known transport type %s. Supported types are: sftp\n" %\
2303
raise errors.BzrCommandError(msg)
2306
takes_args = ['testspecs*']
2307
takes_options = ['verbose',
2308
Option('one', help='stop when one test fails'),
2309
Option('keep-output',
2310
help='keep output directories when tests fail'),
2312
help='Use a different transport by default '
2313
'throughout the test suite.',
2314
type=get_transport_type),
2315
Option('benchmark', help='run the bzr benchmarks.'),
2316
Option('lsprof-timed',
2317
help='generate lsprof output for benchmarked'
2318
' sections of code.'),
2319
Option('cache-dir', type=str,
2320
help='a directory to cache intermediate'
2321
' benchmark steps'),
2322
Option('clean-output',
2323
help='clean temporary tests directories'
2324
' without running tests'),
2326
help='run all tests, but run specified tests first'
2328
Option('numbered-dirs',
2329
help='use numbered dirs for TestCaseInTempDir'),
2331
encoding_type = 'replace'
2333
def run(self, testspecs_list=None, verbose=None, one=False,
2334
keep_output=False, transport=None, benchmark=None,
2335
lsprof_timed=None, cache_dir=None, clean_output=False,
2336
first=False, numbered_dirs=None):
2338
from bzrlib.tests import selftest
2339
import bzrlib.benchmarks as benchmarks
2340
from bzrlib.benchmarks import tree_creator
2343
from bzrlib.tests import clean_selftest_output
2344
clean_selftest_output()
2347
if numbered_dirs is None and sys.platform == 'win32':
2348
numbered_dirs = True
2350
if cache_dir is not None:
2351
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2352
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
2353
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2355
if testspecs_list is not None:
2356
pattern = '|'.join(testspecs_list)
2360
test_suite_factory = benchmarks.test_suite
2363
# TODO: should possibly lock the history file...
2364
benchfile = open(".perf_history", "at", buffering=1)
2366
test_suite_factory = None
2371
result = selftest(verbose=verbose,
2373
stop_on_failure=one,
2374
keep_output=keep_output,
2375
transport=transport,
2376
test_suite_factory=test_suite_factory,
2377
lsprof_timed=lsprof_timed,
2378
bench_history=benchfile,
2379
matching_tests_first=first,
2380
numbered_dirs=numbered_dirs,
2383
if benchfile is not None:
2386
info('tests passed')
2388
info('tests failed')
2389
return int(not result)
2392
class cmd_version(Command):
2393
"""Show version of bzr."""
2397
from bzrlib.version import show_version
2401
class cmd_rocks(Command):
2402
"""Statement of optimism."""
2408
print "It sure does!"
2411
class cmd_find_merge_base(Command):
2412
"""Find and print a base revision for merging two branches."""
2413
# TODO: Options to specify revisions on either side, as if
2414
# merging only part of the history.
2415
takes_args = ['branch', 'other']
2419
def run(self, branch, other):
2420
from bzrlib.revision import MultipleRevisionSources
2422
branch1 = Branch.open_containing(branch)[0]
2423
branch2 = Branch.open_containing(other)[0]
2425
last1 = branch1.last_revision()
2426
last2 = branch2.last_revision()
2428
source = MultipleRevisionSources(branch1.repository,
2431
base_rev_id = common_ancestor(last1, last2, source)
2433
print 'merge base is revision %s' % base_rev_id
2436
class cmd_merge(Command):
2437
"""Perform a three-way merge.
2439
The branch is the branch you will merge from. By default, it will merge
2440
the latest revision. If you specify a revision, that revision will be
2441
merged. If you specify two revisions, the first will be used as a BASE,
2442
and the second one as OTHER. Revision numbers are always relative to the
2445
By default, bzr will try to merge in all new work from the other
2446
branch, automatically determining an appropriate base. If this
2447
fails, you may need to give an explicit base.
2449
Merge will do its best to combine the changes in two branches, but there
2450
are some kinds of problems only a human can fix. When it encounters those,
2451
it will mark a conflict. A conflict means that you need to fix something,
2452
before you should commit.
2454
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2456
If there is no default branch set, the first merge will set it. After
2457
that, you can omit the branch to use the default. To change the
2458
default, use --remember. The value will only be saved if the remote
2459
location can be accessed.
2461
The results of the merge are placed into the destination working
2462
directory, where they can be reviewed (with bzr diff), tested, and then
2463
committed to record the result of the merge.
2467
To merge the latest revision from bzr.dev
2468
bzr merge ../bzr.dev
2470
To merge changes up to and including revision 82 from bzr.dev
2471
bzr merge -r 82 ../bzr.dev
2473
To merge the changes introduced by 82, without previous changes:
2474
bzr merge -r 81..82 ../bzr.dev
2476
merge refuses to run if there are any uncommitted changes, unless
2479
The following merge types are available:
2481
takes_args = ['branch?']
2482
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2483
Option('show-base', help="Show base revision text in "
2485
Option('uncommitted', help='Apply uncommitted changes'
2486
' from a working copy, instead of branch changes'),
2487
Option('pull', help='If the destination is already'
2488
' completely merged into the source, pull from the'
2489
' source rather than merging. When this happens,'
2490
' you do not need to commit the result.'),
2492
help='Branch to merge into, '
2493
'rather than the one containing the working directory',
2499
def run(self, branch=None, revision=None, force=False, merge_type=None,
2500
show_base=False, reprocess=False, remember=False,
2501
uncommitted=False, pull=False,
2504
from bzrlib.tag import _merge_tags_if_possible
2506
if merge_type is None:
2507
merge_type = _mod_merge.Merge3Merger
2509
if directory is None: directory = u'.'
2510
# XXX: jam 20070225 WorkingTree should be locked before you extract its
2511
# inventory. Because merge is a mutating operation, it really
2512
# should be a lock_write() for the whole cmd_merge operation.
2513
# However, cmd_merge open's its own tree in _merge_helper, which
2514
# means if we lock here, the later lock_write() will always block.
2515
# Either the merge helper code should be updated to take a tree,
2516
# (What about tree.merge_from_branch?)
2517
tree = WorkingTree.open_containing(directory)[0]
2518
change_reporter = delta._ChangeReporter(
2519
unversioned_filter=tree.is_ignored)
2521
if branch is not None:
2523
mergeable = bundle.read_mergeable_from_url(
2525
except errors.NotABundle:
2526
pass # Continue on considering this url a Branch
2528
if revision is not None:
2529
raise errors.BzrCommandError(
2530
'Cannot use -r with merge directives or bundles')
2531
other_rev_id = mergeable.get_target_revision(
2532
tree.branch.repository)
2533
revision = [RevisionSpec.from_string(
2534
'revid:' + other_rev_id)]
2536
if revision is None \
2537
or len(revision) < 1 or revision[0].needs_branch():
2538
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2540
if revision is None or len(revision) < 1:
2543
other = [branch, None]
2546
other = [branch, -1]
2547
other_branch, path = Branch.open_containing(branch)
2550
raise errors.BzrCommandError('Cannot use --uncommitted and'
2551
' --revision at the same time.')
2552
branch = revision[0].get_branch() or branch
2553
if len(revision) == 1:
2555
if other_rev_id is not None:
2560
other_branch, path = Branch.open_containing(branch)
2561
revno = revision[0].in_history(other_branch).revno
2562
other = [branch, revno]
2564
assert len(revision) == 2
2565
if None in revision:
2566
raise errors.BzrCommandError(
2567
"Merge doesn't permit empty revision specifier.")
2568
base_branch, path = Branch.open_containing(branch)
2569
branch1 = revision[1].get_branch() or branch
2570
other_branch, path1 = Branch.open_containing(branch1)
2571
if revision[0].get_branch() is not None:
2572
# then path was obtained from it, and is None.
2575
base = [branch, revision[0].in_history(base_branch).revno]
2576
other = [branch1, revision[1].in_history(other_branch).revno]
2578
if ((tree.branch.get_parent() is None or remember) and
2579
other_branch is not None):
2580
tree.branch.set_parent(other_branch.base)
2582
# pull tags now... it's a bit inconsistent to do it ahead of copying
2583
# the history but that's done inside the merge code
2584
if other_branch is not None:
2585
_merge_tags_if_possible(other_branch, tree.branch)
2588
interesting_files = [path]
2590
interesting_files = None
2591
pb = ui.ui_factory.nested_progress_bar()
2594
conflict_count = _merge_helper(
2595
other, base, other_rev_id=other_rev_id,
2596
check_clean=(not force),
2597
merge_type=merge_type,
2598
reprocess=reprocess,
2599
show_base=show_base,
2602
pb=pb, file_list=interesting_files,
2603
change_reporter=change_reporter)
2606
if conflict_count != 0:
2610
except errors.AmbiguousBase, e:
2611
m = ("sorry, bzr can't determine the right merge base yet\n"
2612
"candidates are:\n "
2613
+ "\n ".join(e.bases)
2615
"please specify an explicit base with -r,\n"
2616
"and (if you want) report this to the bzr developers\n")
2619
# TODO: move up to common parent; this isn't merge-specific anymore.
2620
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2621
"""Use tree.branch's parent if none was supplied.
2623
Report if the remembered location was used.
2625
if supplied_location is not None:
2626
return supplied_location
2627
stored_location = tree.branch.get_parent()
2628
mutter("%s", stored_location)
2629
if stored_location is None:
2630
raise errors.BzrCommandError("No location specified or remembered")
2631
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2632
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2633
return stored_location
2636
class cmd_remerge(Command):
2639
Use this if you want to try a different merge technique while resolving
2640
conflicts. Some merge techniques are better than others, and remerge
2641
lets you try different ones on different files.
2643
The options for remerge have the same meaning and defaults as the ones for
2644
merge. The difference is that remerge can (only) be run when there is a
2645
pending merge, and it lets you specify particular files.
2648
$ bzr remerge --show-base
2649
Re-do the merge of all conflicted files, and show the base text in
2650
conflict regions, in addition to the usual THIS and OTHER texts.
2652
$ bzr remerge --merge-type weave --reprocess foobar
2653
Re-do the merge of "foobar", using the weave merge algorithm, with
2654
additional processing to reduce the size of conflict regions.
2656
The following merge types are available:"""
2657
takes_args = ['file*']
2658
takes_options = ['merge-type', 'reprocess',
2659
Option('show-base', help="Show base revision text in "
2662
def run(self, file_list=None, merge_type=None, show_base=False,
2664
if merge_type is None:
2665
merge_type = _mod_merge.Merge3Merger
2666
tree, file_list = tree_files(file_list)
2669
parents = tree.get_parent_ids()
2670
if len(parents) != 2:
2671
raise errors.BzrCommandError("Sorry, remerge only works after normal"
2672
" merges. Not cherrypicking or"
2674
repository = tree.branch.repository
2675
base_revision = common_ancestor(parents[0],
2676
parents[1], repository)
2677
base_tree = repository.revision_tree(base_revision)
2678
other_tree = repository.revision_tree(parents[1])
2679
interesting_ids = None
2681
conflicts = tree.conflicts()
2682
if file_list is not None:
2683
interesting_ids = set()
2684
for filename in file_list:
2685
file_id = tree.path2id(filename)
2687
raise errors.NotVersionedError(filename)
2688
interesting_ids.add(file_id)
2689
if tree.kind(file_id) != "directory":
2692
for name, ie in tree.inventory.iter_entries(file_id):
2693
interesting_ids.add(ie.file_id)
2694
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2696
# Remerge only supports resolving contents conflicts
2697
allowed_conflicts = ('text conflict', 'contents conflict')
2698
restore_files = [c.path for c in conflicts
2699
if c.typestring in allowed_conflicts]
2700
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2701
tree.set_conflicts(ConflictList(new_conflicts))
2702
if file_list is not None:
2703
restore_files = file_list
2704
for filename in restore_files:
2706
restore(tree.abspath(filename))
2707
except errors.NotConflicted:
2709
conflicts = _mod_merge.merge_inner(
2710
tree.branch, other_tree, base_tree,
2712
interesting_ids=interesting_ids,
2713
other_rev_id=parents[1],
2714
merge_type=merge_type,
2715
show_base=show_base,
2716
reprocess=reprocess)
2725
class cmd_revert(Command):
2726
"""Revert files to a previous revision.
2728
Giving a list of files will revert only those files. Otherwise, all files
2729
will be reverted. If the revision is not specified with '--revision', the
2730
last committed revision is used.
2732
To remove only some changes, without reverting to a prior version, use
2733
merge instead. For example, "merge . --r-2..-3" will remove the changes
2734
introduced by -2, without affecting the changes introduced by -1. Or
2735
to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
2737
By default, any files that have been manually changed will be backed up
2738
first. (Files changed only by merge are not backed up.) Backup files have
2739
'.~#~' appended to their name, where # is a number.
2741
When you provide files, you can use their current pathname or the pathname
2742
from the target revision. So you can use revert to "undelete" a file by
2743
name. If you name a directory, all the contents of that directory will be
2746
takes_options = ['revision', 'no-backup']
2747
takes_args = ['file*']
2748
aliases = ['merge-revert']
2750
def run(self, revision=None, no_backup=False, file_list=None):
2751
if file_list is not None:
2752
if len(file_list) == 0:
2753
raise errors.BzrCommandError("No files specified")
2757
tree, file_list = tree_files(file_list)
2758
if revision is None:
2759
# FIXME should be tree.last_revision
2760
rev_id = tree.last_revision()
2761
elif len(revision) != 1:
2762
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
2764
rev_id = revision[0].in_history(tree.branch).rev_id
2765
pb = ui.ui_factory.nested_progress_bar()
2767
tree.revert(file_list,
2768
tree.branch.repository.revision_tree(rev_id),
2769
not no_backup, pb, report_changes=True)
2774
class cmd_assert_fail(Command):
2775
"""Test reporting of assertion failures"""
2776
# intended just for use in testing
2781
raise AssertionError("always fails")
2784
class cmd_help(Command):
2785
"""Show help on a command or other topic.
2787
For a list of all available commands, say 'bzr help commands'.
2789
takes_options = [Option('long', 'show help on all commands')]
2790
takes_args = ['topic?']
2791
aliases = ['?', '--help', '-?', '-h']
2794
def run(self, topic=None, long=False):
2796
if topic is None and long:
2798
bzrlib.help.help(topic)
2801
class cmd_shell_complete(Command):
2802
"""Show appropriate completions for context.
2804
For a list of all available commands, say 'bzr shell-complete'.
2806
takes_args = ['context?']
2811
def run(self, context=None):
2812
import shellcomplete
2813
shellcomplete.shellcomplete(context)
2816
class cmd_fetch(Command):
2817
"""Copy in history from another branch but don't merge it.
2819
This is an internal method used for pull and merge.
2822
takes_args = ['from_branch', 'to_branch']
2823
def run(self, from_branch, to_branch):
2824
from bzrlib.fetch import Fetcher
2825
from_b = Branch.open(from_branch)
2826
to_b = Branch.open(to_branch)
2827
Fetcher(to_b, from_b)
2830
class cmd_missing(Command):
2831
"""Show unmerged/unpulled revisions between two branches.
2833
OTHER_BRANCH may be local or remote.
2835
takes_args = ['other_branch?']
2836
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2838
'Display changes in the local branch only'),
2839
Option('theirs-only',
2840
'Display changes in the remote branch only'),
2845
encoding_type = 'replace'
2848
def run(self, other_branch=None, reverse=False, mine_only=False,
2849
theirs_only=False, log_format=None, long=False, short=False, line=False,
2850
show_ids=False, verbose=False):
2851
from bzrlib.missing import find_unmerged, iter_log_data
2852
from bzrlib.log import log_formatter
2853
local_branch = Branch.open_containing(u".")[0]
2854
parent = local_branch.get_parent()
2855
if other_branch is None:
2856
other_branch = parent
2857
if other_branch is None:
2858
raise errors.BzrCommandError("No peer location known or specified.")
2859
display_url = urlutils.unescape_for_display(parent,
2861
print "Using last location: " + display_url
2863
remote_branch = Branch.open(other_branch)
2864
if remote_branch.base == local_branch.base:
2865
remote_branch = local_branch
2866
local_branch.lock_read()
2868
remote_branch.lock_read()
2870
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2871
if (log_format is None):
2872
log_format = log.log_formatter_registry.get_default(
2874
lf = log_format(to_file=self.outf,
2876
show_timezone='original')
2877
if reverse is False:
2878
local_extra.reverse()
2879
remote_extra.reverse()
2880
if local_extra and not theirs_only:
2881
print "You have %d extra revision(s):" % len(local_extra)
2882
for data in iter_log_data(local_extra, local_branch.repository,
2885
printed_local = True
2887
printed_local = False
2888
if remote_extra and not mine_only:
2889
if printed_local is True:
2891
print "You are missing %d revision(s):" % len(remote_extra)
2892
for data in iter_log_data(remote_extra, remote_branch.repository,
2895
if not remote_extra and not local_extra:
2897
print "Branches are up to date."
2901
remote_branch.unlock()
2903
local_branch.unlock()
2904
if not status_code and parent is None and other_branch is not None:
2905
local_branch.lock_write()
2907
# handle race conditions - a parent might be set while we run.
2908
if local_branch.get_parent() is None:
2909
local_branch.set_parent(remote_branch.base)
2911
local_branch.unlock()
2915
class cmd_plugins(Command):
2920
import bzrlib.plugin
2921
from inspect import getdoc
2922
for name, plugin in bzrlib.plugin.all_plugins().items():
2923
if getattr(plugin, '__path__', None) is not None:
2924
print plugin.__path__[0]
2925
elif getattr(plugin, '__file__', None) is not None:
2926
print plugin.__file__
2932
print '\t', d.split('\n')[0]
2935
class cmd_testament(Command):
2936
"""Show testament (signing-form) of a revision."""
2937
takes_options = ['revision',
2938
Option('long', help='Produce long-format testament'),
2939
Option('strict', help='Produce a strict-format'
2941
takes_args = ['branch?']
2943
def run(self, branch=u'.', revision=None, long=False, strict=False):
2944
from bzrlib.testament import Testament, StrictTestament
2946
testament_class = StrictTestament
2948
testament_class = Testament
2949
b = WorkingTree.open_containing(branch)[0].branch
2952
if revision is None:
2953
rev_id = b.last_revision()
2955
rev_id = revision[0].in_history(b).rev_id
2956
t = testament_class.from_revision(b.repository, rev_id)
2958
sys.stdout.writelines(t.as_text_lines())
2960
sys.stdout.write(t.as_short_text())
2965
class cmd_annotate(Command):
2966
"""Show the origin of each line in a file.
2968
This prints out the given file with an annotation on the left side
2969
indicating which revision, author and date introduced the change.
2971
If the origin is the same for a run of consecutive lines, it is
2972
shown only at the top, unless the --all option is given.
2974
# TODO: annotate directories; showing when each file was last changed
2975
# TODO: if the working copy is modified, show annotations on that
2976
# with new uncommitted lines marked
2977
aliases = ['ann', 'blame', 'praise']
2978
takes_args = ['filename']
2979
takes_options = [Option('all', help='show annotations on all lines'),
2980
Option('long', help='show date in annotations'),
2986
def run(self, filename, all=False, long=False, revision=None,
2988
from bzrlib.annotate import annotate_file
2989
tree, relpath = WorkingTree.open_containing(filename)
2990
branch = tree.branch
2993
if revision is None:
2994
revision_id = branch.last_revision()
2995
elif len(revision) != 1:
2996
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2998
revision_id = revision[0].in_history(branch).rev_id
2999
file_id = tree.path2id(relpath)
3000
tree = branch.repository.revision_tree(revision_id)
3001
file_version = tree.inventory[file_id].revision
3002
annotate_file(branch, file_version, file_id, long, all, sys.stdout,
3008
class cmd_re_sign(Command):
3009
"""Create a digital signature for an existing revision."""
3010
# TODO be able to replace existing ones.
3012
hidden = True # is this right ?
3013
takes_args = ['revision_id*']
3014
takes_options = ['revision']
3016
def run(self, revision_id_list=None, revision=None):
3017
import bzrlib.gpg as gpg
3018
if revision_id_list is not None and revision is not None:
3019
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
3020
if revision_id_list is None and revision is None:
3021
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
3022
b = WorkingTree.open_containing(u'.')[0].branch
3023
gpg_strategy = gpg.GPGStrategy(b.get_config())
3024
if revision_id_list is not None:
3025
for revision_id in revision_id_list:
3026
b.repository.sign_revision(revision_id, gpg_strategy)
3027
elif revision is not None:
3028
if len(revision) == 1:
3029
revno, rev_id = revision[0].in_history(b)
3030
b.repository.sign_revision(rev_id, gpg_strategy)
3031
elif len(revision) == 2:
3032
# are they both on rh- if so we can walk between them
3033
# might be nice to have a range helper for arbitrary
3034
# revision paths. hmm.
3035
from_revno, from_revid = revision[0].in_history(b)
3036
to_revno, to_revid = revision[1].in_history(b)
3037
if to_revid is None:
3038
to_revno = b.revno()
3039
if from_revno is None or to_revno is None:
3040
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
3041
for revno in range(from_revno, to_revno + 1):
3042
b.repository.sign_revision(b.get_rev_id(revno),
3045
raise errors.BzrCommandError('Please supply either one revision, or a range.')
3048
class cmd_bind(Command):
3049
"""Convert the current branch into a checkout of the supplied branch.
3051
Once converted into a checkout, commits must succeed on the master branch
3052
before they will be applied to the local branch.
3054
See "help checkouts" for more information on checkouts.
3057
takes_args = ['location?']
3060
def run(self, location=None):
3061
b, relpath = Branch.open_containing(u'.')
3062
if location is None:
3064
location = b.get_old_bound_location()
3065
except errors.UpgradeRequired:
3066
raise errors.BzrCommandError('No location supplied. '
3067
'This format does not remember old locations.')
3069
if location is None:
3070
raise errors.BzrCommandError('No location supplied and no '
3071
'previous location known')
3072
b_other = Branch.open(location)
3075
except errors.DivergedBranches:
3076
raise errors.BzrCommandError('These branches have diverged.'
3077
' Try merging, and then bind again.')
3080
class cmd_unbind(Command):
3081
"""Convert the current checkout into a regular branch.
3083
After unbinding, the local branch is considered independent and subsequent
3084
commits will be local only.
3086
See "help checkouts" for more information on checkouts.
3093
b, relpath = Branch.open_containing(u'.')
3095
raise errors.BzrCommandError('Local branch is not bound')
3098
class cmd_uncommit(Command):
3099
"""Remove the last committed revision.
3101
--verbose will print out what is being removed.
3102
--dry-run will go through all the motions, but not actually
3105
In the future, uncommit will create a revision bundle, which can then
3109
# TODO: jam 20060108 Add an option to allow uncommit to remove
3110
# unreferenced information in 'branch-as-repository' branches.
3111
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
3112
# information in shared branches as well.
3113
takes_options = ['verbose', 'revision',
3114
Option('dry-run', help='Don\'t actually make changes'),
3115
Option('force', help='Say yes to all questions.')]
3116
takes_args = ['location?']
3119
def run(self, location=None,
3120
dry_run=False, verbose=False,
3121
revision=None, force=False):
3122
from bzrlib.log import log_formatter, show_log
3124
from bzrlib.uncommit import uncommit
3126
if location is None:
3128
control, relpath = bzrdir.BzrDir.open_containing(location)
3130
tree = control.open_workingtree()
3132
except (errors.NoWorkingTree, errors.NotLocalUrl):
3134
b = control.open_branch()
3137
if revision is None:
3140
# 'bzr uncommit -r 10' actually means uncommit
3141
# so that the final tree is at revno 10.
3142
# but bzrlib.uncommit.uncommit() actually uncommits
3143
# the revisions that are supplied.
3144
# So we need to offset it by one
3145
revno = revision[0].in_history(b).revno+1
3147
if revno <= b.revno():
3148
rev_id = b.get_rev_id(revno)
3150
self.outf.write('No revisions to uncommit.\n')
3153
lf = log_formatter('short',
3155
show_timezone='original')
3160
direction='forward',
3161
start_revision=revno,
3162
end_revision=b.revno())
3165
print 'Dry-run, pretending to remove the above revisions.'
3167
val = raw_input('Press <enter> to continue')
3169
print 'The above revision(s) will be removed.'
3171
val = raw_input('Are you sure [y/N]? ')
3172
if val.lower() not in ('y', 'yes'):
3176
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
3180
class cmd_break_lock(Command):
3181
"""Break a dead lock on a repository, branch or working directory.
3183
CAUTION: Locks should only be broken when you are sure that the process
3184
holding the lock has been stopped.
3186
You can get information on what locks are open via the 'bzr info' command.
3191
takes_args = ['location?']
3193
def run(self, location=None, show=False):
3194
if location is None:
3196
control, relpath = bzrdir.BzrDir.open_containing(location)
3198
control.break_lock()
3199
except NotImplementedError:
3203
class cmd_wait_until_signalled(Command):
3204
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3206
This just prints a line to signal when it is ready, then blocks on stdin.
3212
sys.stdout.write("running\n")
3214
sys.stdin.readline()
3217
class cmd_serve(Command):
3218
"""Run the bzr server."""
3220
aliases = ['server']
3224
help='serve on stdin/out for use from inetd or sshd'),
3226
help='listen for connections on nominated port of the form '
3227
'[hostname:]portnumber. Passing 0 as the port number will '
3228
'result in a dynamically allocated port. Default port is '
3232
help='serve contents of directory',
3234
Option('allow-writes',
3235
help='By default the server is a readonly server. Supplying '
3236
'--allow-writes enables write access to the contents of '
3237
'the served directory and below. '
3241
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3242
from bzrlib.transport import smart
3243
from bzrlib.transport import get_transport
3244
if directory is None:
3245
directory = os.getcwd()
3246
url = urlutils.local_path_to_url(directory)
3247
if not allow_writes:
3248
url = 'readonly+' + url
3249
t = get_transport(url)
3251
server = smart.SmartServerPipeStreamMedium(sys.stdin, sys.stdout, t)
3254
port = smart.BZR_DEFAULT_PORT
3258
host, port = port.split(':')
3262
server = smart.SmartTCPServer(t, host=host, port=port)
3263
print 'listening on port: ', server.port
3267
class cmd_join(Command):
3268
"""Combine a subtree into its containing tree.
3270
This command is for experimental use only. It requires the target tree
3271
to be in dirstate-with-subtree format, which cannot be converted into
3274
The TREE argument should be an independent tree, inside another tree, but
3275
not part of it. (Such trees can be produced by "bzr split", but also by
3276
running "bzr branch" with the target inside a tree.)
3278
The result is a combined tree, with the subtree no longer an independant
3279
part. This is marked as a merge of the subtree into the containing tree,
3280
and all history is preserved.
3282
If --reference is specified, the subtree retains its independence. It can
3283
be branched by itself, and can be part of multiple projects at the same
3284
time. But operations performed in the containing tree, such as commit
3285
and merge, will recurse into the subtree.
3288
takes_args = ['tree']
3289
takes_options = [Option('reference', 'join by reference')]
3292
def run(self, tree, reference=False):
3293
sub_tree = WorkingTree.open(tree)
3294
parent_dir = osutils.dirname(sub_tree.basedir)
3295
containing_tree = WorkingTree.open_containing(parent_dir)[0]
3296
repo = containing_tree.branch.repository
3297
if not repo.supports_rich_root():
3298
raise errors.BzrCommandError(
3299
"Can't join trees because %s doesn't support rich root data.\n"
3300
"You can use bzr upgrade on the repository."
3304
containing_tree.add_reference(sub_tree)
3305
except errors.BadReferenceTarget, e:
3306
# XXX: Would be better to just raise a nicely printable
3307
# exception from the real origin. Also below. mbp 20070306
3308
raise errors.BzrCommandError("Cannot join %s. %s" %
3312
containing_tree.subsume(sub_tree)
3313
except errors.BadSubsumeSource, e:
3314
raise errors.BzrCommandError("Cannot join %s. %s" %
3318
class cmd_split(Command):
3319
"""Split a tree into two trees.
3321
This command is for experimental use only. It requires the target tree
3322
to be in dirstate-with-subtree format, which cannot be converted into
3325
The TREE argument should be a subdirectory of a working tree. That
3326
subdirectory will be converted into an independent tree, with its own
3327
branch. Commits in the top-level tree will not apply to the new subtree.
3328
If you want that behavior, do "bzr join --reference TREE".
3330
To undo this operation, do "bzr join TREE".
3333
takes_args = ['tree']
3337
def run(self, tree):
3338
containing_tree, subdir = WorkingTree.open_containing(tree)
3339
sub_id = containing_tree.path2id(subdir)
3341
raise errors.NotVersionedError(subdir)
3343
containing_tree.extract(sub_id)
3344
except errors.RootNotRich:
3345
raise errors.UpgradeRequired(containing_tree.branch.base)
3349
class cmd_merge_directive(Command):
3350
"""Generate a merge directive for auto-merge tools.
3352
A directive requests a merge to be performed, and also provides all the
3353
information necessary to do so. This means it must either include a
3354
revision bundle, or the location of a branch containing the desired
3357
A submit branch (the location to merge into) must be supplied the first
3358
time the command is issued. After it has been supplied once, it will
3359
be remembered as the default.
3361
A public branch is optional if a revision bundle is supplied, but required
3362
if --diff or --plain is specified. It will be remembered as the default
3363
after the first use.
3366
takes_args = ['submit_branch?', 'public_branch?']
3369
RegistryOption.from_kwargs('patch-type',
3370
'The type of patch to include in the directive',
3371
title='Patch type', value_switches=True, enum_switch=False,
3372
bundle='Bazaar revision bundle (default)',
3373
diff='Normal unified diff',
3374
plain='No patch, just directive'),
3375
Option('sign', help='GPG-sign the directive'), 'revision',
3376
Option('mail-to', type=str,
3377
help='Instead of printing the directive, email to this address'),
3378
Option('message', type=str, short_name='m',
3379
help='Message to use when committing this merge')
3382
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
3383
sign=False, revision=None, mail_to=None, message=None):
3384
if patch_type == 'plain':
3386
branch = Branch.open('.')
3387
stored_submit_branch = branch.get_submit_branch()
3388
if submit_branch is None:
3389
submit_branch = stored_submit_branch
3391
if stored_submit_branch is None:
3392
branch.set_submit_branch(submit_branch)
3393
if submit_branch is None:
3394
submit_branch = branch.get_parent()
3395
if submit_branch is None:
3396
raise errors.BzrCommandError('No submit branch specified or known')
3398
stored_public_branch = branch.get_public_branch()
3399
if public_branch is None:
3400
public_branch = stored_public_branch
3401
elif stored_public_branch is None:
3402
branch.set_public_branch(public_branch)
3403
if patch_type != "bundle" and public_branch is None:
3404
raise errors.BzrCommandError('No public branch specified or'
3406
if revision is not None:
3407
if len(revision) != 1:
3408
raise errors.BzrCommandError('bzr merge-directive takes '
3409
'exactly one revision identifier')
3411
revision_id = revision[0].in_history(branch).rev_id
3413
revision_id = branch.last_revision()
3414
directive = merge_directive.MergeDirective.from_objects(
3415
branch.repository, revision_id, time.time(),
3416
osutils.local_time_offset(), submit_branch,
3417
public_branch=public_branch, patch_type=patch_type,
3421
self.outf.write(directive.to_signed(branch))
3423
self.outf.writelines(directive.to_lines())
3425
message = directive.to_email(mail_to, branch, sign)
3427
server = branch.get_config().get_user_option('smtp_server')
3429
server = 'localhost'
3431
s.sendmail(message['From'], message['To'], message.as_string())
3434
class cmd_tag(Command):
3435
"""Create a tag naming a revision.
3437
Tags give human-meaningful names to revisions. Commands that take a -r
3438
(--revision) option can be given -rtag:X, where X is any previously
3441
Tags are stored in the branch. Tags are copied from one branch to another
3442
along when you branch, push, pull or merge.
3444
It is an error to give a tag name that already exists unless you pass
3445
--force, in which case the tag is moved to point to the new revision.
3448
takes_args = ['tag_name']
3451
help='Delete this tag rather than placing it.',
3454
help='Branch in which to place the tag.',
3459
help='Replace existing tags',
3464
def run(self, tag_name,
3470
branch, relpath = Branch.open_containing(directory)
3474
branch.tags.delete_tag(tag_name)
3475
self.outf.write('Deleted tag %s.\n' % tag_name)
3478
if len(revision) != 1:
3479
raise errors.BzrCommandError(
3480
"Tags can only be placed on a single revision, "
3482
revision_id = revision[0].in_history(branch).rev_id
3484
revision_id = branch.last_revision()
3485
if (not force) and branch.tags.has_tag(tag_name):
3486
raise errors.TagAlreadyExists(tag_name)
3487
branch.tags.set_tag(tag_name, revision_id)
3488
self.outf.write('Created tag %s.\n' % tag_name)
3493
class cmd_tags(Command):
3496
This tag shows a table of tag names and the revisions they reference.
3501
help='Branch whose tags should be displayed',
3511
branch, relpath = Branch.open_containing(directory)
3512
for tag_name, target in sorted(branch.tags.get_tag_dict().items()):
3513
self.outf.write('%-20s %s\n' % (tag_name, target))
3516
# command-line interpretation helper for merge-related commands
3517
def _merge_helper(other_revision, base_revision,
3518
check_clean=True, ignore_zero=False,
3519
this_dir=None, backup_files=False,
3521
file_list=None, show_base=False, reprocess=False,
3524
change_reporter=None,
3526
"""Merge changes into a tree.
3529
list(path, revno) Base for three-way merge.
3530
If [None, None] then a base will be automatically determined.
3532
list(path, revno) Other revision for three-way merge.
3534
Directory to merge changes into; '.' by default.
3536
If true, this_dir must have no uncommitted changes before the
3538
ignore_zero - If true, suppress the "zero conflicts" message when
3539
there are no conflicts; should be set when doing something we expect
3540
to complete perfectly.
3541
file_list - If supplied, merge only changes to selected files.
3543
All available ancestors of other_revision and base_revision are
3544
automatically pulled into the branch.
3546
The revno may be -1 to indicate the last revision on the branch, which is
3549
This function is intended for use from the command line; programmatic
3550
clients might prefer to call merge.merge_inner(), which has less magic
3553
# Loading it late, so that we don't always have to import bzrlib.merge
3554
if merge_type is None:
3555
merge_type = _mod_merge.Merge3Merger
3556
if this_dir is None:
3558
this_tree = WorkingTree.open_containing(this_dir)[0]
3559
if show_base and not merge_type is _mod_merge.Merge3Merger:
3560
raise errors.BzrCommandError("Show-base is not supported for this merge"
3561
" type. %s" % merge_type)
3562
if reprocess and not merge_type.supports_reprocess:
3563
raise errors.BzrCommandError("Conflict reduction is not supported for merge"
3564
" type %s." % merge_type)
3565
if reprocess and show_base:
3566
raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
3567
# TODO: jam 20070226 We should really lock these trees earlier. However, we
3568
# only want to take out a lock_tree_write() if we don't have to pull
3569
# any ancestry. But merge might fetch ancestry in the middle, in
3570
# which case we would need a lock_write().
3571
# Because we cannot upgrade locks, for now we live with the fact that
3572
# the tree will be locked multiple times during a merge. (Maybe
3573
# read-only some of the time, but it means things will get read
3576
merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
3577
pb=pb, change_reporter=change_reporter)
3578
merger.pp = ProgressPhase("Merge phase", 5, pb)
3579
merger.pp.next_phase()
3580
merger.check_basis(check_clean)
3581
if other_rev_id is not None:
3582
merger.set_other_revision(other_rev_id, this_tree.branch)
3584
merger.set_other(other_revision)
3585
merger.pp.next_phase()
3586
merger.set_base(base_revision)
3587
if merger.base_rev_id == merger.other_rev_id:
3588
note('Nothing to do.')
3590
if file_list is None:
3591
if pull and merger.base_rev_id == merger.this_rev_id:
3592
# FIXME: deduplicate with pull
3593
result = merger.this_tree.pull(merger.this_branch,
3594
False, merger.other_rev_id)
3595
if result.old_revid == result.new_revid:
3596
note('No revisions to pull.')
3598
note('Now on revision %d.' % result.new_revno)
3600
merger.backup_files = backup_files
3601
merger.merge_type = merge_type
3602
merger.set_interesting_files(file_list)
3603
merger.show_base = show_base
3604
merger.reprocess = reprocess
3605
conflicts = merger.do_merge()
3606
if file_list is None:
3607
merger.set_pending()
3614
merge = _merge_helper
3617
# these get imported and then picked up by the scan for cmd_*
3618
# TODO: Some more consistent way to split command definitions across files;
3619
# we do need to load at least some information about them to know of
3620
# aliases. ideally we would avoid loading the implementation until the
3621
# details were needed.
3622
from bzrlib.cmd_version_info import cmd_version_info
3623
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
3624
from bzrlib.bundle.commands import cmd_bundle_revisions
3625
from bzrlib.sign_my_commits import cmd_sign_my_commits
3626
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
3627
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
