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(), """
47
revision as _mod_revision,
55
from bzrlib.branch import Branch
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.revisionspec import RevisionSpec
58
from bzrlib.smtp_connection import SMTPConnection
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
If no arguments are specified, the status of the entire working
159
directory is shown. Otherwise, only the status of the specified
160
files or directories is reported. If a directory is given, status
161
is reported for everything inside that directory.
163
If a revision argument is given, the status is calculated against
164
that revision, or between two revisions if two are provided.
167
# TODO: --no-recurse, --recurse options
169
takes_args = ['file*']
170
takes_options = ['show-ids', 'revision',
171
Option('short', help='Give short SVN-style status lines.'),
172
Option('versioned', help='Only show versioned files.')]
173
aliases = ['st', 'stat']
175
encoding_type = 'replace'
176
_see_also = ['diff', 'revert', 'status-flags']
179
def run(self, show_ids=False, file_list=None, revision=None, short=False,
181
from bzrlib.status import show_tree_status
183
tree, file_list = tree_files(file_list)
185
show_tree_status(tree, show_ids=show_ids,
186
specific_files=file_list, revision=revision,
187
to_file=self.outf, short=short, versioned=versioned)
190
class cmd_cat_revision(Command):
191
"""Write out metadata for a revision.
193
The revision to print can either be specified by a specific
194
revision identifier, or you can use --revision.
198
takes_args = ['revision_id?']
199
takes_options = ['revision']
200
# cat-revision is more for frontends so should be exact
204
def run(self, revision_id=None, revision=None):
206
revision_id = osutils.safe_revision_id(revision_id, warn=False)
207
if revision_id is not None and revision is not None:
208
raise errors.BzrCommandError('You can only supply one of'
209
' revision_id or --revision')
210
if revision_id is None and revision is None:
211
raise errors.BzrCommandError('You must supply either'
212
' --revision or a revision_id')
213
b = WorkingTree.open_containing(u'.')[0].branch
215
# TODO: jam 20060112 should cat-revision always output utf-8?
216
if revision_id is not None:
217
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
218
elif revision is not None:
221
raise errors.BzrCommandError('You cannot specify a NULL'
223
revno, rev_id = rev.in_history(b)
224
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
227
class cmd_remove_tree(Command):
228
"""Remove the working tree from a given branch/checkout.
230
Since a lightweight checkout is little more than a working tree
231
this will refuse to run against one.
233
To re-create the working tree, use "bzr checkout".
235
_see_also = ['checkout', 'working-trees']
237
takes_args = ['location?']
239
def run(self, location='.'):
240
d = bzrdir.BzrDir.open(location)
243
working = d.open_workingtree()
244
except errors.NoWorkingTree:
245
raise errors.BzrCommandError("No working tree to remove")
246
except errors.NotLocalUrl:
247
raise errors.BzrCommandError("You cannot remove the working tree of a "
250
working_path = working.bzrdir.root_transport.base
251
branch_path = working.branch.bzrdir.root_transport.base
252
if working_path != branch_path:
253
raise errors.BzrCommandError("You cannot remove the working tree from "
254
"a lightweight checkout")
256
d.destroy_workingtree()
259
class cmd_revno(Command):
260
"""Show current revision number.
262
This is equal to the number of revisions on this branch.
266
takes_args = ['location?']
269
def run(self, location=u'.'):
270
self.outf.write(str(Branch.open_containing(location)[0].revno()))
271
self.outf.write('\n')
274
class cmd_revision_info(Command):
275
"""Show revision number and revision id for a given revision identifier.
278
takes_args = ['revision_info*']
279
takes_options = ['revision']
282
def run(self, revision=None, revision_info_list=[]):
285
if revision is not None:
286
revs.extend(revision)
287
if revision_info_list is not None:
288
for rev in revision_info_list:
289
revs.append(RevisionSpec.from_string(rev))
291
b = Branch.open_containing(u'.')[0]
294
revs.append(RevisionSpec.from_string('-1'))
297
revinfo = rev.in_history(b)
298
if revinfo.revno is None:
299
dotted_map = b.get_revision_id_to_revno_map()
300
revno = '.'.join(str(i) for i in dotted_map[revinfo.rev_id])
301
print '%s %s' % (revno, revinfo.rev_id)
303
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
306
class cmd_add(Command):
307
"""Add specified files or directories.
309
In non-recursive mode, all the named items are added, regardless
310
of whether they were previously ignored. A warning is given if
311
any of the named files are already versioned.
313
In recursive mode (the default), files are treated the same way
314
but the behaviour for directories is different. Directories that
315
are already versioned do not give a warning. All directories,
316
whether already versioned or not, are searched for files or
317
subdirectories that are neither versioned or ignored, and these
318
are added. This search proceeds recursively into versioned
319
directories. If no names are given '.' is assumed.
321
Therefore simply saying 'bzr add' will version all files that
322
are currently unknown.
324
Adding a file whose parent directory is not versioned will
325
implicitly add the parent, and so on up to the root. This means
326
you should never need to explicitly add a directory, they'll just
327
get added when you add a file in the directory.
329
--dry-run will show which files would be added, but not actually
332
--file-ids-from will try to use the file ids from the supplied path.
333
It looks up ids trying to find a matching parent directory with the
334
same filename, and then by pure path. This option is rarely needed
335
but can be useful when adding the same logical file into two
336
branches that will be merged later (without showing the two different
337
adds as a conflict). It is also useful when merging another project
338
into a subdirectory of this one.
340
takes_args = ['file*']
343
help="Don't recursively add the contents of directories."),
345
help="Show what would be done, but don't actually do anything."),
347
Option('file-ids-from',
349
help='Lookup file ids from this tree.'),
351
encoding_type = 'replace'
352
_see_also = ['remove']
354
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
359
if file_ids_from is not None:
361
base_tree, base_path = WorkingTree.open_containing(
363
except errors.NoWorkingTree:
364
base_branch, base_path = Branch.open_containing(
366
base_tree = base_branch.basis_tree()
368
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
369
to_file=self.outf, should_print=(not is_quiet()))
371
action = bzrlib.add.AddAction(to_file=self.outf,
372
should_print=(not is_quiet()))
375
base_tree.lock_read()
377
file_list = self._maybe_expand_globs(file_list)
379
tree = WorkingTree.open_containing(file_list[0])[0]
381
tree = WorkingTree.open_containing(u'.')[0]
382
added, ignored = tree.smart_add(file_list, not
383
no_recurse, action=action, save=not dry_run)
385
if base_tree is not None:
389
for glob in sorted(ignored.keys()):
390
for path in ignored[glob]:
391
self.outf.write("ignored %s matching \"%s\"\n"
395
for glob, paths in ignored.items():
396
match_len += len(paths)
397
self.outf.write("ignored %d file(s).\n" % match_len)
398
self.outf.write("If you wish to add some of these files,"
399
" please add them by name.\n")
402
class cmd_mkdir(Command):
403
"""Create a new versioned directory.
405
This is equivalent to creating the directory and then adding it.
408
takes_args = ['dir+']
409
encoding_type = 'replace'
411
def run(self, dir_list):
414
wt, dd = WorkingTree.open_containing(d)
416
self.outf.write('added %s\n' % d)
419
class cmd_relpath(Command):
420
"""Show path of a file relative to root"""
422
takes_args = ['filename']
426
def run(self, filename):
427
# TODO: jam 20050106 Can relpath return a munged path if
428
# sys.stdout encoding cannot represent it?
429
tree, relpath = WorkingTree.open_containing(filename)
430
self.outf.write(relpath)
431
self.outf.write('\n')
434
class cmd_inventory(Command):
435
"""Show inventory of the current working copy or a revision.
437
It is possible to limit the output to a particular entry
438
type using the --kind option. For example: --kind file.
440
It is also possible to restrict the list of files to a specific
441
set. For example: bzr inventory --show-ids this/file
450
help='List entries of a particular kind: file, directory, symlink.',
453
takes_args = ['file*']
456
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
457
if kind and kind not in ['file', 'directory', 'symlink']:
458
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
460
work_tree, file_list = tree_files(file_list)
461
work_tree.lock_read()
463
if revision is not None:
464
if len(revision) > 1:
465
raise errors.BzrCommandError(
466
'bzr inventory --revision takes exactly one revision'
468
revision_id = revision[0].in_history(work_tree.branch).rev_id
469
tree = work_tree.branch.repository.revision_tree(revision_id)
471
extra_trees = [work_tree]
477
if file_list is not None:
478
file_ids = tree.paths2ids(file_list, trees=extra_trees,
479
require_versioned=True)
480
# find_ids_across_trees may include some paths that don't
482
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
483
for file_id in file_ids if file_id in tree)
485
entries = tree.inventory.entries()
488
if tree is not work_tree:
491
for path, entry in entries:
492
if kind and kind != entry.kind:
495
self.outf.write('%-50s %s\n' % (path, entry.file_id))
497
self.outf.write(path)
498
self.outf.write('\n')
501
class cmd_mv(Command):
502
"""Move or rename a file.
505
bzr mv OLDNAME NEWNAME
506
bzr mv SOURCE... DESTINATION
508
If the last argument is a versioned directory, all the other names
509
are moved into it. Otherwise, there must be exactly two arguments
510
and the file is changed to a new name.
512
If OLDNAME does not exist on the filesystem but is versioned and
513
NEWNAME does exist on the filesystem but is not versioned, mv
514
assumes that the file has been manually moved and only updates
515
its internal inventory to reflect that change.
516
The same is valid when moving many SOURCE files to a DESTINATION.
518
Files cannot be moved between branches.
521
takes_args = ['names*']
522
takes_options = [Option("after", help="Move only the bzr identifier"
523
" of the file, because the file has already been moved."),
525
aliases = ['move', 'rename']
526
encoding_type = 'replace'
528
def run(self, names_list, after=False):
529
if names_list is None:
532
if len(names_list) < 2:
533
raise errors.BzrCommandError("missing file argument")
534
tree, rel_names = tree_files(names_list)
536
if os.path.isdir(names_list[-1]):
537
# move into existing directory
538
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
539
self.outf.write("%s => %s\n" % pair)
541
if len(names_list) != 2:
542
raise errors.BzrCommandError('to mv multiple files the'
543
' destination must be a versioned'
545
tree.rename_one(rel_names[0], rel_names[1], after=after)
546
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
549
class cmd_pull(Command):
550
"""Turn this branch into a mirror of another branch.
552
This command only works on branches that have not diverged. Branches are
553
considered diverged if the destination branch's most recent commit is one
554
that has not been merged (directly or indirectly) into the parent.
556
If branches have diverged, you can use 'bzr merge' to integrate the changes
557
from one into the other. Once one branch has merged, the other should
558
be able to pull it again.
560
If you want to forget your local changes and just update your branch to
561
match the remote one, use pull --overwrite.
563
If there is no default location set, the first pull will set it. After
564
that, you can omit the location to use the default. To change the
565
default, use --remember. The value will only be saved if the remote
566
location can be accessed.
569
_see_also = ['push', 'update', 'status-flags']
570
takes_options = ['remember', 'overwrite', 'revision', 'verbose',
572
help='Branch to pull into, '
573
'rather than the one containing the working directory.',
578
takes_args = ['location?']
579
encoding_type = 'replace'
581
def run(self, location=None, remember=False, overwrite=False,
582
revision=None, verbose=False,
584
# FIXME: too much stuff is in the command class
587
if directory is None:
590
tree_to = WorkingTree.open_containing(directory)[0]
591
branch_to = tree_to.branch
592
except errors.NoWorkingTree:
594
branch_to = Branch.open_containing(directory)[0]
596
if location is not None:
597
mergeable, location_transport = _get_mergeable_helper(location)
599
stored_loc = branch_to.get_parent()
601
if stored_loc is None:
602
raise errors.BzrCommandError("No pull location known or"
605
display_url = urlutils.unescape_for_display(stored_loc,
607
self.outf.write("Using saved location: %s\n" % display_url)
608
location = stored_loc
609
location_transport = transport.get_transport(location)
611
if mergeable is not None:
612
if revision is not None:
613
raise errors.BzrCommandError(
614
'Cannot use -r with merge directives or bundles')
615
mergeable.install_revisions(branch_to.repository)
616
base_revision_id, revision_id, verified = \
617
mergeable.get_merge_request(branch_to.repository)
618
branch_from = branch_to
620
branch_from = Branch.open_from_transport(location_transport)
622
if branch_to.get_parent() is None or remember:
623
branch_to.set_parent(branch_from.base)
625
if revision is not None:
626
if len(revision) == 1:
627
revision_id = revision[0].in_history(branch_from).rev_id
629
raise errors.BzrCommandError(
630
'bzr pull --revision takes one value.')
633
old_rh = branch_to.revision_history()
634
if tree_to is not None:
635
result = tree_to.pull(branch_from, overwrite, revision_id,
636
delta._ChangeReporter(unversioned_filter=tree_to.is_ignored))
638
result = branch_to.pull(branch_from, overwrite, revision_id)
640
result.report(self.outf)
642
from bzrlib.log import show_changed_revisions
643
new_rh = branch_to.revision_history()
644
show_changed_revisions(branch_to, old_rh, new_rh,
648
class cmd_push(Command):
649
"""Update a mirror of this branch.
651
The target branch will not have its working tree populated because this
652
is both expensive, and is not supported on remote file systems.
654
Some smart servers or protocols *may* put the working tree in place in
657
This command only works on branches that have not diverged. Branches are
658
considered diverged if the destination branch's most recent commit is one
659
that has not been merged (directly or indirectly) by the source branch.
661
If branches have diverged, you can use 'bzr push --overwrite' to replace
662
the other branch completely, discarding its unmerged changes.
664
If you want to ensure you have the different changes in the other branch,
665
do a merge (see bzr help merge) from the other branch, and commit that.
666
After that you will be able to do a push without '--overwrite'.
668
If there is no default push location set, the first push will set it.
669
After that, you can omit the location to use the default. To change the
670
default, use --remember. The value will only be saved if the remote
671
location can be accessed.
674
_see_also = ['pull', 'update', 'working-trees']
675
takes_options = ['remember', 'overwrite', 'verbose',
676
Option('create-prefix',
677
help='Create the path leading up to the branch '
678
'if it does not already exist.'),
680
help='Branch to push from, '
681
'rather than the one containing the working directory.',
685
Option('use-existing-dir',
686
help='By default push will fail if the target'
687
' directory exists, but does not already'
688
' have a control directory. This flag will'
689
' allow push to proceed.'),
691
takes_args = ['location?']
692
encoding_type = 'replace'
694
def run(self, location=None, remember=False, overwrite=False,
695
create_prefix=False, verbose=False,
696
use_existing_dir=False,
698
# FIXME: Way too big! Put this into a function called from the
700
if directory is None:
702
br_from = Branch.open_containing(directory)[0]
703
stored_loc = br_from.get_push_location()
705
if stored_loc is None:
706
raise errors.BzrCommandError("No push location known or specified.")
708
display_url = urlutils.unescape_for_display(stored_loc,
710
self.outf.write("Using saved location: %s\n" % display_url)
711
location = stored_loc
713
to_transport = transport.get_transport(location)
715
br_to = repository_to = dir_to = None
717
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
718
except errors.NotBranchError:
719
pass # Didn't find anything
721
# If we can open a branch, use its direct repository, otherwise see
722
# if there is a repository without a branch.
724
br_to = dir_to.open_branch()
725
except errors.NotBranchError:
726
# Didn't find a branch, can we find a repository?
728
repository_to = dir_to.find_repository()
729
except errors.NoRepositoryPresent:
732
# Found a branch, so we must have found a repository
733
repository_to = br_to.repository
738
# The destination doesn't exist; create it.
739
# XXX: Refactor the create_prefix/no_create_prefix code into a
740
# common helper function
742
to_transport.mkdir('.')
743
except errors.FileExists:
744
if not use_existing_dir:
745
raise errors.BzrCommandError("Target directory %s"
746
" already exists, but does not have a valid .bzr"
747
" directory. Supply --use-existing-dir to push"
748
" there anyway." % location)
749
except errors.NoSuchFile:
750
if not create_prefix:
751
raise errors.BzrCommandError("Parent directory of %s"
753
"\nYou may supply --create-prefix to create all"
754
" leading parent directories."
756
_create_prefix(to_transport)
758
# Now the target directory exists, but doesn't have a .bzr
759
# directory. So we need to create it, along with any work to create
760
# all of the dependent branches, etc.
761
dir_to = br_from.bzrdir.clone_on_transport(to_transport,
762
revision_id=br_from.last_revision())
763
br_to = dir_to.open_branch()
764
# TODO: Some more useful message about what was copied
765
note('Created new branch.')
766
# We successfully created the target, remember it
767
if br_from.get_push_location() is None or remember:
768
br_from.set_push_location(br_to.base)
769
elif repository_to is None:
770
# we have a bzrdir but no branch or repository
771
# XXX: Figure out what to do other than complain.
772
raise errors.BzrCommandError("At %s you have a valid .bzr control"
773
" directory, but not a branch or repository. This is an"
774
" unsupported configuration. Please move the target directory"
775
" out of the way and try again."
778
# We have a repository but no branch, copy the revisions, and then
780
last_revision_id = br_from.last_revision()
781
repository_to.fetch(br_from.repository,
782
revision_id=last_revision_id)
783
br_to = br_from.clone(dir_to, revision_id=last_revision_id)
784
note('Created new branch.')
785
if br_from.get_push_location() is None or remember:
786
br_from.set_push_location(br_to.base)
787
else: # We have a valid to branch
788
# We were able to connect to the remote location, so remember it
789
# we don't need to successfully push because of possible divergence.
790
if br_from.get_push_location() is None or remember:
791
br_from.set_push_location(br_to.base)
793
old_rh = br_to.revision_history()
796
tree_to = dir_to.open_workingtree()
797
except errors.NotLocalUrl:
798
warning("This transport does not update the working "
799
"tree of: %s. See 'bzr help working-trees' for "
800
"more information." % br_to.base)
801
push_result = br_from.push(br_to, overwrite)
802
except errors.NoWorkingTree:
803
push_result = br_from.push(br_to, overwrite)
807
push_result = br_from.push(tree_to.branch, overwrite)
811
except errors.DivergedBranches:
812
raise errors.BzrCommandError('These branches have diverged.'
813
' Try using "merge" and then "push".')
814
if push_result is not None:
815
push_result.report(self.outf)
817
new_rh = br_to.revision_history()
820
from bzrlib.log import show_changed_revisions
821
show_changed_revisions(br_to, old_rh, new_rh,
824
# we probably did a clone rather than a push, so a message was
829
class cmd_branch(Command):
830
"""Create a new copy of a branch.
832
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
833
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
834
If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
835
is derived from the FROM_LOCATION by stripping a leading scheme or drive
836
identifier, if any. For example, "branch lp:foo-bar" will attempt to
839
To retrieve the branch as of a particular revision, supply the --revision
840
parameter, as in "branch foo/bar -r 5".
843
_see_also = ['checkout']
844
takes_args = ['from_location', 'to_location?']
845
takes_options = ['revision']
846
aliases = ['get', 'clone']
848
def run(self, from_location, to_location=None, revision=None):
849
from bzrlib.tag import _merge_tags_if_possible
852
elif len(revision) > 1:
853
raise errors.BzrCommandError(
854
'bzr branch --revision takes exactly 1 revision value')
856
br_from = Branch.open(from_location)
859
if len(revision) == 1 and revision[0] is not None:
860
revision_id = revision[0].in_history(br_from)[1]
862
# FIXME - wt.last_revision, fallback to branch, fall back to
863
# None or perhaps NULL_REVISION to mean copy nothing
865
revision_id = br_from.last_revision()
866
if to_location is None:
867
to_location = urlutils.derive_to_location(from_location)
870
name = os.path.basename(to_location) + '\n'
872
to_transport = transport.get_transport(to_location)
874
to_transport.mkdir('.')
875
except errors.FileExists:
876
raise errors.BzrCommandError('Target directory "%s" already'
877
' exists.' % to_location)
878
except errors.NoSuchFile:
879
raise errors.BzrCommandError('Parent of "%s" does not exist.'
882
# preserve whatever source format we have.
883
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
884
possible_transports=[to_transport])
885
branch = dir.open_branch()
886
except errors.NoSuchRevision:
887
to_transport.delete_tree('.')
888
msg = "The branch %s has no revision %s." % (from_location, revision[0])
889
raise errors.BzrCommandError(msg)
891
branch.control_files.put_utf8('branch-name', name)
892
_merge_tags_if_possible(br_from, branch)
893
note('Branched %d revision(s).' % branch.revno())
898
class cmd_checkout(Command):
899
"""Create a new checkout of an existing branch.
901
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
902
the branch found in '.'. This is useful if you have removed the working tree
903
or if it was never created - i.e. if you pushed the branch to its current
906
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
907
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
908
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
909
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
910
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
913
To retrieve the branch as of a particular revision, supply the --revision
914
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
915
out of date [so you cannot commit] but it may be useful (i.e. to examine old
919
_see_also = ['checkouts', 'branch']
920
takes_args = ['branch_location?', 'to_location?']
921
takes_options = ['revision',
922
Option('lightweight',
923
help="Perform a lightweight checkout. Lightweight "
924
"checkouts depend on access to the branch for "
925
"every operation. Normal checkouts can perform "
926
"common operations like diff and status without "
927
"such access, and also support local commits."
932
def run(self, branch_location=None, to_location=None, revision=None,
936
elif len(revision) > 1:
937
raise errors.BzrCommandError(
938
'bzr checkout --revision takes exactly 1 revision value')
939
if branch_location is None:
940
branch_location = osutils.getcwd()
941
to_location = branch_location
942
source = Branch.open(branch_location)
943
if len(revision) == 1 and revision[0] is not None:
944
revision_id = _mod_revision.ensure_null(
945
revision[0].in_history(source)[1])
948
if to_location is None:
949
to_location = urlutils.derive_to_location(branch_location)
950
# if the source and to_location are the same,
951
# and there is no working tree,
952
# then reconstitute a branch
953
if (osutils.abspath(to_location) ==
954
osutils.abspath(branch_location)):
956
source.bzrdir.open_workingtree()
957
except errors.NoWorkingTree:
958
source.bzrdir.create_workingtree(revision_id)
961
os.mkdir(to_location)
963
if e.errno == errno.EEXIST:
964
raise errors.BzrCommandError('Target directory "%s" already'
965
' exists.' % to_location)
966
if e.errno == errno.ENOENT:
967
raise errors.BzrCommandError('Parent of "%s" does not exist.'
971
source.create_checkout(to_location, revision_id, lightweight)
974
class cmd_renames(Command):
975
"""Show list of renamed files.
977
# TODO: Option to show renames between two historical versions.
979
# TODO: Only show renames under dir, rather than in the whole branch.
980
_see_also = ['status']
981
takes_args = ['dir?']
984
def run(self, dir=u'.'):
985
tree = WorkingTree.open_containing(dir)[0]
988
new_inv = tree.inventory
989
old_tree = tree.basis_tree()
992
old_inv = old_tree.inventory
993
renames = list(_mod_tree.find_renames(old_inv, new_inv))
995
for old_name, new_name in renames:
996
self.outf.write("%s => %s\n" % (old_name, new_name))
1003
class cmd_update(Command):
1004
"""Update a tree to have the latest code committed to its branch.
1006
This will perform a merge into the working tree, and may generate
1007
conflicts. If you have any local changes, you will still
1008
need to commit them after the update for the update to be complete.
1010
If you want to discard your local changes, you can just do a
1011
'bzr revert' instead of 'bzr commit' after the update.
1014
_see_also = ['pull', 'working-trees', 'status-flags']
1015
takes_args = ['dir?']
1018
def run(self, dir='.'):
1019
tree = WorkingTree.open_containing(dir)[0]
1020
master = tree.branch.get_master_branch()
1021
if master is not None:
1024
tree.lock_tree_write()
1026
existing_pending_merges = tree.get_parent_ids()[1:]
1027
last_rev = _mod_revision.ensure_null(tree.last_revision())
1028
if last_rev == _mod_revision.ensure_null(
1029
tree.branch.last_revision()):
1030
# may be up to date, check master too.
1031
master = tree.branch.get_master_branch()
1032
if master is None or last_rev == _mod_revision.ensure_null(
1033
master.last_revision()):
1034
revno = tree.branch.revision_id_to_revno(last_rev)
1035
note("Tree is up to date at revision %d." % (revno,))
1037
conflicts = tree.update(delta._ChangeReporter(
1038
unversioned_filter=tree.is_ignored))
1039
revno = tree.branch.revision_id_to_revno(
1040
_mod_revision.ensure_null(tree.last_revision()))
1041
note('Updated to revision %d.' % (revno,))
1042
if tree.get_parent_ids()[1:] != existing_pending_merges:
1043
note('Your local commits will now show as pending merges with '
1044
"'bzr status', and can be committed with 'bzr commit'.")
1053
class cmd_info(Command):
1054
"""Show information about a working tree, branch or repository.
1056
This command will show all known locations and formats associated to the
1057
tree, branch or repository. Statistical information is included with
1060
Branches and working trees will also report any missing revisions.
1062
_see_also = ['revno', 'working-trees', 'repositories']
1063
takes_args = ['location?']
1064
takes_options = ['verbose']
1067
def run(self, location=None, verbose=0):
1068
from bzrlib.info import show_bzrdir_info
1069
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1073
class cmd_remove(Command):
1074
"""Remove files or directories.
1076
This makes bzr stop tracking changes to the specified files and
1077
delete them if they can easily be recovered using revert.
1079
You can specify one or more files, and/or --new. If you specify --new,
1080
only 'added' files will be removed. If you specify both, then new files
1081
in the specified directories will be removed. If the directories are
1082
also new, they will also be removed.
1084
takes_args = ['file*']
1085
takes_options = ['verbose',
1086
Option('new', help='Remove newly-added files.'),
1087
RegistryOption.from_kwargs('file-deletion-strategy',
1088
'The file deletion mode to be used',
1089
title='Deletion Strategy', value_switches=True, enum_switch=False,
1090
safe='Only delete files if they can be'
1091
' safely recovered (default).',
1092
keep="Don't delete any files.",
1093
force='Delete all the specified files, even if they can not be '
1094
'recovered and even if they are non-empty directories.')]
1096
encoding_type = 'replace'
1098
def run(self, file_list, verbose=False, new=False,
1099
file_deletion_strategy='safe'):
1100
tree, file_list = tree_files(file_list)
1102
if file_list is not None:
1103
file_list = [f for f in file_list if f != '']
1105
raise errors.BzrCommandError('Specify one or more files to'
1106
' remove, or use --new.')
1109
added = tree.changes_from(tree.basis_tree(),
1110
specific_files=file_list).added
1111
file_list = sorted([f[0] for f in added], reverse=True)
1112
if len(file_list) == 0:
1113
raise errors.BzrCommandError('No matching files.')
1114
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1115
keep_files=file_deletion_strategy=='keep',
1116
force=file_deletion_strategy=='force')
1119
class cmd_file_id(Command):
1120
"""Print file_id of a particular file or directory.
1122
The file_id is assigned when the file is first added and remains the
1123
same through all revisions where the file exists, even when it is
1128
_see_also = ['inventory', 'ls']
1129
takes_args = ['filename']
1132
def run(self, filename):
1133
tree, relpath = WorkingTree.open_containing(filename)
1134
i = tree.path2id(relpath)
1136
raise errors.NotVersionedError(filename)
1138
self.outf.write(i + '\n')
1141
class cmd_file_path(Command):
1142
"""Print path of file_ids to a file or directory.
1144
This prints one line for each directory down to the target,
1145
starting at the branch root.
1149
takes_args = ['filename']
1152
def run(self, filename):
1153
tree, relpath = WorkingTree.open_containing(filename)
1154
fid = tree.path2id(relpath)
1156
raise errors.NotVersionedError(filename)
1157
segments = osutils.splitpath(relpath)
1158
for pos in range(1, len(segments) + 1):
1159
path = osutils.joinpath(segments[:pos])
1160
self.outf.write("%s\n" % tree.path2id(path))
1163
class cmd_reconcile(Command):
1164
"""Reconcile bzr metadata in a branch.
1166
This can correct data mismatches that may have been caused by
1167
previous ghost operations or bzr upgrades. You should only
1168
need to run this command if 'bzr check' or a bzr developer
1169
advises you to run it.
1171
If a second branch is provided, cross-branch reconciliation is
1172
also attempted, which will check that data like the tree root
1173
id which was not present in very early bzr versions is represented
1174
correctly in both branches.
1176
At the same time it is run it may recompress data resulting in
1177
a potential saving in disk space or performance gain.
1179
The branch *MUST* be on a listable system such as local disk or sftp.
1182
_see_also = ['check']
1183
takes_args = ['branch?']
1185
def run(self, branch="."):
1186
from bzrlib.reconcile import reconcile
1187
dir = bzrdir.BzrDir.open(branch)
1191
class cmd_revision_history(Command):
1192
"""Display the list of revision ids on a branch."""
1195
takes_args = ['location?']
1200
def run(self, location="."):
1201
branch = Branch.open_containing(location)[0]
1202
for revid in branch.revision_history():
1203
self.outf.write(revid)
1204
self.outf.write('\n')
1207
class cmd_ancestry(Command):
1208
"""List all revisions merged into this branch."""
1210
_see_also = ['log', 'revision-history']
1211
takes_args = ['location?']
1216
def run(self, location="."):
1218
wt = WorkingTree.open_containing(location)[0]
1219
except errors.NoWorkingTree:
1220
b = Branch.open(location)
1221
last_revision = b.last_revision()
1224
last_revision = wt.last_revision()
1226
revision_ids = b.repository.get_ancestry(last_revision)
1227
assert revision_ids[0] is None
1229
for revision_id in revision_ids:
1230
self.outf.write(revision_id + '\n')
1233
class cmd_init(Command):
1234
"""Make a directory into a versioned branch.
1236
Use this to create an empty branch, or before importing an
1239
If there is a repository in a parent directory of the location, then
1240
the history of the branch will be stored in the repository. Otherwise
1241
init creates a standalone branch which carries its own history
1242
in the .bzr directory.
1244
If there is already a branch at the location but it has no working tree,
1245
the tree can be populated with 'bzr checkout'.
1247
Recipe for importing a tree of files:
1252
bzr commit -m 'imported project'
1255
_see_also = ['init-repo', 'branch', 'checkout']
1256
takes_args = ['location?']
1258
Option('create-prefix',
1259
help='Create the path leading up to the branch '
1260
'if it does not already exist.'),
1261
RegistryOption('format',
1262
help='Specify a format for this branch. '
1263
'See "help formats".',
1264
registry=bzrdir.format_registry,
1265
converter=bzrdir.format_registry.make_bzrdir,
1266
value_switches=True,
1267
title="Branch Format",
1269
Option('append-revisions-only',
1270
help='Never change revnos or the existing log.'
1271
' Append revisions to it only.')
1273
def run(self, location=None, format=None, append_revisions_only=False,
1274
create_prefix=False):
1276
format = bzrdir.format_registry.make_bzrdir('default')
1277
if location is None:
1280
to_transport = transport.get_transport(location)
1282
# The path has to exist to initialize a
1283
# branch inside of it.
1284
# Just using os.mkdir, since I don't
1285
# believe that we want to create a bunch of
1286
# locations if the user supplies an extended path
1288
to_transport.ensure_base()
1289
except errors.NoSuchFile:
1290
if not create_prefix:
1291
raise errors.BzrCommandError("Parent directory of %s"
1293
"\nYou may supply --create-prefix to create all"
1294
" leading parent directories."
1296
_create_prefix(to_transport)
1299
existing_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1300
except errors.NotBranchError:
1301
# really a NotBzrDir error...
1302
create_branch = bzrdir.BzrDir.create_branch_convenience
1303
branch = create_branch(to_transport.base, format=format,
1304
possible_transports=[to_transport])
1306
from bzrlib.transport.local import LocalTransport
1307
if existing_bzrdir.has_branch():
1308
if (isinstance(to_transport, LocalTransport)
1309
and not existing_bzrdir.has_workingtree()):
1310
raise errors.BranchExistsWithoutWorkingTree(location)
1311
raise errors.AlreadyBranchError(location)
1313
branch = existing_bzrdir.create_branch()
1314
existing_bzrdir.create_workingtree()
1315
if append_revisions_only:
1317
branch.set_append_revisions_only(True)
1318
except errors.UpgradeRequired:
1319
raise errors.BzrCommandError('This branch format cannot be set'
1320
' to append-revisions-only. Try --experimental-branch6')
1323
class cmd_init_repository(Command):
1324
"""Create a shared repository to hold branches.
1326
New branches created under the repository directory will store their
1327
revisions in the repository, not in the branch directory.
1329
If the --no-trees option is used then the branches in the repository
1330
will not have working trees by default.
1333
bzr init-repo --no-trees repo
1335
bzr checkout --lightweight repo/trunk trunk-checkout
1339
See 'bzr help repositories' for more information.
1342
_see_also = ['init', 'branch', 'checkout']
1343
takes_args = ["location"]
1344
takes_options = [RegistryOption('format',
1345
help='Specify a format for this repository. See'
1346
' "bzr help formats" for details.',
1347
registry=bzrdir.format_registry,
1348
converter=bzrdir.format_registry.make_bzrdir,
1349
value_switches=True, title='Repository format'),
1351
help='Branches in the repository will default to'
1352
' not having a working tree.'),
1354
aliases = ["init-repo"]
1356
def run(self, location, format=None, no_trees=False):
1358
format = bzrdir.format_registry.make_bzrdir('default')
1360
if location is None:
1363
to_transport = transport.get_transport(location)
1364
to_transport.ensure_base()
1366
newdir = format.initialize_on_transport(to_transport)
1367
repo = newdir.create_repository(shared=True)
1368
repo.set_make_working_trees(not no_trees)
1371
class cmd_diff(Command):
1372
"""Show differences in the working tree or between revisions.
1374
If files are listed, only the changes in those files are listed.
1375
Otherwise, all changes for the tree are listed.
1377
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1378
produces patches suitable for "patch -p1".
1382
Shows the difference in the working tree versus the last commit
1384
Difference between the working tree and revision 1
1386
Difference between revision 2 and revision 1
1387
bzr diff --prefix old/:new/
1388
Same as 'bzr diff' but prefix paths with old/ and new/
1389
bzr diff bzr.mine bzr.dev
1390
Show the differences between the two working trees
1392
Show just the differences for 'foo.c'
1394
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1395
# or a graphical diff.
1397
# TODO: Python difflib is not exactly the same as unidiff; should
1398
# either fix it up or prefer to use an external diff.
1400
# TODO: Selected-file diff is inefficient and doesn't show you
1403
# TODO: This probably handles non-Unix newlines poorly.
1405
_see_also = ['status']
1406
takes_args = ['file*']
1408
Option('diff-options', type=str,
1409
help='Pass these options to the external diff program.'),
1410
Option('prefix', type=str,
1412
help='Set prefixes to added to old and new filenames, as '
1413
'two values separated by a colon. (eg "old/:new/").'),
1416
aliases = ['di', 'dif']
1417
encoding_type = 'exact'
1420
def run(self, revision=None, file_list=None, diff_options=None,
1422
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1424
if (prefix is None) or (prefix == '0'):
1432
old_label, new_label = prefix.split(":")
1434
raise errors.BzrCommandError(
1435
'--prefix expects two values separated by a colon'
1436
' (eg "old/:new/")')
1438
if revision and len(revision) > 2:
1439
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1440
' one or two revision specifiers')
1443
tree1, file_list = internal_tree_files(file_list)
1447
except errors.FileInWrongBranch:
1448
if len(file_list) != 2:
1449
raise errors.BzrCommandError("Files are in different branches")
1451
tree1, file1 = WorkingTree.open_containing(file_list[0])
1452
tree2, file2 = WorkingTree.open_containing(file_list[1])
1453
if file1 != "" or file2 != "":
1454
# FIXME diff those two files. rbc 20051123
1455
raise errors.BzrCommandError("Files are in different branches")
1457
except errors.NotBranchError:
1458
if (revision is not None and len(revision) == 2
1459
and not revision[0].needs_branch()
1460
and not revision[1].needs_branch()):
1461
# If both revision specs include a branch, we can
1462
# diff them without needing a local working tree
1463
tree1, tree2 = None, None
1467
if tree2 is not None:
1468
if revision is not None:
1469
# FIXME: but there should be a clean way to diff between
1470
# non-default versions of two trees, it's not hard to do
1472
raise errors.BzrCommandError(
1473
"Sorry, diffing arbitrary revisions across branches "
1474
"is not implemented yet")
1475
return show_diff_trees(tree1, tree2, sys.stdout,
1476
specific_files=file_list,
1477
external_diff_options=diff_options,
1478
old_label=old_label, new_label=new_label)
1480
return diff_cmd_helper(tree1, file_list, diff_options,
1481
revision_specs=revision,
1482
old_label=old_label, new_label=new_label)
1485
class cmd_deleted(Command):
1486
"""List files deleted in the working tree.
1488
# TODO: Show files deleted since a previous revision, or
1489
# between two revisions.
1490
# TODO: Much more efficient way to do this: read in new
1491
# directories with readdir, rather than stating each one. Same
1492
# level of effort but possibly much less IO. (Or possibly not,
1493
# if the directories are very large...)
1494
_see_also = ['status', 'ls']
1495
takes_options = ['show-ids']
1498
def run(self, show_ids=False):
1499
tree = WorkingTree.open_containing(u'.')[0]
1502
old = tree.basis_tree()
1505
for path, ie in old.inventory.iter_entries():
1506
if not tree.has_id(ie.file_id):
1507
self.outf.write(path)
1509
self.outf.write(' ')
1510
self.outf.write(ie.file_id)
1511
self.outf.write('\n')
1518
class cmd_modified(Command):
1519
"""List files modified in working tree.
1523
_see_also = ['status', 'ls']
1527
tree = WorkingTree.open_containing(u'.')[0]
1528
td = tree.changes_from(tree.basis_tree())
1529
for path, id, kind, text_modified, meta_modified in td.modified:
1530
self.outf.write(path + '\n')
1533
class cmd_added(Command):
1534
"""List files added in working tree.
1538
_see_also = ['status', 'ls']
1542
wt = WorkingTree.open_containing(u'.')[0]
1545
basis = wt.basis_tree()
1548
basis_inv = basis.inventory
1551
if file_id in basis_inv:
1553
if inv.is_root(file_id) and len(basis_inv) == 0:
1555
path = inv.id2path(file_id)
1556
if not os.access(osutils.abspath(path), os.F_OK):
1558
self.outf.write(path + '\n')
1565
class cmd_root(Command):
1566
"""Show the tree root directory.
1568
The root is the nearest enclosing directory with a .bzr control
1571
takes_args = ['filename?']
1573
def run(self, filename=None):
1574
"""Print the branch root."""
1575
tree = WorkingTree.open_containing(filename)[0]
1576
self.outf.write(tree.basedir + '\n')
1579
def _parse_limit(limitstring):
1581
return int(limitstring)
1583
msg = "The limit argument must be an integer."
1584
raise errors.BzrCommandError(msg)
1587
class cmd_log(Command):
1588
"""Show log of a branch, file, or directory.
1590
By default show the log of the branch containing the working directory.
1592
To request a range of logs, you can use the command -r begin..end
1593
-r revision requests a specific revision, -r ..end or -r begin.. are
1599
bzr log -r -10.. http://server/branch
1602
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1604
takes_args = ['location?']
1607
help='Show from oldest to newest.'),
1610
help='Display timezone as local, original, or utc.'),
1613
help='Show files changed in each revision.'),
1619
help='Show revisions whose message matches this '
1620
'regular expression.',
1623
help='Limit the output to the first N revisions.',
1627
encoding_type = 'replace'
1630
def run(self, location=None, timezone='original',
1638
from bzrlib.log import show_log
1639
assert message is None or isinstance(message, basestring), \
1640
"invalid message argument %r" % message
1641
direction = (forward and 'forward') or 'reverse'
1646
# find the file id to log:
1648
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1652
tree = b.basis_tree()
1653
file_id = tree.path2id(fp)
1655
raise errors.BzrCommandError(
1656
"Path does not have any revision history: %s" %
1660
# FIXME ? log the current subdir only RBC 20060203
1661
if revision is not None \
1662
and len(revision) > 0 and revision[0].get_branch():
1663
location = revision[0].get_branch()
1666
dir, relpath = bzrdir.BzrDir.open_containing(location)
1667
b = dir.open_branch()
1671
if revision is None:
1674
elif len(revision) == 1:
1675
rev1 = rev2 = revision[0].in_history(b)
1676
elif len(revision) == 2:
1677
if revision[1].get_branch() != revision[0].get_branch():
1678
# b is taken from revision[0].get_branch(), and
1679
# show_log will use its revision_history. Having
1680
# different branches will lead to weird behaviors.
1681
raise errors.BzrCommandError(
1682
"Log doesn't accept two revisions in different"
1684
rev1 = revision[0].in_history(b)
1685
rev2 = revision[1].in_history(b)
1687
raise errors.BzrCommandError(
1688
'bzr log --revision takes one or two values.')
1690
if log_format is None:
1691
log_format = log.log_formatter_registry.get_default(b)
1693
lf = log_format(show_ids=show_ids, to_file=self.outf,
1694
show_timezone=timezone)
1700
direction=direction,
1701
start_revision=rev1,
1709
def get_log_format(long=False, short=False, line=False, default='long'):
1710
log_format = default
1714
log_format = 'short'
1720
class cmd_touching_revisions(Command):
1721
"""Return revision-ids which affected a particular file.
1723
A more user-friendly interface is "bzr log FILE".
1727
takes_args = ["filename"]
1730
def run(self, filename):
1731
tree, relpath = WorkingTree.open_containing(filename)
1733
file_id = tree.path2id(relpath)
1734
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1735
self.outf.write("%6d %s\n" % (revno, what))
1738
class cmd_ls(Command):
1739
"""List files in a tree.
1742
_see_also = ['status', 'cat']
1743
takes_args = ['path?']
1744
# TODO: Take a revision or remote path and list that tree instead.
1748
Option('non-recursive',
1749
help='Don\'t recurse into subdirectories.'),
1751
help='Print paths relative to the root of the branch.'),
1752
Option('unknown', help='Print unknown files.'),
1753
Option('versioned', help='Print versioned files.'),
1754
Option('ignored', help='Print ignored files.'),
1756
help='Write an ascii NUL (\\0) separator '
1757
'between files rather than a newline.'),
1759
help='List entries of a particular kind: file, directory, symlink.',
1764
def run(self, revision=None, verbose=False,
1765
non_recursive=False, from_root=False,
1766
unknown=False, versioned=False, ignored=False,
1767
null=False, kind=None, show_ids=False, path=None):
1769
if kind and kind not in ('file', 'directory', 'symlink'):
1770
raise errors.BzrCommandError('invalid kind specified')
1772
if verbose and null:
1773
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1774
all = not (unknown or versioned or ignored)
1776
selection = {'I':ignored, '?':unknown, 'V':versioned}
1783
raise errors.BzrCommandError('cannot specify both --from-root'
1787
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1793
if revision is not None:
1794
tree = branch.repository.revision_tree(
1795
revision[0].in_history(branch).rev_id)
1797
tree = branch.basis_tree()
1801
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1802
if fp.startswith(relpath):
1803
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1804
if non_recursive and '/' in fp:
1806
if not all and not selection[fc]:
1808
if kind is not None and fkind != kind:
1811
kindch = entry.kind_character()
1812
outstring = '%-8s %s%s' % (fc, fp, kindch)
1813
if show_ids and fid is not None:
1814
outstring = "%-50s %s" % (outstring, fid)
1815
self.outf.write(outstring + '\n')
1817
self.outf.write(fp + '\0')
1820
self.outf.write(fid)
1821
self.outf.write('\0')
1829
self.outf.write('%-50s %s\n' % (fp, my_id))
1831
self.outf.write(fp + '\n')
1836
class cmd_unknowns(Command):
1837
"""List unknown files.
1845
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1846
self.outf.write(osutils.quotefn(f) + '\n')
1849
class cmd_ignore(Command):
1850
"""Ignore specified files or patterns.
1852
To remove patterns from the ignore list, edit the .bzrignore file.
1854
Trailing slashes on patterns are ignored.
1855
If the pattern contains a slash or is a regular expression, it is compared
1856
to the whole path from the branch root. Otherwise, it is compared to only
1857
the last component of the path. To match a file only in the root
1858
directory, prepend './'.
1860
Ignore patterns specifying absolute paths are not allowed.
1862
Ignore patterns may include globbing wildcards such as:
1863
? - Matches any single character except '/'
1864
* - Matches 0 or more characters except '/'
1865
/**/ - Matches 0 or more directories in a path
1866
[a-z] - Matches a single character from within a group of characters
1868
Ignore patterns may also be Python regular expressions.
1869
Regular expression ignore patterns are identified by a 'RE:' prefix
1870
followed by the regular expression. Regular expression ignore patterns
1871
may not include named or numbered groups.
1873
Note: ignore patterns containing shell wildcards must be quoted from
1877
bzr ignore ./Makefile
1878
bzr ignore '*.class'
1879
bzr ignore 'lib/**/*.o'
1880
bzr ignore 'RE:lib/.*\.o'
1883
_see_also = ['status', 'ignored']
1884
takes_args = ['name_pattern*']
1886
Option('old-default-rules',
1887
help='Write out the ignore rules bzr < 0.9 always used.')
1890
def run(self, name_pattern_list=None, old_default_rules=None):
1891
from bzrlib.atomicfile import AtomicFile
1892
if old_default_rules is not None:
1893
# dump the rules and exit
1894
for pattern in ignores.OLD_DEFAULTS:
1897
if not name_pattern_list:
1898
raise errors.BzrCommandError("ignore requires at least one "
1899
"NAME_PATTERN or --old-default-rules")
1900
name_pattern_list = [globbing.normalize_pattern(p)
1901
for p in name_pattern_list]
1902
for name_pattern in name_pattern_list:
1903
if (name_pattern[0] == '/' or
1904
(len(name_pattern) > 1 and name_pattern[1] == ':')):
1905
raise errors.BzrCommandError(
1906
"NAME_PATTERN should not be an absolute path")
1907
tree, relpath = WorkingTree.open_containing(u'.')
1908
ifn = tree.abspath('.bzrignore')
1909
if os.path.exists(ifn):
1912
igns = f.read().decode('utf-8')
1918
# TODO: If the file already uses crlf-style termination, maybe
1919
# we should use that for the newly added lines?
1921
if igns and igns[-1] != '\n':
1923
for name_pattern in name_pattern_list:
1924
igns += name_pattern + '\n'
1926
f = AtomicFile(ifn, 'wb')
1928
f.write(igns.encode('utf-8'))
1933
if not tree.path2id('.bzrignore'):
1934
tree.add(['.bzrignore'])
1937
class cmd_ignored(Command):
1938
"""List ignored files and the patterns that matched them.
1941
_see_also = ['ignore']
1944
tree = WorkingTree.open_containing(u'.')[0]
1947
for path, file_class, kind, file_id, entry in tree.list_files():
1948
if file_class != 'I':
1950
## XXX: Slightly inefficient since this was already calculated
1951
pat = tree.is_ignored(path)
1952
print '%-50s %s' % (path, pat)
1957
class cmd_lookup_revision(Command):
1958
"""Lookup the revision-id from a revision-number
1961
bzr lookup-revision 33
1964
takes_args = ['revno']
1967
def run(self, revno):
1971
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1973
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1976
class cmd_export(Command):
1977
"""Export current or past revision to a destination directory or archive.
1979
If no revision is specified this exports the last committed revision.
1981
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1982
given, try to find the format with the extension. If no extension
1983
is found exports to a directory (equivalent to --format=dir).
1985
If root is supplied, it will be used as the root directory inside
1986
container formats (tar, zip, etc). If it is not supplied it will default
1987
to the exported filename. The root option has no effect for 'dir' format.
1989
If branch is omitted then the branch containing the current working
1990
directory will be used.
1992
Note: Export of tree with non-ASCII filenames to zip is not supported.
1994
Supported formats Autodetected by extension
1995
----------------- -------------------------
1998
tbz2 .tar.bz2, .tbz2
2002
takes_args = ['dest', 'branch?']
2005
help="Type of file to export to.",
2010
help="Name of the root directory inside the exported file."),
2012
def run(self, dest, branch=None, revision=None, format=None, root=None):
2013
from bzrlib.export import export
2016
tree = WorkingTree.open_containing(u'.')[0]
2019
b = Branch.open(branch)
2021
if revision is None:
2022
# should be tree.last_revision FIXME
2023
rev_id = b.last_revision()
2025
if len(revision) != 1:
2026
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
2027
rev_id = revision[0].in_history(b).rev_id
2028
t = b.repository.revision_tree(rev_id)
2030
export(t, dest, format, root)
2031
except errors.NoSuchExportFormat, e:
2032
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2035
class cmd_cat(Command):
2036
"""Write the contents of a file as of a given revision to standard output.
2038
If no revision is nominated, the last revision is used.
2040
Note: Take care to redirect standard output when using this command on a
2046
Option('name-from-revision', help='The path name in the old tree.'),
2049
takes_args = ['filename']
2050
encoding_type = 'exact'
2053
def run(self, filename, revision=None, name_from_revision=False):
2054
if revision is not None and len(revision) != 1:
2055
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2060
tree, b, relpath = \
2061
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2062
except errors.NotBranchError:
2065
if revision is not None and revision[0].get_branch() is not None:
2066
b = Branch.open(revision[0].get_branch())
2068
tree = b.basis_tree()
2069
if revision is None:
2070
revision_id = b.last_revision()
2072
revision_id = revision[0].in_history(b).rev_id
2074
cur_file_id = tree.path2id(relpath)
2075
rev_tree = b.repository.revision_tree(revision_id)
2076
old_file_id = rev_tree.path2id(relpath)
2078
if name_from_revision:
2079
if old_file_id is None:
2080
raise errors.BzrCommandError("%r is not present in revision %s"
2081
% (filename, revision_id))
2083
rev_tree.print_file(old_file_id)
2084
elif cur_file_id is not None:
2085
rev_tree.print_file(cur_file_id)
2086
elif old_file_id is not None:
2087
rev_tree.print_file(old_file_id)
2089
raise errors.BzrCommandError("%r is not present in revision %s" %
2090
(filename, revision_id))
2093
class cmd_local_time_offset(Command):
2094
"""Show the offset in seconds from GMT to local time."""
2098
print osutils.local_time_offset()
2102
class cmd_commit(Command):
2103
"""Commit changes into a new revision.
2105
If no arguments are given, the entire tree is committed.
2107
If selected files are specified, only changes to those files are
2108
committed. If a directory is specified then the directory and everything
2109
within it is committed.
2111
A selected-file commit may fail in some cases where the committed
2112
tree would be invalid. Consider::
2117
bzr commit foo -m "committing foo"
2118
bzr mv foo/bar foo/baz
2121
bzr commit foo/bar -m "committing bar but not baz"
2123
In the example above, the last commit will fail by design. This gives
2124
the user the opportunity to decide whether they want to commit the
2125
rename at the same time, separately first, or not at all. (As a general
2126
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2128
Note: A selected-file commit after a merge is not yet supported.
2130
# TODO: Run hooks on tree to-be-committed, and after commit.
2132
# TODO: Strict commit that fails if there are deleted files.
2133
# (what does "deleted files" mean ??)
2135
# TODO: Give better message for -s, --summary, used by tla people
2137
# XXX: verbose currently does nothing
2139
_see_also = ['bugs', 'uncommit']
2140
takes_args = ['selected*']
2142
Option('message', type=unicode,
2144
help="Description of the new revision."),
2147
help='Commit even if nothing has changed.'),
2148
Option('file', type=str,
2151
help='Take commit message from this file.'),
2153
help="Refuse to commit if there are unknown "
2154
"files in the working tree."),
2155
ListOption('fixes', type=str,
2156
help="Mark a bug as being fixed by this revision."),
2158
help="Perform a local commit in a bound "
2159
"branch. Local commits are not pushed to "
2160
"the master branch until a normal commit "
2164
aliases = ['ci', 'checkin']
2166
def _get_bug_fix_properties(self, fixes, branch):
2168
# Configure the properties for bug fixing attributes.
2169
for fixed_bug in fixes:
2170
tokens = fixed_bug.split(':')
2171
if len(tokens) != 2:
2172
raise errors.BzrCommandError(
2173
"Invalid bug %s. Must be in the form of 'tag:id'. "
2174
"Commit refused." % fixed_bug)
2175
tag, bug_id = tokens
2177
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
2178
except errors.UnknownBugTrackerAbbreviation:
2179
raise errors.BzrCommandError(
2180
'Unrecognized bug %s. Commit refused.' % fixed_bug)
2181
except errors.MalformedBugIdentifier:
2182
raise errors.BzrCommandError(
2183
"Invalid bug identifier for %s. Commit refused."
2185
properties.append('%s fixed' % bug_url)
2186
return '\n'.join(properties)
2188
def run(self, message=None, file=None, verbose=True, selected_list=None,
2189
unchanged=False, strict=False, local=False, fixes=None):
2190
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
2191
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
2193
from bzrlib.msgeditor import edit_commit_message, \
2194
make_commit_message_template
2196
# TODO: Need a blackbox test for invoking the external editor; may be
2197
# slightly problematic to run this cross-platform.
2199
# TODO: do more checks that the commit will succeed before
2200
# spending the user's valuable time typing a commit message.
2204
tree, selected_list = tree_files(selected_list)
2205
if selected_list == ['']:
2206
# workaround - commit of root of tree should be exactly the same
2207
# as just default commit in that tree, and succeed even though
2208
# selected-file merge commit is not done yet
2211
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
2213
properties['bugs'] = bug_property
2215
if local and not tree.branch.get_bound_location():
2216
raise errors.LocalRequiresBoundBranch()
2218
def get_message(commit_obj):
2219
"""Callback to get commit message"""
2220
my_message = message
2221
if my_message is None and not file:
2222
template = make_commit_message_template(tree, selected_list)
2223
my_message = edit_commit_message(template)
2224
if my_message is None:
2225
raise errors.BzrCommandError("please specify a commit"
2226
" message with either --message or --file")
2227
elif my_message and file:
2228
raise errors.BzrCommandError(
2229
"please specify either --message or --file")
2231
my_message = codecs.open(file, 'rt',
2232
bzrlib.user_encoding).read()
2233
if my_message == "":
2234
raise errors.BzrCommandError("empty commit message specified")
2238
reporter = ReportCommitToLog()
2240
reporter = NullCommitReporter()
2243
tree.commit(message_callback=get_message,
2244
specific_files=selected_list,
2245
allow_pointless=unchanged, strict=strict, local=local,
2246
reporter=reporter, revprops=properties)
2247
except PointlessCommit:
2248
# FIXME: This should really happen before the file is read in;
2249
# perhaps prepare the commit; get the message; then actually commit
2250
raise errors.BzrCommandError("no changes to commit."
2251
" use --unchanged to commit anyhow")
2252
except ConflictsInTree:
2253
raise errors.BzrCommandError('Conflicts detected in working '
2254
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2256
except StrictCommitFailed:
2257
raise errors.BzrCommandError("Commit refused because there are"
2258
" unknown files in the working tree.")
2259
except errors.BoundBranchOutOfDate, e:
2260
raise errors.BzrCommandError(str(e) + "\n"
2261
'To commit to master branch, run update and then commit.\n'
2262
'You can also pass --local to commit to continue working '
2266
class cmd_check(Command):
2267
"""Validate consistency of branch history.
2269
This command checks various invariants about the branch storage to
2270
detect data corruption or bzr bugs.
2273
_see_also = ['reconcile']
2274
takes_args = ['branch?']
2275
takes_options = ['verbose']
2277
def run(self, branch=None, verbose=False):
2278
from bzrlib.check import check
2280
tree = WorkingTree.open_containing()[0]
2281
branch = tree.branch
2283
branch = Branch.open(branch)
2284
check(branch, verbose)
2287
class cmd_upgrade(Command):
2288
"""Upgrade branch storage to current format.
2290
The check command or bzr developers may sometimes advise you to run
2291
this command. When the default format has changed you may also be warned
2292
during other operations to upgrade.
2295
_see_also = ['check']
2296
takes_args = ['url?']
2298
RegistryOption('format',
2299
help='Upgrade to a specific format. See "bzr help'
2300
' formats" for details.',
2301
registry=bzrdir.format_registry,
2302
converter=bzrdir.format_registry.make_bzrdir,
2303
value_switches=True, title='Branch format'),
2306
def run(self, url='.', format=None):
2307
from bzrlib.upgrade import upgrade
2309
format = bzrdir.format_registry.make_bzrdir('default')
2310
upgrade(url, format)
2313
class cmd_whoami(Command):
2314
"""Show or set bzr user id.
2318
bzr whoami 'Frank Chu <fchu@example.com>'
2320
takes_options = [ Option('email',
2321
help='Display email address only.'),
2323
help='Set identity for the current branch instead of '
2326
takes_args = ['name?']
2327
encoding_type = 'replace'
2330
def run(self, email=False, branch=False, name=None):
2332
# use branch if we're inside one; otherwise global config
2334
c = Branch.open_containing('.')[0].get_config()
2335
except errors.NotBranchError:
2336
c = config.GlobalConfig()
2338
self.outf.write(c.user_email() + '\n')
2340
self.outf.write(c.username() + '\n')
2343
# display a warning if an email address isn't included in the given name.
2345
config.extract_email_address(name)
2346
except errors.NoEmailInUsername, e:
2347
warning('"%s" does not seem to contain an email address. '
2348
'This is allowed, but not recommended.', name)
2350
# use global config unless --branch given
2352
c = Branch.open_containing('.')[0].get_config()
2354
c = config.GlobalConfig()
2355
c.set_user_option('email', name)
2358
class cmd_nick(Command):
2359
"""Print or set the branch nickname.
2361
If unset, the tree root directory name is used as the nickname
2362
To print the current nickname, execute with no argument.
2365
_see_also = ['info']
2366
takes_args = ['nickname?']
2367
def run(self, nickname=None):
2368
branch = Branch.open_containing(u'.')[0]
2369
if nickname is None:
2370
self.printme(branch)
2372
branch.nick = nickname
2375
def printme(self, branch):
2379
class cmd_selftest(Command):
2380
"""Run internal test suite.
2382
If arguments are given, they are regular expressions that say which tests
2383
should run. Tests matching any expression are run, and other tests are
2386
Alternatively if --first is given, matching tests are run first and then
2387
all other tests are run. This is useful if you have been working in a
2388
particular area, but want to make sure nothing else was broken.
2390
If --exclude is given, tests that match that regular expression are
2391
excluded, regardless of whether they match --first or not.
2393
To help catch accidential dependencies between tests, the --randomize
2394
option is useful. In most cases, the argument used is the word 'now'.
2395
Note that the seed used for the random number generator is displayed
2396
when this option is used. The seed can be explicitly passed as the
2397
argument to this option if required. This enables reproduction of the
2398
actual ordering used if and when an order sensitive problem is encountered.
2400
If --list-only is given, the tests that would be run are listed. This is
2401
useful when combined with --first, --exclude and/or --randomize to
2402
understand their impact. The test harness reports "Listed nn tests in ..."
2403
instead of "Ran nn tests in ..." when list mode is enabled.
2405
If the global option '--no-plugins' is given, plugins are not loaded
2406
before running the selftests. This has two effects: features provided or
2407
modified by plugins will not be tested, and tests provided by plugins will
2410
Tests that need working space on disk use a common temporary directory,
2411
typically inside $TMPDIR or /tmp.
2415
run only tests relating to 'ignore'
2416
bzr --no-plugins selftest -v
2417
disable plugins and list tests as they're run
2419
# NB: this is used from the class without creating an instance, which is
2420
# why it does not have a self parameter.
2421
def get_transport_type(typestring):
2422
"""Parse and return a transport specifier."""
2423
if typestring == "sftp":
2424
from bzrlib.transport.sftp import SFTPAbsoluteServer
2425
return SFTPAbsoluteServer
2426
if typestring == "memory":
2427
from bzrlib.transport.memory import MemoryServer
2429
if typestring == "fakenfs":
2430
from bzrlib.transport.fakenfs import FakeNFSServer
2431
return FakeNFSServer
2432
msg = "No known transport type %s. Supported types are: sftp\n" %\
2434
raise errors.BzrCommandError(msg)
2437
takes_args = ['testspecs*']
2438
takes_options = ['verbose',
2440
help='Stop when one test fails.',
2444
help='Use a different transport by default '
2445
'throughout the test suite.',
2446
type=get_transport_type),
2448
help='Run the benchmarks rather than selftests.'),
2449
Option('lsprof-timed',
2450
help='Generate lsprof output for benchmarked'
2451
' sections of code.'),
2452
Option('cache-dir', type=str,
2453
help='Cache intermediate benchmark output in this '
2456
help='Run all tests, but run specified tests first.',
2460
help='List the tests instead of running them.'),
2461
Option('randomize', type=str, argname="SEED",
2462
help='Randomize the order of tests using the given'
2463
' seed or "now" for the current time.'),
2464
Option('exclude', type=str, argname="PATTERN",
2466
help='Exclude tests that match this regular'
2469
encoding_type = 'replace'
2471
def run(self, testspecs_list=None, verbose=None, one=False,
2472
transport=None, benchmark=None,
2473
lsprof_timed=None, cache_dir=None,
2474
first=False, list_only=False,
2475
randomize=None, exclude=None):
2477
from bzrlib.tests import selftest
2478
import bzrlib.benchmarks as benchmarks
2479
from bzrlib.benchmarks import tree_creator
2480
from bzrlib.version import show_version
2482
if cache_dir is not None:
2483
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2485
show_version(show_config=False, show_copyright=False)
2487
if testspecs_list is not None:
2488
pattern = '|'.join(testspecs_list)
2492
test_suite_factory = benchmarks.test_suite
2495
# TODO: should possibly lock the history file...
2496
benchfile = open(".perf_history", "at", buffering=1)
2498
test_suite_factory = None
2503
result = selftest(verbose=verbose,
2505
stop_on_failure=one,
2506
transport=transport,
2507
test_suite_factory=test_suite_factory,
2508
lsprof_timed=lsprof_timed,
2509
bench_history=benchfile,
2510
matching_tests_first=first,
2511
list_only=list_only,
2512
random_seed=randomize,
2513
exclude_pattern=exclude
2516
if benchfile is not None:
2519
info('tests passed')
2521
info('tests failed')
2522
return int(not result)
2525
class cmd_version(Command):
2526
"""Show version of bzr."""
2530
from bzrlib.version import show_version
2534
class cmd_rocks(Command):
2535
"""Statement of optimism."""
2541
print "It sure does!"
2544
class cmd_find_merge_base(Command):
2545
"""Find and print a base revision for merging two branches."""
2546
# TODO: Options to specify revisions on either side, as if
2547
# merging only part of the history.
2548
takes_args = ['branch', 'other']
2552
def run(self, branch, other):
2553
from bzrlib.revision import ensure_null, MultipleRevisionSources
2555
branch1 = Branch.open_containing(branch)[0]
2556
branch2 = Branch.open_containing(other)[0]
2558
last1 = ensure_null(branch1.last_revision())
2559
last2 = ensure_null(branch2.last_revision())
2561
graph = branch1.repository.get_graph(branch2.repository)
2562
base_rev_id = graph.find_unique_lca(last1, last2)
2564
print 'merge base is revision %s' % base_rev_id
2567
class cmd_merge(Command):
2568
"""Perform a three-way merge.
2570
The branch is the branch you will merge from. By default, it will merge
2571
the latest revision. If you specify a revision, that revision will be
2572
merged. If you specify two revisions, the first will be used as a BASE,
2573
and the second one as OTHER. Revision numbers are always relative to the
2576
By default, bzr will try to merge in all new work from the other
2577
branch, automatically determining an appropriate base. If this
2578
fails, you may need to give an explicit base.
2580
Merge will do its best to combine the changes in two branches, but there
2581
are some kinds of problems only a human can fix. When it encounters those,
2582
it will mark a conflict. A conflict means that you need to fix something,
2583
before you should commit.
2585
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2587
If there is no default branch set, the first merge will set it. After
2588
that, you can omit the branch to use the default. To change the
2589
default, use --remember. The value will only be saved if the remote
2590
location can be accessed.
2592
The results of the merge are placed into the destination working
2593
directory, where they can be reviewed (with bzr diff), tested, and then
2594
committed to record the result of the merge.
2598
To merge the latest revision from bzr.dev:
2599
bzr merge ../bzr.dev
2601
To merge changes up to and including revision 82 from bzr.dev:
2602
bzr merge -r 82 ../bzr.dev
2604
To merge the changes introduced by 82, without previous changes:
2605
bzr merge -r 81..82 ../bzr.dev
2607
merge refuses to run if there are any uncommitted changes, unless
2611
_see_also = ['update', 'remerge', 'status-flags']
2612
takes_args = ['branch?']
2616
help='Merge even if the destination tree has uncommitted changes.'),
2620
Option('show-base', help="Show base revision text in "
2622
Option('uncommitted', help='Apply uncommitted changes'
2623
' from a working copy, instead of branch changes.'),
2624
Option('pull', help='If the destination is already'
2625
' completely merged into the source, pull from the'
2626
' source rather than merging. When this happens,'
2627
' you do not need to commit the result.'),
2629
help='Branch to merge into, '
2630
'rather than the one containing the working directory.',
2636
def run(self, branch=None, revision=None, force=False, merge_type=None,
2637
show_base=False, reprocess=False, remember=False,
2638
uncommitted=False, pull=False,
2641
from bzrlib.tag import _merge_tags_if_possible
2642
if merge_type is None:
2643
merge_type = _mod_merge.Merge3Merger
2645
if directory is None: directory = u'.'
2646
possible_transports = []
2648
allow_pending = True
2649
verified = 'inapplicable'
2650
tree = WorkingTree.open_containing(directory)[0]
2651
change_reporter = delta._ChangeReporter(
2652
unversioned_filter=tree.is_ignored)
2655
pb = ui.ui_factory.nested_progress_bar()
2656
cleanups.append(pb.finished)
2658
cleanups.append(tree.unlock)
2659
if branch is not None:
2660
mergeable, other_transport = _get_mergeable_helper(branch)
2663
raise errors.BzrCommandError('Cannot use --uncommitted'
2664
' with bundles or merge directives.')
2666
if revision is not None:
2667
raise errors.BzrCommandError(
2668
'Cannot use -r with merge directives or bundles')
2669
merger, verified = _mod_merge.Merger.from_mergeable(tree,
2671
possible_transports.append(other_transport)
2673
if merger is None and uncommitted:
2674
if revision is not None and len(revision) > 0:
2675
raise errors.BzrCommandError('Cannot use --uncommitted and'
2676
' --revision at the same time.')
2677
branch = self._select_branch(tree, branch)[0]
2678
other_tree, other_path = WorkingTree.open_containing(branch)
2679
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
2681
allow_pending = False
2684
merger, allow_pending = self._from_branch(tree, branch,
2685
revision, remember, possible_transports, pb)
2687
merger.merge_type = merge_type
2688
merger.reprocess = reprocess
2689
merger.show_base = show_base
2690
merger.change_reporter = change_reporter
2691
self.sanity_check_merger(merger)
2692
if (merger.base_rev_id == merger.other_rev_id and
2693
merger.other_rev_id != None):
2694
note('Nothing to do.')
2697
if merger.interesting_files is not None:
2698
raise BzrCommandError('Cannot pull individual files')
2699
if (merger.base_rev_id == tree.last_revision()):
2700
result = tree.pull(merger.other_branch, False,
2701
merger.other_rev_id)
2702
result.report(self.outf)
2704
merger.check_basis(not force)
2705
conflict_count = merger.do_merge()
2707
merger.set_pending()
2708
if verified == 'failed':
2709
warning('Preview patch does not match changes')
2710
if conflict_count != 0:
2715
for cleanup in reversed(cleanups):
2718
def sanity_check_merger(self, merger):
2719
if (merger.show_base and
2720
not merger.merge_type is _mod_merge.Merge3Merger):
2721
raise errors.BzrCommandError("Show-base is not supported for this"
2722
" merge type. %s" % merge_type)
2723
if merger.reprocess and not merger.merge_type.supports_reprocess:
2724
raise errors.BzrCommandError("Conflict reduction is not supported"
2725
" for merge type %s." % merge_type)
2726
if merger.reprocess and merger.show_base:
2727
raise errors.BzrCommandError("Cannot do conflict reduction and"
2730
def _from_branch(self, tree, branch, revision, remember,
2731
possible_transports, pb):
2732
from bzrlib.tag import _merge_tags_if_possible
2733
assert revision is None or len(revision) < 3
2734
# find the branch locations
2735
other_loc, branch = self._select_branch(tree, branch, revision, -1)
2736
if revision is not None and len(revision) == 2:
2737
base_loc, branch = self._select_branch(tree, branch, revision, 0)
2739
base_loc = other_loc
2741
other_branch, other_path = Branch.open_containing(other_loc,
2742
possible_transports)
2743
if base_loc == other_loc:
2744
base_branch = other_branch
2746
base_branch, base_path = Branch.open_containing(base_loc,
2747
possible_transports)
2748
# Find the revision ids
2749
if revision is None or len(revision) < 1 or revision[-1] is None:
2750
other_revision_id = _mod_revision.ensure_null(
2751
other_branch.last_revision())
2753
other_revision_id = \
2754
_mod_revision.ensure_null(
2755
revision[-1].in_history(other_branch).rev_id)
2756
if (revision is not None and len(revision) == 2
2757
and revision[0] is not None):
2758
base_revision_id = \
2759
_mod_revision.ensure_null(
2760
revision[0].in_history(base_branch).rev_id)
2762
base_revision_id = None
2763
# Remember where we merge from
2764
if ((tree.branch.get_parent() is None or remember) and
2765
other_branch is not None):
2766
tree.branch.set_parent(other_branch.base)
2767
_merge_tags_if_possible(other_branch, tree.branch)
2768
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
2769
other_revision_id, base_revision_id, other_branch, base_branch)
2770
if other_path != '':
2771
allow_pending = False
2772
merger.interesting_files = [other_path]
2774
allow_pending = True
2775
return merger, allow_pending
2777
def _select_branch(self, tree, path, revision=None, index=None):
2778
if (revision is not None and index is not None
2779
and revision[index] is not None):
2780
branch = revision[index].get_branch()
2781
if branch is not None:
2783
path = self._get_remembered_parent(tree, path, 'Merging from')
2786
# TODO: move up to common parent; this isn't merge-specific anymore.
2787
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2788
"""Use tree.branch's parent if none was supplied.
2790
Report if the remembered location was used.
2792
if supplied_location is not None:
2793
return supplied_location
2794
stored_location = tree.branch.get_parent()
2795
mutter("%s", stored_location)
2796
if stored_location is None:
2797
raise errors.BzrCommandError("No location specified or remembered")
2798
display_url = urlutils.unescape_for_display(stored_location,
2800
self.outf.write("%s remembered location %s\n" % (verb_string,
2802
return stored_location
2805
class cmd_remerge(Command):
2808
Use this if you want to try a different merge technique while resolving
2809
conflicts. Some merge techniques are better than others, and remerge
2810
lets you try different ones on different files.
2812
The options for remerge have the same meaning and defaults as the ones for
2813
merge. The difference is that remerge can (only) be run when there is a
2814
pending merge, and it lets you specify particular files.
2818
$ bzr remerge --show-base
2819
Re-do the merge of all conflicted files, and show the base text in
2820
conflict regions, in addition to the usual THIS and OTHER texts.
2822
$ bzr remerge --merge-type weave --reprocess foobar
2823
Re-do the merge of "foobar", using the weave merge algorithm, with
2824
additional processing to reduce the size of conflict regions.
2826
takes_args = ['file*']
2831
help="Show base revision text in conflicts."),
2834
def run(self, file_list=None, merge_type=None, show_base=False,
2836
if merge_type is None:
2837
merge_type = _mod_merge.Merge3Merger
2838
tree, file_list = tree_files(file_list)
2841
parents = tree.get_parent_ids()
2842
if len(parents) != 2:
2843
raise errors.BzrCommandError("Sorry, remerge only works after normal"
2844
" merges. Not cherrypicking or"
2846
repository = tree.branch.repository
2847
graph = repository.get_graph()
2848
base_revision = graph.find_unique_lca(parents[0], parents[1])
2849
base_tree = repository.revision_tree(base_revision)
2850
other_tree = repository.revision_tree(parents[1])
2851
interesting_ids = None
2853
conflicts = tree.conflicts()
2854
if file_list is not None:
2855
interesting_ids = set()
2856
for filename in file_list:
2857
file_id = tree.path2id(filename)
2859
raise errors.NotVersionedError(filename)
2860
interesting_ids.add(file_id)
2861
if tree.kind(file_id) != "directory":
2864
for name, ie in tree.inventory.iter_entries(file_id):
2865
interesting_ids.add(ie.file_id)
2866
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2868
# Remerge only supports resolving contents conflicts
2869
allowed_conflicts = ('text conflict', 'contents conflict')
2870
restore_files = [c.path for c in conflicts
2871
if c.typestring in allowed_conflicts]
2872
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2873
tree.set_conflicts(ConflictList(new_conflicts))
2874
if file_list is not None:
2875
restore_files = file_list
2876
for filename in restore_files:
2878
restore(tree.abspath(filename))
2879
except errors.NotConflicted:
2881
# Disable pending merges, because the file texts we are remerging
2882
# have not had those merges performed. If we use the wrong parents
2883
# list, we imply that the working tree text has seen and rejected
2884
# all the changes from the other tree, when in fact those changes
2885
# have not yet been seen.
2886
tree.set_parent_ids(parents[:1])
2888
conflicts = _mod_merge.merge_inner(
2889
tree.branch, other_tree, base_tree,
2891
interesting_ids=interesting_ids,
2892
other_rev_id=parents[1],
2893
merge_type=merge_type,
2894
show_base=show_base,
2895
reprocess=reprocess)
2897
tree.set_parent_ids(parents)
2906
class cmd_revert(Command):
2907
"""Revert files to a previous revision.
2909
Giving a list of files will revert only those files. Otherwise, all files
2910
will be reverted. If the revision is not specified with '--revision', the
2911
last committed revision is used.
2913
To remove only some changes, without reverting to a prior version, use
2914
merge instead. For example, "merge . --r-2..-3" will remove the changes
2915
introduced by -2, without affecting the changes introduced by -1. Or
2916
to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
2918
By default, any files that have been manually changed will be backed up
2919
first. (Files changed only by merge are not backed up.) Backup files have
2920
'.~#~' appended to their name, where # is a number.
2922
When you provide files, you can use their current pathname or the pathname
2923
from the target revision. So you can use revert to "undelete" a file by
2924
name. If you name a directory, all the contents of that directory will be
2928
_see_also = ['cat', 'export']
2931
Option('no-backup', "Do not save backups of reverted files."),
2933
takes_args = ['file*']
2935
def run(self, revision=None, no_backup=False, file_list=None):
2936
if file_list is not None:
2937
if len(file_list) == 0:
2938
raise errors.BzrCommandError("No files specified")
2942
tree, file_list = tree_files(file_list)
2943
if revision is None:
2944
# FIXME should be tree.last_revision
2945
rev_id = tree.last_revision()
2946
elif len(revision) != 1:
2947
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
2949
rev_id = revision[0].in_history(tree.branch).rev_id
2950
pb = ui.ui_factory.nested_progress_bar()
2952
tree.revert(file_list,
2953
tree.branch.repository.revision_tree(rev_id),
2954
not no_backup, pb, report_changes=True)
2959
class cmd_assert_fail(Command):
2960
"""Test reporting of assertion failures"""
2961
# intended just for use in testing
2966
raise AssertionError("always fails")
2969
class cmd_help(Command):
2970
"""Show help on a command or other topic.
2973
_see_also = ['topics']
2975
Option('long', 'Show help on all commands.'),
2977
takes_args = ['topic?']
2978
aliases = ['?', '--help', '-?', '-h']
2981
def run(self, topic=None, long=False):
2983
if topic is None and long:
2985
bzrlib.help.help(topic)
2988
class cmd_shell_complete(Command):
2989
"""Show appropriate completions for context.
2991
For a list of all available commands, say 'bzr shell-complete'.
2993
takes_args = ['context?']
2998
def run(self, context=None):
2999
import shellcomplete
3000
shellcomplete.shellcomplete(context)
3003
class cmd_fetch(Command):
3004
"""Copy in history from another branch but don't merge it.
3006
This is an internal method used for pull and merge.
3009
takes_args = ['from_branch', 'to_branch']
3010
def run(self, from_branch, to_branch):
3011
from bzrlib.fetch import Fetcher
3012
from_b = Branch.open(from_branch)
3013
to_b = Branch.open(to_branch)
3014
Fetcher(to_b, from_b)
3017
class cmd_missing(Command):
3018
"""Show unmerged/unpulled revisions between two branches.
3020
OTHER_BRANCH may be local or remote.
3023
_see_also = ['merge', 'pull']
3024
takes_args = ['other_branch?']
3026
Option('reverse', 'Reverse the order of revisions.'),
3028
'Display changes in the local branch only.'),
3029
Option('this' , 'Same as --mine-only.'),
3030
Option('theirs-only',
3031
'Display changes in the remote branch only.'),
3032
Option('other', 'Same as --theirs-only.'),
3037
encoding_type = 'replace'
3040
def run(self, other_branch=None, reverse=False, mine_only=False,
3041
theirs_only=False, log_format=None, long=False, short=False, line=False,
3042
show_ids=False, verbose=False, this=False, other=False):
3043
from bzrlib.missing import find_unmerged, iter_log_revisions
3044
from bzrlib.log import log_formatter
3051
local_branch = Branch.open_containing(u".")[0]
3052
parent = local_branch.get_parent()
3053
if other_branch is None:
3054
other_branch = parent
3055
if other_branch is None:
3056
raise errors.BzrCommandError("No peer location known"
3058
display_url = urlutils.unescape_for_display(parent,
3060
self.outf.write("Using last location: " + display_url + "\n")
3062
remote_branch = Branch.open(other_branch)
3063
if remote_branch.base == local_branch.base:
3064
remote_branch = local_branch
3065
local_branch.lock_read()
3067
remote_branch.lock_read()
3069
local_extra, remote_extra = find_unmerged(local_branch,
3071
if log_format is None:
3072
registry = log.log_formatter_registry
3073
log_format = registry.get_default(local_branch)
3074
lf = log_format(to_file=self.outf,
3076
show_timezone='original')
3077
if reverse is False:
3078
local_extra.reverse()
3079
remote_extra.reverse()
3080
if local_extra and not theirs_only:
3081
self.outf.write("You have %d extra revision(s):\n" %
3083
for revision in iter_log_revisions(local_extra,
3084
local_branch.repository,
3086
lf.log_revision(revision)
3087
printed_local = True
3089
printed_local = False
3090
if remote_extra and not mine_only:
3091
if printed_local is True:
3092
self.outf.write("\n\n\n")
3093
self.outf.write("You are missing %d revision(s):\n" %
3095
for revision in iter_log_revisions(remote_extra,
3096
remote_branch.repository,
3098
lf.log_revision(revision)
3099
if not remote_extra and not local_extra:
3101
self.outf.write("Branches are up to date.\n")
3105
remote_branch.unlock()
3107
local_branch.unlock()
3108
if not status_code and parent is None and other_branch is not None:
3109
local_branch.lock_write()
3111
# handle race conditions - a parent might be set while we run.
3112
if local_branch.get_parent() is None:
3113
local_branch.set_parent(remote_branch.base)
3115
local_branch.unlock()
3119
class cmd_pack(Command):
3120
"""Compress the data within a repository."""
3122
_see_also = ['repositories']
3123
takes_args = ['branch_or_repo?']
3125
def run(self, branch_or_repo='.'):
3126
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
3128
branch = dir.open_branch()
3129
repository = branch.repository
3130
except errors.NotBranchError:
3131
repository = dir.open_repository()
3135
class cmd_plugins(Command):
3136
"""List the installed plugins.
3138
This command displays the list of installed plugins including the
3139
path where each one is located and a short description of each.
3141
A plugin is an external component for Bazaar that extends the
3142
revision control system, by adding or replacing code in Bazaar.
3143
Plugins can do a variety of things, including overriding commands,
3144
adding new commands, providing additional network transports and
3145
customizing log output.
3147
See the Bazaar web site, http://bazaar-vcs.org, for further
3148
information on plugins including where to find them and how to
3149
install them. Instructions are also provided there on how to
3150
write new plugins using the Python programming language.
3155
import bzrlib.plugin
3156
from inspect import getdoc
3157
for name, plugin in bzrlib.plugin.all_plugins().items():
3158
if getattr(plugin, '__path__', None) is not None:
3159
print plugin.__path__[0]
3160
elif getattr(plugin, '__file__', None) is not None:
3161
print plugin.__file__
3167
print '\t', d.split('\n')[0]
3170
class cmd_testament(Command):
3171
"""Show testament (signing-form) of a revision."""
3174
Option('long', help='Produce long-format testament.'),
3176
help='Produce a strict-format testament.')]
3177
takes_args = ['branch?']
3179
def run(self, branch=u'.', revision=None, long=False, strict=False):
3180
from bzrlib.testament import Testament, StrictTestament
3182
testament_class = StrictTestament
3184
testament_class = Testament
3185
b = WorkingTree.open_containing(branch)[0].branch
3188
if revision is None:
3189
rev_id = b.last_revision()
3191
rev_id = revision[0].in_history(b).rev_id
3192
t = testament_class.from_revision(b.repository, rev_id)
3194
sys.stdout.writelines(t.as_text_lines())
3196
sys.stdout.write(t.as_short_text())
3201
class cmd_annotate(Command):
3202
"""Show the origin of each line in a file.
3204
This prints out the given file with an annotation on the left side
3205
indicating which revision, author and date introduced the change.
3207
If the origin is the same for a run of consecutive lines, it is
3208
shown only at the top, unless the --all option is given.
3210
# TODO: annotate directories; showing when each file was last changed
3211
# TODO: if the working copy is modified, show annotations on that
3212
# with new uncommitted lines marked
3213
aliases = ['ann', 'blame', 'praise']
3214
takes_args = ['filename']
3215
takes_options = [Option('all', help='Show annotations on all lines.'),
3216
Option('long', help='Show commit date in annotations.'),
3220
encoding_type = 'exact'
3223
def run(self, filename, all=False, long=False, revision=None,
3225
from bzrlib.annotate import annotate_file
3226
tree, relpath = WorkingTree.open_containing(filename)
3227
branch = tree.branch
3230
if revision is None:
3231
revision_id = branch.last_revision()
3232
elif len(revision) != 1:
3233
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
3235
revision_id = revision[0].in_history(branch).rev_id
3236
file_id = tree.path2id(relpath)
3238
raise errors.NotVersionedError(filename)
3239
tree = branch.repository.revision_tree(revision_id)
3240
file_version = tree.inventory[file_id].revision
3241
annotate_file(branch, file_version, file_id, long, all, self.outf,
3247
class cmd_re_sign(Command):
3248
"""Create a digital signature for an existing revision."""
3249
# TODO be able to replace existing ones.
3251
hidden = True # is this right ?
3252
takes_args = ['revision_id*']
3253
takes_options = ['revision']
3255
def run(self, revision_id_list=None, revision=None):
3256
import bzrlib.gpg as gpg
3257
if revision_id_list is not None and revision is not None:
3258
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
3259
if revision_id_list is None and revision is None:
3260
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
3261
b = WorkingTree.open_containing(u'.')[0].branch
3262
gpg_strategy = gpg.GPGStrategy(b.get_config())
3263
if revision_id_list is not None:
3264
for revision_id in revision_id_list:
3265
b.repository.sign_revision(revision_id, gpg_strategy)
3266
elif revision is not None:
3267
if len(revision) == 1:
3268
revno, rev_id = revision[0].in_history(b)
3269
b.repository.sign_revision(rev_id, gpg_strategy)
3270
elif len(revision) == 2:
3271
# are they both on rh- if so we can walk between them
3272
# might be nice to have a range helper for arbitrary
3273
# revision paths. hmm.
3274
from_revno, from_revid = revision[0].in_history(b)
3275
to_revno, to_revid = revision[1].in_history(b)
3276
if to_revid is None:
3277
to_revno = b.revno()
3278
if from_revno is None or to_revno is None:
3279
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
3280
for revno in range(from_revno, to_revno + 1):
3281
b.repository.sign_revision(b.get_rev_id(revno),
3284
raise errors.BzrCommandError('Please supply either one revision, or a range.')
3287
class cmd_bind(Command):
3288
"""Convert the current branch into a checkout of the supplied branch.
3290
Once converted into a checkout, commits must succeed on the master branch
3291
before they will be applied to the local branch.
3294
_see_also = ['checkouts', 'unbind']
3295
takes_args = ['location?']
3298
def run(self, location=None):
3299
b, relpath = Branch.open_containing(u'.')
3300
if location is None:
3302
location = b.get_old_bound_location()
3303
except errors.UpgradeRequired:
3304
raise errors.BzrCommandError('No location supplied. '
3305
'This format does not remember old locations.')
3307
if location is None:
3308
raise errors.BzrCommandError('No location supplied and no '
3309
'previous location known')
3310
b_other = Branch.open(location)
3313
except errors.DivergedBranches:
3314
raise errors.BzrCommandError('These branches have diverged.'
3315
' Try merging, and then bind again.')
3318
class cmd_unbind(Command):
3319
"""Convert the current checkout into a regular branch.
3321
After unbinding, the local branch is considered independent and subsequent
3322
commits will be local only.
3325
_see_also = ['checkouts', 'bind']
3330
b, relpath = Branch.open_containing(u'.')
3332
raise errors.BzrCommandError('Local branch is not bound')
3335
class cmd_uncommit(Command):
3336
"""Remove the last committed revision.
3338
--verbose will print out what is being removed.
3339
--dry-run will go through all the motions, but not actually
3342
In the future, uncommit will create a revision bundle, which can then
3346
# TODO: jam 20060108 Add an option to allow uncommit to remove
3347
# unreferenced information in 'branch-as-repository' branches.
3348
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
3349
# information in shared branches as well.
3350
_see_also = ['commit']
3351
takes_options = ['verbose', 'revision',
3352
Option('dry-run', help='Don\'t actually make changes.'),
3353
Option('force', help='Say yes to all questions.')]
3354
takes_args = ['location?']
3357
def run(self, location=None,
3358
dry_run=False, verbose=False,
3359
revision=None, force=False):
3360
from bzrlib.log import log_formatter, show_log
3362
from bzrlib.uncommit import uncommit
3364
if location is None:
3366
control, relpath = bzrdir.BzrDir.open_containing(location)
3368
tree = control.open_workingtree()
3370
except (errors.NoWorkingTree, errors.NotLocalUrl):
3372
b = control.open_branch()
3375
if revision is None:
3378
# 'bzr uncommit -r 10' actually means uncommit
3379
# so that the final tree is at revno 10.
3380
# but bzrlib.uncommit.uncommit() actually uncommits
3381
# the revisions that are supplied.
3382
# So we need to offset it by one
3383
revno = revision[0].in_history(b).revno+1
3385
if revno <= b.revno():
3386
rev_id = b.get_rev_id(revno)
3388
self.outf.write('No revisions to uncommit.\n')
3391
lf = log_formatter('short',
3393
show_timezone='original')
3398
direction='forward',
3399
start_revision=revno,
3400
end_revision=b.revno())
3403
print 'Dry-run, pretending to remove the above revisions.'
3405
val = raw_input('Press <enter> to continue')
3407
print 'The above revision(s) will be removed.'
3409
val = raw_input('Are you sure [y/N]? ')
3410
if val.lower() not in ('y', 'yes'):
3414
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
3418
class cmd_break_lock(Command):
3419
"""Break a dead lock on a repository, branch or working directory.
3421
CAUTION: Locks should only be broken when you are sure that the process
3422
holding the lock has been stopped.
3424
You can get information on what locks are open via the 'bzr info' command.
3429
takes_args = ['location?']
3431
def run(self, location=None, show=False):
3432
if location is None:
3434
control, relpath = bzrdir.BzrDir.open_containing(location)
3436
control.break_lock()
3437
except NotImplementedError:
3441
class cmd_wait_until_signalled(Command):
3442
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3444
This just prints a line to signal when it is ready, then blocks on stdin.
3450
sys.stdout.write("running\n")
3452
sys.stdin.readline()
3455
class cmd_serve(Command):
3456
"""Run the bzr server."""
3458
aliases = ['server']
3462
help='Serve on stdin/out for use from inetd or sshd.'),
3464
help='Listen for connections on nominated port of the form '
3465
'[hostname:]portnumber. Passing 0 as the port number will '
3466
'result in a dynamically allocated port. The default port is '
3470
help='Serve contents of this directory.',
3472
Option('allow-writes',
3473
help='By default the server is a readonly server. Supplying '
3474
'--allow-writes enables write access to the contents of '
3475
'the served directory and below.'
3479
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3480
from bzrlib.smart import medium, server
3481
from bzrlib.transport import get_transport
3482
from bzrlib.transport.chroot import ChrootServer
3483
from bzrlib.transport.remote import BZR_DEFAULT_PORT, BZR_DEFAULT_INTERFACE
3484
if directory is None:
3485
directory = os.getcwd()
3486
url = urlutils.local_path_to_url(directory)
3487
if not allow_writes:
3488
url = 'readonly+' + url
3489
chroot_server = ChrootServer(get_transport(url))
3490
chroot_server.setUp()
3491
t = get_transport(chroot_server.get_url())
3493
smart_server = medium.SmartServerPipeStreamMedium(
3494
sys.stdin, sys.stdout, t)
3496
host = BZR_DEFAULT_INTERFACE
3498
port = BZR_DEFAULT_PORT
3501
host, port = port.split(':')
3503
smart_server = server.SmartTCPServer(t, host=host, port=port)
3504
print 'listening on port: ', smart_server.port
3506
# for the duration of this server, no UI output is permitted.
3507
# note that this may cause problems with blackbox tests. This should
3508
# be changed with care though, as we dont want to use bandwidth sending
3509
# progress over stderr to smart server clients!
3510
old_factory = ui.ui_factory
3512
ui.ui_factory = ui.SilentUIFactory()
3513
smart_server.serve()
3515
ui.ui_factory = old_factory
3518
class cmd_join(Command):
3519
"""Combine a subtree into its containing tree.
3521
This command is for experimental use only. It requires the target tree
3522
to be in dirstate-with-subtree format, which cannot be converted into
3525
The TREE argument should be an independent tree, inside another tree, but
3526
not part of it. (Such trees can be produced by "bzr split", but also by
3527
running "bzr branch" with the target inside a tree.)
3529
The result is a combined tree, with the subtree no longer an independant
3530
part. This is marked as a merge of the subtree into the containing tree,
3531
and all history is preserved.
3533
If --reference is specified, the subtree retains its independence. It can
3534
be branched by itself, and can be part of multiple projects at the same
3535
time. But operations performed in the containing tree, such as commit
3536
and merge, will recurse into the subtree.
3539
_see_also = ['split']
3540
takes_args = ['tree']
3542
Option('reference', help='Join by reference.'),
3546
def run(self, tree, reference=False):
3547
sub_tree = WorkingTree.open(tree)
3548
parent_dir = osutils.dirname(sub_tree.basedir)
3549
containing_tree = WorkingTree.open_containing(parent_dir)[0]
3550
repo = containing_tree.branch.repository
3551
if not repo.supports_rich_root():
3552
raise errors.BzrCommandError(
3553
"Can't join trees because %s doesn't support rich root data.\n"
3554
"You can use bzr upgrade on the repository."
3558
containing_tree.add_reference(sub_tree)
3559
except errors.BadReferenceTarget, e:
3560
# XXX: Would be better to just raise a nicely printable
3561
# exception from the real origin. Also below. mbp 20070306
3562
raise errors.BzrCommandError("Cannot join %s. %s" %
3566
containing_tree.subsume(sub_tree)
3567
except errors.BadSubsumeSource, e:
3568
raise errors.BzrCommandError("Cannot join %s. %s" %
3572
class cmd_split(Command):
3573
"""Split a tree into two trees.
3575
This command is for experimental use only. It requires the target tree
3576
to be in dirstate-with-subtree format, which cannot be converted into
3579
The TREE argument should be a subdirectory of a working tree. That
3580
subdirectory will be converted into an independent tree, with its own
3581
branch. Commits in the top-level tree will not apply to the new subtree.
3582
If you want that behavior, do "bzr join --reference TREE".
3585
_see_also = ['join']
3586
takes_args = ['tree']
3590
def run(self, tree):
3591
containing_tree, subdir = WorkingTree.open_containing(tree)
3592
sub_id = containing_tree.path2id(subdir)
3594
raise errors.NotVersionedError(subdir)
3596
containing_tree.extract(sub_id)
3597
except errors.RootNotRich:
3598
raise errors.UpgradeRequired(containing_tree.branch.base)
3602
class cmd_merge_directive(Command):
3603
"""Generate a merge directive for auto-merge tools.
3605
A directive requests a merge to be performed, and also provides all the
3606
information necessary to do so. This means it must either include a
3607
revision bundle, or the location of a branch containing the desired
3610
A submit branch (the location to merge into) must be supplied the first
3611
time the command is issued. After it has been supplied once, it will
3612
be remembered as the default.
3614
A public branch is optional if a revision bundle is supplied, but required
3615
if --diff or --plain is specified. It will be remembered as the default
3616
after the first use.
3619
takes_args = ['submit_branch?', 'public_branch?']
3623
_see_also = ['submit']
3626
RegistryOption.from_kwargs('patch-type',
3627
'The type of patch to include in the directive',
3629
value_switches=True,
3631
bundle='Bazaar revision bundle (default).',
3632
diff='Normal unified diff.',
3633
plain='No patch, just directive.'),
3634
Option('sign', help='GPG-sign the directive.'), 'revision',
3635
Option('mail-to', type=str,
3636
help='Instead of printing the directive, email to this address.'),
3637
Option('message', type=str, short_name='m',
3638
help='Message to use when committing this merge.')
3641
encoding_type = 'exact'
3643
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
3644
sign=False, revision=None, mail_to=None, message=None):
3645
from bzrlib.revision import ensure_null, NULL_REVISION
3646
include_patch, include_bundle = {
3647
'plain': (False, False),
3648
'diff': (True, False),
3649
'bundle': (True, True),
3651
branch = Branch.open('.')
3652
stored_submit_branch = branch.get_submit_branch()
3653
if submit_branch is None:
3654
submit_branch = stored_submit_branch
3656
if stored_submit_branch is None:
3657
branch.set_submit_branch(submit_branch)
3658
if submit_branch is None:
3659
submit_branch = branch.get_parent()
3660
if submit_branch is None:
3661
raise errors.BzrCommandError('No submit branch specified or known')
3663
stored_public_branch = branch.get_public_branch()
3664
if public_branch is None:
3665
public_branch = stored_public_branch
3666
elif stored_public_branch is None:
3667
branch.set_public_branch(public_branch)
3668
if not include_bundle and public_branch is None:
3669
raise errors.BzrCommandError('No public branch specified or'
3671
base_revision_id = None
3672
if revision is not None:
3673
if len(revision) > 2:
3674
raise errors.BzrCommandError('bzr merge-directive takes '
3675
'at most two one revision identifiers')
3676
revision_id = revision[-1].in_history(branch).rev_id
3677
if len(revision) == 2:
3678
base_revision_id = revision[0].in_history(branch).rev_id
3679
base_revision_id = ensure_null(base_revision_id)
3681
revision_id = branch.last_revision()
3682
revision_id = ensure_null(revision_id)
3683
if revision_id == NULL_REVISION:
3684
raise errors.BzrCommandError('No revisions to bundle.')
3685
directive = merge_directive.MergeDirective2.from_objects(
3686
branch.repository, revision_id, time.time(),
3687
osutils.local_time_offset(), submit_branch,
3688
public_branch=public_branch, include_patch=include_patch,
3689
include_bundle=include_bundle, message=message,
3690
base_revision_id=base_revision_id)
3693
self.outf.write(directive.to_signed(branch))
3695
self.outf.writelines(directive.to_lines())
3697
message = directive.to_email(mail_to, branch, sign)
3698
s = SMTPConnection(branch.get_config())
3699
s.send_email(message)
3702
class cmd_submit(Command):
3703
"""Create a merge-directive for submiting changes.
3705
A merge directive provides many things needed for requesting merges:
3706
- A machine-readable description of the merge to perform
3707
- An optional patch that is a preview of the changes requested
3708
- An optional bundle of revision data, so that the changes can be applied
3709
directly from the merge directive, without retrieving data from a
3712
If --no-bundle is specified, then public_branch is needed (and must be
3713
up-to-date), so that the receiver can perform the merge using the
3714
public_branch. The public_branch is always included if known, so that
3715
people can check it later.
3717
The submit branch defaults to the parent, but can be overridden. Both
3718
submit branch and public branch will be remembered if supplied.
3720
If a public_branch is known for the submit_branch, that public submit
3721
branch is used in the merge instructions. This means that a local mirror
3722
can be used as your actual submit branch, once you have set public_branch
3726
encoding_type = 'exact'
3728
aliases = ['bundle', 'bundle-revisions']
3730
_see_also = ['merge']
3732
takes_args = ['submit_branch?', 'public_branch?']
3735
help='Do not include a bundle in the merge directive.'),
3736
Option('no-patch', help='Do not include a preview patch in the merge'
3739
help='Remember submit and public branch.'),
3741
help='Branch to generate the submission from, '
3742
'rather than the one containing the working directory.',
3745
Option('output', short_name='o', help='Write directive to this file.',
3750
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
3751
no_patch=False, revision=None, remember=False, output=None,
3753
from bzrlib.revision import ensure_null, NULL_REVISION
3757
outfile = open(output, 'wb')
3759
from_ = kwargs.get('from', '.')
3760
branch = Branch.open_containing(from_)[0]
3761
if remember and submit_branch is None:
3762
raise errors.BzrCommandError(
3763
'--remember requires a branch to be specified.')
3764
stored_submit_branch = branch.get_submit_branch()
3765
remembered_submit_branch = False
3766
if submit_branch is None:
3767
submit_branch = stored_submit_branch
3768
remembered_submit_branch = True
3770
if stored_submit_branch is None or remember:
3771
branch.set_submit_branch(submit_branch)
3772
if submit_branch is None:
3773
submit_branch = branch.get_parent()
3774
remembered_submit_branch = True
3775
if submit_branch is None:
3776
raise errors.BzrCommandError('No submit branch known or'
3778
if remembered_submit_branch:
3779
note('Using saved location: %s', submit_branch)
3781
stored_public_branch = branch.get_public_branch()
3782
if public_branch is None:
3783
public_branch = stored_public_branch
3784
elif stored_public_branch is None or remember:
3785
branch.set_public_branch(public_branch)
3786
if no_bundle and public_branch is None:
3787
raise errors.BzrCommandError('No public branch specified or'
3789
base_revision_id = None
3790
if revision is not None:
3791
if len(revision) > 2:
3792
raise errors.BzrCommandError('bzr submit takes '
3793
'at most two one revision identifiers')
3794
revision_id = revision[-1].in_history(branch).rev_id
3795
if len(revision) == 2:
3796
base_revision_id = revision[0].in_history(branch).rev_id
3797
base_revision_id = ensure_null(base_revision_id)
3799
revision_id = branch.last_revision()
3800
revision_id = ensure_null(revision_id)
3801
if revision_id == NULL_REVISION:
3802
raise errors.BzrCommandError('No revisions to submit.')
3803
directive = merge_directive.MergeDirective2.from_objects(
3804
branch.repository, revision_id, time.time(),
3805
osutils.local_time_offset(), submit_branch,
3806
public_branch=public_branch, include_patch=not no_patch,
3807
include_bundle=not no_bundle, message=None,
3808
base_revision_id=base_revision_id)
3809
outfile.writelines(directive.to_lines())
3811
if output is not None:
3814
class cmd_tag(Command):
3815
"""Create a tag naming a revision.
3817
Tags give human-meaningful names to revisions. Commands that take a -r
3818
(--revision) option can be given -rtag:X, where X is any previously
3821
Tags are stored in the branch. Tags are copied from one branch to another
3822
along when you branch, push, pull or merge.
3824
It is an error to give a tag name that already exists unless you pass
3825
--force, in which case the tag is moved to point to the new revision.
3828
_see_also = ['commit', 'tags']
3829
takes_args = ['tag_name']
3832
help='Delete this tag rather than placing it.',
3835
help='Branch in which to place the tag.',
3840
help='Replace existing tags.',
3845
def run(self, tag_name,
3851
branch, relpath = Branch.open_containing(directory)
3855
branch.tags.delete_tag(tag_name)
3856
self.outf.write('Deleted tag %s.\n' % tag_name)
3859
if len(revision) != 1:
3860
raise errors.BzrCommandError(
3861
"Tags can only be placed on a single revision, "
3863
revision_id = revision[0].in_history(branch).rev_id
3865
revision_id = branch.last_revision()
3866
if (not force) and branch.tags.has_tag(tag_name):
3867
raise errors.TagAlreadyExists(tag_name)
3868
branch.tags.set_tag(tag_name, revision_id)
3869
self.outf.write('Created tag %s.\n' % tag_name)
3874
class cmd_tags(Command):
3877
This tag shows a table of tag names and the revisions they reference.
3883
help='Branch whose tags should be displayed.',
3893
branch, relpath = Branch.open_containing(directory)
3894
for tag_name, target in sorted(branch.tags.get_tag_dict().items()):
3895
self.outf.write('%-20s %s\n' % (tag_name, target))
3898
# command-line interpretation helper for merge-related commands
3899
def _merge_helper(other_revision, base_revision,
3900
check_clean=True, ignore_zero=False,
3901
this_dir=None, backup_files=False,
3903
file_list=None, show_base=False, reprocess=False,
3906
change_reporter=None,
3907
other_rev_id=None, base_rev_id=None,
3908
possible_transports=None,
3910
"""Merge changes into a tree.
3913
list(path, revno) Base for three-way merge.
3914
If [None, None] then a base will be automatically determined.
3916
list(path, revno) Other revision for three-way merge.
3918
Directory to merge changes into; '.' by default.
3920
If true, this_dir must have no uncommitted changes before the
3922
ignore_zero - If true, suppress the "zero conflicts" message when
3923
there are no conflicts; should be set when doing something we expect
3924
to complete perfectly.
3925
file_list - If supplied, merge only changes to selected files.
3927
All available ancestors of other_revision and base_revision are
3928
automatically pulled into the branch.
3930
The revno may be -1 to indicate the last revision on the branch, which is
3933
This function is intended for use from the command line; programmatic
3934
clients might prefer to call merge.merge_inner(), which has less magic
3937
# Loading it late, so that we don't always have to import bzrlib.merge
3938
if merge_type is None:
3939
merge_type = _mod_merge.Merge3Merger
3940
if this_dir is None:
3942
this_tree = WorkingTree.open_containing(this_dir)[0]
3943
if other_branch is None:
3944
other_branch = this_tree.branch
3946
if show_base and not merge_type is _mod_merge.Merge3Merger:
3947
raise errors.BzrCommandError("Show-base is not supported for this merge"
3948
" type. %s" % merge_type)
3949
if reprocess and not merge_type.supports_reprocess:
3950
raise errors.BzrCommandError("Conflict reduction is not supported for merge"
3951
" type %s." % merge_type)
3952
if reprocess and show_base:
3953
raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
3954
# TODO: jam 20070226 We should really lock these trees earlier. However, we
3955
# only want to take out a lock_tree_write() if we don't have to pull
3956
# any ancestry. But merge might fetch ancestry in the middle, in
3957
# which case we would need a lock_write().
3958
# Because we cannot upgrade locks, for now we live with the fact that
3959
# the tree will be locked multiple times during a merge. (Maybe
3960
# read-only some of the time, but it means things will get read
3963
merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
3964
pb=pb, change_reporter=change_reporter)
3965
merger.pp = ProgressPhase("Merge phase", 5, pb)
3966
merger.pp.next_phase()
3967
merger.check_basis(check_clean)
3968
if other_rev_id is not None:
3969
merger.set_other_revision(other_rev_id, other_branch)
3971
merger.set_other(other_revision, possible_transports)
3972
merger.pp.next_phase()
3973
if base_rev_id is not None:
3974
merger.set_base_revision(base_rev_id, this_tree.branch)
3975
elif base_revision is not None:
3976
merger.set_base(base_revision)
3979
if merger.base_rev_id == merger.other_rev_id:
3980
note('Nothing to do.')
3982
if file_list is None:
3983
if pull and merger.base_rev_id == merger.this_rev_id:
3984
# FIXME: deduplicate with pull
3985
result = merger.this_tree.pull(merger.this_branch,
3986
False, merger.other_rev_id)
3987
if result.old_revid == result.new_revid:
3988
note('No revisions to pull.')
3990
note('Now on revision %d.' % result.new_revno)
3992
merger.backup_files = backup_files
3993
merger.merge_type = merge_type
3994
merger.set_interesting_files(file_list)
3995
merger.show_base = show_base
3996
merger.reprocess = reprocess
3997
conflicts = merger.do_merge()
3998
if file_list is None:
3999
merger.set_pending()
4005
def _create_prefix(cur_transport):
4006
needed = [cur_transport]
4007
# Recurse upwards until we can create a directory successfully
4009
new_transport = cur_transport.clone('..')
4010
if new_transport.base == cur_transport.base:
4011
raise errors.BzrCommandError(
4012
"Failed to create path prefix for %s."
4013
% cur_transport.base)
4015
new_transport.mkdir('.')
4016
except errors.NoSuchFile:
4017
needed.append(new_transport)
4018
cur_transport = new_transport
4021
# Now we only need to create child directories
4023
cur_transport = needed.pop()
4024
cur_transport.ensure_base()
4027
def _get_mergeable_helper(location):
4028
"""Get a merge directive or bundle if 'location' points to one.
4030
Try try to identify a bundle and returns its mergeable form. If it's not,
4031
we return the tried transport anyway so that it can reused to access the
4034
:param location: can point to a bundle or a branch.
4036
:return: mergeable, transport
4039
url = urlutils.normalize_url(location)
4040
url, filename = urlutils.split(url, exclude_trailing_slash=False)
4041
location_transport = transport.get_transport(url)
4044
# There may be redirections but we ignore the intermediate
4045
# and final transports used
4046
read = bundle.read_mergeable_from_transport
4047
mergeable, t = read(location_transport, filename)
4048
except errors.NotABundle:
4049
# Continue on considering this url a Branch but adjust the
4050
# location_transport
4051
location_transport = location_transport.clone(filename)
4052
return mergeable, location_transport
4055
# these get imported and then picked up by the scan for cmd_*
4056
# TODO: Some more consistent way to split command definitions across files;
4057
# we do need to load at least some information about them to know of
4058
# aliases. ideally we would avoid loading the implementation until the
4059
# details were needed.
4060
from bzrlib.cmd_version_info import cmd_version_info
4061
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
4062
from bzrlib.bundle.commands import (
4065
from bzrlib.sign_my_commits import cmd_sign_my_commits
4066
from bzrlib.weave_commands import cmd_versionedfile_list, cmd_weave_join, \
4067
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
