1
# Copyright (C) 2004, 2005, 2006 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"""
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
45
from bzrlib.branch import Branch
46
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
47
from bzrlib.conflicts import ConflictList
48
from bzrlib.revision import common_ancestor
49
from bzrlib.revisionspec import RevisionSpec
50
from bzrlib.workingtree import WorkingTree
53
from bzrlib.commands import Command, display_command
54
from bzrlib.option import Option
55
from bzrlib.progress import DummyProgress, ProgressPhase
56
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
59
def tree_files(file_list, default_branch=u'.'):
61
return internal_tree_files(file_list, default_branch)
62
except errors.FileInWrongBranch, e:
63
raise errors.BzrCommandError("%s is not in the same branch as %s" %
64
(e.path, file_list[0]))
67
# XXX: Bad function name; should possibly also be a class method of
68
# WorkingTree rather than a function.
69
def internal_tree_files(file_list, default_branch=u'.'):
70
"""Convert command-line paths to a WorkingTree and relative paths.
72
This is typically used for command-line processors that take one or
73
more filenames, and infer the workingtree that contains them.
75
The filenames given are not required to exist.
77
:param file_list: Filenames to convert.
79
:param default_branch: Fallback tree path to use if file_list is empty or
82
:return: workingtree, [relative_paths]
84
if file_list is None or len(file_list) == 0:
85
return WorkingTree.open_containing(default_branch)[0], file_list
86
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
88
for filename in file_list:
90
new_list.append(tree.relpath(osutils.dereference_path(filename)))
91
except errors.PathNotChild:
92
raise errors.FileInWrongBranch(tree.branch, filename)
96
def get_format_type(typestring):
97
"""Parse and return a format specifier."""
98
if typestring == "weave":
99
return bzrdir.BzrDirFormat6()
100
if typestring == "default":
101
return bzrdir.BzrDirMetaFormat1()
102
if typestring == "metaweave":
103
format = bzrdir.BzrDirMetaFormat1()
104
format.repository_format = repository.RepositoryFormat7()
106
if typestring == "knit":
107
format = bzrdir.BzrDirMetaFormat1()
108
format.repository_format = repository.RepositoryFormatKnit1()
110
if typestring == "experimental-knit2":
111
format = bzrdir.BzrDirMetaFormat1()
112
format.repository_format = repository.RepositoryFormatKnit2()
114
msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
115
"metaweave and weave" % 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
Not versioned and not matching an ignore pattern.
149
To see ignored files use 'bzr ignored'. For details in the
150
changes to file texts, use 'bzr diff'.
152
If no arguments are specified, the status of the entire working
153
directory is shown. Otherwise, only the status of the specified
154
files or directories is reported. If a directory is given, status
155
is reported for everything inside that directory.
157
If a revision argument is given, the status is calculated against
158
that revision, or between two revisions if two are provided.
161
# TODO: --no-recurse, --recurse options
163
takes_args = ['file*']
164
takes_options = ['show-ids', 'revision']
165
aliases = ['st', 'stat']
167
encoding_type = 'replace'
170
def run(self, show_ids=False, file_list=None, revision=None):
171
from bzrlib.status import show_tree_status
173
tree, file_list = tree_files(file_list)
175
show_tree_status(tree, show_ids=show_ids,
176
specific_files=file_list, revision=revision,
180
class cmd_cat_revision(Command):
181
"""Write out metadata for a revision.
183
The revision to print can either be specified by a specific
184
revision identifier, or you can use --revision.
188
takes_args = ['revision_id?']
189
takes_options = ['revision']
190
# cat-revision is more for frontends so should be exact
194
def run(self, revision_id=None, revision=None):
196
if revision_id is not None and revision is not None:
197
raise errors.BzrCommandError('You can only supply one of'
198
' revision_id or --revision')
199
if revision_id is None and revision is None:
200
raise errors.BzrCommandError('You must supply either'
201
' --revision or a revision_id')
202
b = WorkingTree.open_containing(u'.')[0].branch
204
# TODO: jam 20060112 should cat-revision always output utf-8?
205
if revision_id is not None:
206
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
207
elif revision is not None:
210
raise errors.BzrCommandError('You cannot specify a NULL'
212
revno, rev_id = rev.in_history(b)
213
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
216
class cmd_remove_tree(Command):
217
"""Remove the working tree from a given branch/checkout.
219
Since a lightweight checkout is little more than a working tree
220
this will refuse to run against one.
225
takes_args = ['location?']
227
def run(self, location='.'):
228
d = bzrdir.BzrDir.open(location)
231
working = d.open_workingtree()
232
except errors.NoWorkingTree:
233
raise errors.BzrCommandError("No working tree to remove")
234
except errors.NotLocalUrl:
235
raise errors.BzrCommandError("You cannot remove the working tree of a "
238
working_path = working.bzrdir.root_transport.base
239
branch_path = working.branch.bzrdir.root_transport.base
240
if working_path != branch_path:
241
raise errors.BzrCommandError("You cannot remove the working tree from "
242
"a lightweight checkout")
244
d.destroy_workingtree()
247
class cmd_revno(Command):
248
"""Show current revision number.
250
This is equal to the number of revisions on this branch.
253
takes_args = ['location?']
256
def run(self, location=u'.'):
257
self.outf.write(str(Branch.open_containing(location)[0].revno()))
258
self.outf.write('\n')
261
class cmd_revision_info(Command):
262
"""Show revision number and revision id for a given revision identifier.
265
takes_args = ['revision_info*']
266
takes_options = ['revision']
269
def run(self, revision=None, revision_info_list=[]):
272
if revision is not None:
273
revs.extend(revision)
274
if revision_info_list is not None:
275
for rev in revision_info_list:
276
revs.append(RevisionSpec.from_string(rev))
278
raise errors.BzrCommandError('You must supply a revision identifier')
280
b = WorkingTree.open_containing(u'.')[0].branch
283
revinfo = rev.in_history(b)
284
if revinfo.revno is None:
285
print ' %s' % revinfo.rev_id
287
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
290
class cmd_add(Command):
291
"""Add specified files or directories.
293
In non-recursive mode, all the named items are added, regardless
294
of whether they were previously ignored. A warning is given if
295
any of the named files are already versioned.
297
In recursive mode (the default), files are treated the same way
298
but the behaviour for directories is different. Directories that
299
are already versioned do not give a warning. All directories,
300
whether already versioned or not, are searched for files or
301
subdirectories that are neither versioned or ignored, and these
302
are added. This search proceeds recursively into versioned
303
directories. If no names are given '.' is assumed.
305
Therefore simply saying 'bzr add' will version all files that
306
are currently unknown.
308
Adding a file whose parent directory is not versioned will
309
implicitly add the parent, and so on up to the root. This means
310
you should never need to explicitly add a directory, they'll just
311
get added when you add a file in the directory.
313
--dry-run will show which files would be added, but not actually
316
--file-ids-from will try to use the file ids from the supplied path.
317
It looks up ids trying to find a matching parent directory with the
318
same filename, and then by pure path.
320
takes_args = ['file*']
321
takes_options = ['no-recurse', 'dry-run', 'verbose',
322
Option('file-ids-from', type=unicode,
323
help='Lookup file ids from here')]
324
encoding_type = 'replace'
326
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
330
if file_ids_from is not None:
332
base_tree, base_path = WorkingTree.open_containing(
334
except errors.NoWorkingTree:
335
base_branch, base_path = Branch.open_containing(
337
base_tree = base_branch.basis_tree()
339
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
340
to_file=self.outf, should_print=(not is_quiet()))
342
action = bzrlib.add.AddAction(to_file=self.outf,
343
should_print=(not is_quiet()))
345
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
346
action=action, save=not dry_run)
349
for glob in sorted(ignored.keys()):
350
for path in ignored[glob]:
351
self.outf.write("ignored %s matching \"%s\"\n"
355
for glob, paths in ignored.items():
356
match_len += len(paths)
357
self.outf.write("ignored %d file(s).\n" % match_len)
358
self.outf.write("If you wish to add some of these files,"
359
" please add them by name.\n")
362
class cmd_mkdir(Command):
363
"""Create a new versioned directory.
365
This is equivalent to creating the directory and then adding it.
368
takes_args = ['dir+']
369
encoding_type = 'replace'
371
def run(self, dir_list):
374
wt, dd = WorkingTree.open_containing(d)
376
self.outf.write('added %s\n' % d)
379
class cmd_relpath(Command):
380
"""Show path of a file relative to root"""
382
takes_args = ['filename']
386
def run(self, filename):
387
# TODO: jam 20050106 Can relpath return a munged path if
388
# sys.stdout encoding cannot represent it?
389
tree, relpath = WorkingTree.open_containing(filename)
390
self.outf.write(relpath)
391
self.outf.write('\n')
394
class cmd_inventory(Command):
395
"""Show inventory of the current working copy or a revision.
397
It is possible to limit the output to a particular entry
398
type using the --kind option. For example: --kind file.
400
It is also possible to restrict the list of files to a specific
401
set. For example: bzr inventory --show-ids this/file
404
takes_options = ['revision', 'show-ids', 'kind']
405
takes_args = ['file*']
408
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
409
if kind and kind not in ['file', 'directory', 'symlink']:
410
raise errors.BzrCommandError('invalid kind specified')
412
work_tree, file_list = tree_files(file_list)
414
if revision is not None:
415
if len(revision) > 1:
416
raise errors.BzrCommandError('bzr inventory --revision takes'
417
' exactly one revision identifier')
418
revision_id = revision[0].in_history(work_tree.branch).rev_id
419
tree = work_tree.branch.repository.revision_tree(revision_id)
421
# We include work_tree as well as 'tree' here
422
# So that doing '-r 10 path/foo' will lookup whatever file
423
# exists now at 'path/foo' even if it has been renamed, as
424
# well as whatever files existed in revision 10 at path/foo
425
trees = [tree, work_tree]
430
if file_list is not None:
431
file_ids = _mod_tree.find_ids_across_trees(file_list, trees,
432
require_versioned=True)
433
# find_ids_across_trees may include some paths that don't
435
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
436
for file_id in file_ids if file_id in tree)
438
entries = tree.inventory.entries()
440
for path, entry in entries:
441
if kind and kind != entry.kind:
444
self.outf.write('%-50s %s\n' % (path, entry.file_id))
446
self.outf.write(path)
447
self.outf.write('\n')
450
class cmd_mv(Command):
451
"""Move or rename a file.
454
bzr mv OLDNAME NEWNAME
455
bzr mv SOURCE... DESTINATION
457
If the last argument is a versioned directory, all the other names
458
are moved into it. Otherwise, there must be exactly two arguments
459
and the file is changed to a new name, which must not already exist.
461
Files cannot be moved between branches.
464
takes_args = ['names*']
465
aliases = ['move', 'rename']
466
encoding_type = 'replace'
468
def run(self, names_list):
469
if names_list is None:
472
if len(names_list) < 2:
473
raise errors.BzrCommandError("missing file argument")
474
tree, rel_names = tree_files(names_list)
476
if os.path.isdir(names_list[-1]):
477
# move into existing directory
478
for pair in tree.move(rel_names[:-1], rel_names[-1]):
479
self.outf.write("%s => %s\n" % pair)
481
if len(names_list) != 2:
482
raise errors.BzrCommandError('to mv multiple files the destination '
483
'must be a versioned directory')
484
tree.rename_one(rel_names[0], rel_names[1])
485
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
488
class cmd_pull(Command):
489
"""Turn this branch into a mirror of another branch.
491
This command only works on branches that have not diverged. Branches are
492
considered diverged if the destination branch's most recent commit is one
493
that has not been merged (directly or indirectly) into the parent.
495
If branches have diverged, you can use 'bzr merge' to integrate the changes
496
from one into the other. Once one branch has merged, the other should
497
be able to pull it again.
499
If you want to forget your local changes and just update your branch to
500
match the remote one, use pull --overwrite.
502
If there is no default location set, the first pull will set it. After
503
that, you can omit the location to use the default. To change the
504
default, use --remember. The value will only be saved if the remote
505
location can be accessed.
508
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
509
takes_args = ['location?']
510
encoding_type = 'replace'
512
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
513
# FIXME: too much stuff is in the command class
515
tree_to = WorkingTree.open_containing(u'.')[0]
516
branch_to = tree_to.branch
517
except errors.NoWorkingTree:
519
branch_to = Branch.open_containing(u'.')[0]
522
if location is not None:
524
reader = bundle.read_bundle_from_url(location)
525
except errors.NotABundle:
526
pass # Continue on considering this url a Branch
528
stored_loc = branch_to.get_parent()
530
if stored_loc is None:
531
raise errors.BzrCommandError("No pull location known or"
534
display_url = urlutils.unescape_for_display(stored_loc,
536
self.outf.write("Using saved location: %s\n" % display_url)
537
location = stored_loc
540
if reader is not None:
541
install_bundle(branch_to.repository, reader)
542
branch_from = branch_to
544
branch_from = Branch.open(location)
546
if branch_to.get_parent() is None or remember:
547
branch_to.set_parent(branch_from.base)
551
if reader is not None:
552
rev_id = reader.target
553
elif len(revision) == 1:
554
rev_id = revision[0].in_history(branch_from).rev_id
556
raise errors.BzrCommandError('bzr pull --revision takes one value.')
558
old_rh = branch_to.revision_history()
559
if tree_to is not None:
560
count = tree_to.pull(branch_from, overwrite, rev_id)
562
count = branch_to.pull(branch_from, overwrite, rev_id)
563
note('%d revision(s) pulled.' % (count,))
566
new_rh = branch_to.revision_history()
569
from bzrlib.log import show_changed_revisions
570
show_changed_revisions(branch_to, old_rh, new_rh,
574
class cmd_push(Command):
575
"""Update a mirror of this branch.
577
The target branch will not have its working tree populated because this
578
is both expensive, and is not supported on remote file systems.
580
Some smart servers or protocols *may* put the working tree in place in
583
This command only works on branches that have not diverged. Branches are
584
considered diverged if the destination branch's most recent commit is one
585
that has not been merged (directly or indirectly) by the source branch.
587
If branches have diverged, you can use 'bzr push --overwrite' to replace
588
the other branch completely, discarding its unmerged changes.
590
If you want to ensure you have the different changes in the other branch,
591
do a merge (see bzr help merge) from the other branch, and commit that.
592
After that you will be able to do a push without '--overwrite'.
594
If there is no default push location set, the first push will set it.
595
After that, you can omit the location to use the default. To change the
596
default, use --remember. The value will only be saved if the remote
597
location can be accessed.
600
takes_options = ['remember', 'overwrite', 'verbose',
601
Option('create-prefix',
602
help='Create the path leading up to the branch '
603
'if it does not already exist')]
604
takes_args = ['location?']
605
encoding_type = 'replace'
607
def run(self, location=None, remember=False, overwrite=False,
608
create_prefix=False, verbose=False):
609
# FIXME: Way too big! Put this into a function called from the
612
br_from = Branch.open_containing('.')[0]
613
stored_loc = br_from.get_push_location()
615
if stored_loc is None:
616
raise errors.BzrCommandError("No push location known or specified.")
618
display_url = urlutils.unescape_for_display(stored_loc,
620
self.outf.write("Using saved location: %s\n" % display_url)
621
location = stored_loc
623
to_transport = transport.get_transport(location)
624
location_url = to_transport.base
628
dir_to = bzrdir.BzrDir.open(location_url)
629
br_to = dir_to.open_branch()
630
except errors.NotBranchError:
632
to_transport = to_transport.clone('..')
633
if not create_prefix:
635
relurl = to_transport.relpath(location_url)
636
mutter('creating directory %s => %s', location_url, relurl)
637
to_transport.mkdir(relurl)
638
except errors.NoSuchFile:
639
raise errors.BzrCommandError("Parent directory of %s "
640
"does not exist." % location)
642
current = to_transport.base
643
needed = [(to_transport, to_transport.relpath(location_url))]
646
to_transport, relpath = needed[-1]
647
to_transport.mkdir(relpath)
649
except errors.NoSuchFile:
650
new_transport = to_transport.clone('..')
651
needed.append((new_transport,
652
new_transport.relpath(to_transport.base)))
653
if new_transport.base == to_transport.base:
654
raise errors.BzrCommandError("Could not create "
656
dir_to = br_from.bzrdir.clone(location_url,
657
revision_id=br_from.last_revision())
658
br_to = dir_to.open_branch()
659
count = len(br_to.revision_history())
660
# We successfully created the target, remember it
661
if br_from.get_push_location() is None or remember:
662
br_from.set_push_location(br_to.base)
664
# We were able to connect to the remote location, so remember it
665
# we don't need to successfully push because of possible divergence.
666
if br_from.get_push_location() is None or remember:
667
br_from.set_push_location(br_to.base)
668
old_rh = br_to.revision_history()
671
tree_to = dir_to.open_workingtree()
672
except errors.NotLocalUrl:
673
warning('This transport does not update the working '
674
'tree of: %s' % (br_to.base,))
675
count = br_to.pull(br_from, overwrite)
676
except errors.NoWorkingTree:
677
count = br_to.pull(br_from, overwrite)
679
count = tree_to.pull(br_from, overwrite)
680
except errors.DivergedBranches:
681
raise errors.BzrCommandError('These branches have diverged.'
682
' Try using "merge" and then "push".')
683
note('%d revision(s) pushed.' % (count,))
686
new_rh = br_to.revision_history()
689
from bzrlib.log import show_changed_revisions
690
show_changed_revisions(br_to, old_rh, new_rh,
694
class cmd_branch(Command):
695
"""Create a new copy of a branch.
697
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
698
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
700
To retrieve the branch as of a particular revision, supply the --revision
701
parameter, as in "branch foo/bar -r 5".
703
--basis is to speed up branching from remote branches. When specified, it
704
copies all the file-contents, inventory and revision data from the basis
705
branch before copying anything from the remote branch.
707
takes_args = ['from_location', 'to_location?']
708
takes_options = ['revision', 'basis']
709
aliases = ['get', 'clone']
711
def run(self, from_location, to_location=None, revision=None, basis=None):
714
elif len(revision) > 1:
715
raise errors.BzrCommandError(
716
'bzr branch --revision takes exactly 1 revision value')
718
br_from = Branch.open(from_location)
720
if e.errno == errno.ENOENT:
721
raise errors.BzrCommandError('Source location "%s" does not'
722
' exist.' % to_location)
727
if basis is not None:
728
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
731
if len(revision) == 1 and revision[0] is not None:
732
revision_id = revision[0].in_history(br_from)[1]
734
# FIXME - wt.last_revision, fallback to branch, fall back to
735
# None or perhaps NULL_REVISION to mean copy nothing
737
revision_id = br_from.last_revision()
738
if to_location is None:
739
to_location = os.path.basename(from_location.rstrip("/\\"))
742
name = os.path.basename(to_location) + '\n'
744
to_transport = transport.get_transport(to_location)
746
to_transport.mkdir('.')
747
except errors.FileExists:
748
raise errors.BzrCommandError('Target directory "%s" already'
749
' exists.' % to_location)
750
except errors.NoSuchFile:
751
raise errors.BzrCommandError('Parent of "%s" does not exist.'
754
# preserve whatever source format we have.
755
dir = br_from.bzrdir.sprout(to_transport.base,
756
revision_id, basis_dir)
757
branch = dir.open_branch()
758
except errors.NoSuchRevision:
759
to_transport.delete_tree('.')
760
msg = "The branch %s has no revision %s." % (from_location, revision[0])
761
raise errors.BzrCommandError(msg)
762
except errors.UnlistableBranch:
763
osutils.rmtree(to_location)
764
msg = "The branch %s cannot be used as a --basis" % (basis,)
765
raise errors.BzrCommandError(msg)
767
branch.control_files.put_utf8('branch-name', name)
768
note('Branched %d revision(s).' % branch.revno())
773
class cmd_checkout(Command):
774
"""Create a new checkout of an existing branch.
776
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
777
the branch found in '.'. This is useful if you have removed the working tree
778
or if it was never created - i.e. if you pushed the branch to its current
781
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
782
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
784
To retrieve the branch as of a particular revision, supply the --revision
785
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
786
out of date [so you cannot commit] but it may be useful (i.e. to examine old
789
--basis is to speed up checking out from remote branches. When specified, it
790
uses the inventory and file contents from the basis branch in preference to the
791
branch being checked out.
793
takes_args = ['branch_location?', 'to_location?']
794
takes_options = ['revision', # , 'basis']
795
Option('lightweight',
796
help="perform a lightweight checkout. Lightweight "
797
"checkouts depend on access to the branch for "
798
"every operation. Normal checkouts can perform "
799
"common operations like diff and status without "
800
"such access, and also support local commits."
805
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
809
elif len(revision) > 1:
810
raise errors.BzrCommandError(
811
'bzr checkout --revision takes exactly 1 revision value')
812
if branch_location is None:
813
branch_location = osutils.getcwd()
814
to_location = branch_location
815
source = Branch.open(branch_location)
816
if len(revision) == 1 and revision[0] is not None:
817
revision_id = revision[0].in_history(source)[1]
820
if to_location is None:
821
to_location = os.path.basename(branch_location.rstrip("/\\"))
822
# if the source and to_location are the same,
823
# and there is no working tree,
824
# then reconstitute a branch
825
if (osutils.abspath(to_location) ==
826
osutils.abspath(branch_location)):
828
source.bzrdir.open_workingtree()
829
except errors.NoWorkingTree:
830
source.bzrdir.create_workingtree()
833
os.mkdir(to_location)
835
if e.errno == errno.EEXIST:
836
raise errors.BzrCommandError('Target directory "%s" already'
837
' exists.' % to_location)
838
if e.errno == errno.ENOENT:
839
raise errors.BzrCommandError('Parent of "%s" does not exist.'
843
old_format = bzrdir.BzrDirFormat.get_default_format()
844
bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
846
source.create_checkout(to_location, revision_id, lightweight)
848
bzrdir.BzrDirFormat.set_default_format(old_format)
851
class cmd_renames(Command):
852
"""Show list of renamed files.
854
# TODO: Option to show renames between two historical versions.
856
# TODO: Only show renames under dir, rather than in the whole branch.
857
takes_args = ['dir?']
860
def run(self, dir=u'.'):
861
tree = WorkingTree.open_containing(dir)[0]
862
old_inv = tree.basis_tree().inventory
863
new_inv = tree.read_working_inventory()
864
renames = list(_mod_tree.find_renames(old_inv, new_inv))
866
for old_name, new_name in renames:
867
self.outf.write("%s => %s\n" % (old_name, new_name))
870
class cmd_update(Command):
871
"""Update a tree to have the latest code committed to its branch.
873
This will perform a merge into the working tree, and may generate
874
conflicts. If you have any local changes, you will still
875
need to commit them after the update for the update to be complete.
877
If you want to discard your local changes, you can just do a
878
'bzr revert' instead of 'bzr commit' after the update.
880
takes_args = ['dir?']
883
def run(self, dir='.'):
884
tree = WorkingTree.open_containing(dir)[0]
885
master = tree.branch.get_master_branch()
886
if master is not None:
889
tree.lock_tree_write()
891
existing_pending_merges = tree.get_parent_ids()[1:]
892
last_rev = tree.last_revision()
893
if last_rev == tree.branch.last_revision():
894
# may be up to date, check master too.
895
master = tree.branch.get_master_branch()
896
if master is None or last_rev == master.last_revision():
897
revno = tree.branch.revision_id_to_revno(last_rev)
898
note("Tree is up to date at revision %d." % (revno,))
900
conflicts = tree.update()
901
revno = tree.branch.revision_id_to_revno(tree.last_revision())
902
note('Updated to revision %d.' % (revno,))
903
if tree.get_parent_ids()[1:] != existing_pending_merges:
904
note('Your local commits will now show as pending merges with '
905
"'bzr status', and can be committed with 'bzr commit'.")
914
class cmd_info(Command):
915
"""Show information about a working tree, branch or repository.
917
This command will show all known locations and formats associated to the
918
tree, branch or repository. Statistical information is included with
921
Branches and working trees will also report any missing revisions.
923
takes_args = ['location?']
924
takes_options = ['verbose']
927
def run(self, location=None, verbose=False):
928
from bzrlib.info import show_bzrdir_info
929
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
933
class cmd_remove(Command):
934
"""Make a file unversioned.
936
This makes bzr stop tracking changes to a versioned file. It does
937
not delete the working copy.
939
You can specify one or more files, and/or --new. If you specify --new,
940
only 'added' files will be removed. If you specify both, then new files
941
in the specified directories will be removed. If the directories are
942
also new, they will also be removed.
944
takes_args = ['file*']
945
takes_options = ['verbose', Option('new', help='remove newly-added files')]
947
encoding_type = 'replace'
949
def run(self, file_list, verbose=False, new=False):
950
tree, file_list = tree_files(file_list)
952
if file_list is None:
953
raise errors.BzrCommandError('Specify one or more files to'
954
' remove, or use --new.')
956
added = tree.changes_from(tree.basis_tree(),
957
specific_files=file_list).added
958
file_list = sorted([f[0] for f in added], reverse=True)
959
if len(file_list) == 0:
960
raise errors.BzrCommandError('No matching files.')
961
tree.remove(file_list, verbose=verbose, to_file=self.outf)
964
class cmd_file_id(Command):
965
"""Print file_id of a particular file or directory.
967
The file_id is assigned when the file is first added and remains the
968
same through all revisions where the file exists, even when it is
973
takes_args = ['filename']
976
def run(self, filename):
977
tree, relpath = WorkingTree.open_containing(filename)
978
i = tree.inventory.path2id(relpath)
980
raise errors.NotVersionedError(filename)
982
self.outf.write(i + '\n')
985
class cmd_file_path(Command):
986
"""Print path of file_ids to a file or directory.
988
This prints one line for each directory down to the target,
989
starting at the branch root.
993
takes_args = ['filename']
996
def run(self, filename):
997
tree, relpath = WorkingTree.open_containing(filename)
999
fid = inv.path2id(relpath)
1001
raise errors.NotVersionedError(filename)
1002
for fip in inv.get_idpath(fid):
1003
self.outf.write(fip + '\n')
1006
class cmd_reconcile(Command):
1007
"""Reconcile bzr metadata in a branch.
1009
This can correct data mismatches that may have been caused by
1010
previous ghost operations or bzr upgrades. You should only
1011
need to run this command if 'bzr check' or a bzr developer
1012
advises you to run it.
1014
If a second branch is provided, cross-branch reconciliation is
1015
also attempted, which will check that data like the tree root
1016
id which was not present in very early bzr versions is represented
1017
correctly in both branches.
1019
At the same time it is run it may recompress data resulting in
1020
a potential saving in disk space or performance gain.
1022
The branch *MUST* be on a listable system such as local disk or sftp.
1024
takes_args = ['branch?']
1026
def run(self, branch="."):
1027
from bzrlib.reconcile import reconcile
1028
dir = bzrdir.BzrDir.open(branch)
1032
class cmd_revision_history(Command):
1033
"""Display the list of revision ids on a branch."""
1034
takes_args = ['location?']
1039
def run(self, location="."):
1040
branch = Branch.open_containing(location)[0]
1041
for revid in branch.revision_history():
1042
self.outf.write(revid)
1043
self.outf.write('\n')
1046
class cmd_ancestry(Command):
1047
"""List all revisions merged into this branch."""
1048
takes_args = ['location?']
1053
def run(self, location="."):
1055
wt = WorkingTree.open_containing(location)[0]
1056
except errors.NoWorkingTree:
1057
b = Branch.open(location)
1058
last_revision = b.last_revision()
1061
last_revision = wt.last_revision()
1063
revision_ids = b.repository.get_ancestry(last_revision)
1064
assert revision_ids[0] is None
1066
for revision_id in revision_ids:
1067
self.outf.write(revision_id + '\n')
1070
class cmd_init(Command):
1071
"""Make a directory into a versioned branch.
1073
Use this to create an empty branch, or before importing an
1076
If there is a repository in a parent directory of the location, then
1077
the history of the branch will be stored in the repository. Otherwise
1078
init creates a standalone branch which carries its own history in
1081
If there is already a branch at the location but it has no working tree,
1082
the tree can be populated with 'bzr checkout'.
1084
Recipe for importing a tree of files:
1089
bzr commit -m 'imported project'
1091
takes_args = ['location?']
1094
help='Specify a format for this branch. Current'
1095
' formats are: default, knit, metaweave and'
1096
' weave. Default is knit; metaweave and'
1097
' weave are deprecated',
1098
type=get_format_type),
1100
def run(self, location=None, format=None):
1102
format = get_format_type('default')
1103
if location is None:
1106
to_transport = transport.get_transport(location)
1108
# The path has to exist to initialize a
1109
# branch inside of it.
1110
# Just using os.mkdir, since I don't
1111
# believe that we want to create a bunch of
1112
# locations if the user supplies an extended path
1113
# TODO: create-prefix
1115
to_transport.mkdir('.')
1116
except errors.FileExists:
1120
existing_bzrdir = bzrdir.BzrDir.open(location)
1121
except errors.NotBranchError:
1122
# really a NotBzrDir error...
1123
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1125
from bzrlib.transport.local import LocalTransport
1126
if existing_bzrdir.has_branch():
1127
if (isinstance(to_transport, LocalTransport)
1128
and not existing_bzrdir.has_workingtree()):
1129
raise errors.BranchExistsWithoutWorkingTree(location)
1130
raise errors.AlreadyBranchError(location)
1132
existing_bzrdir.create_branch()
1133
existing_bzrdir.create_workingtree()
1136
class cmd_init_repository(Command):
1137
"""Create a shared repository to hold branches.
1139
New branches created under the repository directory will store their revisions
1140
in the repository, not in the branch directory, if the branch format supports
1146
bzr checkout --lightweight repo/trunk trunk-checkout
1150
takes_args = ["location"]
1151
takes_options = [Option('format',
1152
help='Specify a format for this repository.'
1153
' Current formats are: default, knit,'
1154
' metaweave and weave. Default is knit;'
1155
' metaweave and weave are deprecated',
1156
type=get_format_type),
1158
help='Allows branches in repository to have'
1160
aliases = ["init-repo"]
1161
def run(self, location, format=None, trees=False):
1163
format = get_format_type('default')
1165
if location is None:
1168
to_transport = transport.get_transport(location)
1170
to_transport.mkdir('.')
1171
except errors.FileExists:
1174
newdir = format.initialize_on_transport(to_transport)
1175
repo = newdir.create_repository(shared=True)
1176
repo.set_make_working_trees(trees)
1179
class cmd_diff(Command):
1180
"""Show differences in the working tree or between revisions.
1182
If files are listed, only the changes in those files are listed.
1183
Otherwise, all changes for the tree are listed.
1185
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1186
produces patches suitable for "patch -p1".
1190
Shows the difference in the working tree versus the last commit
1192
Difference between the working tree and revision 1
1194
Difference between revision 2 and revision 1
1195
bzr diff --diff-prefix old/:new/
1196
Same as 'bzr diff' but prefix paths with old/ and new/
1197
bzr diff bzr.mine bzr.dev
1198
Show the differences between the two working trees
1200
Show just the differences for 'foo.c'
1202
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1203
# or a graphical diff.
1205
# TODO: Python difflib is not exactly the same as unidiff; should
1206
# either fix it up or prefer to use an external diff.
1208
# TODO: Selected-file diff is inefficient and doesn't show you
1211
# TODO: This probably handles non-Unix newlines poorly.
1213
takes_args = ['file*']
1214
takes_options = ['revision', 'diff-options', 'prefix']
1215
aliases = ['di', 'dif']
1216
encoding_type = 'exact'
1219
def run(self, revision=None, file_list=None, diff_options=None,
1221
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1223
if (prefix is None) or (prefix == '0'):
1231
if not ':' in prefix:
1232
raise BzrCommandError(
1233
"--diff-prefix expects two values separated by a colon")
1234
old_label, new_label = prefix.split(":")
1237
tree1, file_list = internal_tree_files(file_list)
1241
except errors.FileInWrongBranch:
1242
if len(file_list) != 2:
1243
raise errors.BzrCommandError("Files are in different branches")
1245
tree1, file1 = WorkingTree.open_containing(file_list[0])
1246
tree2, file2 = WorkingTree.open_containing(file_list[1])
1247
if file1 != "" or file2 != "":
1248
# FIXME diff those two files. rbc 20051123
1249
raise errors.BzrCommandError("Files are in different branches")
1251
except errors.NotBranchError:
1252
if (revision is not None and len(revision) == 2
1253
and not revision[0].needs_branch()
1254
and not revision[1].needs_branch()):
1255
# If both revision specs include a branch, we can
1256
# diff them without needing a local working tree
1257
tree1, tree2 = None, None
1260
if revision is not None:
1261
if tree2 is not None:
1262
raise errors.BzrCommandError("Can't specify -r with two branches")
1263
if (len(revision) == 1) or (revision[1].spec is None):
1264
return diff_cmd_helper(tree1, file_list, diff_options,
1266
old_label=old_label, new_label=new_label)
1267
elif len(revision) == 2:
1268
return diff_cmd_helper(tree1, file_list, diff_options,
1269
revision[0], revision[1],
1270
old_label=old_label, new_label=new_label)
1272
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1273
' one or two revision identifiers')
1275
if tree2 is not None:
1276
return show_diff_trees(tree1, tree2, sys.stdout,
1277
specific_files=file_list,
1278
external_diff_options=diff_options,
1279
old_label=old_label, new_label=new_label)
1281
return diff_cmd_helper(tree1, file_list, diff_options,
1282
old_label=old_label, new_label=new_label)
1285
class cmd_deleted(Command):
1286
"""List files deleted in the working tree.
1288
# TODO: Show files deleted since a previous revision, or
1289
# between two revisions.
1290
# TODO: Much more efficient way to do this: read in new
1291
# directories with readdir, rather than stating each one. Same
1292
# level of effort but possibly much less IO. (Or possibly not,
1293
# if the directories are very large...)
1294
takes_options = ['show-ids']
1297
def run(self, show_ids=False):
1298
tree = WorkingTree.open_containing(u'.')[0]
1299
old = tree.basis_tree()
1300
for path, ie in old.inventory.iter_entries():
1301
if not tree.has_id(ie.file_id):
1302
self.outf.write(path)
1304
self.outf.write(' ')
1305
self.outf.write(ie.file_id)
1306
self.outf.write('\n')
1309
class cmd_modified(Command):
1310
"""List files modified in working tree."""
1314
tree = WorkingTree.open_containing(u'.')[0]
1315
td = tree.changes_from(tree.basis_tree())
1316
for path, id, kind, text_modified, meta_modified in td.modified:
1317
self.outf.write(path + '\n')
1320
class cmd_added(Command):
1321
"""List files added in working tree."""
1325
wt = WorkingTree.open_containing(u'.')[0]
1326
basis_inv = wt.basis_tree().inventory
1329
if file_id in basis_inv:
1331
if inv.is_root(file_id) and len(basis_inv) == 0:
1333
path = inv.id2path(file_id)
1334
if not os.access(osutils.abspath(path), os.F_OK):
1336
self.outf.write(path + '\n')
1339
class cmd_root(Command):
1340
"""Show the tree root directory.
1342
The root is the nearest enclosing directory with a .bzr control
1344
takes_args = ['filename?']
1346
def run(self, filename=None):
1347
"""Print the branch root."""
1348
tree = WorkingTree.open_containing(filename)[0]
1349
self.outf.write(tree.basedir + '\n')
1352
class cmd_log(Command):
1353
"""Show log of a branch, file, or directory.
1355
By default show the log of the branch containing the working directory.
1357
To request a range of logs, you can use the command -r begin..end
1358
-r revision requests a specific revision, -r ..end or -r begin.. are
1364
bzr log -r -10.. http://server/branch
1367
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1369
takes_args = ['location?']
1370
takes_options = [Option('forward',
1371
help='show from oldest to newest'),
1374
help='show files changed in each revision'),
1375
'show-ids', 'revision',
1379
help='show revisions whose message matches this regexp',
1383
encoding_type = 'replace'
1386
def run(self, location=None, timezone='original',
1396
from bzrlib.log import log_formatter, show_log
1397
assert message is None or isinstance(message, basestring), \
1398
"invalid message argument %r" % message
1399
direction = (forward and 'forward') or 'reverse'
1404
# find the file id to log:
1406
dir, fp = bzrdir.BzrDir.open_containing(location)
1407
b = dir.open_branch()
1411
inv = dir.open_workingtree().inventory
1412
except (errors.NotBranchError, errors.NotLocalUrl):
1413
# either no tree, or is remote.
1414
inv = b.basis_tree().inventory
1415
file_id = inv.path2id(fp)
1417
raise errors.BzrCommandError(
1418
"Path does not have any revision history: %s" %
1422
# FIXME ? log the current subdir only RBC 20060203
1423
if revision is not None \
1424
and len(revision) > 0 and revision[0].get_branch():
1425
location = revision[0].get_branch()
1428
dir, relpath = bzrdir.BzrDir.open_containing(location)
1429
b = dir.open_branch()
1431
if revision is None:
1434
elif len(revision) == 1:
1435
rev1 = rev2 = revision[0].in_history(b).revno
1436
elif len(revision) == 2:
1437
if revision[1].get_branch() != revision[0].get_branch():
1438
# b is taken from revision[0].get_branch(), and
1439
# show_log will use its revision_history. Having
1440
# different branches will lead to weird behaviors.
1441
raise errors.BzrCommandError(
1442
"Log doesn't accept two revisions in different branches.")
1443
if revision[0].spec is None:
1444
# missing begin-range means first revision
1447
rev1 = revision[0].in_history(b).revno
1449
if revision[1].spec is None:
1450
# missing end-range means last known revision
1453
rev2 = revision[1].in_history(b).revno
1455
raise errors.BzrCommandError('bzr log --revision takes one or two values.')
1457
# By this point, the revision numbers are converted to the +ve
1458
# form if they were supplied in the -ve form, so we can do
1459
# this comparison in relative safety
1461
(rev2, rev1) = (rev1, rev2)
1463
if (log_format is None):
1464
default = b.get_config().log_format()
1465
log_format = get_log_format(long=long, short=short, line=line,
1467
lf = log_formatter(log_format,
1470
show_timezone=timezone)
1476
direction=direction,
1477
start_revision=rev1,
1482
def get_log_format(long=False, short=False, line=False, default='long'):
1483
log_format = default
1487
log_format = 'short'
1493
class cmd_touching_revisions(Command):
1494
"""Return revision-ids which affected a particular file.
1496
A more user-friendly interface is "bzr log FILE".
1500
takes_args = ["filename"]
1503
def run(self, filename):
1504
tree, relpath = WorkingTree.open_containing(filename)
1506
inv = tree.read_working_inventory()
1507
file_id = inv.path2id(relpath)
1508
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1509
self.outf.write("%6d %s\n" % (revno, what))
1512
class cmd_ls(Command):
1513
"""List files in a tree.
1515
# TODO: Take a revision or remote path and list that tree instead.
1517
takes_options = ['verbose', 'revision',
1518
Option('non-recursive',
1519
help='don\'t recurse into sub-directories'),
1521
help='Print all paths from the root of the branch.'),
1522
Option('unknown', help='Print unknown files'),
1523
Option('versioned', help='Print versioned files'),
1524
Option('ignored', help='Print ignored files'),
1526
Option('null', help='Null separate the files'),
1529
def run(self, revision=None, verbose=False,
1530
non_recursive=False, from_root=False,
1531
unknown=False, versioned=False, ignored=False,
1534
if verbose and null:
1535
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1536
all = not (unknown or versioned or ignored)
1538
selection = {'I':ignored, '?':unknown, 'V':versioned}
1540
tree, relpath = WorkingTree.open_containing(u'.')
1545
if revision is not None:
1546
tree = tree.branch.repository.revision_tree(
1547
revision[0].in_history(tree.branch).rev_id)
1549
for fp, fc, kind, fid, entry in tree.list_files(include_root=False):
1550
if fp.startswith(relpath):
1551
fp = fp[len(relpath):]
1552
if non_recursive and '/' in fp:
1554
if not all and not selection[fc]:
1557
kindch = entry.kind_character()
1558
self.outf.write('%-8s %s%s\n' % (fc, fp, kindch))
1560
self.outf.write(fp + '\0')
1563
self.outf.write(fp + '\n')
1566
class cmd_unknowns(Command):
1567
"""List unknown files."""
1570
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1571
self.outf.write(osutils.quotefn(f) + '\n')
1574
class cmd_ignore(Command):
1575
"""Ignore specified files or patterns.
1577
To remove patterns from the ignore list, edit the .bzrignore file.
1579
Trailing slashes on patterns are ignored.
1580
If the pattern contains a slash or is a regular expression, it is compared
1581
to the whole path from the branch root. Otherwise, it is compared to only
1582
the last component of the path. To match a file only in the root
1583
directory, prepend './'.
1585
Ignore patterns specifying absolute paths are not allowed.
1587
Ignore patterns may include globbing wildcards such as:
1588
? - Matches any single character except '/'
1589
* - Matches 0 or more characters except '/'
1590
/**/ - Matches 0 or more directories in a path
1591
[a-z] - Matches a single character from within a group of characters
1593
Ignore patterns may also be Python regular expressions.
1594
Regular expression ignore patterns are identified by a 'RE:' prefix
1595
followed by the regular expression. Regular expression ignore patterns
1596
may not include named or numbered groups.
1598
Note: ignore patterns containing shell wildcards must be quoted from
1602
bzr ignore ./Makefile
1603
bzr ignore '*.class'
1604
bzr ignore 'lib/**/*.o'
1605
bzr ignore 'RE:lib/.*\.o'
1607
takes_args = ['name_pattern*']
1609
Option('old-default-rules',
1610
help='Out the ignore rules bzr < 0.9 always used.')
1613
def run(self, name_pattern_list=None, old_default_rules=None):
1614
from bzrlib.atomicfile import AtomicFile
1615
if old_default_rules is not None:
1616
# dump the rules and exit
1617
for pattern in ignores.OLD_DEFAULTS:
1620
if not name_pattern_list:
1621
raise errors.BzrCommandError("ignore requires at least one "
1622
"NAME_PATTERN or --old-default-rules")
1623
for name_pattern in name_pattern_list:
1624
if name_pattern[0] == '/':
1625
raise errors.BzrCommandError(
1626
"NAME_PATTERN should not be an absolute path")
1627
tree, relpath = WorkingTree.open_containing(u'.')
1628
ifn = tree.abspath('.bzrignore')
1629
if os.path.exists(ifn):
1632
igns = f.read().decode('utf-8')
1638
# TODO: If the file already uses crlf-style termination, maybe
1639
# we should use that for the newly added lines?
1641
if igns and igns[-1] != '\n':
1643
for name_pattern in name_pattern_list:
1644
igns += name_pattern.rstrip('/') + '\n'
1646
f = AtomicFile(ifn, 'wb')
1648
f.write(igns.encode('utf-8'))
1653
inv = tree.inventory
1654
if inv.path2id('.bzrignore'):
1655
mutter('.bzrignore is already versioned')
1657
mutter('need to make new .bzrignore file versioned')
1658
tree.add(['.bzrignore'])
1661
class cmd_ignored(Command):
1662
"""List ignored files and the patterns that matched them.
1664
See also: bzr ignore"""
1667
tree = WorkingTree.open_containing(u'.')[0]
1668
for path, file_class, kind, file_id, entry in tree.list_files():
1669
if file_class != 'I':
1671
## XXX: Slightly inefficient since this was already calculated
1672
pat = tree.is_ignored(path)
1673
print '%-50s %s' % (path, pat)
1676
class cmd_lookup_revision(Command):
1677
"""Lookup the revision-id from a revision-number
1680
bzr lookup-revision 33
1683
takes_args = ['revno']
1686
def run(self, revno):
1690
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1692
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1695
class cmd_export(Command):
1696
"""Export past revision to destination directory.
1698
If no revision is specified this exports the last committed revision.
1700
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1701
given, try to find the format with the extension. If no extension
1702
is found exports to a directory (equivalent to --format=dir).
1704
Root may be the top directory for tar, tgz and tbz2 formats. If none
1705
is given, the top directory will be the root name of the file.
1707
If branch is omitted then the branch containing the CWD will be used.
1709
Note: export of tree with non-ascii filenames to zip is not supported.
1711
Supported formats Autodetected by extension
1712
----------------- -------------------------
1715
tbz2 .tar.bz2, .tbz2
1719
takes_args = ['dest', 'branch?']
1720
takes_options = ['revision', 'format', 'root']
1721
def run(self, dest, branch=None, revision=None, format=None, root=None):
1722
from bzrlib.export import export
1725
tree = WorkingTree.open_containing(u'.')[0]
1728
b = Branch.open(branch)
1730
if revision is None:
1731
# should be tree.last_revision FIXME
1732
rev_id = b.last_revision()
1734
if len(revision) != 1:
1735
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
1736
rev_id = revision[0].in_history(b).rev_id
1737
t = b.repository.revision_tree(rev_id)
1739
export(t, dest, format, root)
1740
except errors.NoSuchExportFormat, e:
1741
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1744
class cmd_cat(Command):
1745
"""Write a file's text from a previous revision."""
1747
takes_options = ['revision', 'name-from-revision']
1748
takes_args = ['filename']
1751
def run(self, filename, revision=None, name_from_revision=False):
1752
if revision is not None and len(revision) != 1:
1753
raise errors.BzrCommandError("bzr cat --revision takes exactly"
1758
tree, relpath = WorkingTree.open_containing(filename)
1760
except errors.NotBranchError:
1764
b, relpath = Branch.open_containing(filename)
1765
if revision is not None and revision[0].get_branch() is not None:
1766
b = Branch.open(revision[0].get_branch())
1767
if revision is None:
1768
revision_id = b.last_revision()
1770
revision_id = revision[0].in_history(b).rev_id
1772
cur_file_id = tree.path2id(relpath)
1773
rev_tree = b.repository.revision_tree(revision_id)
1774
old_file_id = rev_tree.path2id(relpath)
1776
if name_from_revision:
1777
if old_file_id is None:
1778
raise errors.BzrCommandError("%r is not present in revision %s"
1779
% (filename, revision_id))
1781
rev_tree.print_file(old_file_id)
1782
elif cur_file_id is not None:
1783
rev_tree.print_file(cur_file_id)
1784
elif old_file_id is not None:
1785
rev_tree.print_file(old_file_id)
1787
raise errors.BzrCommandError("%r is not present in revision %s" %
1788
(filename, revision_id))
1791
class cmd_local_time_offset(Command):
1792
"""Show the offset in seconds from GMT to local time."""
1796
print osutils.local_time_offset()
1800
class cmd_commit(Command):
1801
"""Commit changes into a new revision.
1803
If no arguments are given, the entire tree is committed.
1805
If selected files are specified, only changes to those files are
1806
committed. If a directory is specified then the directory and everything
1807
within it is committed.
1809
A selected-file commit may fail in some cases where the committed
1810
tree would be invalid, such as trying to commit a file in a
1811
newly-added directory that is not itself committed.
1813
# TODO: Run hooks on tree to-be-committed, and after commit.
1815
# TODO: Strict commit that fails if there are deleted files.
1816
# (what does "deleted files" mean ??)
1818
# TODO: Give better message for -s, --summary, used by tla people
1820
# XXX: verbose currently does nothing
1822
takes_args = ['selected*']
1823
takes_options = ['message', 'verbose',
1825
help='commit even if nothing has changed'),
1826
Option('file', type=str,
1828
help='file containing commit message'),
1830
help="refuse to commit if there are unknown "
1831
"files in the working tree."),
1833
help="perform a local only commit in a bound "
1834
"branch. Such commits are not pushed to "
1835
"the master branch until a normal commit "
1839
aliases = ['ci', 'checkin']
1841
def run(self, message=None, file=None, verbose=True, selected_list=None,
1842
unchanged=False, strict=False, local=False):
1843
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1844
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1846
from bzrlib.msgeditor import edit_commit_message, \
1847
make_commit_message_template
1849
# TODO: Need a blackbox test for invoking the external editor; may be
1850
# slightly problematic to run this cross-platform.
1852
# TODO: do more checks that the commit will succeed before
1853
# spending the user's valuable time typing a commit message.
1854
tree, selected_list = tree_files(selected_list)
1855
if selected_list == ['']:
1856
# workaround - commit of root of tree should be exactly the same
1857
# as just default commit in that tree, and succeed even though
1858
# selected-file merge commit is not done yet
1861
if local and not tree.branch.get_bound_location():
1862
raise errors.LocalRequiresBoundBranch()
1863
if message is None and not file:
1864
template = make_commit_message_template(tree, selected_list)
1865
message = edit_commit_message(template)
1867
raise errors.BzrCommandError("please specify a commit message"
1868
" with either --message or --file")
1869
elif message and file:
1870
raise errors.BzrCommandError("please specify either --message or --file")
1873
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1876
raise errors.BzrCommandError("empty commit message specified")
1879
reporter = ReportCommitToLog()
1881
reporter = NullCommitReporter()
1883
msgfilename = self._save_commit_message(message, tree.basedir)
1885
tree.commit(message, specific_files=selected_list,
1886
allow_pointless=unchanged, strict=strict, local=local,
1888
if msgfilename is not None:
1890
os.unlink(msgfilename)
1892
warning("failed to unlink %s: %s; ignored", msgfilename, e)
1893
except PointlessCommit:
1894
# FIXME: This should really happen before the file is read in;
1895
# perhaps prepare the commit; get the message; then actually commit
1896
if msgfilename is not None:
1897
raise errors.BzrCommandError("no changes to commit."
1898
" use --unchanged to commit anyhow\n"
1899
"Commit message saved. To reuse the message,"
1900
" do\nbzr commit --file " + msgfilename)
1902
raise errors.BzrCommandError("no changes to commit."
1903
" use --unchanged to commit anyhow")
1904
except ConflictsInTree:
1905
if msgfilename is not None:
1906
raise errors.BzrCommandError('Conflicts detected in working '
1907
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
1909
'Commit message saved. To reuse the message,'
1910
' do\nbzr commit --file ' + msgfilename)
1912
raise errors.BzrCommandError('Conflicts detected in working '
1913
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
1915
except StrictCommitFailed:
1916
if msgfilename is not None:
1917
raise errors.BzrCommandError("Commit refused because there are"
1918
" unknown files in the working tree.\n"
1919
"Commit message saved. To reuse the message,"
1920
" do\nbzr commit --file " + msgfilename)
1922
raise errors.BzrCommandError("Commit refused because there are"
1923
" unknown files in the working tree.")
1924
except errors.BoundBranchOutOfDate, e:
1925
if msgfilename is not None:
1926
raise errors.BzrCommandError(str(e) + "\n"
1927
'To commit to master branch, run update and then commit.\n'
1928
'You can also pass --local to commit to continue working '
1930
'Commit message saved. To reuse the message,'
1931
' do\nbzr commit --file ' + msgfilename)
1933
raise errors.BzrCommandError(str(e) + "\n"
1934
'To commit to master branch, run update and then commit.\n'
1935
'You can also pass --local to commit to continue working '
1938
def _save_commit_message(self, message, basedir):
1939
# save the commit message and only unlink it if the commit was
1943
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr-commit-',
1947
# No access to working dir, try $TMP
1948
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr-commit-')
1950
# We can't create a temp file, try to work without it
1953
os.write(tmp_fileno, message.encode(bzrlib.user_encoding, 'replace'))
1955
os.close(tmp_fileno)
1959
class cmd_check(Command):
1960
"""Validate consistency of branch history.
1962
This command checks various invariants about the branch storage to
1963
detect data corruption or bzr bugs.
1965
takes_args = ['branch?']
1966
takes_options = ['verbose']
1968
def run(self, branch=None, verbose=False):
1969
from bzrlib.check import check
1971
tree = WorkingTree.open_containing()[0]
1972
branch = tree.branch
1974
branch = Branch.open(branch)
1975
check(branch, verbose)
1978
class cmd_upgrade(Command):
1979
"""Upgrade branch storage to current format.
1981
The check command or bzr developers may sometimes advise you to run
1982
this command. When the default format has changed you may also be warned
1983
during other operations to upgrade.
1985
takes_args = ['url?']
1988
help='Upgrade to a specific format. Current formats'
1989
' are: default, knit, metaweave and weave.'
1990
' Default is knit; metaweave and weave are'
1992
type=get_format_type),
1996
def run(self, url='.', format=None):
1997
from bzrlib.upgrade import upgrade
1999
format = get_format_type('default')
2000
upgrade(url, format)
2003
class cmd_whoami(Command):
2004
"""Show or set bzr user id.
2008
bzr whoami 'Frank Chu <fchu@example.com>'
2010
takes_options = [ Option('email',
2011
help='display email address only'),
2013
help='set identity for the current branch instead of '
2016
takes_args = ['name?']
2017
encoding_type = 'replace'
2020
def run(self, email=False, branch=False, name=None):
2022
# use branch if we're inside one; otherwise global config
2024
c = Branch.open_containing('.')[0].get_config()
2025
except errors.NotBranchError:
2026
c = config.GlobalConfig()
2028
self.outf.write(c.user_email() + '\n')
2030
self.outf.write(c.username() + '\n')
2033
# display a warning if an email address isn't included in the given name.
2035
config.extract_email_address(name)
2036
except errors.NoEmailInUsername, e:
2037
warning('"%s" does not seem to contain an email address. '
2038
'This is allowed, but not recommended.', name)
2040
# use global config unless --branch given
2042
c = Branch.open_containing('.')[0].get_config()
2044
c = config.GlobalConfig()
2045
c.set_user_option('email', name)
2048
class cmd_nick(Command):
2049
"""Print or set the branch nickname.
2051
If unset, the tree root directory name is used as the nickname
2052
To print the current nickname, execute with no argument.
2054
takes_args = ['nickname?']
2055
def run(self, nickname=None):
2056
branch = Branch.open_containing(u'.')[0]
2057
if nickname is None:
2058
self.printme(branch)
2060
branch.nick = nickname
2063
def printme(self, branch):
2067
class cmd_selftest(Command):
2068
"""Run internal test suite.
2070
This creates temporary test directories in the working directory,
2071
but not existing data is affected. These directories are deleted
2072
if the tests pass, or left behind to help in debugging if they
2073
fail and --keep-output is specified.
2075
If arguments are given, they are regular expressions that say
2076
which tests should run.
2078
If the global option '--no-plugins' is given, plugins are not loaded
2079
before running the selftests. This has two effects: features provided or
2080
modified by plugins will not be tested, and tests provided by plugins will
2085
bzr --no-plugins selftest -v
2087
# TODO: --list should give a list of all available tests
2089
# NB: this is used from the class without creating an instance, which is
2090
# why it does not have a self parameter.
2091
def get_transport_type(typestring):
2092
"""Parse and return a transport specifier."""
2093
if typestring == "sftp":
2094
from bzrlib.transport.sftp import SFTPAbsoluteServer
2095
return SFTPAbsoluteServer
2096
if typestring == "memory":
2097
from bzrlib.transport.memory import MemoryServer
2099
if typestring == "fakenfs":
2100
from bzrlib.transport.fakenfs import FakeNFSServer
2101
return FakeNFSServer
2102
msg = "No known transport type %s. Supported types are: sftp\n" %\
2104
raise errors.BzrCommandError(msg)
2107
takes_args = ['testspecs*']
2108
takes_options = ['verbose',
2109
Option('one', help='stop when one test fails'),
2110
Option('keep-output',
2111
help='keep output directories when tests fail'),
2113
help='Use a different transport by default '
2114
'throughout the test suite.',
2115
type=get_transport_type),
2116
Option('benchmark', help='run the bzr bencharks.'),
2117
Option('lsprof-timed',
2118
help='generate lsprof output for benchmarked'
2119
' sections of code.'),
2120
Option('cache-dir', type=str,
2121
help='a directory to cache intermediate'
2122
' benchmark steps'),
2125
def run(self, testspecs_list=None, verbose=None, one=False,
2126
keep_output=False, transport=None, benchmark=None,
2127
lsprof_timed=None, cache_dir=None):
2129
from bzrlib.tests import selftest
2130
import bzrlib.benchmarks as benchmarks
2131
from bzrlib.benchmarks import tree_creator
2133
if cache_dir is not None:
2134
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2135
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
2136
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2138
if testspecs_list is not None:
2139
pattern = '|'.join(testspecs_list)
2143
test_suite_factory = benchmarks.test_suite
2146
# TODO: should possibly lock the history file...
2147
benchfile = open(".perf_history", "at")
2149
test_suite_factory = None
2154
result = selftest(verbose=verbose,
2156
stop_on_failure=one,
2157
keep_output=keep_output,
2158
transport=transport,
2159
test_suite_factory=test_suite_factory,
2160
lsprof_timed=lsprof_timed,
2161
bench_history=benchfile)
2163
if benchfile is not None:
2166
info('tests passed')
2168
info('tests failed')
2169
return int(not result)
2172
class cmd_version(Command):
2173
"""Show version of bzr."""
2177
from bzrlib.version import show_version
2181
class cmd_rocks(Command):
2182
"""Statement of optimism."""
2188
print "it sure does!"
2191
class cmd_find_merge_base(Command):
2192
"""Find and print a base revision for merging two branches."""
2193
# TODO: Options to specify revisions on either side, as if
2194
# merging only part of the history.
2195
takes_args = ['branch', 'other']
2199
def run(self, branch, other):
2200
from bzrlib.revision import MultipleRevisionSources
2202
branch1 = Branch.open_containing(branch)[0]
2203
branch2 = Branch.open_containing(other)[0]
2205
history_1 = branch1.revision_history()
2206
history_2 = branch2.revision_history()
2208
last1 = branch1.last_revision()
2209
last2 = branch2.last_revision()
2211
source = MultipleRevisionSources(branch1.repository,
2214
base_rev_id = common_ancestor(last1, last2, source)
2216
print 'merge base is revision %s' % base_rev_id
2219
class cmd_merge(Command):
2220
"""Perform a three-way merge.
2222
The branch is the branch you will merge from. By default, it will merge
2223
the latest revision. If you specify a revision, that revision will be
2224
merged. If you specify two revisions, the first will be used as a BASE,
2225
and the second one as OTHER. Revision numbers are always relative to the
2228
By default, bzr will try to merge in all new work from the other
2229
branch, automatically determining an appropriate base. If this
2230
fails, you may need to give an explicit base.
2232
Merge will do its best to combine the changes in two branches, but there
2233
are some kinds of problems only a human can fix. When it encounters those,
2234
it will mark a conflict. A conflict means that you need to fix something,
2235
before you should commit.
2237
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2239
If there is no default branch set, the first merge will set it. After
2240
that, you can omit the branch to use the default. To change the
2241
default, use --remember. The value will only be saved if the remote
2242
location can be accessed.
2246
To merge the latest revision from bzr.dev
2247
bzr merge ../bzr.dev
2249
To merge changes up to and including revision 82 from bzr.dev
2250
bzr merge -r 82 ../bzr.dev
2252
To merge the changes introduced by 82, without previous changes:
2253
bzr merge -r 81..82 ../bzr.dev
2255
merge refuses to run if there are any uncommitted changes, unless
2258
The following merge types are available:
2260
takes_args = ['branch?']
2261
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2262
Option('show-base', help="Show base revision text in "
2264
Option('uncommitted', help='Apply uncommitted changes'
2265
' from a working copy, instead of branch changes')]
2268
from inspect import getdoc
2269
return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2271
def run(self, branch=None, revision=None, force=False, merge_type=None,
2272
show_base=False, reprocess=False, remember=False,
2274
if merge_type is None:
2275
merge_type = _mod_merge.Merge3Merger
2277
tree = WorkingTree.open_containing(u'.')[0]
2279
if branch is not None:
2281
reader = bundle.read_bundle_from_url(branch)
2282
except errors.NotABundle:
2283
pass # Continue on considering this url a Branch
2285
conflicts = merge_bundle(reader, tree, not force, merge_type,
2286
reprocess, show_base)
2292
if revision is None \
2293
or len(revision) < 1 or revision[0].needs_branch():
2294
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2296
if revision is None or len(revision) < 1:
2299
other = [branch, None]
2302
other = [branch, -1]
2303
other_branch, path = Branch.open_containing(branch)
2306
raise errors.BzrCommandError('Cannot use --uncommitted and'
2307
' --revision at the same time.')
2308
branch = revision[0].get_branch() or branch
2309
if len(revision) == 1:
2311
other_branch, path = Branch.open_containing(branch)
2312
revno = revision[0].in_history(other_branch).revno
2313
other = [branch, revno]
2315
assert len(revision) == 2
2316
if None in revision:
2317
raise errors.BzrCommandError(
2318
"Merge doesn't permit empty revision specifier.")
2319
base_branch, path = Branch.open_containing(branch)
2320
branch1 = revision[1].get_branch() or branch
2321
other_branch, path1 = Branch.open_containing(branch1)
2322
if revision[0].get_branch() is not None:
2323
# then path was obtained from it, and is None.
2326
base = [branch, revision[0].in_history(base_branch).revno]
2327
other = [branch1, revision[1].in_history(other_branch).revno]
2329
if tree.branch.get_parent() is None or remember:
2330
tree.branch.set_parent(other_branch.base)
2333
interesting_files = [path]
2335
interesting_files = None
2336
pb = ui.ui_factory.nested_progress_bar()
2339
conflict_count = _merge_helper(
2340
other, base, check_clean=(not force),
2341
merge_type=merge_type,
2342
reprocess=reprocess,
2343
show_base=show_base,
2344
pb=pb, file_list=interesting_files)
2347
if conflict_count != 0:
2351
except errors.AmbiguousBase, e:
2352
m = ("sorry, bzr can't determine the right merge base yet\n"
2353
"candidates are:\n "
2354
+ "\n ".join(e.bases)
2356
"please specify an explicit base with -r,\n"
2357
"and (if you want) report this to the bzr developers\n")
2360
# TODO: move up to common parent; this isn't merge-specific anymore.
2361
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2362
"""Use tree.branch's parent if none was supplied.
2364
Report if the remembered location was used.
2366
if supplied_location is not None:
2367
return supplied_location
2368
stored_location = tree.branch.get_parent()
2369
mutter("%s", stored_location)
2370
if stored_location is None:
2371
raise errors.BzrCommandError("No location specified or remembered")
2372
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2373
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2374
return stored_location
2377
class cmd_remerge(Command):
2380
Use this if you want to try a different merge technique while resolving
2381
conflicts. Some merge techniques are better than others, and remerge
2382
lets you try different ones on different files.
2384
The options for remerge have the same meaning and defaults as the ones for
2385
merge. The difference is that remerge can (only) be run when there is a
2386
pending merge, and it lets you specify particular files.
2389
$ bzr remerge --show-base
2390
Re-do the merge of all conflicted files, and show the base text in
2391
conflict regions, in addition to the usual THIS and OTHER texts.
2393
$ bzr remerge --merge-type weave --reprocess foobar
2394
Re-do the merge of "foobar", using the weave merge algorithm, with
2395
additional processing to reduce the size of conflict regions.
2397
The following merge types are available:"""
2398
takes_args = ['file*']
2399
takes_options = ['merge-type', 'reprocess',
2400
Option('show-base', help="Show base revision text in "
2404
from inspect import getdoc
2405
return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2407
def run(self, file_list=None, merge_type=None, show_base=False,
2409
if merge_type is None:
2410
merge_type = _mod_merge.Merge3Merger
2411
tree, file_list = tree_files(file_list)
2414
parents = tree.get_parent_ids()
2415
if len(parents) != 2:
2416
raise errors.BzrCommandError("Sorry, remerge only works after normal"
2417
" merges. Not cherrypicking or"
2419
repository = tree.branch.repository
2420
base_revision = common_ancestor(parents[0],
2421
parents[1], repository)
2422
base_tree = repository.revision_tree(base_revision)
2423
other_tree = repository.revision_tree(parents[1])
2424
interesting_ids = None
2426
conflicts = tree.conflicts()
2427
if file_list is not None:
2428
interesting_ids = set()
2429
for filename in file_list:
2430
file_id = tree.path2id(filename)
2432
raise errors.NotVersionedError(filename)
2433
interesting_ids.add(file_id)
2434
if tree.kind(file_id) != "directory":
2437
for name, ie in tree.inventory.iter_entries(file_id):
2438
interesting_ids.add(ie.file_id)
2439
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2441
# Remerge only supports resolving contents conflicts
2442
allowed_conflicts = ('text conflict', 'contents conflict')
2443
restore_files = [c.path for c in conflicts
2444
if c.typestring in allowed_conflicts]
2445
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2446
tree.set_conflicts(ConflictList(new_conflicts))
2447
if file_list is not None:
2448
restore_files = file_list
2449
for filename in restore_files:
2451
restore(tree.abspath(filename))
2452
except errors.NotConflicted:
2454
conflicts = _mod_merge.merge_inner(
2455
tree.branch, other_tree, base_tree,
2457
interesting_ids=interesting_ids,
2458
other_rev_id=parents[1],
2459
merge_type=merge_type,
2460
show_base=show_base,
2461
reprocess=reprocess)
2470
class cmd_revert(Command):
2471
"""Revert files to a previous revision.
2473
Giving a list of files will revert only those files. Otherwise, all files
2474
will be reverted. If the revision is not specified with '--revision', the
2475
last committed revision is used.
2477
To remove only some changes, without reverting to a prior version, use
2478
merge instead. For example, "merge . --r-2..-3" will remove the changes
2479
introduced by -2, without affecting the changes introduced by -1. Or
2480
to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
2482
By default, any files that have been manually changed will be backed up
2483
first. (Files changed only by merge are not backed up.) Backup files have
2484
'.~#~' appended to their name, where # is a number.
2486
When you provide files, you can use their current pathname or the pathname
2487
from the target revision. So you can use revert to "undelete" a file by
2488
name. If you name a directory, all the contents of that directory will be
2491
takes_options = ['revision', 'no-backup']
2492
takes_args = ['file*']
2493
aliases = ['merge-revert']
2495
def run(self, revision=None, no_backup=False, file_list=None):
2496
if file_list is not None:
2497
if len(file_list) == 0:
2498
raise errors.BzrCommandError("No files specified")
2502
tree, file_list = tree_files(file_list)
2503
if revision is None:
2504
# FIXME should be tree.last_revision
2505
rev_id = tree.last_revision()
2506
elif len(revision) != 1:
2507
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
2509
rev_id = revision[0].in_history(tree.branch).rev_id
2510
pb = ui.ui_factory.nested_progress_bar()
2512
tree.revert(file_list,
2513
tree.branch.repository.revision_tree(rev_id),
2519
class cmd_assert_fail(Command):
2520
"""Test reporting of assertion failures"""
2521
# intended just for use in testing
2526
raise AssertionError("always fails")
2529
class cmd_help(Command):
2530
"""Show help on a command or other topic.
2532
For a list of all available commands, say 'bzr help commands'.
2534
takes_options = [Option('long', 'show help on all commands')]
2535
takes_args = ['topic?']
2536
aliases = ['?', '--help', '-?', '-h']
2539
def run(self, topic=None, long=False):
2541
if topic is None and long:
2543
bzrlib.help.help(topic)
2546
class cmd_shell_complete(Command):
2547
"""Show appropriate completions for context.
2549
For a list of all available commands, say 'bzr shell-complete'.
2551
takes_args = ['context?']
2556
def run(self, context=None):
2557
import shellcomplete
2558
shellcomplete.shellcomplete(context)
2561
class cmd_fetch(Command):
2562
"""Copy in history from another branch but don't merge it.
2564
This is an internal method used for pull and merge.
2567
takes_args = ['from_branch', 'to_branch']
2568
def run(self, from_branch, to_branch):
2569
from bzrlib.fetch import Fetcher
2570
from_b = Branch.open(from_branch)
2571
to_b = Branch.open(to_branch)
2572
Fetcher(to_b, from_b)
2575
class cmd_missing(Command):
2576
"""Show unmerged/unpulled revisions between two branches.
2578
OTHER_BRANCH may be local or remote.
2580
takes_args = ['other_branch?']
2581
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2583
'Display changes in the local branch only'),
2584
Option('theirs-only',
2585
'Display changes in the remote branch only'),
2593
encoding_type = 'replace'
2596
def run(self, other_branch=None, reverse=False, mine_only=False,
2597
theirs_only=False, log_format=None, long=False, short=False, line=False,
2598
show_ids=False, verbose=False):
2599
from bzrlib.missing import find_unmerged, iter_log_data
2600
from bzrlib.log import log_formatter
2601
local_branch = Branch.open_containing(u".")[0]
2602
parent = local_branch.get_parent()
2603
if other_branch is None:
2604
other_branch = parent
2605
if other_branch is None:
2606
raise errors.BzrCommandError("No peer location known or specified.")
2607
print "Using last location: " + local_branch.get_parent()
2608
remote_branch = Branch.open(other_branch)
2609
if remote_branch.base == local_branch.base:
2610
remote_branch = local_branch
2611
local_branch.lock_read()
2613
remote_branch.lock_read()
2615
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2616
if (log_format is None):
2617
default = local_branch.get_config().log_format()
2618
log_format = get_log_format(long=long, short=short,
2619
line=line, default=default)
2620
lf = log_formatter(log_format,
2623
show_timezone='original')
2624
if reverse is False:
2625
local_extra.reverse()
2626
remote_extra.reverse()
2627
if local_extra and not theirs_only:
2628
print "You have %d extra revision(s):" % len(local_extra)
2629
for data in iter_log_data(local_extra, local_branch.repository,
2632
printed_local = True
2634
printed_local = False
2635
if remote_extra and not mine_only:
2636
if printed_local is True:
2638
print "You are missing %d revision(s):" % len(remote_extra)
2639
for data in iter_log_data(remote_extra, remote_branch.repository,
2642
if not remote_extra and not local_extra:
2644
print "Branches are up to date."
2648
remote_branch.unlock()
2650
local_branch.unlock()
2651
if not status_code and parent is None and other_branch is not None:
2652
local_branch.lock_write()
2654
# handle race conditions - a parent might be set while we run.
2655
if local_branch.get_parent() is None:
2656
local_branch.set_parent(remote_branch.base)
2658
local_branch.unlock()
2662
class cmd_plugins(Command):
2667
import bzrlib.plugin
2668
from inspect import getdoc
2669
for name, plugin in bzrlib.plugin.all_plugins().items():
2670
if getattr(plugin, '__path__', None) is not None:
2671
print plugin.__path__[0]
2672
elif getattr(plugin, '__file__', None) is not None:
2673
print plugin.__file__
2679
print '\t', d.split('\n')[0]
2682
class cmd_testament(Command):
2683
"""Show testament (signing-form) of a revision."""
2684
takes_options = ['revision',
2685
Option('long', help='Produce long-format testament'),
2686
Option('strict', help='Produce a strict-format'
2688
takes_args = ['branch?']
2690
def run(self, branch=u'.', revision=None, long=False, strict=False):
2691
from bzrlib.testament import Testament, StrictTestament
2693
testament_class = StrictTestament
2695
testament_class = Testament
2696
b = WorkingTree.open_containing(branch)[0].branch
2699
if revision is None:
2700
rev_id = b.last_revision()
2702
rev_id = revision[0].in_history(b).rev_id
2703
t = testament_class.from_revision(b.repository, rev_id)
2705
sys.stdout.writelines(t.as_text_lines())
2707
sys.stdout.write(t.as_short_text())
2712
class cmd_annotate(Command):
2713
"""Show the origin of each line in a file.
2715
This prints out the given file with an annotation on the left side
2716
indicating which revision, author and date introduced the change.
2718
If the origin is the same for a run of consecutive lines, it is
2719
shown only at the top, unless the --all option is given.
2721
# TODO: annotate directories; showing when each file was last changed
2722
# TODO: if the working copy is modified, show annotations on that
2723
# with new uncommitted lines marked
2724
aliases = ['ann', 'blame', 'praise']
2725
takes_args = ['filename']
2726
takes_options = [Option('all', help='show annotations on all lines'),
2727
Option('long', help='show date in annotations'),
2732
def run(self, filename, all=False, long=False, revision=None):
2733
from bzrlib.annotate import annotate_file
2734
tree, relpath = WorkingTree.open_containing(filename)
2735
branch = tree.branch
2738
if revision is None:
2739
revision_id = branch.last_revision()
2740
elif len(revision) != 1:
2741
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2743
revision_id = revision[0].in_history(branch).rev_id
2744
file_id = tree.inventory.path2id(relpath)
2745
tree = branch.repository.revision_tree(revision_id)
2746
file_version = tree.inventory[file_id].revision
2747
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
2752
class cmd_re_sign(Command):
2753
"""Create a digital signature for an existing revision."""
2754
# TODO be able to replace existing ones.
2756
hidden = True # is this right ?
2757
takes_args = ['revision_id*']
2758
takes_options = ['revision']
2760
def run(self, revision_id_list=None, revision=None):
2761
import bzrlib.gpg as gpg
2762
if revision_id_list is not None and revision is not None:
2763
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
2764
if revision_id_list is None and revision is None:
2765
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
2766
b = WorkingTree.open_containing(u'.')[0].branch
2767
gpg_strategy = gpg.GPGStrategy(b.get_config())
2768
if revision_id_list is not None:
2769
for revision_id in revision_id_list:
2770
b.repository.sign_revision(revision_id, gpg_strategy)
2771
elif revision is not None:
2772
if len(revision) == 1:
2773
revno, rev_id = revision[0].in_history(b)
2774
b.repository.sign_revision(rev_id, gpg_strategy)
2775
elif len(revision) == 2:
2776
# are they both on rh- if so we can walk between them
2777
# might be nice to have a range helper for arbitrary
2778
# revision paths. hmm.
2779
from_revno, from_revid = revision[0].in_history(b)
2780
to_revno, to_revid = revision[1].in_history(b)
2781
if to_revid is None:
2782
to_revno = b.revno()
2783
if from_revno is None or to_revno is None:
2784
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
2785
for revno in range(from_revno, to_revno + 1):
2786
b.repository.sign_revision(b.get_rev_id(revno),
2789
raise errors.BzrCommandError('Please supply either one revision, or a range.')
2792
class cmd_bind(Command):
2793
"""Bind the current branch to a master branch.
2795
After binding, commits must succeed on the master branch
2796
before they are executed on the local one.
2799
takes_args = ['location']
2802
def run(self, location=None):
2803
b, relpath = Branch.open_containing(u'.')
2804
b_other = Branch.open(location)
2807
except errors.DivergedBranches:
2808
raise errors.BzrCommandError('These branches have diverged.'
2809
' Try merging, and then bind again.')
2812
class cmd_unbind(Command):
2813
"""Unbind the current branch from its master branch.
2815
After unbinding, the local branch is considered independent.
2816
All subsequent commits will be local.
2823
b, relpath = Branch.open_containing(u'.')
2825
raise errors.BzrCommandError('Local branch is not bound')
2828
class cmd_uncommit(Command):
2829
"""Remove the last committed revision.
2831
--verbose will print out what is being removed.
2832
--dry-run will go through all the motions, but not actually
2835
In the future, uncommit will create a revision bundle, which can then
2839
# TODO: jam 20060108 Add an option to allow uncommit to remove
2840
# unreferenced information in 'branch-as-repository' branches.
2841
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2842
# information in shared branches as well.
2843
takes_options = ['verbose', 'revision',
2844
Option('dry-run', help='Don\'t actually make changes'),
2845
Option('force', help='Say yes to all questions.')]
2846
takes_args = ['location?']
2849
def run(self, location=None,
2850
dry_run=False, verbose=False,
2851
revision=None, force=False):
2852
from bzrlib.log import log_formatter, show_log
2854
from bzrlib.uncommit import uncommit
2856
if location is None:
2858
control, relpath = bzrdir.BzrDir.open_containing(location)
2860
tree = control.open_workingtree()
2862
except (errors.NoWorkingTree, errors.NotLocalUrl):
2864
b = control.open_branch()
2867
if revision is None:
2870
# 'bzr uncommit -r 10' actually means uncommit
2871
# so that the final tree is at revno 10.
2872
# but bzrlib.uncommit.uncommit() actually uncommits
2873
# the revisions that are supplied.
2874
# So we need to offset it by one
2875
revno = revision[0].in_history(b).revno+1
2877
if revno <= b.revno():
2878
rev_id = b.get_rev_id(revno)
2880
self.outf.write('No revisions to uncommit.\n')
2883
lf = log_formatter('short',
2885
show_timezone='original')
2890
direction='forward',
2891
start_revision=revno,
2892
end_revision=b.revno())
2895
print 'Dry-run, pretending to remove the above revisions.'
2897
val = raw_input('Press <enter> to continue')
2899
print 'The above revision(s) will be removed.'
2901
val = raw_input('Are you sure [y/N]? ')
2902
if val.lower() not in ('y', 'yes'):
2906
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2910
class cmd_break_lock(Command):
2911
"""Break a dead lock on a repository, branch or working directory.
2913
CAUTION: Locks should only be broken when you are sure that the process
2914
holding the lock has been stopped.
2916
You can get information on what locks are open via the 'bzr info' command.
2921
takes_args = ['location?']
2923
def run(self, location=None, show=False):
2924
if location is None:
2926
control, relpath = bzrdir.BzrDir.open_containing(location)
2928
control.break_lock()
2929
except NotImplementedError:
2933
class cmd_wait_until_signalled(Command):
2934
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
2936
This just prints a line to signal when it is ready, then blocks on stdin.
2942
sys.stdout.write("running\n")
2944
sys.stdin.readline()
2947
class cmd_serve(Command):
2948
"""Run the bzr server."""
2950
aliases = ['server']
2954
help='serve on stdin/out for use from inetd or sshd'),
2956
help='listen for connections on nominated port of the form '
2957
'[hostname:]portnumber. Passing 0 as the port number will '
2958
'result in a dynamically allocated port.',
2961
help='serve contents of directory',
2963
Option('allow-writes',
2964
help='By default the server is a readonly server. Supplying '
2965
'--allow-writes enables write access to the contents of '
2966
'the served directory and below. '
2970
def run(self, port=None, inet=False, directory=None, allow_writes=False):
2971
from bzrlib.transport import smart
2972
from bzrlib.transport import get_transport
2973
if directory is None:
2974
directory = os.getcwd()
2975
url = urlutils.local_path_to_url(directory)
2976
if not allow_writes:
2977
url = 'readonly+' + url
2978
t = get_transport(url)
2980
server = smart.SmartServerPipeStreamMedium(sys.stdin, sys.stdout, t)
2981
elif port is not None:
2983
host, port = port.split(':')
2986
server = smart.SmartTCPServer(t, host=host, port=int(port))
2987
print 'listening on port: ', server.port
2990
raise errors.BzrCommandError("bzr serve requires one of --inet or --port")
2994
# command-line interpretation helper for merge-related commands
2995
def _merge_helper(other_revision, base_revision,
2996
check_clean=True, ignore_zero=False,
2997
this_dir=None, backup_files=False,
2999
file_list=None, show_base=False, reprocess=False,
3000
pb=DummyProgress()):
3001
"""Merge changes into a tree.
3004
list(path, revno) Base for three-way merge.
3005
If [None, None] then a base will be automatically determined.
3007
list(path, revno) Other revision for three-way merge.
3009
Directory to merge changes into; '.' by default.
3011
If true, this_dir must have no uncommitted changes before the
3013
ignore_zero - If true, suppress the "zero conflicts" message when
3014
there are no conflicts; should be set when doing something we expect
3015
to complete perfectly.
3016
file_list - If supplied, merge only changes to selected files.
3018
All available ancestors of other_revision and base_revision are
3019
automatically pulled into the branch.
3021
The revno may be -1 to indicate the last revision on the branch, which is
3024
This function is intended for use from the command line; programmatic
3025
clients might prefer to call merge.merge_inner(), which has less magic
3028
# Loading it late, so that we don't always have to import bzrlib.merge
3029
if merge_type is None:
3030
merge_type = _mod_merge.Merge3Merger
3031
if this_dir is None:
3033
this_tree = WorkingTree.open_containing(this_dir)[0]
3034
if show_base and not merge_type is _mod_merge.Merge3Merger:
3035
raise errors.BzrCommandError("Show-base is not supported for this merge"
3036
" type. %s" % merge_type)
3037
if reprocess and not merge_type.supports_reprocess:
3038
raise errors.BzrCommandError("Conflict reduction is not supported for merge"
3039
" type %s." % merge_type)
3040
if reprocess and show_base:
3041
raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
3043
merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
3045
merger.pp = ProgressPhase("Merge phase", 5, pb)
3046
merger.pp.next_phase()
3047
merger.check_basis(check_clean)
3048
merger.set_other(other_revision)
3049
merger.pp.next_phase()
3050
merger.set_base(base_revision)
3051
if merger.base_rev_id == merger.other_rev_id:
3052
note('Nothing to do.')
3054
merger.backup_files = backup_files
3055
merger.merge_type = merge_type
3056
merger.set_interesting_files(file_list)
3057
merger.show_base = show_base
3058
merger.reprocess = reprocess
3059
conflicts = merger.do_merge()
3060
if file_list is None:
3061
merger.set_pending()
3068
merge = _merge_helper
3071
# these get imported and then picked up by the scan for cmd_*
3072
# TODO: Some more consistent way to split command definitions across files;
3073
# we do need to load at least some information about them to know of
3074
# aliases. ideally we would avoid loading the implementation until the
3075
# details were needed.
3076
from bzrlib.cmd_version_info import cmd_version_info
3077
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
3078
from bzrlib.bundle.commands import cmd_bundle_revisions
3079
from bzrlib.sign_my_commits import cmd_sign_my_commits
3080
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
3081
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
