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(), """
47
from bzrlib.branch import Branch
48
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
49
from bzrlib.conflicts import ConflictList
50
from bzrlib.revision import common_ancestor
51
from bzrlib.revisionspec import RevisionSpec
52
from bzrlib.workingtree import WorkingTree
55
from bzrlib.commands import Command, display_command
56
from bzrlib.option import Option, RegistryOption
57
from bzrlib.progress import DummyProgress, ProgressPhase
58
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
61
def tree_files(file_list, default_branch=u'.'):
63
return internal_tree_files(file_list, default_branch)
64
except errors.FileInWrongBranch, e:
65
raise errors.BzrCommandError("%s is not in the same branch as %s" %
66
(e.path, file_list[0]))
69
# XXX: Bad function name; should possibly also be a class method of
70
# WorkingTree rather than a function.
71
def internal_tree_files(file_list, default_branch=u'.'):
72
"""Convert command-line paths to a WorkingTree and relative paths.
74
This is typically used for command-line processors that take one or
75
more filenames, and infer the workingtree that contains them.
77
The filenames given are not required to exist.
79
:param file_list: Filenames to convert.
81
:param default_branch: Fallback tree path to use if file_list is empty or
84
:return: workingtree, [relative_paths]
86
if file_list is None or len(file_list) == 0:
87
return WorkingTree.open_containing(default_branch)[0], file_list
88
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
90
for filename in file_list:
92
new_list.append(tree.relpath(osutils.dereference_path(filename)))
93
except errors.PathNotChild:
94
raise errors.FileInWrongBranch(tree.branch, filename)
98
@symbol_versioning.deprecated_function(symbol_versioning.zero_fifteen)
99
def get_format_type(typestring):
100
"""Parse and return a format specifier."""
101
# Have to use BzrDirMetaFormat1 directly, so that
102
# RepositoryFormat.set_default_format works
103
if typestring == "default":
104
return bzrdir.BzrDirMetaFormat1()
106
return bzrdir.format_registry.make_bzrdir(typestring)
108
msg = 'Unknown bzr format "%s". See "bzr help formats".' % typestring
109
raise errors.BzrCommandError(msg)
112
# TODO: Make sure no commands unconditionally use the working directory as a
113
# branch. If a filename argument is used, the first of them should be used to
114
# specify the branch. (Perhaps this can be factored out into some kind of
115
# Argument class, representing a file in a branch, where the first occurrence
118
class cmd_status(Command):
119
"""Display status summary.
121
This reports on versioned and unknown files, reporting them
122
grouped by state. Possible states are:
125
Versioned in the working copy but not in the previous revision.
128
Versioned in the previous revision but removed or deleted
132
Path of this file changed from the previous revision;
133
the text may also have changed. This includes files whose
134
parent directory was renamed.
137
Text has changed since the previous revision.
140
File kind has been changed (e.g. from file to directory).
143
Not versioned and not matching an ignore pattern.
145
To see ignored files use 'bzr ignored'. For details in the
146
changes to file texts, use 'bzr diff'.
148
--short gives a status flags for each item, similar to the SVN's status
151
Column 1: versioning / renames
157
P Entry for a pending merge (not a file)
166
* The execute bit was changed
168
If no arguments are specified, the status of the entire working
169
directory is shown. Otherwise, only the status of the specified
170
files or directories is reported. If a directory is given, status
171
is reported for everything inside that directory.
173
If a revision argument is given, the status is calculated against
174
that revision, or between two revisions if two are provided.
177
# TODO: --no-recurse, --recurse options
179
takes_args = ['file*']
180
takes_options = ['show-ids', 'revision', 'short']
181
aliases = ['st', 'stat']
183
encoding_type = 'replace'
186
def run(self, show_ids=False, file_list=None, revision=None, short=False):
187
from bzrlib.status import show_tree_status
189
tree, file_list = tree_files(file_list)
191
show_tree_status(tree, show_ids=show_ids,
192
specific_files=file_list, revision=revision,
197
class cmd_cat_revision(Command):
198
"""Write out metadata for a revision.
200
The revision to print can either be specified by a specific
201
revision identifier, or you can use --revision.
205
takes_args = ['revision_id?']
206
takes_options = ['revision']
207
# cat-revision is more for frontends so should be exact
211
def run(self, revision_id=None, revision=None):
213
if revision_id is not None and revision is not None:
214
raise errors.BzrCommandError('You can only supply one of'
215
' revision_id or --revision')
216
if revision_id is None and revision is None:
217
raise errors.BzrCommandError('You must supply either'
218
' --revision or a revision_id')
219
b = WorkingTree.open_containing(u'.')[0].branch
221
# TODO: jam 20060112 should cat-revision always output utf-8?
222
if revision_id is not None:
223
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
224
elif revision is not None:
227
raise errors.BzrCommandError('You cannot specify a NULL'
229
revno, rev_id = rev.in_history(b)
230
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
233
class cmd_remove_tree(Command):
234
"""Remove the working tree from a given branch/checkout.
236
Since a lightweight checkout is little more than a working tree
237
this will refuse to run against one.
242
takes_args = ['location?']
244
def run(self, location='.'):
245
d = bzrdir.BzrDir.open(location)
248
working = d.open_workingtree()
249
except errors.NoWorkingTree:
250
raise errors.BzrCommandError("No working tree to remove")
251
except errors.NotLocalUrl:
252
raise errors.BzrCommandError("You cannot remove the working tree of a "
255
working_path = working.bzrdir.root_transport.base
256
branch_path = working.branch.bzrdir.root_transport.base
257
if working_path != branch_path:
258
raise errors.BzrCommandError("You cannot remove the working tree from "
259
"a lightweight checkout")
261
d.destroy_workingtree()
264
class cmd_revno(Command):
265
"""Show current revision number.
267
This is equal to the number of revisions on this branch.
270
takes_args = ['location?']
273
def run(self, location=u'.'):
274
self.outf.write(str(Branch.open_containing(location)[0].revno()))
275
self.outf.write('\n')
278
class cmd_revision_info(Command):
279
"""Show revision number and revision id for a given revision identifier.
282
takes_args = ['revision_info*']
283
takes_options = ['revision']
286
def run(self, revision=None, revision_info_list=[]):
289
if revision is not None:
290
revs.extend(revision)
291
if revision_info_list is not None:
292
for rev in revision_info_list:
293
revs.append(RevisionSpec.from_string(rev))
295
raise errors.BzrCommandError('You must supply a revision identifier')
297
b = WorkingTree.open_containing(u'.')[0].branch
300
revinfo = rev.in_history(b)
301
if revinfo.revno is None:
302
print ' %s' % revinfo.rev_id
304
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
307
class cmd_add(Command):
308
"""Add specified files or directories.
310
In non-recursive mode, all the named items are added, regardless
311
of whether they were previously ignored. A warning is given if
312
any of the named files are already versioned.
314
In recursive mode (the default), files are treated the same way
315
but the behaviour for directories is different. Directories that
316
are already versioned do not give a warning. All directories,
317
whether already versioned or not, are searched for files or
318
subdirectories that are neither versioned or ignored, and these
319
are added. This search proceeds recursively into versioned
320
directories. If no names are given '.' is assumed.
322
Therefore simply saying 'bzr add' will version all files that
323
are currently unknown.
325
Adding a file whose parent directory is not versioned will
326
implicitly add the parent, and so on up to the root. This means
327
you should never need to explicitly add a directory, they'll just
328
get added when you add a file in the directory.
330
--dry-run will show which files would be added, but not actually
333
--file-ids-from will try to use the file ids from the supplied path.
334
It looks up ids trying to find a matching parent directory with the
335
same filename, and then by pure path.
337
takes_args = ['file*']
338
takes_options = ['no-recurse', 'dry-run', 'verbose',
339
Option('file-ids-from', type=unicode,
340
help='Lookup file ids from here')]
341
encoding_type = 'replace'
343
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
347
if file_ids_from is not None:
349
base_tree, base_path = WorkingTree.open_containing(
351
except errors.NoWorkingTree:
352
base_branch, base_path = Branch.open_containing(
354
base_tree = base_branch.basis_tree()
356
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
357
to_file=self.outf, should_print=(not is_quiet()))
359
action = bzrlib.add.AddAction(to_file=self.outf,
360
should_print=(not is_quiet()))
362
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
363
action=action, save=not dry_run)
366
for glob in sorted(ignored.keys()):
367
for path in ignored[glob]:
368
self.outf.write("ignored %s matching \"%s\"\n"
372
for glob, paths in ignored.items():
373
match_len += len(paths)
374
self.outf.write("ignored %d file(s).\n" % match_len)
375
self.outf.write("If you wish to add some of these files,"
376
" please add them by name.\n")
379
class cmd_mkdir(Command):
380
"""Create a new versioned directory.
382
This is equivalent to creating the directory and then adding it.
385
takes_args = ['dir+']
386
encoding_type = 'replace'
388
def run(self, dir_list):
391
wt, dd = WorkingTree.open_containing(d)
393
self.outf.write('added %s\n' % d)
396
class cmd_relpath(Command):
397
"""Show path of a file relative to root"""
399
takes_args = ['filename']
403
def run(self, filename):
404
# TODO: jam 20050106 Can relpath return a munged path if
405
# sys.stdout encoding cannot represent it?
406
tree, relpath = WorkingTree.open_containing(filename)
407
self.outf.write(relpath)
408
self.outf.write('\n')
411
class cmd_inventory(Command):
412
"""Show inventory of the current working copy or a revision.
414
It is possible to limit the output to a particular entry
415
type using the --kind option. For example: --kind file.
417
It is also possible to restrict the list of files to a specific
418
set. For example: bzr inventory --show-ids this/file
421
takes_options = ['revision', 'show-ids', 'kind']
422
takes_args = ['file*']
425
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
426
if kind and kind not in ['file', 'directory', 'symlink']:
427
raise errors.BzrCommandError('invalid kind specified')
429
work_tree, file_list = tree_files(file_list)
431
if revision is not None:
432
if len(revision) > 1:
433
raise errors.BzrCommandError('bzr inventory --revision takes'
434
' exactly one revision identifier')
435
revision_id = revision[0].in_history(work_tree.branch).rev_id
436
tree = work_tree.branch.repository.revision_tree(revision_id)
438
# We include work_tree as well as 'tree' here
439
# So that doing '-r 10 path/foo' will lookup whatever file
440
# exists now at 'path/foo' even if it has been renamed, as
441
# well as whatever files existed in revision 10 at path/foo
442
trees = [tree, work_tree]
447
if file_list is not None:
448
file_ids = _mod_tree.find_ids_across_trees(file_list, trees,
449
require_versioned=True)
450
# find_ids_across_trees may include some paths that don't
452
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
453
for file_id in file_ids if file_id in tree)
455
entries = tree.inventory.entries()
457
for path, entry in entries:
458
if kind and kind != entry.kind:
461
self.outf.write('%-50s %s\n' % (path, entry.file_id))
463
self.outf.write(path)
464
self.outf.write('\n')
467
class cmd_mv(Command):
468
"""Move or rename a file.
471
bzr mv OLDNAME NEWNAME
472
bzr mv SOURCE... DESTINATION
474
If the last argument is a versioned directory, all the other names
475
are moved into it. Otherwise, there must be exactly two arguments
476
and the file is changed to a new name.
478
If OLDNAME does not exist on the filesystem but is versioned and
479
NEWNAME does exist on the filesystem but is not versioned, mv
480
assumes that the file has been manually moved and only updates
481
its internal inventory to reflect that change.
482
The same is valid when moving many SOURCE files to a DESTINATION.
484
Files cannot be moved between branches.
487
takes_args = ['names*']
488
takes_options = [Option("after", help="move only the bzr identifier"
489
" of the file (file has already been moved). Use this flag if"
490
" bzr is not able to detect this itself.")]
491
aliases = ['move', 'rename']
492
encoding_type = 'replace'
494
def run(self, names_list, after=False):
495
if names_list is None:
498
if len(names_list) < 2:
499
raise errors.BzrCommandError("missing file argument")
500
tree, rel_names = tree_files(names_list)
502
if os.path.isdir(names_list[-1]):
503
# move into existing directory
504
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
505
self.outf.write("%s => %s\n" % pair)
507
if len(names_list) != 2:
508
raise errors.BzrCommandError('to mv multiple files the'
509
' destination must be a versioned'
511
tree.rename_one(rel_names[0], rel_names[1], after=after)
512
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
515
class cmd_pull(Command):
516
"""Turn this branch into a mirror of another branch.
518
This command only works on branches that have not diverged. Branches are
519
considered diverged if the destination branch's most recent commit is one
520
that has not been merged (directly or indirectly) into the parent.
522
If branches have diverged, you can use 'bzr merge' to integrate the changes
523
from one into the other. Once one branch has merged, the other should
524
be able to pull it again.
526
If you want to forget your local changes and just update your branch to
527
match the remote one, use pull --overwrite.
529
If there is no default location set, the first pull will set it. After
530
that, you can omit the location to use the default. To change the
531
default, use --remember. The value will only be saved if the remote
532
location can be accessed.
535
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
536
takes_args = ['location?']
537
encoding_type = 'replace'
539
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
540
# FIXME: too much stuff is in the command class
542
tree_to = WorkingTree.open_containing(u'.')[0]
543
branch_to = tree_to.branch
544
except errors.NoWorkingTree:
546
branch_to = Branch.open_containing(u'.')[0]
549
if location is not None:
551
reader = bundle.read_bundle_from_url(location)
552
except errors.NotABundle:
553
pass # Continue on considering this url a Branch
555
stored_loc = branch_to.get_parent()
557
if stored_loc is None:
558
raise errors.BzrCommandError("No pull location known or"
561
display_url = urlutils.unescape_for_display(stored_loc,
563
self.outf.write("Using saved location: %s\n" % display_url)
564
location = stored_loc
567
if reader is not None:
568
install_bundle(branch_to.repository, reader)
569
branch_from = branch_to
571
branch_from = Branch.open(location)
573
if branch_to.get_parent() is None or remember:
574
branch_to.set_parent(branch_from.base)
578
if reader is not None:
579
rev_id = reader.target
580
elif len(revision) == 1:
581
rev_id = revision[0].in_history(branch_from).rev_id
583
raise errors.BzrCommandError('bzr pull --revision takes one value.')
585
old_rh = branch_to.revision_history()
586
if tree_to is not None:
587
count = tree_to.pull(branch_from, overwrite, rev_id)
589
count = branch_to.pull(branch_from, overwrite, rev_id)
590
note('%d revision(s) pulled.' % (count,))
593
new_rh = branch_to.revision_history()
596
from bzrlib.log import show_changed_revisions
597
show_changed_revisions(branch_to, old_rh, new_rh,
601
class cmd_push(Command):
602
"""Update a mirror of this branch.
604
The target branch will not have its working tree populated because this
605
is both expensive, and is not supported on remote file systems.
607
Some smart servers or protocols *may* put the working tree in place in
610
This command only works on branches that have not diverged. Branches are
611
considered diverged if the destination branch's most recent commit is one
612
that has not been merged (directly or indirectly) by the source branch.
614
If branches have diverged, you can use 'bzr push --overwrite' to replace
615
the other branch completely, discarding its unmerged changes.
617
If you want to ensure you have the different changes in the other branch,
618
do a merge (see bzr help merge) from the other branch, and commit that.
619
After that you will be able to do a push without '--overwrite'.
621
If there is no default push location set, the first push will set it.
622
After that, you can omit the location to use the default. To change the
623
default, use --remember. The value will only be saved if the remote
624
location can be accessed.
627
takes_options = ['remember', 'overwrite', 'verbose',
628
Option('create-prefix',
629
help='Create the path leading up to the branch '
630
'if it does not already exist')]
631
takes_args = ['location?']
632
encoding_type = 'replace'
634
def run(self, location=None, remember=False, overwrite=False,
635
create_prefix=False, verbose=False):
636
# FIXME: Way too big! Put this into a function called from the
639
br_from = Branch.open_containing('.')[0]
640
stored_loc = br_from.get_push_location()
642
if stored_loc is None:
643
raise errors.BzrCommandError("No push location known or specified.")
645
display_url = urlutils.unescape_for_display(stored_loc,
647
self.outf.write("Using saved location: %s\n" % display_url)
648
location = stored_loc
650
to_transport = transport.get_transport(location)
651
location_url = to_transport.base
655
dir_to = bzrdir.BzrDir.open(location_url)
656
br_to = dir_to.open_branch()
657
except errors.NotBranchError:
659
to_transport = to_transport.clone('..')
660
if not create_prefix:
662
relurl = to_transport.relpath(location_url)
663
mutter('creating directory %s => %s', location_url, relurl)
664
to_transport.mkdir(relurl)
665
except errors.NoSuchFile:
666
raise errors.BzrCommandError("Parent directory of %s "
667
"does not exist." % location)
669
current = to_transport.base
670
needed = [(to_transport, to_transport.relpath(location_url))]
673
to_transport, relpath = needed[-1]
674
to_transport.mkdir(relpath)
676
except errors.NoSuchFile:
677
new_transport = to_transport.clone('..')
678
needed.append((new_transport,
679
new_transport.relpath(to_transport.base)))
680
if new_transport.base == to_transport.base:
681
raise errors.BzrCommandError("Could not create "
683
dir_to = br_from.bzrdir.clone(location_url,
684
revision_id=br_from.last_revision())
685
br_to = dir_to.open_branch()
686
count = br_to.last_revision_info()[0]
687
# We successfully created the target, remember it
688
if br_from.get_push_location() is None or remember:
689
br_from.set_push_location(br_to.base)
691
# We were able to connect to the remote location, so remember it
692
# we don't need to successfully push because of possible divergence.
693
if br_from.get_push_location() is None or remember:
694
br_from.set_push_location(br_to.base)
695
old_rh = br_to.revision_history()
698
tree_to = dir_to.open_workingtree()
699
except errors.NotLocalUrl:
700
warning('This transport does not update the working '
701
'tree of: %s' % (br_to.base,))
702
count = br_from.push(br_to, overwrite)
703
except errors.NoWorkingTree:
704
count = br_from.push(br_to, overwrite)
708
count = br_from.push(tree_to.branch, overwrite)
712
except errors.DivergedBranches:
713
raise errors.BzrCommandError('These branches have diverged.'
714
' Try using "merge" and then "push".')
715
note('%d revision(s) pushed.' % (count,))
718
new_rh = br_to.revision_history()
721
from bzrlib.log import show_changed_revisions
722
show_changed_revisions(br_to, old_rh, new_rh,
726
class cmd_branch(Command):
727
"""Create a new copy of a branch.
729
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
730
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
732
To retrieve the branch as of a particular revision, supply the --revision
733
parameter, as in "branch foo/bar -r 5".
735
--basis is to speed up branching from remote branches. When specified, it
736
copies all the file-contents, inventory and revision data from the basis
737
branch before copying anything from the remote branch.
739
takes_args = ['from_location', 'to_location?']
740
takes_options = ['revision', 'basis']
741
aliases = ['get', 'clone']
743
def run(self, from_location, to_location=None, revision=None, basis=None):
746
elif len(revision) > 1:
747
raise errors.BzrCommandError(
748
'bzr branch --revision takes exactly 1 revision value')
750
br_from = Branch.open(from_location)
752
if e.errno == errno.ENOENT:
753
raise errors.BzrCommandError('Source location "%s" does not'
754
' exist.' % to_location)
759
if basis is not None:
760
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
763
if len(revision) == 1 and revision[0] is not None:
764
revision_id = revision[0].in_history(br_from)[1]
766
# FIXME - wt.last_revision, fallback to branch, fall back to
767
# None or perhaps NULL_REVISION to mean copy nothing
769
revision_id = br_from.last_revision()
770
if to_location is None:
771
to_location = os.path.basename(from_location.rstrip("/\\"))
774
name = os.path.basename(to_location) + '\n'
776
to_transport = transport.get_transport(to_location)
778
to_transport.mkdir('.')
779
except errors.FileExists:
780
raise errors.BzrCommandError('Target directory "%s" already'
781
' exists.' % to_location)
782
except errors.NoSuchFile:
783
raise errors.BzrCommandError('Parent of "%s" does not exist.'
786
# preserve whatever source format we have.
787
dir = br_from.bzrdir.sprout(to_transport.base,
788
revision_id, basis_dir)
789
branch = dir.open_branch()
790
except errors.NoSuchRevision:
791
to_transport.delete_tree('.')
792
msg = "The branch %s has no revision %s." % (from_location, revision[0])
793
raise errors.BzrCommandError(msg)
794
except errors.UnlistableBranch:
795
osutils.rmtree(to_location)
796
msg = "The branch %s cannot be used as a --basis" % (basis,)
797
raise errors.BzrCommandError(msg)
799
branch.control_files.put_utf8('branch-name', name)
800
note('Branched %d revision(s).' % branch.revno())
805
class cmd_checkout(Command):
806
"""Create a new checkout of an existing branch.
808
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
809
the branch found in '.'. This is useful if you have removed the working tree
810
or if it was never created - i.e. if you pushed the branch to its current
813
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
814
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
816
To retrieve the branch as of a particular revision, supply the --revision
817
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
818
out of date [so you cannot commit] but it may be useful (i.e. to examine old
821
--basis is to speed up checking out from remote branches. When specified, it
822
uses the inventory and file contents from the basis branch in preference to the
823
branch being checked out.
825
takes_args = ['branch_location?', 'to_location?']
826
takes_options = ['revision', # , 'basis']
827
Option('lightweight',
828
help="perform a lightweight checkout. Lightweight "
829
"checkouts depend on access to the branch for "
830
"every operation. Normal checkouts can perform "
831
"common operations like diff and status without "
832
"such access, and also support local commits."
837
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
841
elif len(revision) > 1:
842
raise errors.BzrCommandError(
843
'bzr checkout --revision takes exactly 1 revision value')
844
if branch_location is None:
845
branch_location = osutils.getcwd()
846
to_location = branch_location
847
source = Branch.open(branch_location)
848
if len(revision) == 1 and revision[0] is not None:
849
revision_id = revision[0].in_history(source)[1]
852
if to_location is None:
853
to_location = os.path.basename(branch_location.rstrip("/\\"))
854
# if the source and to_location are the same,
855
# and there is no working tree,
856
# then reconstitute a branch
857
if (osutils.abspath(to_location) ==
858
osutils.abspath(branch_location)):
860
source.bzrdir.open_workingtree()
861
except errors.NoWorkingTree:
862
source.bzrdir.create_workingtree()
865
os.mkdir(to_location)
867
if e.errno == errno.EEXIST:
868
raise errors.BzrCommandError('Target directory "%s" already'
869
' exists.' % to_location)
870
if e.errno == errno.ENOENT:
871
raise errors.BzrCommandError('Parent of "%s" does not exist.'
875
source.create_checkout(to_location, revision_id, lightweight)
878
class cmd_renames(Command):
879
"""Show list of renamed files.
881
# TODO: Option to show renames between two historical versions.
883
# TODO: Only show renames under dir, rather than in the whole branch.
884
takes_args = ['dir?']
887
def run(self, dir=u'.'):
888
tree = WorkingTree.open_containing(dir)[0]
889
old_inv = tree.basis_tree().inventory
890
new_inv = tree.read_working_inventory()
891
renames = list(_mod_tree.find_renames(old_inv, new_inv))
893
for old_name, new_name in renames:
894
self.outf.write("%s => %s\n" % (old_name, new_name))
897
class cmd_update(Command):
898
"""Update a tree to have the latest code committed to its branch.
900
This will perform a merge into the working tree, and may generate
901
conflicts. If you have any local changes, you will still
902
need to commit them after the update for the update to be complete.
904
If you want to discard your local changes, you can just do a
905
'bzr revert' instead of 'bzr commit' after the update.
907
takes_args = ['dir?']
910
def run(self, dir='.'):
911
tree = WorkingTree.open_containing(dir)[0]
912
master = tree.branch.get_master_branch()
913
if master is not None:
916
tree.lock_tree_write()
918
existing_pending_merges = tree.get_parent_ids()[1:]
919
last_rev = tree.last_revision()
920
if last_rev == tree.branch.last_revision():
921
# may be up to date, check master too.
922
master = tree.branch.get_master_branch()
923
if master is None or last_rev == master.last_revision():
924
revno = tree.branch.revision_id_to_revno(last_rev)
925
note("Tree is up to date at revision %d." % (revno,))
927
conflicts = tree.update()
928
revno = tree.branch.revision_id_to_revno(tree.last_revision())
929
note('Updated to revision %d.' % (revno,))
930
if tree.get_parent_ids()[1:] != existing_pending_merges:
931
note('Your local commits will now show as pending merges with '
932
"'bzr status', and can be committed with 'bzr commit'.")
941
class cmd_info(Command):
942
"""Show information about a working tree, branch or repository.
944
This command will show all known locations and formats associated to the
945
tree, branch or repository. Statistical information is included with
948
Branches and working trees will also report any missing revisions.
950
takes_args = ['location?']
951
takes_options = ['verbose']
954
def run(self, location=None, verbose=False):
955
from bzrlib.info import show_bzrdir_info
956
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
960
class cmd_remove(Command):
961
"""Make a file unversioned.
963
This makes bzr stop tracking changes to a versioned file. It does
964
not delete the working copy.
966
You can specify one or more files, and/or --new. If you specify --new,
967
only 'added' files will be removed. If you specify both, then new files
968
in the specified directories will be removed. If the directories are
969
also new, they will also be removed.
971
takes_args = ['file*']
972
takes_options = ['verbose', Option('new', help='remove newly-added files')]
974
encoding_type = 'replace'
976
def run(self, file_list, verbose=False, new=False):
977
tree, file_list = tree_files(file_list)
979
if file_list is None:
980
raise errors.BzrCommandError('Specify one or more files to'
981
' remove, or use --new.')
983
added = tree.changes_from(tree.basis_tree(),
984
specific_files=file_list).added
985
file_list = sorted([f[0] for f in added], reverse=True)
986
if len(file_list) == 0:
987
raise errors.BzrCommandError('No matching files.')
988
tree.remove(file_list, verbose=verbose, to_file=self.outf)
991
class cmd_file_id(Command):
992
"""Print file_id of a particular file or directory.
994
The file_id is assigned when the file is first added and remains the
995
same through all revisions where the file exists, even when it is
1000
takes_args = ['filename']
1003
def run(self, filename):
1004
tree, relpath = WorkingTree.open_containing(filename)
1005
i = tree.inventory.path2id(relpath)
1007
raise errors.NotVersionedError(filename)
1009
self.outf.write(i + '\n')
1012
class cmd_file_path(Command):
1013
"""Print path of file_ids to a file or directory.
1015
This prints one line for each directory down to the target,
1016
starting at the branch root.
1020
takes_args = ['filename']
1023
def run(self, filename):
1024
tree, relpath = WorkingTree.open_containing(filename)
1025
inv = tree.inventory
1026
fid = inv.path2id(relpath)
1028
raise errors.NotVersionedError(filename)
1029
for fip in inv.get_idpath(fid):
1030
self.outf.write(fip + '\n')
1033
class cmd_reconcile(Command):
1034
"""Reconcile bzr metadata in a branch.
1036
This can correct data mismatches that may have been caused by
1037
previous ghost operations or bzr upgrades. You should only
1038
need to run this command if 'bzr check' or a bzr developer
1039
advises you to run it.
1041
If a second branch is provided, cross-branch reconciliation is
1042
also attempted, which will check that data like the tree root
1043
id which was not present in very early bzr versions is represented
1044
correctly in both branches.
1046
At the same time it is run it may recompress data resulting in
1047
a potential saving in disk space or performance gain.
1049
The branch *MUST* be on a listable system such as local disk or sftp.
1051
takes_args = ['branch?']
1053
def run(self, branch="."):
1054
from bzrlib.reconcile import reconcile
1055
dir = bzrdir.BzrDir.open(branch)
1059
class cmd_revision_history(Command):
1060
"""Display the list of revision ids on a branch."""
1061
takes_args = ['location?']
1066
def run(self, location="."):
1067
branch = Branch.open_containing(location)[0]
1068
for revid in branch.revision_history():
1069
self.outf.write(revid)
1070
self.outf.write('\n')
1073
class cmd_ancestry(Command):
1074
"""List all revisions merged into this branch."""
1075
takes_args = ['location?']
1080
def run(self, location="."):
1082
wt = WorkingTree.open_containing(location)[0]
1083
except errors.NoWorkingTree:
1084
b = Branch.open(location)
1085
last_revision = b.last_revision()
1088
last_revision = wt.last_revision()
1090
revision_ids = b.repository.get_ancestry(last_revision)
1091
assert revision_ids[0] is None
1093
for revision_id in revision_ids:
1094
self.outf.write(revision_id + '\n')
1097
class cmd_init(Command):
1098
"""Make a directory into a versioned branch.
1100
Use this to create an empty branch, or before importing an
1103
If there is a repository in a parent directory of the location, then
1104
the history of the branch will be stored in the repository. Otherwise
1105
init creates a standalone branch which carries its own history in
1108
If there is already a branch at the location but it has no working tree,
1109
the tree can be populated with 'bzr checkout'.
1111
Recipe for importing a tree of files:
1116
bzr commit -m 'imported project'
1118
takes_args = ['location?']
1120
RegistryOption('format',
1121
help='Specify a format for this branch. See "bzr '
1122
'help formats" for details',
1123
converter=bzrdir.format_registry.make_bzrdir,
1124
registry=bzrdir.format_registry,
1125
value_switches=True, title="Branch Format"),
1127
def run(self, location=None, format=None):
1129
format = bzrdir.format_registry.make_bzrdir('default')
1130
if location is None:
1133
to_transport = transport.get_transport(location)
1135
# The path has to exist to initialize a
1136
# branch inside of it.
1137
# Just using os.mkdir, since I don't
1138
# believe that we want to create a bunch of
1139
# locations if the user supplies an extended path
1140
# TODO: create-prefix
1142
to_transport.mkdir('.')
1143
except errors.FileExists:
1147
existing_bzrdir = bzrdir.BzrDir.open(location)
1148
except errors.NotBranchError:
1149
# really a NotBzrDir error...
1150
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1152
from bzrlib.transport.local import LocalTransport
1153
if existing_bzrdir.has_branch():
1154
if (isinstance(to_transport, LocalTransport)
1155
and not existing_bzrdir.has_workingtree()):
1156
raise errors.BranchExistsWithoutWorkingTree(location)
1157
raise errors.AlreadyBranchError(location)
1159
existing_bzrdir.create_branch()
1160
existing_bzrdir.create_workingtree()
1163
class cmd_init_repository(Command):
1164
"""Create a shared repository to hold branches.
1166
New branches created under the repository directory will store their revisions
1167
in the repository, not in the branch directory, if the branch format supports
1173
bzr checkout --lightweight repo/trunk trunk-checkout
1177
takes_args = ["location"]
1178
takes_options = [RegistryOption('format',
1179
help='Specify a format for this repository. See'
1180
' "bzr help formats" for details',
1181
registry=bzrdir.format_registry,
1182
converter=bzrdir.format_registry.make_bzrdir,
1183
value_switches=True, title='Repository format'),
1185
help='Allows branches in repository to have'
1187
aliases = ["init-repo"]
1188
def run(self, location, format=None, trees=False):
1190
format = bzrdir.format_registry.make_bzrdir('default')
1192
if location is None:
1195
to_transport = transport.get_transport(location)
1197
to_transport.mkdir('.')
1198
except errors.FileExists:
1201
newdir = format.initialize_on_transport(to_transport)
1202
repo = newdir.create_repository(shared=True)
1203
repo.set_make_working_trees(trees)
1206
class cmd_diff(Command):
1207
"""Show differences in the working tree or between revisions.
1209
If files are listed, only the changes in those files are listed.
1210
Otherwise, all changes for the tree are listed.
1212
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1213
produces patches suitable for "patch -p1".
1217
Shows the difference in the working tree versus the last commit
1219
Difference between the working tree and revision 1
1221
Difference between revision 2 and revision 1
1222
bzr diff --diff-prefix old/:new/
1223
Same as 'bzr diff' but prefix paths with old/ and new/
1224
bzr diff bzr.mine bzr.dev
1225
Show the differences between the two working trees
1227
Show just the differences for 'foo.c'
1229
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1230
# or a graphical diff.
1232
# TODO: Python difflib is not exactly the same as unidiff; should
1233
# either fix it up or prefer to use an external diff.
1235
# TODO: Selected-file diff is inefficient and doesn't show you
1238
# TODO: This probably handles non-Unix newlines poorly.
1240
takes_args = ['file*']
1241
takes_options = ['revision', 'diff-options',
1242
Option('prefix', type=str,
1244
help='Set prefixes to added to old and new filenames, as '
1245
'two values separated by a colon.'),
1247
aliases = ['di', 'dif']
1248
encoding_type = 'exact'
1251
def run(self, revision=None, file_list=None, diff_options=None,
1253
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1255
if (prefix is None) or (prefix == '0'):
1263
old_label, new_label = prefix.split(":")
1265
raise BzrCommandError(
1266
"--prefix expects two values separated by a colon")
1268
if revision and len(revision) > 2:
1269
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1270
' one or two revision specifiers')
1273
tree1, file_list = internal_tree_files(file_list)
1277
except errors.FileInWrongBranch:
1278
if len(file_list) != 2:
1279
raise errors.BzrCommandError("Files are in different branches")
1281
tree1, file1 = WorkingTree.open_containing(file_list[0])
1282
tree2, file2 = WorkingTree.open_containing(file_list[1])
1283
if file1 != "" or file2 != "":
1284
# FIXME diff those two files. rbc 20051123
1285
raise errors.BzrCommandError("Files are in different branches")
1287
except errors.NotBranchError:
1288
if (revision is not None and len(revision) == 2
1289
and not revision[0].needs_branch()
1290
and not revision[1].needs_branch()):
1291
# If both revision specs include a branch, we can
1292
# diff them without needing a local working tree
1293
tree1, tree2 = None, None
1297
if tree2 is not None:
1298
if revision is not None:
1299
# FIXME: but there should be a clean way to diff between
1300
# non-default versions of two trees, it's not hard to do
1302
raise errors.BzrCommandError(
1303
"Sorry, diffing arbitrary revisions across branches "
1304
"is not implemented yet")
1305
return show_diff_trees(tree1, tree2, sys.stdout,
1306
specific_files=file_list,
1307
external_diff_options=diff_options,
1308
old_label=old_label, new_label=new_label)
1310
return diff_cmd_helper(tree1, file_list, diff_options,
1311
revision_specs=revision,
1312
old_label=old_label, new_label=new_label)
1315
class cmd_deleted(Command):
1316
"""List files deleted in the working tree.
1318
# TODO: Show files deleted since a previous revision, or
1319
# between two revisions.
1320
# TODO: Much more efficient way to do this: read in new
1321
# directories with readdir, rather than stating each one. Same
1322
# level of effort but possibly much less IO. (Or possibly not,
1323
# if the directories are very large...)
1324
takes_options = ['show-ids']
1327
def run(self, show_ids=False):
1328
tree = WorkingTree.open_containing(u'.')[0]
1329
old = tree.basis_tree()
1330
for path, ie in old.inventory.iter_entries():
1331
if not tree.has_id(ie.file_id):
1332
self.outf.write(path)
1334
self.outf.write(' ')
1335
self.outf.write(ie.file_id)
1336
self.outf.write('\n')
1339
class cmd_modified(Command):
1340
"""List files modified in working tree."""
1344
tree = WorkingTree.open_containing(u'.')[0]
1345
td = tree.changes_from(tree.basis_tree())
1346
for path, id, kind, text_modified, meta_modified in td.modified:
1347
self.outf.write(path + '\n')
1350
class cmd_added(Command):
1351
"""List files added in working tree."""
1355
wt = WorkingTree.open_containing(u'.')[0]
1356
basis_inv = wt.basis_tree().inventory
1359
if file_id in basis_inv:
1361
if inv.is_root(file_id) and len(basis_inv) == 0:
1363
path = inv.id2path(file_id)
1364
if not os.access(osutils.abspath(path), os.F_OK):
1366
self.outf.write(path + '\n')
1369
class cmd_root(Command):
1370
"""Show the tree root directory.
1372
The root is the nearest enclosing directory with a .bzr control
1374
takes_args = ['filename?']
1376
def run(self, filename=None):
1377
"""Print the branch root."""
1378
tree = WorkingTree.open_containing(filename)[0]
1379
self.outf.write(tree.basedir + '\n')
1382
class cmd_log(Command):
1383
"""Show log of a branch, file, or directory.
1385
By default show the log of the branch containing the working directory.
1387
To request a range of logs, you can use the command -r begin..end
1388
-r revision requests a specific revision, -r ..end or -r begin.. are
1394
bzr log -r -10.. http://server/branch
1397
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1399
takes_args = ['location?']
1400
takes_options = [Option('forward',
1401
help='show from oldest to newest'),
1405
help='show files changed in each revision'),
1406
'show-ids', 'revision',
1410
help='show revisions whose message matches this regexp',
1413
encoding_type = 'replace'
1416
def run(self, location=None, timezone='original',
1423
from bzrlib.log import show_log
1424
assert message is None or isinstance(message, basestring), \
1425
"invalid message argument %r" % message
1426
direction = (forward and 'forward') or 'reverse'
1431
# find the file id to log:
1433
dir, fp = bzrdir.BzrDir.open_containing(location)
1434
b = dir.open_branch()
1438
inv = dir.open_workingtree().inventory
1439
except (errors.NotBranchError, errors.NotLocalUrl):
1440
# either no tree, or is remote.
1441
inv = b.basis_tree().inventory
1442
file_id = inv.path2id(fp)
1444
raise errors.BzrCommandError(
1445
"Path does not have any revision history: %s" %
1449
# FIXME ? log the current subdir only RBC 20060203
1450
if revision is not None \
1451
and len(revision) > 0 and revision[0].get_branch():
1452
location = revision[0].get_branch()
1455
dir, relpath = bzrdir.BzrDir.open_containing(location)
1456
b = dir.open_branch()
1458
if revision is None:
1461
elif len(revision) == 1:
1462
rev1 = rev2 = revision[0].in_history(b).revno
1463
elif len(revision) == 2:
1464
if revision[1].get_branch() != revision[0].get_branch():
1465
# b is taken from revision[0].get_branch(), and
1466
# show_log will use its revision_history. Having
1467
# different branches will lead to weird behaviors.
1468
raise errors.BzrCommandError(
1469
"Log doesn't accept two revisions in different branches.")
1470
if revision[0].spec is None:
1471
# missing begin-range means first revision
1474
rev1 = revision[0].in_history(b).revno
1476
if revision[1].spec is None:
1477
# missing end-range means last known revision
1480
rev2 = revision[1].in_history(b).revno
1482
raise errors.BzrCommandError('bzr log --revision takes one or two values.')
1484
# By this point, the revision numbers are converted to the +ve
1485
# form if they were supplied in the -ve form, so we can do
1486
# this comparison in relative safety
1488
(rev2, rev1) = (rev1, rev2)
1490
if log_format is None:
1491
log_format = log.log_formatter_registry.get_default(b)
1493
lf = log_format(show_ids=show_ids, to_file=self.outf,
1494
show_timezone=timezone)
1500
direction=direction,
1501
start_revision=rev1,
1506
def get_log_format(long=False, short=False, line=False, default='long'):
1507
log_format = default
1511
log_format = 'short'
1517
class cmd_touching_revisions(Command):
1518
"""Return revision-ids which affected a particular file.
1520
A more user-friendly interface is "bzr log FILE".
1524
takes_args = ["filename"]
1527
def run(self, filename):
1528
tree, relpath = WorkingTree.open_containing(filename)
1530
inv = tree.read_working_inventory()
1531
file_id = inv.path2id(relpath)
1532
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1533
self.outf.write("%6d %s\n" % (revno, what))
1536
class cmd_ls(Command):
1537
"""List files in a tree.
1540
takes_args = ['path?']
1541
# TODO: Take a revision or remote path and list that tree instead.
1542
takes_options = ['verbose', 'revision',
1543
Option('non-recursive',
1544
help='don\'t recurse into sub-directories'),
1546
help='Print all paths from the root of the branch.'),
1547
Option('unknown', help='Print unknown files'),
1548
Option('versioned', help='Print versioned files'),
1549
Option('ignored', help='Print ignored files'),
1551
Option('null', help='Null separate the files'),
1555
def run(self, revision=None, verbose=False,
1556
non_recursive=False, from_root=False,
1557
unknown=False, versioned=False, ignored=False,
1558
null=False, kind=None, show_ids=False, path=None):
1560
if kind and kind not in ('file', 'directory', 'symlink'):
1561
raise errors.BzrCommandError('invalid kind specified')
1563
if verbose and null:
1564
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1565
all = not (unknown or versioned or ignored)
1567
selection = {'I':ignored, '?':unknown, 'V':versioned}
1574
raise errors.BzrCommandError('cannot specify both --from-root'
1578
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1584
if revision is not None:
1585
tree = branch.repository.revision_tree(
1586
revision[0].in_history(branch).rev_id)
1588
tree = branch.basis_tree()
1590
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1591
if fp.startswith(relpath):
1592
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1593
if non_recursive and '/' in fp:
1595
if not all and not selection[fc]:
1597
if kind is not None and fkind != kind:
1600
kindch = entry.kind_character()
1601
outstring = '%-8s %s%s' % (fc, fp, kindch)
1602
if show_ids and fid is not None:
1603
outstring = "%-50s %s" % (outstring, fid)
1604
self.outf.write(outstring + '\n')
1606
self.outf.write(fp + '\0')
1609
self.outf.write(fid)
1610
self.outf.write('\0')
1618
self.outf.write('%-50s %s\n' % (fp, my_id))
1620
self.outf.write(fp + '\n')
1623
class cmd_unknowns(Command):
1624
"""List unknown files."""
1627
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1628
self.outf.write(osutils.quotefn(f) + '\n')
1631
class cmd_ignore(Command):
1632
"""Ignore specified files or patterns.
1634
To remove patterns from the ignore list, edit the .bzrignore file.
1636
Trailing slashes on patterns are ignored.
1637
If the pattern contains a slash or is a regular expression, it is compared
1638
to the whole path from the branch root. Otherwise, it is compared to only
1639
the last component of the path. To match a file only in the root
1640
directory, prepend './'.
1642
Ignore patterns specifying absolute paths are not allowed.
1644
Ignore patterns may include globbing wildcards such as:
1645
? - Matches any single character except '/'
1646
* - Matches 0 or more characters except '/'
1647
/**/ - Matches 0 or more directories in a path
1648
[a-z] - Matches a single character from within a group of characters
1650
Ignore patterns may also be Python regular expressions.
1651
Regular expression ignore patterns are identified by a 'RE:' prefix
1652
followed by the regular expression. Regular expression ignore patterns
1653
may not include named or numbered groups.
1655
Note: ignore patterns containing shell wildcards must be quoted from
1659
bzr ignore ./Makefile
1660
bzr ignore '*.class'
1661
bzr ignore 'lib/**/*.o'
1662
bzr ignore 'RE:lib/.*\.o'
1664
takes_args = ['name_pattern*']
1666
Option('old-default-rules',
1667
help='Out the ignore rules bzr < 0.9 always used.')
1670
def run(self, name_pattern_list=None, old_default_rules=None):
1671
from bzrlib.atomicfile import AtomicFile
1672
if old_default_rules is not None:
1673
# dump the rules and exit
1674
for pattern in ignores.OLD_DEFAULTS:
1677
if not name_pattern_list:
1678
raise errors.BzrCommandError("ignore requires at least one "
1679
"NAME_PATTERN or --old-default-rules")
1680
for name_pattern in name_pattern_list:
1681
if name_pattern[0] == '/':
1682
raise errors.BzrCommandError(
1683
"NAME_PATTERN should not be an absolute path")
1684
tree, relpath = WorkingTree.open_containing(u'.')
1685
ifn = tree.abspath('.bzrignore')
1686
if os.path.exists(ifn):
1689
igns = f.read().decode('utf-8')
1695
# TODO: If the file already uses crlf-style termination, maybe
1696
# we should use that for the newly added lines?
1698
if igns and igns[-1] != '\n':
1700
for name_pattern in name_pattern_list:
1701
igns += name_pattern.rstrip('/') + '\n'
1703
f = AtomicFile(ifn, 'wb')
1705
f.write(igns.encode('utf-8'))
1710
inv = tree.inventory
1711
if inv.path2id('.bzrignore'):
1712
mutter('.bzrignore is already versioned')
1714
mutter('need to make new .bzrignore file versioned')
1715
tree.add(['.bzrignore'])
1718
class cmd_ignored(Command):
1719
"""List ignored files and the patterns that matched them.
1721
See also: bzr ignore"""
1724
tree = WorkingTree.open_containing(u'.')[0]
1725
for path, file_class, kind, file_id, entry in tree.list_files():
1726
if file_class != 'I':
1728
## XXX: Slightly inefficient since this was already calculated
1729
pat = tree.is_ignored(path)
1730
print '%-50s %s' % (path, pat)
1733
class cmd_lookup_revision(Command):
1734
"""Lookup the revision-id from a revision-number
1737
bzr lookup-revision 33
1740
takes_args = ['revno']
1743
def run(self, revno):
1747
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1749
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1752
class cmd_export(Command):
1753
"""Export past revision to destination directory.
1755
If no revision is specified this exports the last committed revision.
1757
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1758
given, try to find the format with the extension. If no extension
1759
is found exports to a directory (equivalent to --format=dir).
1761
Root may be the top directory for tar, tgz and tbz2 formats. If none
1762
is given, the top directory will be the root name of the file.
1764
If branch is omitted then the branch containing the CWD will be used.
1766
Note: export of tree with non-ascii filenames to zip is not supported.
1768
Supported formats Autodetected by extension
1769
----------------- -------------------------
1772
tbz2 .tar.bz2, .tbz2
1776
takes_args = ['dest', 'branch?']
1777
takes_options = ['revision', 'format', 'root']
1778
def run(self, dest, branch=None, revision=None, format=None, root=None):
1779
from bzrlib.export import export
1782
tree = WorkingTree.open_containing(u'.')[0]
1785
b = Branch.open(branch)
1787
if revision is None:
1788
# should be tree.last_revision FIXME
1789
rev_id = b.last_revision()
1791
if len(revision) != 1:
1792
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
1793
rev_id = revision[0].in_history(b).rev_id
1794
t = b.repository.revision_tree(rev_id)
1796
export(t, dest, format, root)
1797
except errors.NoSuchExportFormat, e:
1798
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1801
class cmd_cat(Command):
1802
"""Write a file's text from a previous revision."""
1804
takes_options = ['revision', 'name-from-revision']
1805
takes_args = ['filename']
1806
encoding_type = 'exact'
1809
def run(self, filename, revision=None, name_from_revision=False):
1810
if revision is not None and len(revision) != 1:
1811
raise errors.BzrCommandError("bzr cat --revision takes exactly"
1816
tree, relpath = WorkingTree.open_containing(filename)
1818
except (errors.NotBranchError, errors.NotLocalUrl):
1821
if revision is not None and revision[0].get_branch() is not None:
1822
b = Branch.open(revision[0].get_branch())
1824
b, relpath = Branch.open_containing(filename)
1825
tree = b.basis_tree()
1826
if revision is None:
1827
revision_id = b.last_revision()
1829
revision_id = revision[0].in_history(b).rev_id
1831
cur_file_id = tree.path2id(relpath)
1832
rev_tree = b.repository.revision_tree(revision_id)
1833
old_file_id = rev_tree.path2id(relpath)
1835
if name_from_revision:
1836
if old_file_id is None:
1837
raise errors.BzrCommandError("%r is not present in revision %s"
1838
% (filename, revision_id))
1840
rev_tree.print_file(old_file_id)
1841
elif cur_file_id is not None:
1842
rev_tree.print_file(cur_file_id)
1843
elif old_file_id is not None:
1844
rev_tree.print_file(old_file_id)
1846
raise errors.BzrCommandError("%r is not present in revision %s" %
1847
(filename, revision_id))
1850
class cmd_local_time_offset(Command):
1851
"""Show the offset in seconds from GMT to local time."""
1855
print osutils.local_time_offset()
1859
class cmd_commit(Command):
1860
"""Commit changes into a new revision.
1862
If no arguments are given, the entire tree is committed.
1864
If selected files are specified, only changes to those files are
1865
committed. If a directory is specified then the directory and everything
1866
within it is committed.
1868
A selected-file commit may fail in some cases where the committed
1869
tree would be invalid, such as trying to commit a file in a
1870
newly-added directory that is not itself committed.
1872
# TODO: Run hooks on tree to-be-committed, and after commit.
1874
# TODO: Strict commit that fails if there are deleted files.
1875
# (what does "deleted files" mean ??)
1877
# TODO: Give better message for -s, --summary, used by tla people
1879
# XXX: verbose currently does nothing
1881
takes_args = ['selected*']
1882
takes_options = ['message', 'verbose',
1884
help='commit even if nothing has changed'),
1885
Option('file', type=str,
1888
help='file containing commit message'),
1890
help="refuse to commit if there are unknown "
1891
"files in the working tree."),
1893
help="perform a local only commit in a bound "
1894
"branch. Such commits are not pushed to "
1895
"the master branch until a normal commit "
1899
aliases = ['ci', 'checkin']
1901
def run(self, message=None, file=None, verbose=True, selected_list=None,
1902
unchanged=False, strict=False, local=False):
1903
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1904
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1906
from bzrlib.msgeditor import edit_commit_message, \
1907
make_commit_message_template
1909
# TODO: Need a blackbox test for invoking the external editor; may be
1910
# slightly problematic to run this cross-platform.
1912
# TODO: do more checks that the commit will succeed before
1913
# spending the user's valuable time typing a commit message.
1914
tree, selected_list = tree_files(selected_list)
1915
if selected_list == ['']:
1916
# workaround - commit of root of tree should be exactly the same
1917
# as just default commit in that tree, and succeed even though
1918
# selected-file merge commit is not done yet
1921
if local and not tree.branch.get_bound_location():
1922
raise errors.LocalRequiresBoundBranch()
1924
def get_message(commit_obj):
1925
"""Callback to get commit message"""
1926
my_message = message
1927
if my_message is None and not file:
1928
template = make_commit_message_template(tree, selected_list)
1929
my_message = edit_commit_message(template)
1930
if my_message is None:
1931
raise errors.BzrCommandError("please specify a commit"
1932
" message with either --message or --file")
1933
elif my_message and file:
1934
raise errors.BzrCommandError(
1935
"please specify either --message or --file")
1937
my_message = codecs.open(file, 'rt',
1938
bzrlib.user_encoding).read()
1939
if my_message == "":
1940
raise errors.BzrCommandError("empty commit message specified")
1944
reporter = ReportCommitToLog()
1946
reporter = NullCommitReporter()
1949
tree.commit(message_callback=get_message,
1950
specific_files=selected_list,
1951
allow_pointless=unchanged, strict=strict, local=local,
1953
except PointlessCommit:
1954
# FIXME: This should really happen before the file is read in;
1955
# perhaps prepare the commit; get the message; then actually commit
1956
raise errors.BzrCommandError("no changes to commit."
1957
" use --unchanged to commit anyhow")
1958
except ConflictsInTree:
1959
raise errors.BzrCommandError('Conflicts detected in working '
1960
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
1962
except StrictCommitFailed:
1963
raise errors.BzrCommandError("Commit refused because there are"
1964
" unknown files in the working tree.")
1965
except errors.BoundBranchOutOfDate, e:
1966
raise errors.BzrCommandError(str(e) + "\n"
1967
'To commit to master branch, run update and then commit.\n'
1968
'You can also pass --local to commit to continue working '
1972
class cmd_check(Command):
1973
"""Validate consistency of branch history.
1975
This command checks various invariants about the branch storage to
1976
detect data corruption or bzr bugs.
1978
takes_args = ['branch?']
1979
takes_options = ['verbose']
1981
def run(self, branch=None, verbose=False):
1982
from bzrlib.check import check
1984
tree = WorkingTree.open_containing()[0]
1985
branch = tree.branch
1987
branch = Branch.open(branch)
1988
check(branch, verbose)
1991
class cmd_upgrade(Command):
1992
"""Upgrade branch storage to current format.
1994
The check command or bzr developers may sometimes advise you to run
1995
this command. When the default format has changed you may also be warned
1996
during other operations to upgrade.
1998
takes_args = ['url?']
2000
RegistryOption('format',
2001
help='Upgrade to a specific format. See "bzr help'
2002
' formats" for details',
2003
registry=bzrdir.format_registry,
2004
converter=bzrdir.format_registry.make_bzrdir,
2005
value_switches=True, title='Branch format'),
2009
def run(self, url='.', format=None):
2010
from bzrlib.upgrade import upgrade
2012
format = bzrdir.format_registry.make_bzrdir('default')
2013
upgrade(url, format)
2016
class cmd_whoami(Command):
2017
"""Show or set bzr user id.
2021
bzr whoami 'Frank Chu <fchu@example.com>'
2023
takes_options = [ Option('email',
2024
help='display email address only'),
2026
help='set identity for the current branch instead of '
2029
takes_args = ['name?']
2030
encoding_type = 'replace'
2033
def run(self, email=False, branch=False, name=None):
2035
# use branch if we're inside one; otherwise global config
2037
c = Branch.open_containing('.')[0].get_config()
2038
except errors.NotBranchError:
2039
c = config.GlobalConfig()
2041
self.outf.write(c.user_email() + '\n')
2043
self.outf.write(c.username() + '\n')
2046
# display a warning if an email address isn't included in the given name.
2048
config.extract_email_address(name)
2049
except errors.NoEmailInUsername, e:
2050
warning('"%s" does not seem to contain an email address. '
2051
'This is allowed, but not recommended.', name)
2053
# use global config unless --branch given
2055
c = Branch.open_containing('.')[0].get_config()
2057
c = config.GlobalConfig()
2058
c.set_user_option('email', name)
2061
class cmd_nick(Command):
2062
"""Print or set the branch nickname.
2064
If unset, the tree root directory name is used as the nickname
2065
To print the current nickname, execute with no argument.
2067
takes_args = ['nickname?']
2068
def run(self, nickname=None):
2069
branch = Branch.open_containing(u'.')[0]
2070
if nickname is None:
2071
self.printme(branch)
2073
branch.nick = nickname
2076
def printme(self, branch):
2080
class cmd_selftest(Command):
2081
"""Run internal test suite.
2083
This creates temporary test directories in the working directory, but not
2084
existing data is affected. These directories are deleted if the tests
2085
pass, or left behind to help in debugging if they fail and --keep-output
2088
If arguments are given, they are regular expressions that say which tests
2089
should run. Tests matching any expression are run, and other tests are
2092
Alternatively if --first is given, matching tests are run first and then
2093
all other tests are run. This is useful if you have been working in a
2094
particular area, but want to make sure nothing else was broken.
2096
If the global option '--no-plugins' is given, plugins are not loaded
2097
before running the selftests. This has two effects: features provided or
2098
modified by plugins will not be tested, and tests provided by plugins will
2103
run only tests relating to 'ignore'
2104
bzr --no-plugins selftest -v
2105
disable plugins and list tests as they're run
2107
# TODO: --list should give a list of all available tests
2109
# NB: this is used from the class without creating an instance, which is
2110
# why it does not have a self parameter.
2111
def get_transport_type(typestring):
2112
"""Parse and return a transport specifier."""
2113
if typestring == "sftp":
2114
from bzrlib.transport.sftp import SFTPAbsoluteServer
2115
return SFTPAbsoluteServer
2116
if typestring == "memory":
2117
from bzrlib.transport.memory import MemoryServer
2119
if typestring == "fakenfs":
2120
from bzrlib.transport.fakenfs import FakeNFSServer
2121
return FakeNFSServer
2122
msg = "No known transport type %s. Supported types are: sftp\n" %\
2124
raise errors.BzrCommandError(msg)
2127
takes_args = ['testspecs*']
2128
takes_options = ['verbose',
2129
Option('one', help='stop when one test fails'),
2130
Option('keep-output',
2131
help='keep output directories when tests fail'),
2133
help='Use a different transport by default '
2134
'throughout the test suite.',
2135
type=get_transport_type),
2136
Option('benchmark', help='run the bzr bencharks.'),
2137
Option('lsprof-timed',
2138
help='generate lsprof output for benchmarked'
2139
' sections of code.'),
2140
Option('cache-dir', type=str,
2141
help='a directory to cache intermediate'
2142
' benchmark steps'),
2143
Option('clean-output',
2144
help='clean temporary tests directories'
2145
' without running tests'),
2147
help='run all tests, but run specified tests first',
2150
encoding_type = 'replace'
2152
def run(self, testspecs_list=None, verbose=None, one=False,
2153
keep_output=False, transport=None, benchmark=None,
2154
lsprof_timed=None, cache_dir=None, clean_output=False,
2157
from bzrlib.tests import selftest
2158
import bzrlib.benchmarks as benchmarks
2159
from bzrlib.benchmarks import tree_creator
2162
from bzrlib.tests import clean_selftest_output
2163
clean_selftest_output()
2166
if cache_dir is not None:
2167
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2168
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
2169
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2171
if testspecs_list is not None:
2172
pattern = '|'.join(testspecs_list)
2176
test_suite_factory = benchmarks.test_suite
2179
# TODO: should possibly lock the history file...
2180
benchfile = open(".perf_history", "at", buffering=1)
2182
test_suite_factory = None
2187
result = selftest(verbose=verbose,
2189
stop_on_failure=one,
2190
keep_output=keep_output,
2191
transport=transport,
2192
test_suite_factory=test_suite_factory,
2193
lsprof_timed=lsprof_timed,
2194
bench_history=benchfile,
2195
matching_tests_first=first,
2198
if benchfile is not None:
2201
info('tests passed')
2203
info('tests failed')
2204
return int(not result)
2207
class cmd_version(Command):
2208
"""Show version of bzr."""
2212
from bzrlib.version import show_version
2216
class cmd_rocks(Command):
2217
"""Statement of optimism."""
2223
print "it sure does!"
2226
class cmd_find_merge_base(Command):
2227
"""Find and print a base revision for merging two branches."""
2228
# TODO: Options to specify revisions on either side, as if
2229
# merging only part of the history.
2230
takes_args = ['branch', 'other']
2234
def run(self, branch, other):
2235
from bzrlib.revision import MultipleRevisionSources
2237
branch1 = Branch.open_containing(branch)[0]
2238
branch2 = Branch.open_containing(other)[0]
2240
last1 = branch1.last_revision()
2241
last2 = branch2.last_revision()
2243
source = MultipleRevisionSources(branch1.repository,
2246
base_rev_id = common_ancestor(last1, last2, source)
2248
print 'merge base is revision %s' % base_rev_id
2251
class cmd_merge(Command):
2252
"""Perform a three-way merge.
2254
The branch is the branch you will merge from. By default, it will merge
2255
the latest revision. If you specify a revision, that revision will be
2256
merged. If you specify two revisions, the first will be used as a BASE,
2257
and the second one as OTHER. Revision numbers are always relative to the
2260
By default, bzr will try to merge in all new work from the other
2261
branch, automatically determining an appropriate base. If this
2262
fails, you may need to give an explicit base.
2264
Merge will do its best to combine the changes in two branches, but there
2265
are some kinds of problems only a human can fix. When it encounters those,
2266
it will mark a conflict. A conflict means that you need to fix something,
2267
before you should commit.
2269
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2271
If there is no default branch set, the first merge will set it. After
2272
that, you can omit the branch to use the default. To change the
2273
default, use --remember. The value will only be saved if the remote
2274
location can be accessed.
2278
To merge the latest revision from bzr.dev
2279
bzr merge ../bzr.dev
2281
To merge changes up to and including revision 82 from bzr.dev
2282
bzr merge -r 82 ../bzr.dev
2284
To merge the changes introduced by 82, without previous changes:
2285
bzr merge -r 81..82 ../bzr.dev
2287
merge refuses to run if there are any uncommitted changes, unless
2290
The following merge types are available:
2292
takes_args = ['branch?']
2293
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2294
Option('show-base', help="Show base revision text in "
2296
Option('uncommitted', help='Apply uncommitted changes'
2297
' from a working copy, instead of branch changes'),
2298
Option('pull', help='If the destination is already'
2299
' completely merged into the source, pull from the'
2300
' source rather than merging. When this happens,'
2301
' you do not need to commit the result.'),
2304
def run(self, branch=None, revision=None, force=False, merge_type=None,
2305
show_base=False, reprocess=False, remember=False,
2306
uncommitted=False, pull=False):
2307
if merge_type is None:
2308
merge_type = _mod_merge.Merge3Merger
2310
tree = WorkingTree.open_containing(u'.')[0]
2312
if branch is not None:
2314
reader = bundle.read_bundle_from_url(branch)
2315
except errors.NotABundle:
2316
pass # Continue on considering this url a Branch
2318
conflicts = merge_bundle(reader, tree, not force, merge_type,
2319
reprocess, show_base)
2325
if revision is None \
2326
or len(revision) < 1 or revision[0].needs_branch():
2327
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2329
if revision is None or len(revision) < 1:
2332
other = [branch, None]
2335
other = [branch, -1]
2336
other_branch, path = Branch.open_containing(branch)
2339
raise errors.BzrCommandError('Cannot use --uncommitted and'
2340
' --revision at the same time.')
2341
branch = revision[0].get_branch() or branch
2342
if len(revision) == 1:
2344
other_branch, path = Branch.open_containing(branch)
2345
revno = revision[0].in_history(other_branch).revno
2346
other = [branch, revno]
2348
assert len(revision) == 2
2349
if None in revision:
2350
raise errors.BzrCommandError(
2351
"Merge doesn't permit empty revision specifier.")
2352
base_branch, path = Branch.open_containing(branch)
2353
branch1 = revision[1].get_branch() or branch
2354
other_branch, path1 = Branch.open_containing(branch1)
2355
if revision[0].get_branch() is not None:
2356
# then path was obtained from it, and is None.
2359
base = [branch, revision[0].in_history(base_branch).revno]
2360
other = [branch1, revision[1].in_history(other_branch).revno]
2362
if tree.branch.get_parent() is None or remember:
2363
tree.branch.set_parent(other_branch.base)
2366
interesting_files = [path]
2368
interesting_files = None
2369
pb = ui.ui_factory.nested_progress_bar()
2372
conflict_count = _merge_helper(
2373
other, base, check_clean=(not force),
2374
merge_type=merge_type,
2375
reprocess=reprocess,
2376
show_base=show_base,
2378
pb=pb, file_list=interesting_files)
2381
if conflict_count != 0:
2385
except errors.AmbiguousBase, e:
2386
m = ("sorry, bzr can't determine the right merge base yet\n"
2387
"candidates are:\n "
2388
+ "\n ".join(e.bases)
2390
"please specify an explicit base with -r,\n"
2391
"and (if you want) report this to the bzr developers\n")
2394
# TODO: move up to common parent; this isn't merge-specific anymore.
2395
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2396
"""Use tree.branch's parent if none was supplied.
2398
Report if the remembered location was used.
2400
if supplied_location is not None:
2401
return supplied_location
2402
stored_location = tree.branch.get_parent()
2403
mutter("%s", stored_location)
2404
if stored_location is None:
2405
raise errors.BzrCommandError("No location specified or remembered")
2406
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2407
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2408
return stored_location
2411
class cmd_remerge(Command):
2414
Use this if you want to try a different merge technique while resolving
2415
conflicts. Some merge techniques are better than others, and remerge
2416
lets you try different ones on different files.
2418
The options for remerge have the same meaning and defaults as the ones for
2419
merge. The difference is that remerge can (only) be run when there is a
2420
pending merge, and it lets you specify particular files.
2423
$ bzr remerge --show-base
2424
Re-do the merge of all conflicted files, and show the base text in
2425
conflict regions, in addition to the usual THIS and OTHER texts.
2427
$ bzr remerge --merge-type weave --reprocess foobar
2428
Re-do the merge of "foobar", using the weave merge algorithm, with
2429
additional processing to reduce the size of conflict regions.
2431
The following merge types are available:"""
2432
takes_args = ['file*']
2433
takes_options = ['merge-type', 'reprocess',
2434
Option('show-base', help="Show base revision text in "
2437
def run(self, file_list=None, merge_type=None, show_base=False,
2439
if merge_type is None:
2440
merge_type = _mod_merge.Merge3Merger
2441
tree, file_list = tree_files(file_list)
2444
parents = tree.get_parent_ids()
2445
if len(parents) != 2:
2446
raise errors.BzrCommandError("Sorry, remerge only works after normal"
2447
" merges. Not cherrypicking or"
2449
repository = tree.branch.repository
2450
base_revision = common_ancestor(parents[0],
2451
parents[1], repository)
2452
base_tree = repository.revision_tree(base_revision)
2453
other_tree = repository.revision_tree(parents[1])
2454
interesting_ids = None
2456
conflicts = tree.conflicts()
2457
if file_list is not None:
2458
interesting_ids = set()
2459
for filename in file_list:
2460
file_id = tree.path2id(filename)
2462
raise errors.NotVersionedError(filename)
2463
interesting_ids.add(file_id)
2464
if tree.kind(file_id) != "directory":
2467
for name, ie in tree.inventory.iter_entries(file_id):
2468
interesting_ids.add(ie.file_id)
2469
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2471
# Remerge only supports resolving contents conflicts
2472
allowed_conflicts = ('text conflict', 'contents conflict')
2473
restore_files = [c.path for c in conflicts
2474
if c.typestring in allowed_conflicts]
2475
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2476
tree.set_conflicts(ConflictList(new_conflicts))
2477
if file_list is not None:
2478
restore_files = file_list
2479
for filename in restore_files:
2481
restore(tree.abspath(filename))
2482
except errors.NotConflicted:
2484
conflicts = _mod_merge.merge_inner(
2485
tree.branch, other_tree, base_tree,
2487
interesting_ids=interesting_ids,
2488
other_rev_id=parents[1],
2489
merge_type=merge_type,
2490
show_base=show_base,
2491
reprocess=reprocess)
2500
class cmd_revert(Command):
2501
"""Revert files to a previous revision.
2503
Giving a list of files will revert only those files. Otherwise, all files
2504
will be reverted. If the revision is not specified with '--revision', the
2505
last committed revision is used.
2507
To remove only some changes, without reverting to a prior version, use
2508
merge instead. For example, "merge . --r-2..-3" will remove the changes
2509
introduced by -2, without affecting the changes introduced by -1. Or
2510
to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
2512
By default, any files that have been manually changed will be backed up
2513
first. (Files changed only by merge are not backed up.) Backup files have
2514
'.~#~' appended to their name, where # is a number.
2516
When you provide files, you can use their current pathname or the pathname
2517
from the target revision. So you can use revert to "undelete" a file by
2518
name. If you name a directory, all the contents of that directory will be
2521
takes_options = ['revision', 'no-backup']
2522
takes_args = ['file*']
2523
aliases = ['merge-revert']
2525
def run(self, revision=None, no_backup=False, file_list=None):
2526
if file_list is not None:
2527
if len(file_list) == 0:
2528
raise errors.BzrCommandError("No files specified")
2532
tree, file_list = tree_files(file_list)
2533
if revision is None:
2534
# FIXME should be tree.last_revision
2535
rev_id = tree.last_revision()
2536
elif len(revision) != 1:
2537
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
2539
rev_id = revision[0].in_history(tree.branch).rev_id
2540
pb = ui.ui_factory.nested_progress_bar()
2542
tree.revert(file_list,
2543
tree.branch.repository.revision_tree(rev_id),
2544
not no_backup, pb, report_changes=True)
2549
class cmd_assert_fail(Command):
2550
"""Test reporting of assertion failures"""
2551
# intended just for use in testing
2556
raise AssertionError("always fails")
2559
class cmd_help(Command):
2560
"""Show help on a command or other topic.
2562
For a list of all available commands, say 'bzr help commands'.
2564
takes_options = [Option('long', 'show help on all commands')]
2565
takes_args = ['topic?']
2566
aliases = ['?', '--help', '-?', '-h']
2569
def run(self, topic=None, long=False):
2571
if topic is None and long:
2573
bzrlib.help.help(topic)
2576
class cmd_shell_complete(Command):
2577
"""Show appropriate completions for context.
2579
For a list of all available commands, say 'bzr shell-complete'.
2581
takes_args = ['context?']
2586
def run(self, context=None):
2587
import shellcomplete
2588
shellcomplete.shellcomplete(context)
2591
class cmd_fetch(Command):
2592
"""Copy in history from another branch but don't merge it.
2594
This is an internal method used for pull and merge.
2597
takes_args = ['from_branch', 'to_branch']
2598
def run(self, from_branch, to_branch):
2599
from bzrlib.fetch import Fetcher
2600
from_b = Branch.open(from_branch)
2601
to_b = Branch.open(to_branch)
2602
Fetcher(to_b, from_b)
2605
class cmd_missing(Command):
2606
"""Show unmerged/unpulled revisions between two branches.
2608
OTHER_BRANCH may be local or remote.
2610
takes_args = ['other_branch?']
2611
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2613
'Display changes in the local branch only'),
2614
Option('theirs-only',
2615
'Display changes in the remote branch only'),
2620
encoding_type = 'replace'
2623
def run(self, other_branch=None, reverse=False, mine_only=False,
2624
theirs_only=False, log_format=None, long=False, short=False, line=False,
2625
show_ids=False, verbose=False):
2626
from bzrlib.missing import find_unmerged, iter_log_data
2627
from bzrlib.log import log_formatter
2628
local_branch = Branch.open_containing(u".")[0]
2629
parent = local_branch.get_parent()
2630
if other_branch is None:
2631
other_branch = parent
2632
if other_branch is None:
2633
raise errors.BzrCommandError("No peer location known or specified.")
2634
display_url = urlutils.unescape_for_display(parent,
2636
print "Using last location: " + display_url
2638
remote_branch = Branch.open(other_branch)
2639
if remote_branch.base == local_branch.base:
2640
remote_branch = local_branch
2641
local_branch.lock_read()
2643
remote_branch.lock_read()
2645
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2646
if (log_format is None):
2647
log_format = log.log_formatter_registry.get_default(
2649
lf = log_format(to_file=self.outf,
2651
show_timezone='original')
2652
if reverse is False:
2653
local_extra.reverse()
2654
remote_extra.reverse()
2655
if local_extra and not theirs_only:
2656
print "You have %d extra revision(s):" % len(local_extra)
2657
for data in iter_log_data(local_extra, local_branch.repository,
2660
printed_local = True
2662
printed_local = False
2663
if remote_extra and not mine_only:
2664
if printed_local is True:
2666
print "You are missing %d revision(s):" % len(remote_extra)
2667
for data in iter_log_data(remote_extra, remote_branch.repository,
2670
if not remote_extra and not local_extra:
2672
print "Branches are up to date."
2676
remote_branch.unlock()
2678
local_branch.unlock()
2679
if not status_code and parent is None and other_branch is not None:
2680
local_branch.lock_write()
2682
# handle race conditions - a parent might be set while we run.
2683
if local_branch.get_parent() is None:
2684
local_branch.set_parent(remote_branch.base)
2686
local_branch.unlock()
2690
class cmd_plugins(Command):
2695
import bzrlib.plugin
2696
from inspect import getdoc
2697
for name, plugin in bzrlib.plugin.all_plugins().items():
2698
if getattr(plugin, '__path__', None) is not None:
2699
print plugin.__path__[0]
2700
elif getattr(plugin, '__file__', None) is not None:
2701
print plugin.__file__
2707
print '\t', d.split('\n')[0]
2710
class cmd_testament(Command):
2711
"""Show testament (signing-form) of a revision."""
2712
takes_options = ['revision',
2713
Option('long', help='Produce long-format testament'),
2714
Option('strict', help='Produce a strict-format'
2716
takes_args = ['branch?']
2718
def run(self, branch=u'.', revision=None, long=False, strict=False):
2719
from bzrlib.testament import Testament, StrictTestament
2721
testament_class = StrictTestament
2723
testament_class = Testament
2724
b = WorkingTree.open_containing(branch)[0].branch
2727
if revision is None:
2728
rev_id = b.last_revision()
2730
rev_id = revision[0].in_history(b).rev_id
2731
t = testament_class.from_revision(b.repository, rev_id)
2733
sys.stdout.writelines(t.as_text_lines())
2735
sys.stdout.write(t.as_short_text())
2740
class cmd_annotate(Command):
2741
"""Show the origin of each line in a file.
2743
This prints out the given file with an annotation on the left side
2744
indicating which revision, author and date introduced the change.
2746
If the origin is the same for a run of consecutive lines, it is
2747
shown only at the top, unless the --all option is given.
2749
# TODO: annotate directories; showing when each file was last changed
2750
# TODO: if the working copy is modified, show annotations on that
2751
# with new uncommitted lines marked
2752
aliases = ['ann', 'blame', 'praise']
2753
takes_args = ['filename']
2754
takes_options = [Option('all', help='show annotations on all lines'),
2755
Option('long', help='show date in annotations'),
2761
def run(self, filename, all=False, long=False, revision=None,
2763
from bzrlib.annotate import annotate_file
2764
tree, relpath = WorkingTree.open_containing(filename)
2765
branch = tree.branch
2768
if revision is None:
2769
revision_id = branch.last_revision()
2770
elif len(revision) != 1:
2771
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2773
revision_id = revision[0].in_history(branch).rev_id
2774
file_id = tree.inventory.path2id(relpath)
2775
tree = branch.repository.revision_tree(revision_id)
2776
file_version = tree.inventory[file_id].revision
2777
annotate_file(branch, file_version, file_id, long, all, sys.stdout,
2783
class cmd_re_sign(Command):
2784
"""Create a digital signature for an existing revision."""
2785
# TODO be able to replace existing ones.
2787
hidden = True # is this right ?
2788
takes_args = ['revision_id*']
2789
takes_options = ['revision']
2791
def run(self, revision_id_list=None, revision=None):
2792
import bzrlib.gpg as gpg
2793
if revision_id_list is not None and revision is not None:
2794
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
2795
if revision_id_list is None and revision is None:
2796
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
2797
b = WorkingTree.open_containing(u'.')[0].branch
2798
gpg_strategy = gpg.GPGStrategy(b.get_config())
2799
if revision_id_list is not None:
2800
for revision_id in revision_id_list:
2801
b.repository.sign_revision(revision_id, gpg_strategy)
2802
elif revision is not None:
2803
if len(revision) == 1:
2804
revno, rev_id = revision[0].in_history(b)
2805
b.repository.sign_revision(rev_id, gpg_strategy)
2806
elif len(revision) == 2:
2807
# are they both on rh- if so we can walk between them
2808
# might be nice to have a range helper for arbitrary
2809
# revision paths. hmm.
2810
from_revno, from_revid = revision[0].in_history(b)
2811
to_revno, to_revid = revision[1].in_history(b)
2812
if to_revid is None:
2813
to_revno = b.revno()
2814
if from_revno is None or to_revno is None:
2815
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
2816
for revno in range(from_revno, to_revno + 1):
2817
b.repository.sign_revision(b.get_rev_id(revno),
2820
raise errors.BzrCommandError('Please supply either one revision, or a range.')
2823
class cmd_bind(Command):
2824
"""Bind the current branch to a master branch.
2826
After binding, commits must succeed on the master branch
2827
before they are executed on the local one.
2830
takes_args = ['location']
2833
def run(self, location=None):
2834
b, relpath = Branch.open_containing(u'.')
2835
b_other = Branch.open(location)
2838
except errors.DivergedBranches:
2839
raise errors.BzrCommandError('These branches have diverged.'
2840
' Try merging, and then bind again.')
2843
class cmd_unbind(Command):
2844
"""Unbind the current branch from its master branch.
2846
After unbinding, the local branch is considered independent.
2847
All subsequent commits will be local.
2854
b, relpath = Branch.open_containing(u'.')
2856
raise errors.BzrCommandError('Local branch is not bound')
2859
class cmd_uncommit(Command):
2860
"""Remove the last committed revision.
2862
--verbose will print out what is being removed.
2863
--dry-run will go through all the motions, but not actually
2866
In the future, uncommit will create a revision bundle, which can then
2870
# TODO: jam 20060108 Add an option to allow uncommit to remove
2871
# unreferenced information in 'branch-as-repository' branches.
2872
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2873
# information in shared branches as well.
2874
takes_options = ['verbose', 'revision',
2875
Option('dry-run', help='Don\'t actually make changes'),
2876
Option('force', help='Say yes to all questions.')]
2877
takes_args = ['location?']
2880
def run(self, location=None,
2881
dry_run=False, verbose=False,
2882
revision=None, force=False):
2883
from bzrlib.log import log_formatter, show_log
2885
from bzrlib.uncommit import uncommit
2887
if location is None:
2889
control, relpath = bzrdir.BzrDir.open_containing(location)
2891
tree = control.open_workingtree()
2893
except (errors.NoWorkingTree, errors.NotLocalUrl):
2895
b = control.open_branch()
2898
if revision is None:
2901
# 'bzr uncommit -r 10' actually means uncommit
2902
# so that the final tree is at revno 10.
2903
# but bzrlib.uncommit.uncommit() actually uncommits
2904
# the revisions that are supplied.
2905
# So we need to offset it by one
2906
revno = revision[0].in_history(b).revno+1
2908
if revno <= b.revno():
2909
rev_id = b.get_rev_id(revno)
2911
self.outf.write('No revisions to uncommit.\n')
2914
lf = log_formatter('short',
2916
show_timezone='original')
2921
direction='forward',
2922
start_revision=revno,
2923
end_revision=b.revno())
2926
print 'Dry-run, pretending to remove the above revisions.'
2928
val = raw_input('Press <enter> to continue')
2930
print 'The above revision(s) will be removed.'
2932
val = raw_input('Are you sure [y/N]? ')
2933
if val.lower() not in ('y', 'yes'):
2937
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2941
class cmd_break_lock(Command):
2942
"""Break a dead lock on a repository, branch or working directory.
2944
CAUTION: Locks should only be broken when you are sure that the process
2945
holding the lock has been stopped.
2947
You can get information on what locks are open via the 'bzr info' command.
2952
takes_args = ['location?']
2954
def run(self, location=None, show=False):
2955
if location is None:
2957
control, relpath = bzrdir.BzrDir.open_containing(location)
2959
control.break_lock()
2960
except NotImplementedError:
2964
class cmd_wait_until_signalled(Command):
2965
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
2967
This just prints a line to signal when it is ready, then blocks on stdin.
2973
sys.stdout.write("running\n")
2975
sys.stdin.readline()
2978
class cmd_serve(Command):
2979
"""Run the bzr server."""
2981
aliases = ['server']
2985
help='serve on stdin/out for use from inetd or sshd'),
2987
help='listen for connections on nominated port of the form '
2988
'[hostname:]portnumber. Passing 0 as the port number will '
2989
'result in a dynamically allocated port.',
2992
help='serve contents of directory',
2994
Option('allow-writes',
2995
help='By default the server is a readonly server. Supplying '
2996
'--allow-writes enables write access to the contents of '
2997
'the served directory and below. '
3001
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3002
from bzrlib.transport import smart
3003
from bzrlib.transport import get_transport
3004
if directory is None:
3005
directory = os.getcwd()
3006
url = urlutils.local_path_to_url(directory)
3007
if not allow_writes:
3008
url = 'readonly+' + url
3009
t = get_transport(url)
3011
server = smart.SmartServerPipeStreamMedium(sys.stdin, sys.stdout, t)
3012
elif port is not None:
3014
host, port = port.split(':')
3017
server = smart.SmartTCPServer(t, host=host, port=int(port))
3018
print 'listening on port: ', server.port
3021
raise errors.BzrCommandError("bzr serve requires one of --inet or --port")
3025
# command-line interpretation helper for merge-related commands
3026
def _merge_helper(other_revision, base_revision,
3027
check_clean=True, ignore_zero=False,
3028
this_dir=None, backup_files=False,
3030
file_list=None, show_base=False, reprocess=False,
3032
pb=DummyProgress()):
3033
"""Merge changes into a tree.
3036
list(path, revno) Base for three-way merge.
3037
If [None, None] then a base will be automatically determined.
3039
list(path, revno) Other revision for three-way merge.
3041
Directory to merge changes into; '.' by default.
3043
If true, this_dir must have no uncommitted changes before the
3045
ignore_zero - If true, suppress the "zero conflicts" message when
3046
there are no conflicts; should be set when doing something we expect
3047
to complete perfectly.
3048
file_list - If supplied, merge only changes to selected files.
3050
All available ancestors of other_revision and base_revision are
3051
automatically pulled into the branch.
3053
The revno may be -1 to indicate the last revision on the branch, which is
3056
This function is intended for use from the command line; programmatic
3057
clients might prefer to call merge.merge_inner(), which has less magic
3060
# Loading it late, so that we don't always have to import bzrlib.merge
3061
if merge_type is None:
3062
merge_type = _mod_merge.Merge3Merger
3063
if this_dir is None:
3065
this_tree = WorkingTree.open_containing(this_dir)[0]
3066
if show_base and not merge_type is _mod_merge.Merge3Merger:
3067
raise errors.BzrCommandError("Show-base is not supported for this merge"
3068
" type. %s" % merge_type)
3069
if reprocess and not merge_type.supports_reprocess:
3070
raise errors.BzrCommandError("Conflict reduction is not supported for merge"
3071
" type %s." % merge_type)
3072
if reprocess and show_base:
3073
raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
3075
merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
3077
merger.pp = ProgressPhase("Merge phase", 5, pb)
3078
merger.pp.next_phase()
3079
merger.check_basis(check_clean)
3080
merger.set_other(other_revision)
3081
merger.pp.next_phase()
3082
merger.set_base(base_revision)
3083
if merger.base_rev_id == merger.other_rev_id:
3084
note('Nothing to do.')
3086
if file_list is None:
3087
if pull and merger.base_rev_id == merger.this_rev_id:
3088
count = merger.this_tree.pull(merger.this_branch,
3089
False, merger.other_rev_id)
3090
note('%d revision(s) pulled.' % (count,))
3092
merger.backup_files = backup_files
3093
merger.merge_type = merge_type
3094
merger.set_interesting_files(file_list)
3095
merger.show_base = show_base
3096
merger.reprocess = reprocess
3097
conflicts = merger.do_merge()
3098
if file_list is None:
3099
merger.set_pending()
3106
merge = _merge_helper
3109
# these get imported and then picked up by the scan for cmd_*
3110
# TODO: Some more consistent way to split command definitions across files;
3111
# we do need to load at least some information about them to know of
3112
# aliases. ideally we would avoid loading the implementation until the
3113
# details were needed.
3114
from bzrlib.cmd_version_info import cmd_version_info
3115
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
3116
from bzrlib.bundle.commands import cmd_bundle_revisions
3117
from bzrlib.sign_my_commits import cmd_sign_my_commits
3118
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
3119
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
