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(), """
54
from bzrlib.branch import Branch
55
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.revision import common_ancestor
58
from bzrlib.revisionspec import RevisionSpec
59
from bzrlib.workingtree import WorkingTree
62
from bzrlib.commands import Command, display_command
63
from bzrlib.option import ListOption, Option, RegistryOption
64
from bzrlib.progress import DummyProgress, ProgressPhase
65
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
68
def tree_files(file_list, default_branch=u'.'):
70
return internal_tree_files(file_list, default_branch)
71
except errors.FileInWrongBranch, e:
72
raise errors.BzrCommandError("%s is not in the same branch as %s" %
73
(e.path, file_list[0]))
76
# XXX: Bad function name; should possibly also be a class method of
77
# WorkingTree rather than a function.
78
def internal_tree_files(file_list, default_branch=u'.'):
79
"""Convert command-line paths to a WorkingTree and relative paths.
81
This is typically used for command-line processors that take one or
82
more filenames, and infer the workingtree that contains them.
84
The filenames given are not required to exist.
86
:param file_list: Filenames to convert.
88
:param default_branch: Fallback tree path to use if file_list is empty or
91
:return: workingtree, [relative_paths]
93
if file_list is None or len(file_list) == 0:
94
return WorkingTree.open_containing(default_branch)[0], file_list
95
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
97
for filename in file_list:
99
new_list.append(tree.relpath(osutils.dereference_path(filename)))
100
except errors.PathNotChild:
101
raise errors.FileInWrongBranch(tree.branch, filename)
102
return tree, new_list
105
@symbol_versioning.deprecated_function(symbol_versioning.zero_fifteen)
106
def get_format_type(typestring):
107
"""Parse and return a format specifier."""
108
# Have to use BzrDirMetaFormat1 directly, so that
109
# RepositoryFormat.set_default_format works
110
if typestring == "default":
111
return bzrdir.BzrDirMetaFormat1()
113
return bzrdir.format_registry.make_bzrdir(typestring)
115
msg = 'Unknown bzr format "%s". See "bzr help formats".' % typestring
116
raise errors.BzrCommandError(msg)
119
# TODO: Make sure no commands unconditionally use the working directory as a
120
# branch. If a filename argument is used, the first of them should be used to
121
# specify the branch. (Perhaps this can be factored out into some kind of
122
# Argument class, representing a file in a branch, where the first occurrence
125
class cmd_status(Command):
126
"""Display status summary.
128
This reports on versioned and unknown files, reporting them
129
grouped by state. Possible states are:
132
Versioned in the working copy but not in the previous revision.
135
Versioned in the previous revision but removed or deleted
139
Path of this file changed from the previous revision;
140
the text may also have changed. This includes files whose
141
parent directory was renamed.
144
Text has changed since the previous revision.
147
File kind has been changed (e.g. from file to directory).
150
Not versioned and not matching an ignore pattern.
152
To see ignored files use 'bzr ignored'. For details on the
153
changes to file texts, use 'bzr diff'.
155
--short gives a status flags for each item, similar to the SVN's status
158
Column 1: versioning / renames
164
P Entry for a pending merge (not a file)
173
* The execute bit was changed
175
If no arguments are specified, the status of the entire working
176
directory is shown. Otherwise, only the status of the specified
177
files or directories is reported. If a directory is given, status
178
is reported for everything inside that directory.
180
If a revision argument is given, the status is calculated against
181
that revision, or between two revisions if two are provided.
184
# TODO: --no-recurse, --recurse options
186
takes_args = ['file*']
187
takes_options = ['show-ids', 'revision',
188
Option('short', help='Give short SVN-style status lines'),
189
Option('versioned', help='Only show versioned files')]
190
aliases = ['st', 'stat']
192
encoding_type = 'replace'
193
_see_also = ['diff', 'revert']
196
def run(self, show_ids=False, file_list=None, revision=None, short=False,
198
from bzrlib.status import show_tree_status
200
tree, file_list = tree_files(file_list)
202
show_tree_status(tree, show_ids=show_ids,
203
specific_files=file_list, revision=revision,
204
to_file=self.outf, short=short, versioned=versioned)
207
class cmd_cat_revision(Command):
208
"""Write out metadata for a revision.
210
The revision to print can either be specified by a specific
211
revision identifier, or you can use --revision.
215
takes_args = ['revision_id?']
216
takes_options = ['revision']
217
# cat-revision is more for frontends so should be exact
221
def run(self, revision_id=None, revision=None):
223
revision_id = osutils.safe_revision_id(revision_id, warn=False)
224
if revision_id is not None and revision is not None:
225
raise errors.BzrCommandError('You can only supply one of'
226
' revision_id or --revision')
227
if revision_id is None and revision is None:
228
raise errors.BzrCommandError('You must supply either'
229
' --revision or a revision_id')
230
b = WorkingTree.open_containing(u'.')[0].branch
232
# TODO: jam 20060112 should cat-revision always output utf-8?
233
if revision_id is not None:
234
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
235
elif revision is not None:
238
raise errors.BzrCommandError('You cannot specify a NULL'
240
revno, rev_id = rev.in_history(b)
241
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
244
class cmd_remove_tree(Command):
245
"""Remove the working tree from a given branch/checkout.
247
Since a lightweight checkout is little more than a working tree
248
this will refuse to run against one.
250
To re-create the working tree, use "bzr checkout".
252
_see_also = ['checkout', 'working-trees']
254
takes_args = ['location?']
256
def run(self, location='.'):
257
d = bzrdir.BzrDir.open(location)
260
working = d.open_workingtree()
261
except errors.NoWorkingTree:
262
raise errors.BzrCommandError("No working tree to remove")
263
except errors.NotLocalUrl:
264
raise errors.BzrCommandError("You cannot remove the working tree of a "
267
working_path = working.bzrdir.root_transport.base
268
branch_path = working.branch.bzrdir.root_transport.base
269
if working_path != branch_path:
270
raise errors.BzrCommandError("You cannot remove the working tree from "
271
"a lightweight checkout")
273
d.destroy_workingtree()
276
class cmd_revno(Command):
277
"""Show current revision number.
279
This is equal to the number of revisions on this branch.
283
takes_args = ['location?']
286
def run(self, location=u'.'):
287
self.outf.write(str(Branch.open_containing(location)[0].revno()))
288
self.outf.write('\n')
291
class cmd_revision_info(Command):
292
"""Show revision number and revision id for a given revision identifier.
295
takes_args = ['revision_info*']
296
takes_options = ['revision']
299
def run(self, revision=None, revision_info_list=[]):
302
if revision is not None:
303
revs.extend(revision)
304
if revision_info_list is not None:
305
for rev in revision_info_list:
306
revs.append(RevisionSpec.from_string(rev))
308
raise errors.BzrCommandError('You must supply a revision identifier')
310
b = WorkingTree.open_containing(u'.')[0].branch
313
revinfo = rev.in_history(b)
314
if revinfo.revno is None:
315
print ' %s' % revinfo.rev_id
317
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
320
class cmd_add(Command):
321
"""Add specified files or directories.
323
In non-recursive mode, all the named items are added, regardless
324
of whether they were previously ignored. A warning is given if
325
any of the named files are already versioned.
327
In recursive mode (the default), files are treated the same way
328
but the behaviour for directories is different. Directories that
329
are already versioned do not give a warning. All directories,
330
whether already versioned or not, are searched for files or
331
subdirectories that are neither versioned or ignored, and these
332
are added. This search proceeds recursively into versioned
333
directories. If no names are given '.' is assumed.
335
Therefore simply saying 'bzr add' will version all files that
336
are currently unknown.
338
Adding a file whose parent directory is not versioned will
339
implicitly add the parent, and so on up to the root. This means
340
you should never need to explicitly add a directory, they'll just
341
get added when you add a file in the directory.
343
--dry-run will show which files would be added, but not actually
346
--file-ids-from will try to use the file ids from the supplied path.
347
It looks up ids trying to find a matching parent directory with the
348
same filename, and then by pure path. This option is rarely needed
349
but can be useful when adding the same logical file into two
350
branches that will be merged later (without showing the two different
351
adds as a conflict). It is also useful when merging another project
352
into a subdirectory of this one.
354
takes_args = ['file*']
355
takes_options = ['no-recurse', 'dry-run', 'verbose',
356
Option('file-ids-from', type=unicode,
357
help='Lookup file ids from here')]
358
encoding_type = 'replace'
359
_see_also = ['remove']
361
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
366
if file_ids_from is not None:
368
base_tree, base_path = WorkingTree.open_containing(
370
except errors.NoWorkingTree:
371
base_branch, base_path = Branch.open_containing(
373
base_tree = base_branch.basis_tree()
375
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
376
to_file=self.outf, should_print=(not is_quiet()))
378
action = bzrlib.add.AddAction(to_file=self.outf,
379
should_print=(not is_quiet()))
382
base_tree.lock_read()
384
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
385
action=action, save=not dry_run)
387
if base_tree is not None:
391
for glob in sorted(ignored.keys()):
392
for path in ignored[glob]:
393
self.outf.write("ignored %s matching \"%s\"\n"
397
for glob, paths in ignored.items():
398
match_len += len(paths)
399
self.outf.write("ignored %d file(s).\n" % match_len)
400
self.outf.write("If you wish to add some of these files,"
401
" please add them by name.\n")
404
class cmd_mkdir(Command):
405
"""Create a new versioned directory.
407
This is equivalent to creating the directory and then adding it.
410
takes_args = ['dir+']
411
encoding_type = 'replace'
413
def run(self, dir_list):
416
wt, dd = WorkingTree.open_containing(d)
418
self.outf.write('added %s\n' % d)
421
class cmd_relpath(Command):
422
"""Show path of a file relative to root"""
424
takes_args = ['filename']
428
def run(self, filename):
429
# TODO: jam 20050106 Can relpath return a munged path if
430
# sys.stdout encoding cannot represent it?
431
tree, relpath = WorkingTree.open_containing(filename)
432
self.outf.write(relpath)
433
self.outf.write('\n')
436
class cmd_inventory(Command):
437
"""Show inventory of the current working copy or a revision.
439
It is possible to limit the output to a particular entry
440
type using the --kind option. For example: --kind file.
442
It is also possible to restrict the list of files to a specific
443
set. For example: bzr inventory --show-ids this/file
448
takes_options = ['revision', 'show-ids', 'kind']
449
takes_args = ['file*']
452
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
453
if kind and kind not in ['file', 'directory', 'symlink']:
454
raise errors.BzrCommandError('invalid kind specified')
456
work_tree, file_list = tree_files(file_list)
457
work_tree.lock_read()
459
if revision is not None:
460
if len(revision) > 1:
461
raise errors.BzrCommandError(
462
'bzr inventory --revision takes exactly one revision'
464
revision_id = revision[0].in_history(work_tree.branch).rev_id
465
tree = work_tree.branch.repository.revision_tree(revision_id)
467
extra_trees = [work_tree]
473
if file_list is not None:
474
file_ids = tree.paths2ids(file_list, trees=extra_trees,
475
require_versioned=True)
476
# find_ids_across_trees may include some paths that don't
478
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
479
for file_id in file_ids if file_id in tree)
481
entries = tree.inventory.entries()
484
if tree is not work_tree:
487
for path, entry in entries:
488
if kind and kind != entry.kind:
491
self.outf.write('%-50s %s\n' % (path, entry.file_id))
493
self.outf.write(path)
494
self.outf.write('\n')
497
class cmd_mv(Command):
498
"""Move or rename a file.
501
bzr mv OLDNAME NEWNAME
502
bzr mv SOURCE... DESTINATION
504
If the last argument is a versioned directory, all the other names
505
are moved into it. Otherwise, there must be exactly two arguments
506
and the file is changed to a new name.
508
If OLDNAME does not exist on the filesystem but is versioned and
509
NEWNAME does exist on the filesystem but is not versioned, mv
510
assumes that the file has been manually moved and only updates
511
its internal inventory to reflect that change.
512
The same is valid when moving many SOURCE files to a DESTINATION.
514
Files cannot be moved between branches.
517
takes_args = ['names*']
518
takes_options = [Option("after", help="move only the bzr identifier"
519
" of the file (file has already been moved). Use this flag if"
520
" bzr is not able to detect this itself.")]
521
aliases = ['move', 'rename']
522
encoding_type = 'replace'
524
def run(self, names_list, after=False):
525
if names_list is None:
528
if len(names_list) < 2:
529
raise errors.BzrCommandError("missing file argument")
530
tree, rel_names = tree_files(names_list)
532
if os.path.isdir(names_list[-1]):
533
# move into existing directory
534
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
535
self.outf.write("%s => %s\n" % pair)
537
if len(names_list) != 2:
538
raise errors.BzrCommandError('to mv multiple files the'
539
' destination must be a versioned'
541
tree.rename_one(rel_names[0], rel_names[1], after=after)
542
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
545
class cmd_pull(Command):
546
"""Turn this branch into a mirror of another branch.
548
This command only works on branches that have not diverged. Branches are
549
considered diverged if the destination branch's most recent commit is one
550
that has not been merged (directly or indirectly) into the parent.
552
If branches have diverged, you can use 'bzr merge' to integrate the changes
553
from one into the other. Once one branch has merged, the other should
554
be able to pull it again.
556
If you want to forget your local changes and just update your branch to
557
match the remote one, use pull --overwrite.
559
If there is no default location set, the first pull will set it. After
560
that, you can omit the location to use the default. To change the
561
default, use --remember. The value will only be saved if the remote
562
location can be accessed.
565
_see_also = ['push', 'update']
566
takes_options = ['remember', 'overwrite', 'revision', 'verbose',
568
help='branch to pull into, '
569
'rather than the one containing the working directory',
574
takes_args = ['location?']
575
encoding_type = 'replace'
577
def run(self, location=None, remember=False, overwrite=False,
578
revision=None, verbose=False,
580
from bzrlib.tag import _merge_tags_if_possible
581
# FIXME: too much stuff is in the command class
584
if directory is None:
587
tree_to = WorkingTree.open_containing(directory)[0]
588
branch_to = tree_to.branch
589
except errors.NoWorkingTree:
591
branch_to = Branch.open_containing(directory)[0]
594
# The user may provide a bundle or branch as 'location' We first try to
595
# identify a bundle, if it's not, we try to preserve connection used by
596
# the transport to access the branch.
597
if location is not None:
598
url = urlutils.normalize_url(location)
599
url, filename = urlutils.split(url, exclude_trailing_slash=False)
600
location_transport = transport.get_transport(url)
603
read_bundle = bundle.read_mergeable_from_transport
604
# There may be redirections but we ignore the intermediate
605
# and final transports used
606
mergeable, t = read_bundle(location_transport, filename)
607
except errors.NotABundle:
608
# Continue on considering this url a Branch but adjust the
610
location_transport = location_transport.clone(filename)
612
# A directory was provided, location_transport is correct
615
stored_loc = branch_to.get_parent()
617
if stored_loc is None:
618
raise errors.BzrCommandError("No pull location known or"
621
display_url = urlutils.unescape_for_display(stored_loc,
623
self.outf.write("Using saved location: %s\n" % display_url)
624
location = stored_loc
625
location_transport = transport.get_transport(location)
627
if mergeable is not None:
628
if revision is not None:
629
raise errors.BzrCommandError(
630
'Cannot use -r with merge directives or bundles')
631
revision_id = mergeable.install_revisions(branch_to.repository)
632
branch_from = branch_to
634
branch_from = Branch.open_from_transport(location_transport)
636
if branch_to.get_parent() is None or remember:
637
branch_to.set_parent(branch_from.base)
639
if revision is not None:
640
if len(revision) == 1:
641
revision_id = revision[0].in_history(branch_from).rev_id
643
raise errors.BzrCommandError(
644
'bzr pull --revision takes one value.')
646
old_rh = branch_to.revision_history()
647
if tree_to is not None:
648
result = tree_to.pull(branch_from, overwrite, revision_id,
649
delta._ChangeReporter(unversioned_filter=tree_to.is_ignored))
651
result = branch_to.pull(branch_from, overwrite, revision_id)
653
result.report(self.outf)
655
from bzrlib.log import show_changed_revisions
656
new_rh = branch_to.revision_history()
657
show_changed_revisions(branch_to, old_rh, new_rh,
661
class cmd_push(Command):
662
"""Update a mirror of this branch.
664
The target branch will not have its working tree populated because this
665
is both expensive, and is not supported on remote file systems.
667
Some smart servers or protocols *may* put the working tree in place in
670
This command only works on branches that have not diverged. Branches are
671
considered diverged if the destination branch's most recent commit is one
672
that has not been merged (directly or indirectly) by the source branch.
674
If branches have diverged, you can use 'bzr push --overwrite' to replace
675
the other branch completely, discarding its unmerged changes.
677
If you want to ensure you have the different changes in the other branch,
678
do a merge (see bzr help merge) from the other branch, and commit that.
679
After that you will be able to do a push without '--overwrite'.
681
If there is no default push location set, the first push will set it.
682
After that, you can omit the location to use the default. To change the
683
default, use --remember. The value will only be saved if the remote
684
location can be accessed.
687
_see_also = ['pull', 'update', 'working-trees']
688
takes_options = ['remember', 'overwrite', 'verbose',
689
Option('create-prefix',
690
help='Create the path leading up to the branch '
691
'if it does not already exist'),
693
help='branch to push from, '
694
'rather than the one containing the working directory',
698
Option('use-existing-dir',
699
help='By default push will fail if the target'
700
' directory exists, but does not already'
701
' have a control directory. This flag will'
702
' allow push to proceed.'),
704
takes_args = ['location?']
705
encoding_type = 'replace'
707
def run(self, location=None, remember=False, overwrite=False,
708
create_prefix=False, verbose=False,
709
use_existing_dir=False,
711
# FIXME: Way too big! Put this into a function called from the
713
if directory is None:
715
br_from = Branch.open_containing(directory)[0]
716
stored_loc = br_from.get_push_location()
718
if stored_loc is None:
719
raise errors.BzrCommandError("No push location known or specified.")
721
display_url = urlutils.unescape_for_display(stored_loc,
723
self.outf.write("Using saved location: %s\n" % display_url)
724
location = stored_loc
726
to_transport = transport.get_transport(location)
728
br_to = repository_to = dir_to = None
730
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
731
except errors.NotBranchError:
732
pass # Didn't find anything
734
# If we can open a branch, use its direct repository, otherwise see
735
# if there is a repository without a branch.
737
br_to = dir_to.open_branch()
738
except errors.NotBranchError:
739
# Didn't find a branch, can we find a repository?
741
repository_to = dir_to.find_repository()
742
except errors.NoRepositoryPresent:
745
# Found a branch, so we must have found a repository
746
repository_to = br_to.repository
750
# The destination doesn't exist; create it.
751
# XXX: Refactor the create_prefix/no_create_prefix code into a
752
# common helper function
754
to_transport.mkdir('.')
755
except errors.FileExists:
756
if not use_existing_dir:
757
raise errors.BzrCommandError("Target directory %s"
758
" already exists, but does not have a valid .bzr"
759
" directory. Supply --use-existing-dir to push"
760
" there anyway." % location)
761
except errors.NoSuchFile:
762
if not create_prefix:
763
raise errors.BzrCommandError("Parent directory of %s"
765
"\nYou may supply --create-prefix to create all"
766
" leading parent directories."
769
cur_transport = to_transport
770
needed = [cur_transport]
771
# Recurse upwards until we can create a directory successfully
773
new_transport = cur_transport.clone('..')
774
if new_transport.base == cur_transport.base:
775
raise errors.BzrCommandError("Failed to create path"
779
new_transport.mkdir('.')
780
except errors.NoSuchFile:
781
needed.append(new_transport)
782
cur_transport = new_transport
786
# Now we only need to create child directories
788
cur_transport = needed.pop()
789
cur_transport.ensure_base()
791
# Now the target directory exists, but doesn't have a .bzr
792
# directory. So we need to create it, along with any work to create
793
# all of the dependent branches, etc.
794
dir_to = br_from.bzrdir.clone_on_transport(to_transport,
795
revision_id=br_from.last_revision())
796
br_to = dir_to.open_branch()
797
# TODO: Some more useful message about what was copied
798
note('Created new branch.')
799
# We successfully created the target, remember it
800
if br_from.get_push_location() is None or remember:
801
br_from.set_push_location(br_to.base)
802
elif repository_to is None:
803
# we have a bzrdir but no branch or repository
804
# XXX: Figure out what to do other than complain.
805
raise errors.BzrCommandError("At %s you have a valid .bzr control"
806
" directory, but not a branch or repository. This is an"
807
" unsupported configuration. Please move the target directory"
808
" out of the way and try again."
811
# We have a repository but no branch, copy the revisions, and then
813
last_revision_id = br_from.last_revision()
814
repository_to.fetch(br_from.repository,
815
revision_id=last_revision_id)
816
br_to = br_from.clone(dir_to, revision_id=last_revision_id)
817
note('Created new branch.')
818
if br_from.get_push_location() is None or remember:
819
br_from.set_push_location(br_to.base)
820
else: # We have a valid to branch
821
# We were able to connect to the remote location, so remember it
822
# we don't need to successfully push because of possible divergence.
823
if br_from.get_push_location() is None or remember:
824
br_from.set_push_location(br_to.base)
825
old_rh = br_to.revision_history()
828
tree_to = dir_to.open_workingtree()
829
except errors.NotLocalUrl:
830
warning("This transport does not update the working "
831
"tree of: %s. See 'bzr help working-trees' for "
832
"more information." % br_to.base)
833
push_result = br_from.push(br_to, overwrite)
834
except errors.NoWorkingTree:
835
push_result = br_from.push(br_to, overwrite)
839
push_result = br_from.push(tree_to.branch, overwrite)
843
except errors.DivergedBranches:
844
raise errors.BzrCommandError('These branches have diverged.'
845
' Try using "merge" and then "push".')
846
if push_result is not None:
847
push_result.report(self.outf)
849
new_rh = br_to.revision_history()
852
from bzrlib.log import show_changed_revisions
853
show_changed_revisions(br_to, old_rh, new_rh,
856
# we probably did a clone rather than a push, so a message was
861
class cmd_branch(Command):
862
"""Create a new copy of a branch.
864
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
865
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
867
To retrieve the branch as of a particular revision, supply the --revision
868
parameter, as in "branch foo/bar -r 5".
871
_see_also = ['checkout']
872
takes_args = ['from_location', 'to_location?']
873
takes_options = ['revision']
874
aliases = ['get', 'clone']
876
def run(self, from_location, to_location=None, revision=None):
877
from bzrlib.tag import _merge_tags_if_possible
880
elif len(revision) > 1:
881
raise errors.BzrCommandError(
882
'bzr branch --revision takes exactly 1 revision value')
884
br_from = Branch.open(from_location)
887
if len(revision) == 1 and revision[0] is not None:
888
revision_id = revision[0].in_history(br_from)[1]
890
# FIXME - wt.last_revision, fallback to branch, fall back to
891
# None or perhaps NULL_REVISION to mean copy nothing
893
revision_id = br_from.last_revision()
894
if to_location is None:
895
to_location = os.path.basename(from_location.rstrip("/\\"))
898
name = os.path.basename(to_location) + '\n'
900
to_transport = transport.get_transport(to_location)
902
to_transport.mkdir('.')
903
except errors.FileExists:
904
raise errors.BzrCommandError('Target directory "%s" already'
905
' exists.' % to_location)
906
except errors.NoSuchFile:
907
raise errors.BzrCommandError('Parent of "%s" does not exist.'
910
# preserve whatever source format we have.
911
dir = br_from.bzrdir.sprout(to_transport.base, revision_id)
912
branch = dir.open_branch()
913
except errors.NoSuchRevision:
914
to_transport.delete_tree('.')
915
msg = "The branch %s has no revision %s." % (from_location, revision[0])
916
raise errors.BzrCommandError(msg)
918
branch.control_files.put_utf8('branch-name', name)
919
_merge_tags_if_possible(br_from, branch)
920
note('Branched %d revision(s).' % branch.revno())
925
class cmd_checkout(Command):
926
"""Create a new checkout of an existing branch.
928
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
929
the branch found in '.'. This is useful if you have removed the working tree
930
or if it was never created - i.e. if you pushed the branch to its current
933
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
934
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
936
To retrieve the branch as of a particular revision, supply the --revision
937
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
938
out of date [so you cannot commit] but it may be useful (i.e. to examine old
942
_see_also = ['checkouts', 'branch']
943
takes_args = ['branch_location?', 'to_location?']
944
takes_options = ['revision',
945
Option('lightweight',
946
help="perform a lightweight checkout. Lightweight "
947
"checkouts depend on access to the branch for "
948
"every operation. Normal checkouts can perform "
949
"common operations like diff and status without "
950
"such access, and also support local commits."
955
def run(self, branch_location=None, to_location=None, revision=None,
959
elif len(revision) > 1:
960
raise errors.BzrCommandError(
961
'bzr checkout --revision takes exactly 1 revision value')
962
if branch_location is None:
963
branch_location = osutils.getcwd()
964
to_location = branch_location
965
source = Branch.open(branch_location)
966
if len(revision) == 1 and revision[0] is not None:
967
revision_id = revision[0].in_history(source)[1]
970
if to_location is None:
971
to_location = os.path.basename(branch_location.rstrip("/\\"))
972
# if the source and to_location are the same,
973
# and there is no working tree,
974
# then reconstitute a branch
975
if (osutils.abspath(to_location) ==
976
osutils.abspath(branch_location)):
978
source.bzrdir.open_workingtree()
979
except errors.NoWorkingTree:
980
source.bzrdir.create_workingtree()
983
os.mkdir(to_location)
985
if e.errno == errno.EEXIST:
986
raise errors.BzrCommandError('Target directory "%s" already'
987
' exists.' % to_location)
988
if e.errno == errno.ENOENT:
989
raise errors.BzrCommandError('Parent of "%s" does not exist.'
993
source.create_checkout(to_location, revision_id, lightweight)
996
class cmd_renames(Command):
997
"""Show list of renamed files.
999
# TODO: Option to show renames between two historical versions.
1001
# TODO: Only show renames under dir, rather than in the whole branch.
1002
_see_also = ['status']
1003
takes_args = ['dir?']
1006
def run(self, dir=u'.'):
1007
tree = WorkingTree.open_containing(dir)[0]
1010
new_inv = tree.inventory
1011
old_tree = tree.basis_tree()
1012
old_tree.lock_read()
1014
old_inv = old_tree.inventory
1015
renames = list(_mod_tree.find_renames(old_inv, new_inv))
1017
for old_name, new_name in renames:
1018
self.outf.write("%s => %s\n" % (old_name, new_name))
1025
class cmd_update(Command):
1026
"""Update a tree to have the latest code committed to its branch.
1028
This will perform a merge into the working tree, and may generate
1029
conflicts. If you have any local changes, you will still
1030
need to commit them after the update for the update to be complete.
1032
If you want to discard your local changes, you can just do a
1033
'bzr revert' instead of 'bzr commit' after the update.
1036
_see_also = ['pull', 'working-trees']
1037
takes_args = ['dir?']
1040
def run(self, dir='.'):
1041
tree = WorkingTree.open_containing(dir)[0]
1042
master = tree.branch.get_master_branch()
1043
if master is not None:
1046
tree.lock_tree_write()
1048
existing_pending_merges = tree.get_parent_ids()[1:]
1049
last_rev = tree.last_revision()
1050
if last_rev == tree.branch.last_revision():
1051
# may be up to date, check master too.
1052
master = tree.branch.get_master_branch()
1053
if master is None or last_rev == master.last_revision():
1054
revno = tree.branch.revision_id_to_revno(last_rev)
1055
note("Tree is up to date at revision %d." % (revno,))
1057
conflicts = tree.update()
1058
revno = tree.branch.revision_id_to_revno(tree.last_revision())
1059
note('Updated to revision %d.' % (revno,))
1060
if tree.get_parent_ids()[1:] != existing_pending_merges:
1061
note('Your local commits will now show as pending merges with '
1062
"'bzr status', and can be committed with 'bzr commit'.")
1071
class cmd_info(Command):
1072
"""Show information about a working tree, branch or repository.
1074
This command will show all known locations and formats associated to the
1075
tree, branch or repository. Statistical information is included with
1078
Branches and working trees will also report any missing revisions.
1080
_see_also = ['revno', 'working-trees', 'repositories']
1081
takes_args = ['location?']
1082
takes_options = ['verbose']
1085
def run(self, location=None, verbose=False):
1086
from bzrlib.info import show_bzrdir_info
1087
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1091
class cmd_remove(Command):
1092
"""Remove files or directories.
1094
This makes bzr stop tracking changes to the specified files and
1095
delete them if they can easily be recovered using revert.
1097
You can specify one or more files, and/or --new. If you specify --new,
1098
only 'added' files will be removed. If you specify both, then new files
1099
in the specified directories will be removed. If the directories are
1100
also new, they will also be removed.
1102
takes_args = ['file*']
1103
takes_options = ['verbose',
1104
Option('new', help='remove newly-added files'),
1105
RegistryOption.from_kwargs('file-deletion-strategy',
1106
'The file deletion mode to be used',
1107
title='Deletion Strategy', value_switches=True, enum_switch=False,
1108
safe='Only delete files if they can be'
1109
' safely recovered (default).',
1110
keep="Don't delete any files.",
1111
force='Delete all the specified files, even if they can not be '
1112
'recovered and even if they are non-empty directories.')]
1114
encoding_type = 'replace'
1116
def run(self, file_list, verbose=False, new=False,
1117
file_deletion_strategy='safe'):
1118
tree, file_list = tree_files(file_list)
1120
if file_list is not None:
1121
file_list = [f for f in file_list if f != '']
1123
raise errors.BzrCommandError('Specify one or more files to'
1124
' remove, or use --new.')
1127
added = tree.changes_from(tree.basis_tree(),
1128
specific_files=file_list).added
1129
file_list = sorted([f[0] for f in added], reverse=True)
1130
if len(file_list) == 0:
1131
raise errors.BzrCommandError('No matching files.')
1132
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1133
keep_files=file_deletion_strategy=='keep',
1134
force=file_deletion_strategy=='force')
1137
class cmd_file_id(Command):
1138
"""Print file_id of a particular file or directory.
1140
The file_id is assigned when the file is first added and remains the
1141
same through all revisions where the file exists, even when it is
1146
_see_also = ['inventory', 'ls']
1147
takes_args = ['filename']
1150
def run(self, filename):
1151
tree, relpath = WorkingTree.open_containing(filename)
1152
i = tree.path2id(relpath)
1154
raise errors.NotVersionedError(filename)
1156
self.outf.write(i + '\n')
1159
class cmd_file_path(Command):
1160
"""Print path of file_ids to a file or directory.
1162
This prints one line for each directory down to the target,
1163
starting at the branch root.
1167
takes_args = ['filename']
1170
def run(self, filename):
1171
tree, relpath = WorkingTree.open_containing(filename)
1172
fid = tree.path2id(relpath)
1174
raise errors.NotVersionedError(filename)
1175
segments = osutils.splitpath(relpath)
1176
for pos in range(1, len(segments) + 1):
1177
path = osutils.joinpath(segments[:pos])
1178
self.outf.write("%s\n" % tree.path2id(path))
1181
class cmd_reconcile(Command):
1182
"""Reconcile bzr metadata in a branch.
1184
This can correct data mismatches that may have been caused by
1185
previous ghost operations or bzr upgrades. You should only
1186
need to run this command if 'bzr check' or a bzr developer
1187
advises you to run it.
1189
If a second branch is provided, cross-branch reconciliation is
1190
also attempted, which will check that data like the tree root
1191
id which was not present in very early bzr versions is represented
1192
correctly in both branches.
1194
At the same time it is run it may recompress data resulting in
1195
a potential saving in disk space or performance gain.
1197
The branch *MUST* be on a listable system such as local disk or sftp.
1200
_see_also = ['check']
1201
takes_args = ['branch?']
1203
def run(self, branch="."):
1204
from bzrlib.reconcile import reconcile
1205
dir = bzrdir.BzrDir.open(branch)
1209
class cmd_revision_history(Command):
1210
"""Display the list of revision ids on a branch."""
1213
takes_args = ['location?']
1218
def run(self, location="."):
1219
branch = Branch.open_containing(location)[0]
1220
for revid in branch.revision_history():
1221
self.outf.write(revid)
1222
self.outf.write('\n')
1225
class cmd_ancestry(Command):
1226
"""List all revisions merged into this branch."""
1228
_see_also = ['log', 'revision-history']
1229
takes_args = ['location?']
1234
def run(self, location="."):
1236
wt = WorkingTree.open_containing(location)[0]
1237
except errors.NoWorkingTree:
1238
b = Branch.open(location)
1239
last_revision = b.last_revision()
1242
last_revision = wt.last_revision()
1244
revision_ids = b.repository.get_ancestry(last_revision)
1245
assert revision_ids[0] is None
1247
for revision_id in revision_ids:
1248
self.outf.write(revision_id + '\n')
1251
class cmd_init(Command):
1252
"""Make a directory into a versioned branch.
1254
Use this to create an empty branch, or before importing an
1257
If there is a repository in a parent directory of the location, then
1258
the history of the branch will be stored in the repository. Otherwise
1259
init creates a standalone branch which carries its own history
1260
in the .bzr directory.
1262
If there is already a branch at the location but it has no working tree,
1263
the tree can be populated with 'bzr checkout'.
1265
Recipe for importing a tree of files:
1270
bzr commit -m 'imported project'
1273
_see_also = ['init-repo', 'branch', 'checkout']
1274
takes_args = ['location?']
1276
RegistryOption('format',
1277
help='Specify a format for this branch. '
1278
'See "help formats".',
1279
registry=bzrdir.format_registry,
1280
converter=bzrdir.format_registry.make_bzrdir,
1281
value_switches=True,
1282
title="Branch Format",
1284
Option('append-revisions-only',
1285
help='Never change revnos or the existing log.'
1286
' Append revisions to it only.')
1288
def run(self, location=None, format=None, append_revisions_only=False):
1290
format = bzrdir.format_registry.make_bzrdir('default')
1291
if location is None:
1294
to_transport = transport.get_transport(location)
1296
# TODO: create-prefix
1297
to_transport.ensure_base()
1300
existing_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1301
except errors.NotBranchError:
1302
# really a NotBzrDir error...
1303
create_branch = bzrdir.BzrDir.create_branch_convenience
1304
branch = create_branch(to_transport.base, format=format,
1305
possible_transports=[to_transport])
1307
from bzrlib.transport.local import LocalTransport
1308
if existing_bzrdir.has_branch():
1309
if (isinstance(to_transport, LocalTransport)
1310
and not existing_bzrdir.has_workingtree()):
1311
raise errors.BranchExistsWithoutWorkingTree(location)
1312
raise errors.AlreadyBranchError(location)
1314
branch = existing_bzrdir.create_branch()
1315
existing_bzrdir.create_workingtree()
1316
if append_revisions_only:
1318
branch.set_append_revisions_only(True)
1319
except errors.UpgradeRequired:
1320
raise errors.BzrCommandError('This branch format cannot be set'
1321
' to append-revisions-only. Try --experimental-branch6')
1324
class cmd_init_repository(Command):
1325
"""Create a shared repository to hold branches.
1327
New branches created under the repository directory will store their
1328
revisions in the repository, not in the branch directory.
1330
If the --no-trees option is used then the branches in the repository
1331
will not have working trees by default.
1334
bzr init-repo --no-trees repo
1336
bzr checkout --lightweight repo/trunk trunk-checkout
1340
See 'bzr help repositories' for more information.
1343
_see_also = ['init', 'branch', 'checkout']
1344
takes_args = ["location"]
1345
takes_options = [RegistryOption('format',
1346
help='Specify a format for this repository. See'
1347
' "bzr help formats" for details',
1348
registry=bzrdir.format_registry,
1349
converter=bzrdir.format_registry.make_bzrdir,
1350
value_switches=True, title='Repository format'),
1352
help='Branches in the repository will default to'
1353
' not having a working tree'),
1355
aliases = ["init-repo"]
1357
def run(self, location, format=None, no_trees=False):
1359
format = bzrdir.format_registry.make_bzrdir('default')
1361
if location is None:
1364
to_transport = transport.get_transport(location)
1365
to_transport.ensure_base()
1367
newdir = format.initialize_on_transport(to_transport)
1368
repo = newdir.create_repository(shared=True)
1369
repo.set_make_working_trees(not no_trees)
1372
class cmd_diff(Command):
1373
"""Show differences in the working tree or between revisions.
1375
If files are listed, only the changes in those files are listed.
1376
Otherwise, all changes for the tree are listed.
1378
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1379
produces patches suitable for "patch -p1".
1383
Shows the difference in the working tree versus the last commit
1385
Difference between the working tree and revision 1
1387
Difference between revision 2 and revision 1
1388
bzr diff --prefix old/:new/
1389
Same as 'bzr diff' but prefix paths with old/ and new/
1390
bzr diff bzr.mine bzr.dev
1391
Show the differences between the two working trees
1393
Show just the differences for 'foo.c'
1395
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1396
# or a graphical diff.
1398
# TODO: Python difflib is not exactly the same as unidiff; should
1399
# either fix it up or prefer to use an external diff.
1401
# TODO: Selected-file diff is inefficient and doesn't show you
1404
# TODO: This probably handles non-Unix newlines poorly.
1406
_see_also = ['status']
1407
takes_args = ['file*']
1408
takes_options = ['revision', 'diff-options',
1409
Option('prefix', type=str,
1411
help='Set prefixes to added to old and new filenames, as '
1412
'two values separated by a colon. (eg "old/:new/")'),
1414
aliases = ['di', 'dif']
1415
encoding_type = 'exact'
1418
def run(self, revision=None, file_list=None, diff_options=None,
1420
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1422
if (prefix is None) or (prefix == '0'):
1430
old_label, new_label = prefix.split(":")
1432
raise errors.BzrCommandError(
1433
'--prefix expects two values separated by a colon'
1434
' (eg "old/:new/")')
1436
if revision and len(revision) > 2:
1437
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1438
' one or two revision specifiers')
1441
tree1, file_list = internal_tree_files(file_list)
1445
except errors.FileInWrongBranch:
1446
if len(file_list) != 2:
1447
raise errors.BzrCommandError("Files are in different branches")
1449
tree1, file1 = WorkingTree.open_containing(file_list[0])
1450
tree2, file2 = WorkingTree.open_containing(file_list[1])
1451
if file1 != "" or file2 != "":
1452
# FIXME diff those two files. rbc 20051123
1453
raise errors.BzrCommandError("Files are in different branches")
1455
except errors.NotBranchError:
1456
if (revision is not None and len(revision) == 2
1457
and not revision[0].needs_branch()
1458
and not revision[1].needs_branch()):
1459
# If both revision specs include a branch, we can
1460
# diff them without needing a local working tree
1461
tree1, tree2 = None, None
1465
if tree2 is not None:
1466
if revision is not None:
1467
# FIXME: but there should be a clean way to diff between
1468
# non-default versions of two trees, it's not hard to do
1470
raise errors.BzrCommandError(
1471
"Sorry, diffing arbitrary revisions across branches "
1472
"is not implemented yet")
1473
return show_diff_trees(tree1, tree2, sys.stdout,
1474
specific_files=file_list,
1475
external_diff_options=diff_options,
1476
old_label=old_label, new_label=new_label)
1478
return diff_cmd_helper(tree1, file_list, diff_options,
1479
revision_specs=revision,
1480
old_label=old_label, new_label=new_label)
1483
class cmd_deleted(Command):
1484
"""List files deleted in the working tree.
1486
# TODO: Show files deleted since a previous revision, or
1487
# between two revisions.
1488
# TODO: Much more efficient way to do this: read in new
1489
# directories with readdir, rather than stating each one. Same
1490
# level of effort but possibly much less IO. (Or possibly not,
1491
# if the directories are very large...)
1492
_see_also = ['status', 'ls']
1493
takes_options = ['show-ids']
1496
def run(self, show_ids=False):
1497
tree = WorkingTree.open_containing(u'.')[0]
1500
old = tree.basis_tree()
1503
for path, ie in old.inventory.iter_entries():
1504
if not tree.has_id(ie.file_id):
1505
self.outf.write(path)
1507
self.outf.write(' ')
1508
self.outf.write(ie.file_id)
1509
self.outf.write('\n')
1516
class cmd_modified(Command):
1517
"""List files modified in working tree.
1521
_see_also = ['status', 'ls']
1525
tree = WorkingTree.open_containing(u'.')[0]
1526
td = tree.changes_from(tree.basis_tree())
1527
for path, id, kind, text_modified, meta_modified in td.modified:
1528
self.outf.write(path + '\n')
1531
class cmd_added(Command):
1532
"""List files added in working tree.
1536
_see_also = ['status', 'ls']
1540
wt = WorkingTree.open_containing(u'.')[0]
1543
basis = wt.basis_tree()
1546
basis_inv = basis.inventory
1549
if file_id in basis_inv:
1551
if inv.is_root(file_id) and len(basis_inv) == 0:
1553
path = inv.id2path(file_id)
1554
if not os.access(osutils.abspath(path), os.F_OK):
1556
self.outf.write(path + '\n')
1563
class cmd_root(Command):
1564
"""Show the tree root directory.
1566
The root is the nearest enclosing directory with a .bzr control
1569
takes_args = ['filename?']
1571
def run(self, filename=None):
1572
"""Print the branch root."""
1573
tree = WorkingTree.open_containing(filename)[0]
1574
self.outf.write(tree.basedir + '\n')
1577
def _parse_limit(limitstring):
1579
return int(limitstring)
1581
msg = "The limit argument must be an integer."
1582
raise errors.BzrCommandError(msg)
1585
class cmd_log(Command):
1586
"""Show log of a branch, file, or directory.
1588
By default show the log of the branch containing the working directory.
1590
To request a range of logs, you can use the command -r begin..end
1591
-r revision requests a specific revision, -r ..end or -r begin.. are
1597
bzr log -r -10.. http://server/branch
1600
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1602
takes_args = ['location?']
1603
takes_options = [Option('forward',
1604
help='show from oldest to newest'),
1608
help='show files changed in each revision'),
1609
'show-ids', 'revision',
1613
help='show revisions whose message matches this regexp',
1616
help='limit the output to the first N revisions',
1619
encoding_type = 'replace'
1622
def run(self, location=None, timezone='original',
1630
from bzrlib.log import show_log
1631
assert message is None or isinstance(message, basestring), \
1632
"invalid message argument %r" % message
1633
direction = (forward and 'forward') or 'reverse'
1638
# find the file id to log:
1640
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1644
tree = b.basis_tree()
1645
file_id = tree.path2id(fp)
1647
raise errors.BzrCommandError(
1648
"Path does not have any revision history: %s" %
1652
# FIXME ? log the current subdir only RBC 20060203
1653
if revision is not None \
1654
and len(revision) > 0 and revision[0].get_branch():
1655
location = revision[0].get_branch()
1658
dir, relpath = bzrdir.BzrDir.open_containing(location)
1659
b = dir.open_branch()
1663
if revision is None:
1666
elif len(revision) == 1:
1667
rev1 = rev2 = revision[0].in_history(b).revno
1668
elif len(revision) == 2:
1669
if revision[1].get_branch() != revision[0].get_branch():
1670
# b is taken from revision[0].get_branch(), and
1671
# show_log will use its revision_history. Having
1672
# different branches will lead to weird behaviors.
1673
raise errors.BzrCommandError(
1674
"Log doesn't accept two revisions in different"
1676
if revision[0].spec is None:
1677
# missing begin-range means first revision
1680
rev1 = revision[0].in_history(b).revno
1682
if revision[1].spec is None:
1683
# missing end-range means last known revision
1686
rev2 = revision[1].in_history(b).revno
1688
raise errors.BzrCommandError(
1689
'bzr log --revision takes one or two values.')
1691
# By this point, the revision numbers are converted to the +ve
1692
# form if they were supplied in the -ve form, so we can do
1693
# this comparison in relative safety
1695
(rev2, rev1) = (rev1, rev2)
1697
if log_format is None:
1698
log_format = log.log_formatter_registry.get_default(b)
1700
lf = log_format(show_ids=show_ids, to_file=self.outf,
1701
show_timezone=timezone)
1707
direction=direction,
1708
start_revision=rev1,
1716
def get_log_format(long=False, short=False, line=False, default='long'):
1717
log_format = default
1721
log_format = 'short'
1727
class cmd_touching_revisions(Command):
1728
"""Return revision-ids which affected a particular file.
1730
A more user-friendly interface is "bzr log FILE".
1734
takes_args = ["filename"]
1737
def run(self, filename):
1738
tree, relpath = WorkingTree.open_containing(filename)
1740
file_id = tree.path2id(relpath)
1741
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1742
self.outf.write("%6d %s\n" % (revno, what))
1745
class cmd_ls(Command):
1746
"""List files in a tree.
1749
_see_also = ['status', 'cat']
1750
takes_args = ['path?']
1751
# TODO: Take a revision or remote path and list that tree instead.
1752
takes_options = ['verbose', 'revision',
1753
Option('non-recursive',
1754
help='don\'t recurse into sub-directories'),
1756
help='Print all paths from the root of the branch.'),
1757
Option('unknown', help='Print unknown files'),
1758
Option('versioned', help='Print versioned files'),
1759
Option('ignored', help='Print ignored files'),
1761
Option('null', help='Null separate the files'),
1765
def run(self, revision=None, verbose=False,
1766
non_recursive=False, from_root=False,
1767
unknown=False, versioned=False, ignored=False,
1768
null=False, kind=None, show_ids=False, path=None):
1770
if kind and kind not in ('file', 'directory', 'symlink'):
1771
raise errors.BzrCommandError('invalid kind specified')
1773
if verbose and null:
1774
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1775
all = not (unknown or versioned or ignored)
1777
selection = {'I':ignored, '?':unknown, 'V':versioned}
1784
raise errors.BzrCommandError('cannot specify both --from-root'
1788
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1794
if revision is not None:
1795
tree = branch.repository.revision_tree(
1796
revision[0].in_history(branch).rev_id)
1798
tree = branch.basis_tree()
1802
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1803
if fp.startswith(relpath):
1804
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1805
if non_recursive and '/' in fp:
1807
if not all and not selection[fc]:
1809
if kind is not None and fkind != kind:
1812
kindch = entry.kind_character()
1813
outstring = '%-8s %s%s' % (fc, fp, kindch)
1814
if show_ids and fid is not None:
1815
outstring = "%-50s %s" % (outstring, fid)
1816
self.outf.write(outstring + '\n')
1818
self.outf.write(fp + '\0')
1821
self.outf.write(fid)
1822
self.outf.write('\0')
1830
self.outf.write('%-50s %s\n' % (fp, my_id))
1832
self.outf.write(fp + '\n')
1837
class cmd_unknowns(Command):
1838
"""List unknown files.
1846
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1847
self.outf.write(osutils.quotefn(f) + '\n')
1850
class cmd_ignore(Command):
1851
"""Ignore specified files or patterns.
1853
To remove patterns from the ignore list, edit the .bzrignore file.
1855
Trailing slashes on patterns are ignored.
1856
If the pattern contains a slash or is a regular expression, it is compared
1857
to the whole path from the branch root. Otherwise, it is compared to only
1858
the last component of the path. To match a file only in the root
1859
directory, prepend './'.
1861
Ignore patterns specifying absolute paths are not allowed.
1863
Ignore patterns may include globbing wildcards such as:
1864
? - Matches any single character except '/'
1865
* - Matches 0 or more characters except '/'
1866
/**/ - Matches 0 or more directories in a path
1867
[a-z] - Matches a single character from within a group of characters
1869
Ignore patterns may also be Python regular expressions.
1870
Regular expression ignore patterns are identified by a 'RE:' prefix
1871
followed by the regular expression. Regular expression ignore patterns
1872
may not include named or numbered groups.
1874
Note: ignore patterns containing shell wildcards must be quoted from
1878
bzr ignore ./Makefile
1879
bzr ignore '*.class'
1880
bzr ignore 'lib/**/*.o'
1881
bzr ignore 'RE:lib/.*\.o'
1884
_see_also = ['status', 'ignored']
1885
takes_args = ['name_pattern*']
1887
Option('old-default-rules',
1888
help='Out the ignore rules bzr < 0.9 always used.')
1891
def run(self, name_pattern_list=None, old_default_rules=None):
1892
from bzrlib.atomicfile import AtomicFile
1893
if old_default_rules is not None:
1894
# dump the rules and exit
1895
for pattern in ignores.OLD_DEFAULTS:
1898
if not name_pattern_list:
1899
raise errors.BzrCommandError("ignore requires at least one "
1900
"NAME_PATTERN or --old-default-rules")
1901
name_pattern_list = [globbing.normalize_pattern(p)
1902
for p in name_pattern_list]
1903
for name_pattern in name_pattern_list:
1904
if (name_pattern[0] == '/' or
1905
(len(name_pattern) > 1 and name_pattern[1] == ':')):
1906
raise errors.BzrCommandError(
1907
"NAME_PATTERN should not be an absolute path")
1908
tree, relpath = WorkingTree.open_containing(u'.')
1909
ifn = tree.abspath('.bzrignore')
1910
if os.path.exists(ifn):
1913
igns = f.read().decode('utf-8')
1919
# TODO: If the file already uses crlf-style termination, maybe
1920
# we should use that for the newly added lines?
1922
if igns and igns[-1] != '\n':
1924
for name_pattern in name_pattern_list:
1925
igns += name_pattern + '\n'
1927
f = AtomicFile(ifn, 'wb')
1929
f.write(igns.encode('utf-8'))
1934
if not tree.path2id('.bzrignore'):
1935
tree.add(['.bzrignore'])
1938
class cmd_ignored(Command):
1939
"""List ignored files and the patterns that matched them.
1942
_see_also = ['ignore']
1945
tree = WorkingTree.open_containing(u'.')[0]
1948
for path, file_class, kind, file_id, entry in tree.list_files():
1949
if file_class != 'I':
1951
## XXX: Slightly inefficient since this was already calculated
1952
pat = tree.is_ignored(path)
1953
print '%-50s %s' % (path, pat)
1958
class cmd_lookup_revision(Command):
1959
"""Lookup the revision-id from a revision-number
1962
bzr lookup-revision 33
1965
takes_args = ['revno']
1968
def run(self, revno):
1972
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1974
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1977
class cmd_export(Command):
1978
"""Export current or past revision to a destination directory or archive.
1980
If no revision is specified this exports the last committed revision.
1982
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1983
given, try to find the format with the extension. If no extension
1984
is found exports to a directory (equivalent to --format=dir).
1986
If root is supplied, it will be used as the root directory inside
1987
container formats (tar, zip, etc). If it is not supplied it will default
1988
to the exported filename. The root option has no effect for 'dir' format.
1990
If branch is omitted then the branch containing the current working
1991
directory will be used.
1993
Note: Export of tree with non-ASCII filenames to zip is not supported.
1995
Supported formats Autodetected by extension
1996
----------------- -------------------------
1999
tbz2 .tar.bz2, .tbz2
2003
takes_args = ['dest', 'branch?']
2004
takes_options = ['revision', 'format', 'root']
2005
def run(self, dest, branch=None, revision=None, format=None, root=None):
2006
from bzrlib.export import export
2009
tree = WorkingTree.open_containing(u'.')[0]
2012
b = Branch.open(branch)
2014
if revision is None:
2015
# should be tree.last_revision FIXME
2016
rev_id = b.last_revision()
2018
if len(revision) != 1:
2019
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
2020
rev_id = revision[0].in_history(b).rev_id
2021
t = b.repository.revision_tree(rev_id)
2023
export(t, dest, format, root)
2024
except errors.NoSuchExportFormat, e:
2025
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2028
class cmd_cat(Command):
2029
"""Write the contents of a file as of a given revision to standard output.
2031
If no revision is nominated, the last revision is used.
2033
Note: Take care to redirect standard output when using this command on a
2038
takes_options = ['revision', 'name-from-revision']
2039
takes_args = ['filename']
2040
encoding_type = 'exact'
2043
def run(self, filename, revision=None, name_from_revision=False):
2044
if revision is not None and len(revision) != 1:
2045
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2050
tree, b, relpath = \
2051
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2052
except errors.NotBranchError:
2055
if revision is not None and revision[0].get_branch() is not None:
2056
b = Branch.open(revision[0].get_branch())
2058
tree = b.basis_tree()
2059
if revision is None:
2060
revision_id = b.last_revision()
2062
revision_id = revision[0].in_history(b).rev_id
2064
cur_file_id = tree.path2id(relpath)
2065
rev_tree = b.repository.revision_tree(revision_id)
2066
old_file_id = rev_tree.path2id(relpath)
2068
if name_from_revision:
2069
if old_file_id is None:
2070
raise errors.BzrCommandError("%r is not present in revision %s"
2071
% (filename, revision_id))
2073
rev_tree.print_file(old_file_id)
2074
elif cur_file_id is not None:
2075
rev_tree.print_file(cur_file_id)
2076
elif old_file_id is not None:
2077
rev_tree.print_file(old_file_id)
2079
raise errors.BzrCommandError("%r is not present in revision %s" %
2080
(filename, revision_id))
2083
class cmd_local_time_offset(Command):
2084
"""Show the offset in seconds from GMT to local time."""
2088
print osutils.local_time_offset()
2092
class cmd_commit(Command):
2093
"""Commit changes into a new revision.
2095
If no arguments are given, the entire tree is committed.
2097
If selected files are specified, only changes to those files are
2098
committed. If a directory is specified then the directory and everything
2099
within it is committed.
2101
A selected-file commit may fail in some cases where the committed
2102
tree would be invalid. Consider::
2107
bzr commit foo -m "committing foo"
2108
bzr mv foo/bar foo/baz
2111
bzr commit foo/bar -m "committing bar but not baz"
2113
In the example above, the last commit will fail by design. This gives
2114
the user the opportunity to decide whether they want to commit the
2115
rename at the same time, separately first, or not at all. (As a general
2116
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2118
Note: A selected-file commit after a merge is not yet supported.
2120
# TODO: Run hooks on tree to-be-committed, and after commit.
2122
# TODO: Strict commit that fails if there are deleted files.
2123
# (what does "deleted files" mean ??)
2125
# TODO: Give better message for -s, --summary, used by tla people
2127
# XXX: verbose currently does nothing
2129
_see_also = ['bugs', 'uncommit']
2130
takes_args = ['selected*']
2131
takes_options = ['message', 'verbose',
2133
help='commit even if nothing has changed'),
2134
Option('file', type=str,
2137
help='file containing commit message'),
2139
help="refuse to commit if there are unknown "
2140
"files in the working tree."),
2141
ListOption('fixes', type=str,
2142
help="mark a bug as being fixed by this "
2145
help="perform a local only commit in a bound "
2146
"branch. Such commits are not pushed to "
2147
"the master branch until a normal commit "
2151
aliases = ['ci', 'checkin']
2153
def _get_bug_fix_properties(self, fixes, branch):
2155
# Configure the properties for bug fixing attributes.
2156
for fixed_bug in fixes:
2157
tokens = fixed_bug.split(':')
2158
if len(tokens) != 2:
2159
raise errors.BzrCommandError(
2160
"Invalid bug %s. Must be in the form of 'tag:id'. "
2161
"Commit refused." % fixed_bug)
2162
tag, bug_id = tokens
2164
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
2165
except errors.UnknownBugTrackerAbbreviation:
2166
raise errors.BzrCommandError(
2167
'Unrecognized bug %s. Commit refused.' % fixed_bug)
2168
except errors.MalformedBugIdentifier:
2169
raise errors.BzrCommandError(
2170
"Invalid bug identifier for %s. Commit refused."
2172
properties.append('%s fixed' % bug_url)
2173
return '\n'.join(properties)
2175
def run(self, message=None, file=None, verbose=True, selected_list=None,
2176
unchanged=False, strict=False, local=False, fixes=None):
2177
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
2178
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
2180
from bzrlib.msgeditor import edit_commit_message, \
2181
make_commit_message_template
2183
# TODO: Need a blackbox test for invoking the external editor; may be
2184
# slightly problematic to run this cross-platform.
2186
# TODO: do more checks that the commit will succeed before
2187
# spending the user's valuable time typing a commit message.
2191
tree, selected_list = tree_files(selected_list)
2192
if selected_list == ['']:
2193
# workaround - commit of root of tree should be exactly the same
2194
# as just default commit in that tree, and succeed even though
2195
# selected-file merge commit is not done yet
2198
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
2200
properties['bugs'] = bug_property
2202
if local and not tree.branch.get_bound_location():
2203
raise errors.LocalRequiresBoundBranch()
2205
def get_message(commit_obj):
2206
"""Callback to get commit message"""
2207
my_message = message
2208
if my_message is None and not file:
2209
template = make_commit_message_template(tree, selected_list)
2210
my_message = edit_commit_message(template)
2211
if my_message is None:
2212
raise errors.BzrCommandError("please specify a commit"
2213
" message with either --message or --file")
2214
elif my_message and file:
2215
raise errors.BzrCommandError(
2216
"please specify either --message or --file")
2218
my_message = codecs.open(file, 'rt',
2219
bzrlib.user_encoding).read()
2220
if my_message == "":
2221
raise errors.BzrCommandError("empty commit message specified")
2225
reporter = ReportCommitToLog()
2227
reporter = NullCommitReporter()
2230
tree.commit(message_callback=get_message,
2231
specific_files=selected_list,
2232
allow_pointless=unchanged, strict=strict, local=local,
2233
reporter=reporter, revprops=properties)
2234
except PointlessCommit:
2235
# FIXME: This should really happen before the file is read in;
2236
# perhaps prepare the commit; get the message; then actually commit
2237
raise errors.BzrCommandError("no changes to commit."
2238
" use --unchanged to commit anyhow")
2239
except ConflictsInTree:
2240
raise errors.BzrCommandError('Conflicts detected in working '
2241
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2243
except StrictCommitFailed:
2244
raise errors.BzrCommandError("Commit refused because there are"
2245
" unknown files in the working tree.")
2246
except errors.BoundBranchOutOfDate, e:
2247
raise errors.BzrCommandError(str(e) + "\n"
2248
'To commit to master branch, run update and then commit.\n'
2249
'You can also pass --local to commit to continue working '
2253
class cmd_check(Command):
2254
"""Validate consistency of branch history.
2256
This command checks various invariants about the branch storage to
2257
detect data corruption or bzr bugs.
2260
_see_also = ['reconcile']
2261
takes_args = ['branch?']
2262
takes_options = ['verbose']
2264
def run(self, branch=None, verbose=False):
2265
from bzrlib.check import check
2267
tree = WorkingTree.open_containing()[0]
2268
branch = tree.branch
2270
branch = Branch.open(branch)
2271
check(branch, verbose)
2274
class cmd_upgrade(Command):
2275
"""Upgrade branch storage to current format.
2277
The check command or bzr developers may sometimes advise you to run
2278
this command. When the default format has changed you may also be warned
2279
during other operations to upgrade.
2282
_see_also = ['check']
2283
takes_args = ['url?']
2285
RegistryOption('format',
2286
help='Upgrade to a specific format. See "bzr help'
2287
' formats" for details',
2288
registry=bzrdir.format_registry,
2289
converter=bzrdir.format_registry.make_bzrdir,
2290
value_switches=True, title='Branch format'),
2293
def run(self, url='.', format=None):
2294
from bzrlib.upgrade import upgrade
2296
format = bzrdir.format_registry.make_bzrdir('default')
2297
upgrade(url, format)
2300
class cmd_whoami(Command):
2301
"""Show or set bzr user id.
2305
bzr whoami 'Frank Chu <fchu@example.com>'
2307
takes_options = [ Option('email',
2308
help='display email address only'),
2310
help='set identity for the current branch instead of '
2313
takes_args = ['name?']
2314
encoding_type = 'replace'
2317
def run(self, email=False, branch=False, name=None):
2319
# use branch if we're inside one; otherwise global config
2321
c = Branch.open_containing('.')[0].get_config()
2322
except errors.NotBranchError:
2323
c = config.GlobalConfig()
2325
self.outf.write(c.user_email() + '\n')
2327
self.outf.write(c.username() + '\n')
2330
# display a warning if an email address isn't included in the given name.
2332
config.extract_email_address(name)
2333
except errors.NoEmailInUsername, e:
2334
warning('"%s" does not seem to contain an email address. '
2335
'This is allowed, but not recommended.', name)
2337
# use global config unless --branch given
2339
c = Branch.open_containing('.')[0].get_config()
2341
c = config.GlobalConfig()
2342
c.set_user_option('email', name)
2345
class cmd_nick(Command):
2346
"""Print or set the branch nickname.
2348
If unset, the tree root directory name is used as the nickname
2349
To print the current nickname, execute with no argument.
2352
_see_also = ['info']
2353
takes_args = ['nickname?']
2354
def run(self, nickname=None):
2355
branch = Branch.open_containing(u'.')[0]
2356
if nickname is None:
2357
self.printme(branch)
2359
branch.nick = nickname
2362
def printme(self, branch):
2366
class cmd_selftest(Command):
2367
"""Run internal test suite.
2369
This creates temporary test directories in the working directory, but no
2370
existing data is affected. These directories are deleted if the tests
2371
pass, or left behind to help in debugging if they fail and --keep-output
2374
If arguments are given, they are regular expressions that say which tests
2375
should run. Tests matching any expression are run, and other tests are
2378
Alternatively if --first is given, matching tests are run first and then
2379
all other tests are run. This is useful if you have been working in a
2380
particular area, but want to make sure nothing else was broken.
2382
If --exclude is given, tests that match that regular expression are
2383
excluded, regardless of whether they match --first or not.
2385
To help catch accidential dependencies between tests, the --randomize
2386
option is useful. In most cases, the argument used is the word 'now'.
2387
Note that the seed used for the random number generator is displayed
2388
when this option is used. The seed can be explicitly passed as the
2389
argument to this option if required. This enables reproduction of the
2390
actual ordering used if and when an order sensitive problem is encountered.
2392
If --list-only is given, the tests that would be run are listed. This is
2393
useful when combined with --first, --exclude and/or --randomize to
2394
understand their impact. The test harness reports "Listed nn tests in ..."
2395
instead of "Ran nn tests in ..." when list mode is enabled.
2397
If the global option '--no-plugins' is given, plugins are not loaded
2398
before running the selftests. This has two effects: features provided or
2399
modified by plugins will not be tested, and tests provided by plugins will
2404
run only tests relating to 'ignore'
2405
bzr --no-plugins selftest -v
2406
disable plugins and list tests as they're run
2408
For each test, that needs actual disk access, bzr create their own
2409
subdirectory in the temporary testing directory (testXXXX.tmp).
2410
By default the name of such subdirectory is based on the name of the test.
2411
If option '--numbered-dirs' is given, bzr will use sequent numbers
2412
of running tests to create such subdirectories. This is default behavior
2413
on Windows because of path length limitation.
2415
# NB: this is used from the class without creating an instance, which is
2416
# why it does not have a self parameter.
2417
def get_transport_type(typestring):
2418
"""Parse and return a transport specifier."""
2419
if typestring == "sftp":
2420
from bzrlib.transport.sftp import SFTPAbsoluteServer
2421
return SFTPAbsoluteServer
2422
if typestring == "memory":
2423
from bzrlib.transport.memory import MemoryServer
2425
if typestring == "fakenfs":
2426
from bzrlib.transport.fakenfs import FakeNFSServer
2427
return FakeNFSServer
2428
msg = "No known transport type %s. Supported types are: sftp\n" %\
2430
raise errors.BzrCommandError(msg)
2433
takes_args = ['testspecs*']
2434
takes_options = ['verbose',
2436
help='stop when one test fails',
2439
Option('keep-output',
2440
help='keep output directories when tests fail'),
2442
help='Use a different transport by default '
2443
'throughout the test suite.',
2444
type=get_transport_type),
2445
Option('benchmark', help='run the bzr benchmarks.'),
2446
Option('lsprof-timed',
2447
help='generate lsprof output for benchmarked'
2448
' sections of code.'),
2449
Option('cache-dir', type=str,
2450
help='a directory to cache intermediate'
2451
' benchmark steps'),
2452
Option('clean-output',
2453
help='clean temporary tests directories'
2454
' without running tests'),
2456
help='run all tests, but run specified tests first',
2459
Option('numbered-dirs',
2460
help='use numbered dirs for TestCaseInTempDir'),
2462
help='list the tests instead of running them'),
2463
Option('randomize', type=str, argname="SEED",
2464
help='randomize the order of tests using the given'
2465
' seed or "now" for the current time'),
2466
Option('exclude', type=str, argname="PATTERN",
2468
help='exclude tests that match this regular'
2471
encoding_type = 'replace'
2473
def run(self, testspecs_list=None, verbose=None, one=False,
2474
keep_output=False, transport=None, benchmark=None,
2475
lsprof_timed=None, cache_dir=None, clean_output=False,
2476
first=False, numbered_dirs=None, list_only=False,
2477
randomize=None, exclude=None):
2479
from bzrlib.tests import selftest
2480
import bzrlib.benchmarks as benchmarks
2481
from bzrlib.benchmarks import tree_creator
2484
from bzrlib.tests import clean_selftest_output
2485
clean_selftest_output()
2488
if numbered_dirs is None and sys.platform == 'win32':
2489
numbered_dirs = True
2491
if cache_dir is not None:
2492
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2493
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
2494
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2496
if testspecs_list is not None:
2497
pattern = '|'.join(testspecs_list)
2501
test_suite_factory = benchmarks.test_suite
2504
# TODO: should possibly lock the history file...
2505
benchfile = open(".perf_history", "at", buffering=1)
2507
test_suite_factory = None
2512
result = selftest(verbose=verbose,
2514
stop_on_failure=one,
2515
keep_output=keep_output,
2516
transport=transport,
2517
test_suite_factory=test_suite_factory,
2518
lsprof_timed=lsprof_timed,
2519
bench_history=benchfile,
2520
matching_tests_first=first,
2521
numbered_dirs=numbered_dirs,
2522
list_only=list_only,
2523
random_seed=randomize,
2524
exclude_pattern=exclude
2527
if benchfile is not None:
2530
info('tests passed')
2532
info('tests failed')
2533
return int(not result)
2536
class cmd_version(Command):
2537
"""Show version of bzr."""
2541
from bzrlib.version import show_version
2545
class cmd_rocks(Command):
2546
"""Statement of optimism."""
2552
print "It sure does!"
2555
class cmd_find_merge_base(Command):
2556
"""Find and print a base revision for merging two branches."""
2557
# TODO: Options to specify revisions on either side, as if
2558
# merging only part of the history.
2559
takes_args = ['branch', 'other']
2563
def run(self, branch, other):
2564
from bzrlib.revision import MultipleRevisionSources
2566
branch1 = Branch.open_containing(branch)[0]
2567
branch2 = Branch.open_containing(other)[0]
2569
last1 = branch1.last_revision()
2570
last2 = branch2.last_revision()
2572
source = MultipleRevisionSources(branch1.repository,
2575
base_rev_id = common_ancestor(last1, last2, source)
2577
print 'merge base is revision %s' % base_rev_id
2580
class cmd_merge(Command):
2581
"""Perform a three-way merge.
2583
The branch is the branch you will merge from. By default, it will merge
2584
the latest revision. If you specify a revision, that revision will be
2585
merged. If you specify two revisions, the first will be used as a BASE,
2586
and the second one as OTHER. Revision numbers are always relative to the
2589
By default, bzr will try to merge in all new work from the other
2590
branch, automatically determining an appropriate base. If this
2591
fails, you may need to give an explicit base.
2593
Merge will do its best to combine the changes in two branches, but there
2594
are some kinds of problems only a human can fix. When it encounters those,
2595
it will mark a conflict. A conflict means that you need to fix something,
2596
before you should commit.
2598
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2600
If there is no default branch set, the first merge will set it. After
2601
that, you can omit the branch to use the default. To change the
2602
default, use --remember. The value will only be saved if the remote
2603
location can be accessed.
2605
The results of the merge are placed into the destination working
2606
directory, where they can be reviewed (with bzr diff), tested, and then
2607
committed to record the result of the merge.
2611
To merge the latest revision from bzr.dev:
2612
bzr merge ../bzr.dev
2614
To merge changes up to and including revision 82 from bzr.dev:
2615
bzr merge -r 82 ../bzr.dev
2617
To merge the changes introduced by 82, without previous changes:
2618
bzr merge -r 81..82 ../bzr.dev
2620
merge refuses to run if there are any uncommitted changes, unless
2624
_see_also = ['update', 'remerge']
2625
takes_args = ['branch?']
2626
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2627
Option('show-base', help="Show base revision text in "
2629
Option('uncommitted', help='Apply uncommitted changes'
2630
' from a working copy, instead of branch changes'),
2631
Option('pull', help='If the destination is already'
2632
' completely merged into the source, pull from the'
2633
' source rather than merging. When this happens,'
2634
' you do not need to commit the result.'),
2636
help='Branch to merge into, '
2637
'rather than the one containing the working directory',
2643
def run(self, branch=None, revision=None, force=False, merge_type=None,
2644
show_base=False, reprocess=False, remember=False,
2645
uncommitted=False, pull=False,
2648
from bzrlib.tag import _merge_tags_if_possible
2649
other_revision_id = None
2650
if merge_type is None:
2651
merge_type = _mod_merge.Merge3Merger
2653
if directory is None: directory = u'.'
2654
# XXX: jam 20070225 WorkingTree should be locked before you extract its
2655
# inventory. Because merge is a mutating operation, it really
2656
# should be a lock_write() for the whole cmd_merge operation.
2657
# However, cmd_merge open's its own tree in _merge_helper, which
2658
# means if we lock here, the later lock_write() will always block.
2659
# Either the merge helper code should be updated to take a tree,
2660
# (What about tree.merge_from_branch?)
2661
tree = WorkingTree.open_containing(directory)[0]
2662
change_reporter = delta._ChangeReporter(
2663
unversioned_filter=tree.is_ignored)
2665
if branch is not None:
2667
mergeable = bundle.read_mergeable_from_url(
2669
except errors.NotABundle:
2670
pass # Continue on considering this url a Branch
2672
if revision is not None:
2673
raise errors.BzrCommandError(
2674
'Cannot use -r with merge directives or bundles')
2675
other_revision_id = mergeable.install_revisions(
2676
tree.branch.repository)
2677
revision = [RevisionSpec.from_string(
2678
'revid:' + other_revision_id)]
2680
if revision is None \
2681
or len(revision) < 1 or revision[0].needs_branch():
2682
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2684
if revision is None or len(revision) < 1:
2687
other = [branch, None]
2690
other = [branch, -1]
2691
other_branch, path = Branch.open_containing(branch)
2694
raise errors.BzrCommandError('Cannot use --uncommitted and'
2695
' --revision at the same time.')
2696
branch = revision[0].get_branch() or branch
2697
if len(revision) == 1:
2699
if other_revision_id is not None:
2704
other_branch, path = Branch.open_containing(branch)
2705
revno = revision[0].in_history(other_branch).revno
2706
other = [branch, revno]
2708
assert len(revision) == 2
2709
if None in revision:
2710
raise errors.BzrCommandError(
2711
"Merge doesn't permit empty revision specifier.")
2712
base_branch, path = Branch.open_containing(branch)
2713
branch1 = revision[1].get_branch() or branch
2714
other_branch, path1 = Branch.open_containing(branch1)
2715
if revision[0].get_branch() is not None:
2716
# then path was obtained from it, and is None.
2719
base = [branch, revision[0].in_history(base_branch).revno]
2720
other = [branch1, revision[1].in_history(other_branch).revno]
2722
if ((tree.branch.get_parent() is None or remember) and
2723
other_branch is not None):
2724
tree.branch.set_parent(other_branch.base)
2726
# pull tags now... it's a bit inconsistent to do it ahead of copying
2727
# the history but that's done inside the merge code
2728
if other_branch is not None:
2729
_merge_tags_if_possible(other_branch, tree.branch)
2732
interesting_files = [path]
2734
interesting_files = None
2735
pb = ui.ui_factory.nested_progress_bar()
2738
conflict_count = _merge_helper(
2739
other, base, other_rev_id=other_revision_id,
2740
check_clean=(not force),
2741
merge_type=merge_type,
2742
reprocess=reprocess,
2743
show_base=show_base,
2746
pb=pb, file_list=interesting_files,
2747
change_reporter=change_reporter)
2750
if conflict_count != 0:
2754
except errors.AmbiguousBase, e:
2755
m = ("sorry, bzr can't determine the right merge base yet\n"
2756
"candidates are:\n "
2757
+ "\n ".join(e.bases)
2759
"please specify an explicit base with -r,\n"
2760
"and (if you want) report this to the bzr developers\n")
2763
# TODO: move up to common parent; this isn't merge-specific anymore.
2764
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2765
"""Use tree.branch's parent if none was supplied.
2767
Report if the remembered location was used.
2769
if supplied_location is not None:
2770
return supplied_location
2771
stored_location = tree.branch.get_parent()
2772
mutter("%s", stored_location)
2773
if stored_location is None:
2774
raise errors.BzrCommandError("No location specified or remembered")
2775
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2776
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2777
return stored_location
2780
class cmd_remerge(Command):
2783
Use this if you want to try a different merge technique while resolving
2784
conflicts. Some merge techniques are better than others, and remerge
2785
lets you try different ones on different files.
2787
The options for remerge have the same meaning and defaults as the ones for
2788
merge. The difference is that remerge can (only) be run when there is a
2789
pending merge, and it lets you specify particular files.
2793
$ bzr remerge --show-base
2794
Re-do the merge of all conflicted files, and show the base text in
2795
conflict regions, in addition to the usual THIS and OTHER texts.
2797
$ bzr remerge --merge-type weave --reprocess foobar
2798
Re-do the merge of "foobar", using the weave merge algorithm, with
2799
additional processing to reduce the size of conflict regions.
2801
takes_args = ['file*']
2802
takes_options = ['merge-type', 'reprocess',
2803
Option('show-base', help="Show base revision text in "
2806
def run(self, file_list=None, merge_type=None, show_base=False,
2808
if merge_type is None:
2809
merge_type = _mod_merge.Merge3Merger
2810
tree, file_list = tree_files(file_list)
2813
parents = tree.get_parent_ids()
2814
if len(parents) != 2:
2815
raise errors.BzrCommandError("Sorry, remerge only works after normal"
2816
" merges. Not cherrypicking or"
2818
repository = tree.branch.repository
2819
base_revision = common_ancestor(parents[0],
2820
parents[1], repository)
2821
base_tree = repository.revision_tree(base_revision)
2822
other_tree = repository.revision_tree(parents[1])
2823
interesting_ids = None
2825
conflicts = tree.conflicts()
2826
if file_list is not None:
2827
interesting_ids = set()
2828
for filename in file_list:
2829
file_id = tree.path2id(filename)
2831
raise errors.NotVersionedError(filename)
2832
interesting_ids.add(file_id)
2833
if tree.kind(file_id) != "directory":
2836
for name, ie in tree.inventory.iter_entries(file_id):
2837
interesting_ids.add(ie.file_id)
2838
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2840
# Remerge only supports resolving contents conflicts
2841
allowed_conflicts = ('text conflict', 'contents conflict')
2842
restore_files = [c.path for c in conflicts
2843
if c.typestring in allowed_conflicts]
2844
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2845
tree.set_conflicts(ConflictList(new_conflicts))
2846
if file_list is not None:
2847
restore_files = file_list
2848
for filename in restore_files:
2850
restore(tree.abspath(filename))
2851
except errors.NotConflicted:
2853
conflicts = _mod_merge.merge_inner(
2854
tree.branch, other_tree, base_tree,
2856
interesting_ids=interesting_ids,
2857
other_rev_id=parents[1],
2858
merge_type=merge_type,
2859
show_base=show_base,
2860
reprocess=reprocess)
2869
class cmd_revert(Command):
2870
"""Revert files to a previous revision.
2872
Giving a list of files will revert only those files. Otherwise, all files
2873
will be reverted. If the revision is not specified with '--revision', the
2874
last committed revision is used.
2876
To remove only some changes, without reverting to a prior version, use
2877
merge instead. For example, "merge . --r-2..-3" will remove the changes
2878
introduced by -2, without affecting the changes introduced by -1. Or
2879
to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
2881
By default, any files that have been manually changed will be backed up
2882
first. (Files changed only by merge are not backed up.) Backup files have
2883
'.~#~' appended to their name, where # is a number.
2885
When you provide files, you can use their current pathname or the pathname
2886
from the target revision. So you can use revert to "undelete" a file by
2887
name. If you name a directory, all the contents of that directory will be
2891
_see_also = ['cat', 'export']
2892
takes_options = ['revision', 'no-backup']
2893
takes_args = ['file*']
2895
def run(self, revision=None, no_backup=False, file_list=None):
2896
if file_list is not None:
2897
if len(file_list) == 0:
2898
raise errors.BzrCommandError("No files specified")
2902
tree, file_list = tree_files(file_list)
2903
if revision is None:
2904
# FIXME should be tree.last_revision
2905
rev_id = tree.last_revision()
2906
elif len(revision) != 1:
2907
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
2909
rev_id = revision[0].in_history(tree.branch).rev_id
2910
pb = ui.ui_factory.nested_progress_bar()
2912
tree.revert(file_list,
2913
tree.branch.repository.revision_tree(rev_id),
2914
not no_backup, pb, report_changes=True)
2919
class cmd_assert_fail(Command):
2920
"""Test reporting of assertion failures"""
2921
# intended just for use in testing
2926
raise AssertionError("always fails")
2929
class cmd_help(Command):
2930
"""Show help on a command or other topic.
2933
_see_also = ['topics']
2934
takes_options = [Option('long', 'show help on all commands')]
2935
takes_args = ['topic?']
2936
aliases = ['?', '--help', '-?', '-h']
2939
def run(self, topic=None, long=False):
2941
if topic is None and long:
2943
bzrlib.help.help(topic)
2946
class cmd_shell_complete(Command):
2947
"""Show appropriate completions for context.
2949
For a list of all available commands, say 'bzr shell-complete'.
2951
takes_args = ['context?']
2956
def run(self, context=None):
2957
import shellcomplete
2958
shellcomplete.shellcomplete(context)
2961
class cmd_fetch(Command):
2962
"""Copy in history from another branch but don't merge it.
2964
This is an internal method used for pull and merge.
2967
takes_args = ['from_branch', 'to_branch']
2968
def run(self, from_branch, to_branch):
2969
from bzrlib.fetch import Fetcher
2970
from_b = Branch.open(from_branch)
2971
to_b = Branch.open(to_branch)
2972
Fetcher(to_b, from_b)
2975
class cmd_missing(Command):
2976
"""Show unmerged/unpulled revisions between two branches.
2978
OTHER_BRANCH may be local or remote.
2981
_see_also = ['merge', 'pull']
2982
takes_args = ['other_branch?']
2983
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2985
'Display changes in the local branch only'),
2986
Option('theirs-only',
2987
'Display changes in the remote branch only'),
2992
encoding_type = 'replace'
2995
def run(self, other_branch=None, reverse=False, mine_only=False,
2996
theirs_only=False, log_format=None, long=False, short=False,
2998
show_ids=False, verbose=False):
2999
from bzrlib.missing import find_unmerged, iter_log_revisions
3000
from bzrlib.log import log_formatter
3001
local_branch = Branch.open_containing(u".")[0]
3002
parent = local_branch.get_parent()
3003
if other_branch is None:
3004
other_branch = parent
3005
if other_branch is None:
3006
raise errors.BzrCommandError("No peer location known"
3008
display_url = urlutils.unescape_for_display(parent,
3010
self.outf.write("Using last location: " + display_url + '\n')
3012
remote_branch = Branch.open(other_branch)
3013
if remote_branch.base == local_branch.base:
3014
remote_branch = local_branch
3015
local_branch.lock_read()
3017
remote_branch.lock_read()
3019
local_extra, remote_extra = find_unmerged(local_branch,
3021
if log_format is None:
3022
registry = log.log_formatter_registry
3023
log_format = registry.get_default(local_branch)
3024
lf = log_format(to_file=self.outf,
3026
show_timezone='original')
3027
if reverse is False:
3028
local_extra.reverse()
3029
remote_extra.reverse()
3030
if local_extra and not theirs_only:
3031
self.outf.write("You have %d extra revision(s):\n" %
3033
for revision in iter_log_revisions(local_extra,
3034
local_branch.repository,
3036
lf.log_revision(revision)
3037
printed_local = True
3039
printed_local = False
3040
if remote_extra and not mine_only:
3041
if printed_local is True:
3042
self.outf.write("\n\n\n")
3043
self.outf.write("You are missing %d revision(s):\n" %
3045
for revision in iter_log_revisions(remote_extra,
3046
remote_branch.repository,
3048
lf.log_revision(revision)
3049
if not remote_extra and not local_extra:
3051
self.outf.write("Branches are up to date.\n")
3055
remote_branch.unlock()
3057
local_branch.unlock()
3058
if not status_code and parent is None and other_branch is not None:
3059
local_branch.lock_write()
3061
# handle race conditions - a parent might be set while we run.
3062
if local_branch.get_parent() is None:
3063
local_branch.set_parent(remote_branch.base)
3065
local_branch.unlock()
3069
class cmd_plugins(Command):
3074
import bzrlib.plugin
3075
from inspect import getdoc
3076
for name, plugin in bzrlib.plugin.all_plugins().items():
3077
if getattr(plugin, '__path__', None) is not None:
3078
print plugin.__path__[0]
3079
elif getattr(plugin, '__file__', None) is not None:
3080
print plugin.__file__
3086
print '\t', d.split('\n')[0]
3089
class cmd_testament(Command):
3090
"""Show testament (signing-form) of a revision."""
3091
takes_options = ['revision',
3092
Option('long', help='Produce long-format testament'),
3093
Option('strict', help='Produce a strict-format'
3095
takes_args = ['branch?']
3097
def run(self, branch=u'.', revision=None, long=False, strict=False):
3098
from bzrlib.testament import Testament, StrictTestament
3100
testament_class = StrictTestament
3102
testament_class = Testament
3103
b = WorkingTree.open_containing(branch)[0].branch
3106
if revision is None:
3107
rev_id = b.last_revision()
3109
rev_id = revision[0].in_history(b).rev_id
3110
t = testament_class.from_revision(b.repository, rev_id)
3112
sys.stdout.writelines(t.as_text_lines())
3114
sys.stdout.write(t.as_short_text())
3119
class cmd_annotate(Command):
3120
"""Show the origin of each line in a file.
3122
This prints out the given file with an annotation on the left side
3123
indicating which revision, author and date introduced the change.
3125
If the origin is the same for a run of consecutive lines, it is
3126
shown only at the top, unless the --all option is given.
3128
# TODO: annotate directories; showing when each file was last changed
3129
# TODO: if the working copy is modified, show annotations on that
3130
# with new uncommitted lines marked
3131
aliases = ['ann', 'blame', 'praise']
3132
takes_args = ['filename']
3133
takes_options = [Option('all', help='show annotations on all lines'),
3134
Option('long', help='show date in annotations'),
3140
def run(self, filename, all=False, long=False, revision=None,
3142
from bzrlib.annotate import annotate_file
3143
tree, relpath = WorkingTree.open_containing(filename)
3144
branch = tree.branch
3147
if revision is None:
3148
revision_id = branch.last_revision()
3149
elif len(revision) != 1:
3150
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
3152
revision_id = revision[0].in_history(branch).rev_id
3153
file_id = tree.path2id(relpath)
3154
tree = branch.repository.revision_tree(revision_id)
3155
file_version = tree.inventory[file_id].revision
3156
annotate_file(branch, file_version, file_id, long, all, sys.stdout,
3162
class cmd_re_sign(Command):
3163
"""Create a digital signature for an existing revision."""
3164
# TODO be able to replace existing ones.
3166
hidden = True # is this right ?
3167
takes_args = ['revision_id*']
3168
takes_options = ['revision']
3170
def run(self, revision_id_list=None, revision=None):
3171
import bzrlib.gpg as gpg
3172
if revision_id_list is not None and revision is not None:
3173
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
3174
if revision_id_list is None and revision is None:
3175
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
3176
b = WorkingTree.open_containing(u'.')[0].branch
3177
gpg_strategy = gpg.GPGStrategy(b.get_config())
3178
if revision_id_list is not None:
3179
for revision_id in revision_id_list:
3180
b.repository.sign_revision(revision_id, gpg_strategy)
3181
elif revision is not None:
3182
if len(revision) == 1:
3183
revno, rev_id = revision[0].in_history(b)
3184
b.repository.sign_revision(rev_id, gpg_strategy)
3185
elif len(revision) == 2:
3186
# are they both on rh- if so we can walk between them
3187
# might be nice to have a range helper for arbitrary
3188
# revision paths. hmm.
3189
from_revno, from_revid = revision[0].in_history(b)
3190
to_revno, to_revid = revision[1].in_history(b)
3191
if to_revid is None:
3192
to_revno = b.revno()
3193
if from_revno is None or to_revno is None:
3194
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
3195
for revno in range(from_revno, to_revno + 1):
3196
b.repository.sign_revision(b.get_rev_id(revno),
3199
raise errors.BzrCommandError('Please supply either one revision, or a range.')
3202
class cmd_bind(Command):
3203
"""Convert the current branch into a checkout of the supplied branch.
3205
Once converted into a checkout, commits must succeed on the master branch
3206
before they will be applied to the local branch.
3209
_see_also = ['checkouts', 'unbind']
3210
takes_args = ['location?']
3213
def run(self, location=None):
3214
b, relpath = Branch.open_containing(u'.')
3215
if location is None:
3217
location = b.get_old_bound_location()
3218
except errors.UpgradeRequired:
3219
raise errors.BzrCommandError('No location supplied. '
3220
'This format does not remember old locations.')
3222
if location is None:
3223
raise errors.BzrCommandError('No location supplied and no '
3224
'previous location known')
3225
b_other = Branch.open(location)
3228
except errors.DivergedBranches:
3229
raise errors.BzrCommandError('These branches have diverged.'
3230
' Try merging, and then bind again.')
3233
class cmd_unbind(Command):
3234
"""Convert the current checkout into a regular branch.
3236
After unbinding, the local branch is considered independent and subsequent
3237
commits will be local only.
3240
_see_also = ['checkouts', 'bind']
3245
b, relpath = Branch.open_containing(u'.')
3247
raise errors.BzrCommandError('Local branch is not bound')
3250
class cmd_uncommit(Command):
3251
"""Remove the last committed revision.
3253
--verbose will print out what is being removed.
3254
--dry-run will go through all the motions, but not actually
3257
In the future, uncommit will create a revision bundle, which can then
3261
# TODO: jam 20060108 Add an option to allow uncommit to remove
3262
# unreferenced information in 'branch-as-repository' branches.
3263
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
3264
# information in shared branches as well.
3265
_see_also = ['commit']
3266
takes_options = ['verbose', 'revision',
3267
Option('dry-run', help='Don\'t actually make changes'),
3268
Option('force', help='Say yes to all questions.')]
3269
takes_args = ['location?']
3272
def run(self, location=None,
3273
dry_run=False, verbose=False,
3274
revision=None, force=False):
3275
from bzrlib.log import log_formatter, show_log
3277
from bzrlib.uncommit import uncommit
3279
if location is None:
3281
control, relpath = bzrdir.BzrDir.open_containing(location)
3283
tree = control.open_workingtree()
3285
except (errors.NoWorkingTree, errors.NotLocalUrl):
3287
b = control.open_branch()
3290
if revision is None:
3293
# 'bzr uncommit -r 10' actually means uncommit
3294
# so that the final tree is at revno 10.
3295
# but bzrlib.uncommit.uncommit() actually uncommits
3296
# the revisions that are supplied.
3297
# So we need to offset it by one
3298
revno = revision[0].in_history(b).revno+1
3300
if revno <= b.revno():
3301
rev_id = b.get_rev_id(revno)
3303
self.outf.write('No revisions to uncommit.\n')
3306
lf = log_formatter('short',
3308
show_timezone='original')
3313
direction='forward',
3314
start_revision=revno,
3315
end_revision=b.revno())
3318
print 'Dry-run, pretending to remove the above revisions.'
3320
val = raw_input('Press <enter> to continue')
3322
print 'The above revision(s) will be removed.'
3324
val = raw_input('Are you sure [y/N]? ')
3325
if val.lower() not in ('y', 'yes'):
3329
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
3333
class cmd_break_lock(Command):
3334
"""Break a dead lock on a repository, branch or working directory.
3336
CAUTION: Locks should only be broken when you are sure that the process
3337
holding the lock has been stopped.
3339
You can get information on what locks are open via the 'bzr info' command.
3344
takes_args = ['location?']
3346
def run(self, location=None, show=False):
3347
if location is None:
3349
control, relpath = bzrdir.BzrDir.open_containing(location)
3351
control.break_lock()
3352
except NotImplementedError:
3356
class cmd_wait_until_signalled(Command):
3357
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3359
This just prints a line to signal when it is ready, then blocks on stdin.
3365
sys.stdout.write("running\n")
3367
sys.stdin.readline()
3370
class cmd_serve(Command):
3371
"""Run the bzr server."""
3373
aliases = ['server']
3377
help='serve on stdin/out for use from inetd or sshd'),
3379
help='listen for connections on nominated port of the form '
3380
'[hostname:]portnumber. Passing 0 as the port number will '
3381
'result in a dynamically allocated port. Default port is '
3385
help='serve contents of directory',
3387
Option('allow-writes',
3388
help='By default the server is a readonly server. Supplying '
3389
'--allow-writes enables write access to the contents of '
3390
'the served directory and below. '
3394
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3395
from bzrlib.smart import medium, server
3396
from bzrlib.transport import get_transport
3397
from bzrlib.transport.chroot import ChrootServer
3398
from bzrlib.transport.remote import BZR_DEFAULT_PORT, BZR_DEFAULT_INTERFACE
3399
if directory is None:
3400
directory = os.getcwd()
3401
url = urlutils.local_path_to_url(directory)
3402
if not allow_writes:
3403
url = 'readonly+' + url
3404
chroot_server = ChrootServer(get_transport(url))
3405
chroot_server.setUp()
3406
t = get_transport(chroot_server.get_url())
3408
smart_server = medium.SmartServerPipeStreamMedium(
3409
sys.stdin, sys.stdout, t)
3411
host = BZR_DEFAULT_INTERFACE
3413
port = BZR_DEFAULT_PORT
3416
host, port = port.split(':')
3418
smart_server = server.SmartTCPServer(t, host=host, port=port)
3419
print 'listening on port: ', smart_server.port
3421
# for the duration of this server, no UI output is permitted.
3422
# note that this may cause problems with blackbox tests. This should
3423
# be changed with care though, as we dont want to use bandwidth sending
3424
# progress over stderr to smart server clients!
3425
old_factory = ui.ui_factory
3427
ui.ui_factory = ui.SilentUIFactory()
3428
smart_server.serve()
3430
ui.ui_factory = old_factory
3433
class cmd_join(Command):
3434
"""Combine a subtree into its containing tree.
3436
This command is for experimental use only. It requires the target tree
3437
to be in dirstate-with-subtree format, which cannot be converted into
3440
The TREE argument should be an independent tree, inside another tree, but
3441
not part of it. (Such trees can be produced by "bzr split", but also by
3442
running "bzr branch" with the target inside a tree.)
3444
The result is a combined tree, with the subtree no longer an independant
3445
part. This is marked as a merge of the subtree into the containing tree,
3446
and all history is preserved.
3448
If --reference is specified, the subtree retains its independence. It can
3449
be branched by itself, and can be part of multiple projects at the same
3450
time. But operations performed in the containing tree, such as commit
3451
and merge, will recurse into the subtree.
3454
_see_also = ['split']
3455
takes_args = ['tree']
3456
takes_options = [Option('reference', 'join by reference')]
3459
def run(self, tree, reference=False):
3460
sub_tree = WorkingTree.open(tree)
3461
parent_dir = osutils.dirname(sub_tree.basedir)
3462
containing_tree = WorkingTree.open_containing(parent_dir)[0]
3463
repo = containing_tree.branch.repository
3464
if not repo.supports_rich_root():
3465
raise errors.BzrCommandError(
3466
"Can't join trees because %s doesn't support rich root data.\n"
3467
"You can use bzr upgrade on the repository."
3471
containing_tree.add_reference(sub_tree)
3472
except errors.BadReferenceTarget, e:
3473
# XXX: Would be better to just raise a nicely printable
3474
# exception from the real origin. Also below. mbp 20070306
3475
raise errors.BzrCommandError("Cannot join %s. %s" %
3479
containing_tree.subsume(sub_tree)
3480
except errors.BadSubsumeSource, e:
3481
raise errors.BzrCommandError("Cannot join %s. %s" %
3485
class cmd_split(Command):
3486
"""Split a tree into two trees.
3488
This command is for experimental use only. It requires the target tree
3489
to be in dirstate-with-subtree format, which cannot be converted into
3492
The TREE argument should be a subdirectory of a working tree. That
3493
subdirectory will be converted into an independent tree, with its own
3494
branch. Commits in the top-level tree will not apply to the new subtree.
3495
If you want that behavior, do "bzr join --reference TREE".
3498
_see_also = ['join']
3499
takes_args = ['tree']
3503
def run(self, tree):
3504
containing_tree, subdir = WorkingTree.open_containing(tree)
3505
sub_id = containing_tree.path2id(subdir)
3507
raise errors.NotVersionedError(subdir)
3509
containing_tree.extract(sub_id)
3510
except errors.RootNotRich:
3511
raise errors.UpgradeRequired(containing_tree.branch.base)
3515
class cmd_merge_directive(Command):
3516
"""Generate a merge directive for auto-merge tools.
3518
A directive requests a merge to be performed, and also provides all the
3519
information necessary to do so. This means it must either include a
3520
revision bundle, or the location of a branch containing the desired
3523
A submit branch (the location to merge into) must be supplied the first
3524
time the command is issued. After it has been supplied once, it will
3525
be remembered as the default.
3527
A public branch is optional if a revision bundle is supplied, but required
3528
if --diff or --plain is specified. It will be remembered as the default
3529
after the first use.
3532
takes_args = ['submit_branch?', 'public_branch?']
3535
RegistryOption.from_kwargs('patch-type',
3536
'The type of patch to include in the directive',
3537
title='Patch type', value_switches=True, enum_switch=False,
3538
bundle='Bazaar revision bundle (default)',
3539
diff='Normal unified diff',
3540
plain='No patch, just directive'),
3541
Option('sign', help='GPG-sign the directive'), 'revision',
3542
Option('mail-to', type=str,
3543
help='Instead of printing the directive, email to this address'),
3544
Option('message', type=str, short_name='m',
3545
help='Message to use when committing this merge')
3548
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
3549
sign=False, revision=None, mail_to=None, message=None):
3550
if patch_type == 'plain':
3552
branch = Branch.open('.')
3553
stored_submit_branch = branch.get_submit_branch()
3554
if submit_branch is None:
3555
submit_branch = stored_submit_branch
3557
if stored_submit_branch is None:
3558
branch.set_submit_branch(submit_branch)
3559
if submit_branch is None:
3560
submit_branch = branch.get_parent()
3561
if submit_branch is None:
3562
raise errors.BzrCommandError('No submit branch specified or known')
3564
stored_public_branch = branch.get_public_branch()
3565
if public_branch is None:
3566
public_branch = stored_public_branch
3567
elif stored_public_branch is None:
3568
branch.set_public_branch(public_branch)
3569
if patch_type != "bundle" and public_branch is None:
3570
raise errors.BzrCommandError('No public branch specified or'
3572
if revision is not None:
3573
if len(revision) != 1:
3574
raise errors.BzrCommandError('bzr merge-directive takes '
3575
'exactly one revision identifier')
3577
revision_id = revision[0].in_history(branch).rev_id
3579
revision_id = branch.last_revision()
3580
directive = merge_directive.MergeDirective.from_objects(
3581
branch.repository, revision_id, time.time(),
3582
osutils.local_time_offset(), submit_branch,
3583
public_branch=public_branch, patch_type=patch_type,
3587
self.outf.write(directive.to_signed(branch))
3589
self.outf.writelines(directive.to_lines())
3591
message = directive.to_email(mail_to, branch, sign)
3593
server = branch.get_config().get_user_option('smtp_server')
3595
server = 'localhost'
3597
s.sendmail(message['From'], message['To'], message.as_string())
3600
class cmd_tag(Command):
3601
"""Create a tag naming a revision.
3603
Tags give human-meaningful names to revisions. Commands that take a -r
3604
(--revision) option can be given -rtag:X, where X is any previously
3607
Tags are stored in the branch. Tags are copied from one branch to another
3608
along when you branch, push, pull or merge.
3610
It is an error to give a tag name that already exists unless you pass
3611
--force, in which case the tag is moved to point to the new revision.
3614
_see_also = ['commit', 'tags']
3615
takes_args = ['tag_name']
3618
help='Delete this tag rather than placing it.',
3621
help='Branch in which to place the tag.',
3626
help='Replace existing tags',
3631
def run(self, tag_name,
3637
branch, relpath = Branch.open_containing(directory)
3641
branch.tags.delete_tag(tag_name)
3642
self.outf.write('Deleted tag %s.\n' % tag_name)
3645
if len(revision) != 1:
3646
raise errors.BzrCommandError(
3647
"Tags can only be placed on a single revision, "
3649
revision_id = revision[0].in_history(branch).rev_id
3651
revision_id = branch.last_revision()
3652
if (not force) and branch.tags.has_tag(tag_name):
3653
raise errors.TagAlreadyExists(tag_name)
3654
branch.tags.set_tag(tag_name, revision_id)
3655
self.outf.write('Created tag %s.\n' % tag_name)
3660
class cmd_tags(Command):
3663
This tag shows a table of tag names and the revisions they reference.
3669
help='Branch whose tags should be displayed',
3679
branch, relpath = Branch.open_containing(directory)
3680
for tag_name, target in sorted(branch.tags.get_tag_dict().items()):
3681
self.outf.write('%-20s %s\n' % (tag_name, target))
3684
# command-line interpretation helper for merge-related commands
3685
def _merge_helper(other_revision, base_revision,
3686
check_clean=True, ignore_zero=False,
3687
this_dir=None, backup_files=False,
3689
file_list=None, show_base=False, reprocess=False,
3692
change_reporter=None,
3694
"""Merge changes into a tree.
3697
list(path, revno) Base for three-way merge.
3698
If [None, None] then a base will be automatically determined.
3700
list(path, revno) Other revision for three-way merge.
3702
Directory to merge changes into; '.' by default.
3704
If true, this_dir must have no uncommitted changes before the
3706
ignore_zero - If true, suppress the "zero conflicts" message when
3707
there are no conflicts; should be set when doing something we expect
3708
to complete perfectly.
3709
file_list - If supplied, merge only changes to selected files.
3711
All available ancestors of other_revision and base_revision are
3712
automatically pulled into the branch.
3714
The revno may be -1 to indicate the last revision on the branch, which is
3717
This function is intended for use from the command line; programmatic
3718
clients might prefer to call merge.merge_inner(), which has less magic
3721
# Loading it late, so that we don't always have to import bzrlib.merge
3722
if merge_type is None:
3723
merge_type = _mod_merge.Merge3Merger
3724
if this_dir is None:
3726
this_tree = WorkingTree.open_containing(this_dir)[0]
3727
if show_base and not merge_type is _mod_merge.Merge3Merger:
3728
raise errors.BzrCommandError("Show-base is not supported for this merge"
3729
" type. %s" % merge_type)
3730
if reprocess and not merge_type.supports_reprocess:
3731
raise errors.BzrCommandError("Conflict reduction is not supported for merge"
3732
" type %s." % merge_type)
3733
if reprocess and show_base:
3734
raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
3735
# TODO: jam 20070226 We should really lock these trees earlier. However, we
3736
# only want to take out a lock_tree_write() if we don't have to pull
3737
# any ancestry. But merge might fetch ancestry in the middle, in
3738
# which case we would need a lock_write().
3739
# Because we cannot upgrade locks, for now we live with the fact that
3740
# the tree will be locked multiple times during a merge. (Maybe
3741
# read-only some of the time, but it means things will get read
3744
merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
3745
pb=pb, change_reporter=change_reporter)
3746
merger.pp = ProgressPhase("Merge phase", 5, pb)
3747
merger.pp.next_phase()
3748
merger.check_basis(check_clean)
3749
if other_rev_id is not None:
3750
merger.set_other_revision(other_rev_id, this_tree.branch)
3752
merger.set_other(other_revision)
3753
merger.pp.next_phase()
3754
merger.set_base(base_revision)
3755
if merger.base_rev_id == merger.other_rev_id:
3756
note('Nothing to do.')
3758
if file_list is None:
3759
if pull and merger.base_rev_id == merger.this_rev_id:
3760
# FIXME: deduplicate with pull
3761
result = merger.this_tree.pull(merger.this_branch,
3762
False, merger.other_rev_id)
3763
if result.old_revid == result.new_revid:
3764
note('No revisions to pull.')
3766
note('Now on revision %d.' % result.new_revno)
3768
merger.backup_files = backup_files
3769
merger.merge_type = merge_type
3770
merger.set_interesting_files(file_list)
3771
merger.show_base = show_base
3772
merger.reprocess = reprocess
3773
conflicts = merger.do_merge()
3774
if file_list is None:
3775
merger.set_pending()
3782
merge = _merge_helper
3785
# these get imported and then picked up by the scan for cmd_*
3786
# TODO: Some more consistent way to split command definitions across files;
3787
# we do need to load at least some information about them to know of
3788
# aliases. ideally we would avoid loading the implementation until the
3789
# details were needed.
3790
from bzrlib.cmd_version_info import cmd_version_info
3791
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
3792
from bzrlib.bundle.commands import cmd_bundle_revisions
3793
from bzrlib.sign_my_commits import cmd_sign_my_commits
3794
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
3795
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
