1
# Copyright (C) 2004, 2005 by 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"""
22
from shutil import rmtree
27
from bzrlib.branch import Branch
28
import bzrlib.bzrdir as bzrdir
29
from bzrlib._merge_core import ApplyMerge3
30
from bzrlib.commands import Command, display_command
31
from bzrlib.revision import common_ancestor
32
import bzrlib.errors as errors
33
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
34
NotBranchError, DivergedBranches, NotConflicted,
35
NoSuchFile, NoWorkingTree, FileInWrongBranch)
36
from bzrlib.log import show_one_log
37
from bzrlib.option import Option
38
from bzrlib.revisionspec import RevisionSpec
40
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
41
from bzrlib.transport.local import LocalTransport
42
from bzrlib.workingtree import WorkingTree
45
def tree_files(file_list, default_branch=u'.'):
47
return internal_tree_files(file_list, default_branch)
48
except FileInWrongBranch, e:
49
raise BzrCommandError("%s is not in the same branch as %s" %
50
(e.path, file_list[0]))
52
def internal_tree_files(file_list, default_branch=u'.'):
54
Return a branch and list of branch-relative paths.
55
If supplied file_list is empty or None, the branch default will be used,
56
and returned file_list will match the original.
58
if file_list is None or len(file_list) == 0:
59
return WorkingTree.open_containing(default_branch)[0], file_list
60
tree = WorkingTree.open_containing(file_list[0])[0]
62
for filename in file_list:
64
new_list.append(tree.relpath(filename))
65
except errors.PathNotChild:
66
raise FileInWrongBranch(tree.branch, filename)
70
# TODO: Make sure no commands unconditionally use the working directory as a
71
# branch. If a filename argument is used, the first of them should be used to
72
# specify the branch. (Perhaps this can be factored out into some kind of
73
# Argument class, representing a file in a branch, where the first occurrence
76
class cmd_status(Command):
77
"""Display status summary.
79
This reports on versioned and unknown files, reporting them
80
grouped by state. Possible states are:
83
Versioned in the working copy but not in the previous revision.
86
Versioned in the previous revision but removed or deleted
90
Path of this file changed from the previous revision;
91
the text may also have changed. This includes files whose
92
parent directory was renamed.
95
Text has changed since the previous revision.
98
Nothing about this file has changed since the previous revision.
99
Only shown with --all.
102
Not versioned and not matching an ignore pattern.
104
To see ignored files use 'bzr ignored'. For details in the
105
changes to file texts, use 'bzr diff'.
107
If no arguments are specified, the status of the entire working
108
directory is shown. Otherwise, only the status of the specified
109
files or directories is reported. If a directory is given, status
110
is reported for everything inside that directory.
112
If a revision argument is given, the status is calculated against
113
that revision, or between two revisions if two are provided.
116
# TODO: --no-recurse, --recurse options
118
takes_args = ['file*']
119
takes_options = ['all', 'show-ids', 'revision']
120
aliases = ['st', 'stat']
123
def run(self, all=False, show_ids=False, file_list=None, revision=None):
124
tree, file_list = tree_files(file_list)
126
from bzrlib.status import show_status
127
show_status(tree.branch, show_unchanged=all, show_ids=show_ids,
128
specific_files=file_list, revision=revision)
131
class cmd_cat_revision(Command):
132
"""Write out metadata for a revision.
134
The revision to print can either be specified by a specific
135
revision identifier, or you can use --revision.
139
takes_args = ['revision_id?']
140
takes_options = ['revision']
143
def run(self, revision_id=None, revision=None):
145
if revision_id is not None and revision is not None:
146
raise BzrCommandError('You can only supply one of revision_id or --revision')
147
if revision_id is None and revision is None:
148
raise BzrCommandError('You must supply either --revision or a revision_id')
149
b = WorkingTree.open_containing(u'.')[0].branch
150
if revision_id is not None:
151
sys.stdout.write(b.repository.get_revision_xml(revision_id))
152
elif revision is not None:
155
raise BzrCommandError('You cannot specify a NULL revision.')
156
revno, rev_id = rev.in_history(b)
157
sys.stdout.write(b.repository.get_revision_xml(rev_id))
160
class cmd_revno(Command):
161
"""Show current revision number.
163
This is equal to the number of revisions on this branch."""
164
takes_args = ['location?']
166
def run(self, location=u'.'):
167
print Branch.open_containing(location)[0].revno()
170
class cmd_revision_info(Command):
171
"""Show revision number and revision id for a given revision identifier.
174
takes_args = ['revision_info*']
175
takes_options = ['revision']
177
def run(self, revision=None, revision_info_list=[]):
180
if revision is not None:
181
revs.extend(revision)
182
if revision_info_list is not None:
183
for rev in revision_info_list:
184
revs.append(RevisionSpec(rev))
186
raise BzrCommandError('You must supply a revision identifier')
188
b = WorkingTree.open_containing(u'.')[0].branch
191
revinfo = rev.in_history(b)
192
if revinfo.revno is None:
193
print ' %s' % revinfo.rev_id
195
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
198
class cmd_add(Command):
199
"""Add specified files or directories.
201
In non-recursive mode, all the named items are added, regardless
202
of whether they were previously ignored. A warning is given if
203
any of the named files are already versioned.
205
In recursive mode (the default), files are treated the same way
206
but the behaviour for directories is different. Directories that
207
are already versioned do not give a warning. All directories,
208
whether already versioned or not, are searched for files or
209
subdirectories that are neither versioned or ignored, and these
210
are added. This search proceeds recursively into versioned
211
directories. If no names are given '.' is assumed.
213
Therefore simply saying 'bzr add' will version all files that
214
are currently unknown.
216
Adding a file whose parent directory is not versioned will
217
implicitly add the parent, and so on up to the root. This means
218
you should never need to explictly add a directory, they'll just
219
get added when you add a file in the directory.
221
--dry-run will show which files would be added, but not actually
224
takes_args = ['file*']
225
takes_options = ['no-recurse', 'dry-run', 'verbose']
227
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
232
# This is pointless, but I'd rather not raise an error
233
action = bzrlib.add.add_action_null
235
action = bzrlib.add.add_action_print
237
action = bzrlib.add.add_action_add
239
action = bzrlib.add.add_action_add_and_print
241
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
244
for glob in sorted(ignored.keys()):
245
match_len = len(ignored[glob])
247
for path in ignored[glob]:
248
print "ignored %s matching \"%s\"" % (path, glob)
250
print "ignored %d file(s) matching \"%s\"" % (match_len,
252
print "If you wish to add some of these files, please add them"\
256
class cmd_mkdir(Command):
257
"""Create a new versioned directory.
259
This is equivalent to creating the directory and then adding it.
261
takes_args = ['dir+']
263
def run(self, dir_list):
266
wt, dd = WorkingTree.open_containing(d)
271
class cmd_relpath(Command):
272
"""Show path of a file relative to root"""
273
takes_args = ['filename']
277
def run(self, filename):
278
tree, relpath = WorkingTree.open_containing(filename)
282
class cmd_inventory(Command):
283
"""Show inventory of the current working copy or a revision.
285
It is possible to limit the output to a particular entry
286
type using the --kind option. For example; --kind file.
288
takes_options = ['revision', 'show-ids', 'kind']
291
def run(self, revision=None, show_ids=False, kind=None):
292
if kind and kind not in ['file', 'directory', 'symlink']:
293
raise BzrCommandError('invalid kind specified')
294
tree = WorkingTree.open_containing(u'.')[0]
296
inv = tree.read_working_inventory()
298
if len(revision) > 1:
299
raise BzrCommandError('bzr inventory --revision takes'
300
' exactly one revision identifier')
301
inv = tree.branch.repository.get_revision_inventory(
302
revision[0].in_history(tree.branch).rev_id)
304
for path, entry in inv.entries():
305
if kind and kind != entry.kind:
308
print '%-50s %s' % (path, entry.file_id)
313
class cmd_move(Command):
314
"""Move files to a different directory.
319
The destination must be a versioned directory in the same branch.
321
takes_args = ['source$', 'dest']
322
def run(self, source_list, dest):
323
tree, source_list = tree_files(source_list)
324
# TODO: glob expansion on windows?
325
tree.move(source_list, tree.relpath(dest))
328
class cmd_rename(Command):
329
"""Change the name of an entry.
332
bzr rename frob.c frobber.c
333
bzr rename src/frob.c lib/frob.c
335
It is an error if the destination name exists.
337
See also the 'move' command, which moves files into a different
338
directory without changing their name.
340
# TODO: Some way to rename multiple files without invoking
341
# bzr for each one?"""
342
takes_args = ['from_name', 'to_name']
344
def run(self, from_name, to_name):
345
tree, (from_name, to_name) = tree_files((from_name, to_name))
346
tree.rename_one(from_name, to_name)
349
class cmd_mv(Command):
350
"""Move or rename a file.
353
bzr mv OLDNAME NEWNAME
354
bzr mv SOURCE... DESTINATION
356
If the last argument is a versioned directory, all the other names
357
are moved into it. Otherwise, there must be exactly two arguments
358
and the file is changed to a new name, which must not already exist.
360
Files cannot be moved between branches.
362
takes_args = ['names*']
363
def run(self, names_list):
364
if len(names_list) < 2:
365
raise BzrCommandError("missing file argument")
366
tree, rel_names = tree_files(names_list)
368
if os.path.isdir(names_list[-1]):
369
# move into existing directory
370
for pair in tree.move(rel_names[:-1], rel_names[-1]):
371
print "%s => %s" % pair
373
if len(names_list) != 2:
374
raise BzrCommandError('to mv multiple files the destination '
375
'must be a versioned directory')
376
tree.rename_one(rel_names[0], rel_names[1])
377
print "%s => %s" % (rel_names[0], rel_names[1])
380
class cmd_pull(Command):
381
"""Pull any changes from another branch into the current one.
383
If there is no default location set, the first pull will set it. After
384
that, you can omit the location to use the default. To change the
385
default, use --remember.
387
This command only works on branches that have not diverged. Branches are
388
considered diverged if both branches have had commits without first
389
pulling from the other.
391
If branches have diverged, you can use 'bzr merge' to pull the text changes
392
from one into the other. Once one branch has merged, the other should
393
be able to pull it again.
395
If you want to forget your local changes and just update your branch to
396
match the remote one, use --overwrite.
398
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
399
takes_args = ['location?']
401
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
402
# FIXME: too much stuff is in the command class
403
tree_to = WorkingTree.open_containing(u'.')[0]
404
stored_loc = tree_to.branch.get_parent()
406
if stored_loc is None:
407
raise BzrCommandError("No pull location known or specified.")
409
print "Using saved location: %s" % stored_loc
410
location = stored_loc
412
br_from = Branch.open(location)
413
br_to = tree_to.branch
417
elif len(revision) == 1:
418
rev_id = revision[0].in_history(br_from).rev_id
420
raise BzrCommandError('bzr pull --revision takes one value.')
422
old_rh = br_to.revision_history()
423
count = tree_to.pull(br_from, overwrite, rev_id)
425
if br_to.get_parent() is None or remember:
426
br_to.set_parent(location)
427
note('%d revision(s) pulled.' % (count,))
430
new_rh = tree_to.branch.revision_history()
433
from bzrlib.log import show_changed_revisions
434
show_changed_revisions(tree_to.branch, old_rh, new_rh)
437
class cmd_push(Command):
438
"""Push this branch into another branch.
440
The remote branch will not have its working tree populated because this
441
is both expensive, and may not be supported on the remote file system.
443
Some smart servers or protocols *may* put the working tree in place.
445
If there is no default push location set, the first push will set it.
446
After that, you can omit the location to use the default. To change the
447
default, use --remember.
449
This command only works on branches that have not diverged. Branches are
450
considered diverged if the branch being pushed to is not an older version
453
If branches have diverged, you can use 'bzr push --overwrite' to replace
454
the other branch completely.
456
If you want to ensure you have the different changes in the other branch,
457
do a merge (see bzr help merge) from the other branch, and commit that
458
before doing a 'push --overwrite'.
460
takes_options = ['remember', 'overwrite',
461
Option('create-prefix',
462
help='Create the path leading up to the branch '
463
'if it does not already exist')]
464
takes_args = ['location?']
466
def run(self, location=None, remember=False, overwrite=False,
467
create_prefix=False, verbose=False):
468
# FIXME: Way too big! Put this into a function called from the
470
from bzrlib.transport import get_transport
472
tree_from = WorkingTree.open_containing(u'.')[0]
473
br_from = tree_from.branch
474
stored_loc = tree_from.branch.get_push_location()
476
if stored_loc is None:
477
raise BzrCommandError("No push location known or specified.")
479
print "Using saved location: %s" % stored_loc
480
location = stored_loc
482
br_to = Branch.open(location)
483
except NotBranchError:
485
transport = get_transport(location).clone('..')
486
if not create_prefix:
488
transport.mkdir(transport.relpath(location))
490
raise BzrCommandError("Parent directory of %s "
491
"does not exist." % location)
493
current = transport.base
494
needed = [(transport, transport.relpath(location))]
497
transport, relpath = needed[-1]
498
transport.mkdir(relpath)
501
new_transport = transport.clone('..')
502
needed.append((new_transport,
503
new_transport.relpath(transport.base)))
504
if new_transport.base == transport.base:
505
raise BzrCommandError("Could not creeate "
507
if isinstance(transport, LocalTransport):
508
br_to = WorkingTree.create_standalone(location).branch
510
br_to = Branch.create(location)
511
old_rh = br_to.revision_history()
514
tree_to = br_to.working_tree()
515
except NoWorkingTree:
516
# TODO: This should be updated for branches which don't have a
517
# working tree, as opposed to ones where we just couldn't
519
warning('Unable to update the working tree of: %s' % (br_to.base,))
520
count = br_to.pull(br_from, overwrite)
522
count = tree_to.pull(br_from, overwrite)
523
except DivergedBranches:
524
raise BzrCommandError("These branches have diverged."
525
" Try a merge then push with overwrite.")
526
if br_from.get_push_location() is None or remember:
527
br_from.set_push_location(location)
528
note('%d revision(s) pushed.' % (count,))
531
new_rh = br_to.revision_history()
534
from bzrlib.log import show_changed_revisions
535
show_changed_revisions(br_to, old_rh, new_rh)
538
class cmd_branch(Command):
539
"""Create a new copy of a branch.
541
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
542
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
544
To retrieve the branch as of a particular revision, supply the --revision
545
parameter, as in "branch foo/bar -r 5".
547
--basis is to speed up branching from remote branches. When specified, it
548
copies all the file-contents, inventory and revision data from the basis
549
branch before copying anything from the remote branch.
551
takes_args = ['from_location', 'to_location?']
552
takes_options = ['revision', 'basis']
553
aliases = ['get', 'clone']
555
def run(self, from_location, to_location=None, revision=None, basis=None):
558
elif len(revision) > 1:
559
raise BzrCommandError(
560
'bzr branch --revision takes exactly 1 revision value')
562
br_from = Branch.open(from_location)
564
if e.errno == errno.ENOENT:
565
raise BzrCommandError('Source location "%s" does not'
566
' exist.' % to_location)
571
if basis is not None:
572
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
575
if len(revision) == 1 and revision[0] is not None:
576
revision_id = revision[0].in_history(br_from)[1]
578
# FIXME - wt.last_revision, fallback to branch, fall back to
579
# None or perhaps NULL_REVISION to mean copy nothing
581
revision_id = br_from.last_revision()
582
if to_location is None:
583
to_location = os.path.basename(from_location.rstrip("/\\"))
586
name = os.path.basename(to_location) + '\n'
588
os.mkdir(to_location)
590
if e.errno == errno.EEXIST:
591
raise BzrCommandError('Target directory "%s" already'
592
' exists.' % to_location)
593
if e.errno == errno.ENOENT:
594
raise BzrCommandError('Parent of "%s" does not exist.' %
599
dir = br_from.bzrdir.sprout(to_location, revision_id, basis_dir)
600
branch = dir.open_branch()
601
except bzrlib.errors.NoSuchRevision:
603
msg = "The branch %s has no revision %s." % (from_location, revision[0])
604
raise BzrCommandError(msg)
605
except bzrlib.errors.UnlistableBranch:
607
msg = "The branch %s cannot be used as a --basis"
608
raise BzrCommandError(msg)
610
branch.control_files.put_utf8('branch-name', name)
612
note('Branched %d revision(s).' % branch.revno())
617
class cmd_checkout(Command):
618
"""Create a new checkout of an existing branch.
620
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
621
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
623
To retrieve the branch as of a particular revision, supply the --revision
624
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
625
out of date [so you cannot commit] but it may be useful (i.e. to examine old
628
--basis is to speed up checking out from remote branches. When specified, it
629
uses the inventory and file contents from the basis branch in preference to the
630
branch being checked out. [Not implemented yet.]
632
takes_args = ['branch_location', 'to_location?']
633
takes_options = ['revision'] # , 'basis']
635
def run(self, branch_location, to_location=None, revision=None, basis=None):
638
elif len(revision) > 1:
639
raise BzrCommandError(
640
'bzr checkout --revision takes exactly 1 revision value')
641
source = Branch.open(branch_location)
642
if len(revision) == 1 and revision[0] is not None:
643
revision_id = revision[0].in_history(source)[1]
646
if to_location is None:
647
to_location = os.path.basename(branch_location.rstrip("/\\"))
649
os.mkdir(to_location)
651
if e.errno == errno.EEXIST:
652
raise BzrCommandError('Target directory "%s" already'
653
' exists.' % to_location)
654
if e.errno == errno.ENOENT:
655
raise BzrCommandError('Parent of "%s" does not exist.' %
659
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
660
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
661
checkout.create_workingtree(revision_id)
664
class cmd_renames(Command):
665
"""Show list of renamed files.
667
# TODO: Option to show renames between two historical versions.
669
# TODO: Only show renames under dir, rather than in the whole branch.
670
takes_args = ['dir?']
673
def run(self, dir=u'.'):
674
tree = WorkingTree.open_containing(dir)[0]
675
old_inv = tree.basis_tree().inventory
676
new_inv = tree.read_working_inventory()
678
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
680
for old_name, new_name in renames:
681
print "%s => %s" % (old_name, new_name)
684
class cmd_update(Command):
685
"""Update a tree to have the latest code committed to its branch.
687
This will perform a merge into the working tree, and may generate
688
conflicts. If you have any uncommitted changes, you will still
689
need to commit them after the update.
691
takes_args = ['dir?']
693
def run(self, dir='.'):
694
tree = WorkingTree.open_containing(dir)[0]
697
if tree.last_revision() == tree.branch.last_revision():
698
note("Tree is up to date.")
700
conflicts = tree.update()
701
note('Updated to revision %d.' %
702
(tree.branch.revision_id_to_revno(tree.last_revision()),))
711
class cmd_info(Command):
712
"""Show statistical information about a branch."""
713
takes_args = ['branch?']
716
def run(self, branch=None):
718
info.show_bzrdir_info(bzrdir.BzrDir.open_containing(branch)[0])
721
class cmd_remove(Command):
722
"""Make a file unversioned.
724
This makes bzr stop tracking changes to a versioned file. It does
725
not delete the working copy.
727
takes_args = ['file+']
728
takes_options = ['verbose']
731
def run(self, file_list, verbose=False):
732
tree, file_list = tree_files(file_list)
733
tree.remove(file_list, verbose=verbose)
736
class cmd_file_id(Command):
737
"""Print file_id of a particular file or directory.
739
The file_id is assigned when the file is first added and remains the
740
same through all revisions where the file exists, even when it is
744
takes_args = ['filename']
746
def run(self, filename):
747
tree, relpath = WorkingTree.open_containing(filename)
748
i = tree.inventory.path2id(relpath)
750
raise BzrError("%r is not a versioned file" % filename)
755
class cmd_file_path(Command):
756
"""Print path of file_ids to a file or directory.
758
This prints one line for each directory down to the target,
759
starting at the branch root."""
761
takes_args = ['filename']
763
def run(self, filename):
764
tree, relpath = WorkingTree.open_containing(filename)
766
fid = inv.path2id(relpath)
768
raise BzrError("%r is not a versioned file" % filename)
769
for fip in inv.get_idpath(fid):
773
class cmd_revision_history(Command):
774
"""Display list of revision ids on this branch."""
778
branch = WorkingTree.open_containing(u'.')[0].branch
779
for patchid in branch.revision_history():
783
class cmd_ancestry(Command):
784
"""List all revisions merged into this branch."""
788
tree = WorkingTree.open_containing(u'.')[0]
790
# FIXME. should be tree.last_revision
791
for revision_id in b.repository.get_ancestry(b.last_revision()):
795
class cmd_init(Command):
796
"""Make a directory into a versioned branch.
798
Use this to create an empty branch, or before importing an
801
Recipe for importing a tree of files:
806
bzr commit -m 'imported project'
808
takes_args = ['location?']
809
def run(self, location=None):
810
from bzrlib.branch import Branch
814
# The path has to exist to initialize a
815
# branch inside of it.
816
# Just using os.mkdir, since I don't
817
# believe that we want to create a bunch of
818
# locations if the user supplies an extended path
819
if not os.path.exists(location):
821
bzrdir.BzrDir.create_standalone_workingtree(location)
824
class cmd_diff(Command):
825
"""Show differences in working tree.
827
If files are listed, only the changes in those files are listed.
828
Otherwise, all changes for the tree are listed.
835
# TODO: Allow diff across branches.
836
# TODO: Option to use external diff command; could be GNU diff, wdiff,
837
# or a graphical diff.
839
# TODO: Python difflib is not exactly the same as unidiff; should
840
# either fix it up or prefer to use an external diff.
842
# TODO: If a directory is given, diff everything under that.
844
# TODO: Selected-file diff is inefficient and doesn't show you
847
# TODO: This probably handles non-Unix newlines poorly.
849
takes_args = ['file*']
850
takes_options = ['revision', 'diff-options']
851
aliases = ['di', 'dif']
854
def run(self, revision=None, file_list=None, diff_options=None):
855
from bzrlib.diff import show_diff
857
tree, file_list = internal_tree_files(file_list)
860
except FileInWrongBranch:
861
if len(file_list) != 2:
862
raise BzrCommandError("Files are in different branches")
864
b, file1 = Branch.open_containing(file_list[0])
865
b2, file2 = Branch.open_containing(file_list[1])
866
if file1 != "" or file2 != "":
867
# FIXME diff those two files. rbc 20051123
868
raise BzrCommandError("Files are in different branches")
870
if revision is not None:
872
raise BzrCommandError("Can't specify -r with two branches")
873
if (len(revision) == 1) or (revision[1].spec is None):
874
return show_diff(tree.branch, revision[0], specific_files=file_list,
875
external_diff_options=diff_options)
876
elif len(revision) == 2:
877
return show_diff(tree.branch, revision[0], specific_files=file_list,
878
external_diff_options=diff_options,
879
revision2=revision[1])
881
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
884
return show_diff(b, None, specific_files=file_list,
885
external_diff_options=diff_options, b2=b2)
887
return show_diff(tree.branch, None, specific_files=file_list,
888
external_diff_options=diff_options)
891
class cmd_deleted(Command):
892
"""List files deleted in the working tree.
894
# TODO: Show files deleted since a previous revision, or
895
# between two revisions.
896
# TODO: Much more efficient way to do this: read in new
897
# directories with readdir, rather than stating each one. Same
898
# level of effort but possibly much less IO. (Or possibly not,
899
# if the directories are very large...)
901
def run(self, show_ids=False):
902
tree = WorkingTree.open_containing(u'.')[0]
903
old = tree.basis_tree()
904
for path, ie in old.inventory.iter_entries():
905
if not tree.has_id(ie.file_id):
907
print '%-50s %s' % (path, ie.file_id)
912
class cmd_modified(Command):
913
"""List files modified in working tree."""
917
from bzrlib.delta import compare_trees
919
tree = WorkingTree.open_containing(u'.')[0]
920
td = compare_trees(tree.basis_tree(), tree)
922
for path, id, kind, text_modified, meta_modified in td.modified:
927
class cmd_added(Command):
928
"""List files added in working tree."""
932
wt = WorkingTree.open_containing(u'.')[0]
933
basis_inv = wt.basis_tree().inventory
936
if file_id in basis_inv:
938
path = inv.id2path(file_id)
939
if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
945
class cmd_root(Command):
946
"""Show the tree root directory.
948
The root is the nearest enclosing directory with a .bzr control
950
takes_args = ['filename?']
952
def run(self, filename=None):
953
"""Print the branch root."""
954
tree = WorkingTree.open_containing(filename)[0]
958
class cmd_log(Command):
959
"""Show log of this branch.
961
To request a range of logs, you can use the command -r begin..end
962
-r revision requests a specific revision, -r ..end or -r begin.. are
966
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
968
takes_args = ['filename?']
969
takes_options = [Option('forward',
970
help='show from oldest to newest'),
971
'timezone', 'verbose',
972
'show-ids', 'revision',
975
help='show revisions whose message matches this regexp',
980
def run(self, filename=None, timezone='original',
989
from bzrlib.log import log_formatter, show_log
991
assert message is None or isinstance(message, basestring), \
992
"invalid message argument %r" % message
993
direction = (forward and 'forward') or 'reverse'
998
# find the file id to log:
1000
dir, fp = bzrdir.BzrDir.open_containing(filename)
1001
b = dir.open_branch()
1005
inv = dir.open_workingtree().inventory
1006
except (errors.NotBranchError, errors.NotLocalUrl):
1007
# either no tree, or is remote.
1008
inv = b.basis_tree().inventory
1009
file_id = inv.path2id(fp)
1012
# FIXME ? log the current subdir only RBC 20060203
1013
dir, relpath = bzrdir.BzrDir.open_containing('.')
1014
b = dir.open_branch()
1016
if revision is None:
1019
elif len(revision) == 1:
1020
rev1 = rev2 = revision[0].in_history(b).revno
1021
elif len(revision) == 2:
1022
rev1 = revision[0].in_history(b).revno
1023
if revision[1].spec is None:
1024
# missing end-range means last known revision
1027
rev2 = revision[1].in_history(b).revno
1029
raise BzrCommandError('bzr log --revision takes one or two values.')
1031
# By this point, the revision numbers are converted to the +ve
1032
# form if they were supplied in the -ve form, so we can do
1033
# this comparison in relative safety
1035
(rev2, rev1) = (rev1, rev2)
1037
mutter('encoding log as %r', bzrlib.user_encoding)
1039
# use 'replace' so that we don't abort if trying to write out
1040
# in e.g. the default C locale.
1041
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1043
log_format = get_log_format(long=long, short=short, line=line)
1044
lf = log_formatter(log_format,
1047
show_timezone=timezone)
1053
direction=direction,
1054
start_revision=rev1,
1059
def get_log_format(long=False, short=False, line=False, default='long'):
1060
log_format = default
1064
log_format = 'short'
1070
class cmd_touching_revisions(Command):
1071
"""Return revision-ids which affected a particular file.
1073
A more user-friendly interface is "bzr log FILE"."""
1075
takes_args = ["filename"]
1077
def run(self, filename):
1078
tree, relpath = WorkingTree.open_containing(filename)
1080
inv = tree.read_working_inventory()
1081
file_id = inv.path2id(relpath)
1082
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1083
print "%6d %s" % (revno, what)
1086
class cmd_ls(Command):
1087
"""List files in a tree.
1089
# TODO: Take a revision or remote path and list that tree instead.
1091
takes_options = ['verbose', 'revision',
1092
Option('non-recursive',
1093
help='don\'t recurse into sub-directories'),
1095
help='Print all paths from the root of the branch.'),
1096
Option('unknown', help='Print unknown files'),
1097
Option('versioned', help='Print versioned files'),
1098
Option('ignored', help='Print ignored files'),
1100
Option('null', help='Null separate the files'),
1103
def run(self, revision=None, verbose=False,
1104
non_recursive=False, from_root=False,
1105
unknown=False, versioned=False, ignored=False,
1108
if verbose and null:
1109
raise BzrCommandError('Cannot set both --verbose and --null')
1110
all = not (unknown or versioned or ignored)
1112
selection = {'I':ignored, '?':unknown, 'V':versioned}
1114
tree, relpath = WorkingTree.open_containing(u'.')
1119
if revision is not None:
1120
tree = tree.branch.repository.revision_tree(
1121
revision[0].in_history(tree.branch).rev_id)
1122
for fp, fc, kind, fid, entry in tree.list_files():
1123
if fp.startswith(relpath):
1124
fp = fp[len(relpath):]
1125
if non_recursive and '/' in fp:
1127
if not all and not selection[fc]:
1130
kindch = entry.kind_character()
1131
print '%-8s %s%s' % (fc, fp, kindch)
1133
sys.stdout.write(fp)
1134
sys.stdout.write('\0')
1140
class cmd_unknowns(Command):
1141
"""List unknown files."""
1144
from bzrlib.osutils import quotefn
1145
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1149
class cmd_ignore(Command):
1150
"""Ignore a command or pattern.
1152
To remove patterns from the ignore list, edit the .bzrignore file.
1154
If the pattern contains a slash, it is compared to the whole path
1155
from the branch root. Otherwise, it is compared to only the last
1156
component of the path. To match a file only in the root directory,
1159
Ignore patterns are case-insensitive on case-insensitive systems.
1161
Note: wildcards must be quoted from the shell on Unix.
1164
bzr ignore ./Makefile
1165
bzr ignore '*.class'
1167
# TODO: Complain if the filename is absolute
1168
takes_args = ['name_pattern']
1170
def run(self, name_pattern):
1171
from bzrlib.atomicfile import AtomicFile
1174
tree, relpath = WorkingTree.open_containing(u'.')
1175
ifn = tree.abspath('.bzrignore')
1177
if os.path.exists(ifn):
1180
igns = f.read().decode('utf-8')
1186
# TODO: If the file already uses crlf-style termination, maybe
1187
# we should use that for the newly added lines?
1189
if igns and igns[-1] != '\n':
1191
igns += name_pattern + '\n'
1194
f = AtomicFile(ifn, 'wt')
1195
f.write(igns.encode('utf-8'))
1200
inv = tree.inventory
1201
if inv.path2id('.bzrignore'):
1202
mutter('.bzrignore is already versioned')
1204
mutter('need to make new .bzrignore file versioned')
1205
tree.add(['.bzrignore'])
1208
class cmd_ignored(Command):
1209
"""List ignored files and the patterns that matched them.
1211
See also: bzr ignore"""
1214
tree = WorkingTree.open_containing(u'.')[0]
1215
for path, file_class, kind, file_id, entry in tree.list_files():
1216
if file_class != 'I':
1218
## XXX: Slightly inefficient since this was already calculated
1219
pat = tree.is_ignored(path)
1220
print '%-50s %s' % (path, pat)
1223
class cmd_lookup_revision(Command):
1224
"""Lookup the revision-id from a revision-number
1227
bzr lookup-revision 33
1230
takes_args = ['revno']
1233
def run(self, revno):
1237
raise BzrCommandError("not a valid revision-number: %r" % revno)
1239
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1242
class cmd_export(Command):
1243
"""Export past revision to destination directory.
1245
If no revision is specified this exports the last committed revision.
1247
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1248
given, try to find the format with the extension. If no extension
1249
is found exports to a directory (equivalent to --format=dir).
1251
Root may be the top directory for tar, tgz and tbz2 formats. If none
1252
is given, the top directory will be the root name of the file.
1254
Note: export of tree with non-ascii filenames to zip is not supported.
1256
Supported formats Autodetected by extension
1257
----------------- -------------------------
1260
tbz2 .tar.bz2, .tbz2
1264
takes_args = ['dest']
1265
takes_options = ['revision', 'format', 'root']
1266
def run(self, dest, revision=None, format=None, root=None):
1268
from bzrlib.export import export
1269
tree = WorkingTree.open_containing(u'.')[0]
1271
if revision is None:
1272
# should be tree.last_revision FIXME
1273
rev_id = b.last_revision()
1275
if len(revision) != 1:
1276
raise BzrError('bzr export --revision takes exactly 1 argument')
1277
rev_id = revision[0].in_history(b).rev_id
1278
t = b.repository.revision_tree(rev_id)
1280
export(t, dest, format, root)
1281
except errors.NoSuchExportFormat, e:
1282
raise BzrCommandError('Unsupported export format: %s' % e.format)
1285
class cmd_cat(Command):
1286
"""Write a file's text from a previous revision."""
1288
takes_options = ['revision']
1289
takes_args = ['filename']
1292
def run(self, filename, revision=None):
1293
if revision is not None and len(revision) != 1:
1294
raise BzrCommandError("bzr cat --revision takes exactly one number")
1297
tree, relpath = WorkingTree.open_containing(filename)
1299
except NotBranchError:
1303
b, relpath = Branch.open_containing(filename)
1304
if revision is None:
1305
revision_id = b.last_revision()
1307
revision_id = revision[0].in_history(b).rev_id
1308
b.print_file(relpath, revision_id)
1311
class cmd_local_time_offset(Command):
1312
"""Show the offset in seconds from GMT to local time."""
1316
print bzrlib.osutils.local_time_offset()
1320
class cmd_commit(Command):
1321
"""Commit changes into a new revision.
1323
If no arguments are given, the entire tree is committed.
1325
If selected files are specified, only changes to those files are
1326
committed. If a directory is specified then the directory and everything
1327
within it is committed.
1329
A selected-file commit may fail in some cases where the committed
1330
tree would be invalid, such as trying to commit a file in a
1331
newly-added directory that is not itself committed.
1333
# TODO: Run hooks on tree to-be-committed, and after commit.
1335
# TODO: Strict commit that fails if there are deleted files.
1336
# (what does "deleted files" mean ??)
1338
# TODO: Give better message for -s, --summary, used by tla people
1340
# XXX: verbose currently does nothing
1342
takes_args = ['selected*']
1343
takes_options = ['message', 'verbose',
1345
help='commit even if nothing has changed'),
1346
Option('file', type=str,
1348
help='file containing commit message'),
1350
help="refuse to commit if there are unknown "
1351
"files in the working tree."),
1353
aliases = ['ci', 'checkin']
1355
def run(self, message=None, file=None, verbose=True, selected_list=None,
1356
unchanged=False, strict=False):
1357
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1359
from bzrlib.msgeditor import edit_commit_message, \
1360
make_commit_message_template
1361
from bzrlib.status import show_status
1362
from tempfile import TemporaryFile
1365
# TODO: Need a blackbox test for invoking the external editor; may be
1366
# slightly problematic to run this cross-platform.
1368
# TODO: do more checks that the commit will succeed before
1369
# spending the user's valuable time typing a commit message.
1371
# TODO: if the commit *does* happen to fail, then save the commit
1372
# message to a temporary file where it can be recovered
1373
tree, selected_list = tree_files(selected_list)
1374
if message is None and not file:
1375
template = make_commit_message_template(tree, selected_list)
1376
message = edit_commit_message(template)
1378
raise BzrCommandError("please specify a commit message"
1379
" with either --message or --file")
1380
elif message and file:
1381
raise BzrCommandError("please specify either --message or --file")
1385
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1388
raise BzrCommandError("empty commit message specified")
1391
tree.commit(message, specific_files=selected_list,
1392
allow_pointless=unchanged, strict=strict)
1393
except PointlessCommit:
1394
# FIXME: This should really happen before the file is read in;
1395
# perhaps prepare the commit; get the message; then actually commit
1396
raise BzrCommandError("no changes to commit",
1397
["use --unchanged to commit anyhow"])
1398
except ConflictsInTree:
1399
raise BzrCommandError("Conflicts detected in working tree. "
1400
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1401
except StrictCommitFailed:
1402
raise BzrCommandError("Commit refused because there are unknown "
1403
"files in the working tree.")
1404
note('Committed revision %d.' % (tree.branch.revno(),))
1407
class cmd_check(Command):
1408
"""Validate consistency of branch history.
1410
This command checks various invariants about the branch storage to
1411
detect data corruption or bzr bugs.
1413
takes_args = ['branch?']
1414
takes_options = ['verbose']
1416
def run(self, branch=None, verbose=False):
1417
from bzrlib.check import check
1419
tree = WorkingTree.open_containing()[0]
1420
branch = tree.branch
1422
branch = Branch.open(branch)
1423
check(branch, verbose)
1426
class cmd_scan_cache(Command):
1429
from bzrlib.hashcache import HashCache
1435
print '%6d stats' % c.stat_count
1436
print '%6d in hashcache' % len(c._cache)
1437
print '%6d files removed from cache' % c.removed_count
1438
print '%6d hashes updated' % c.update_count
1439
print '%6d files changed too recently to cache' % c.danger_count
1446
class cmd_upgrade(Command):
1447
"""Upgrade branch storage to current format.
1449
The check command or bzr developers may sometimes advise you to run
1450
this command. When the default format has changed you may also be warned
1451
during other operations to upgrade.
1453
takes_args = ['url?']
1455
def run(self, url='.'):
1456
from bzrlib.upgrade import upgrade
1460
class cmd_whoami(Command):
1461
"""Show bzr user id."""
1462
takes_options = ['email']
1465
def run(self, email=False):
1467
b = WorkingTree.open_containing(u'.')[0].branch
1468
config = bzrlib.config.BranchConfig(b)
1469
except NotBranchError:
1470
config = bzrlib.config.GlobalConfig()
1473
print config.user_email()
1475
print config.username()
1478
class cmd_nick(Command):
1479
"""Print or set the branch nickname.
1481
If unset, the tree root directory name is used as the nickname
1482
To print the current nickname, execute with no argument.
1484
takes_args = ['nickname?']
1485
def run(self, nickname=None):
1486
branch = Branch.open_containing(u'.')[0]
1487
if nickname is None:
1488
self.printme(branch)
1490
branch.nick = nickname
1493
def printme(self, branch):
1497
class cmd_selftest(Command):
1498
"""Run internal test suite.
1500
This creates temporary test directories in the working directory,
1501
but not existing data is affected. These directories are deleted
1502
if the tests pass, or left behind to help in debugging if they
1503
fail and --keep-output is specified.
1505
If arguments are given, they are regular expressions that say
1506
which tests should run.
1508
If the global option '--no-plugins' is given, plugins are not loaded
1509
before running the selftests. This has two effects: features provided or
1510
modified by plugins will not be tested, and tests provided by plugins will
1515
bzr --no-plugins selftest -v
1517
# TODO: --list should give a list of all available tests
1519
# NB: this is used from the class without creating an instance, which is
1520
# why it does not have a self parameter.
1521
def get_transport_type(typestring):
1522
"""Parse and return a transport specifier."""
1523
if typestring == "sftp":
1524
from bzrlib.transport.sftp import SFTPAbsoluteServer
1525
return SFTPAbsoluteServer
1526
if typestring == "memory":
1527
from bzrlib.transport.memory import MemoryServer
1529
msg = "No known transport type %s. Supported types are: sftp\n" %\
1531
raise BzrCommandError(msg)
1534
takes_args = ['testspecs*']
1535
takes_options = ['verbose',
1536
Option('one', help='stop when one test fails'),
1537
Option('keep-output',
1538
help='keep output directories when tests fail'),
1540
help='Use a different transport by default '
1541
'throughout the test suite.',
1542
type=get_transport_type),
1545
def run(self, testspecs_list=None, verbose=False, one=False,
1546
keep_output=False, transport=None):
1548
from bzrlib.tests import selftest
1549
# we don't want progress meters from the tests to go to the
1550
# real output; and we don't want log messages cluttering up
1552
save_ui = bzrlib.ui.ui_factory
1553
bzrlib.trace.info('running tests...')
1555
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1556
if testspecs_list is not None:
1557
pattern = '|'.join(testspecs_list)
1560
result = selftest(verbose=verbose,
1562
stop_on_failure=one,
1563
keep_output=keep_output,
1564
transport=transport)
1566
bzrlib.trace.info('tests passed')
1568
bzrlib.trace.info('tests failed')
1569
return int(not result)
1571
bzrlib.ui.ui_factory = save_ui
1574
def _get_bzr_branch():
1575
"""If bzr is run from a branch, return Branch or None"""
1576
import bzrlib.errors
1577
from bzrlib.branch import Branch
1578
from bzrlib.osutils import abspath
1579
from os.path import dirname
1582
branch = Branch.open(dirname(abspath(dirname(__file__))))
1584
except bzrlib.errors.BzrError:
1589
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1590
# is bzrlib itself in a branch?
1591
branch = _get_bzr_branch()
1593
rh = branch.revision_history()
1595
print " bzr checkout, revision %d" % (revno,)
1596
print " nick: %s" % (branch.nick,)
1598
print " revid: %s" % (rh[-1],)
1599
print bzrlib.__copyright__
1600
print "http://bazaar-ng.org/"
1602
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1603
print "you may use, modify and redistribute it under the terms of the GNU"
1604
print "General Public License version 2 or later."
1607
class cmd_version(Command):
1608
"""Show version of bzr."""
1613
class cmd_rocks(Command):
1614
"""Statement of optimism."""
1618
print "it sure does!"
1621
class cmd_find_merge_base(Command):
1622
"""Find and print a base revision for merging two branches.
1624
# TODO: Options to specify revisions on either side, as if
1625
# merging only part of the history.
1626
takes_args = ['branch', 'other']
1630
def run(self, branch, other):
1631
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1633
branch1 = Branch.open_containing(branch)[0]
1634
branch2 = Branch.open_containing(other)[0]
1636
history_1 = branch1.revision_history()
1637
history_2 = branch2.revision_history()
1639
last1 = branch1.last_revision()
1640
last2 = branch2.last_revision()
1642
source = MultipleRevisionSources(branch1.repository,
1645
base_rev_id = common_ancestor(last1, last2, source)
1647
print 'merge base is revision %s' % base_rev_id
1651
if base_revno is None:
1652
raise bzrlib.errors.UnrelatedBranches()
1654
print ' r%-6d in %s' % (base_revno, branch)
1656
other_revno = branch2.revision_id_to_revno(base_revid)
1658
print ' r%-6d in %s' % (other_revno, other)
1662
class cmd_merge(Command):
1663
"""Perform a three-way merge.
1665
The branch is the branch you will merge from. By default, it will
1666
merge the latest revision. If you specify a revision, that
1667
revision will be merged. If you specify two revisions, the first
1668
will be used as a BASE, and the second one as OTHER. Revision
1669
numbers are always relative to the specified branch.
1671
By default bzr will try to merge in all new work from the other
1672
branch, automatically determining an appropriate base. If this
1673
fails, you may need to give an explicit base.
1677
To merge the latest revision from bzr.dev
1678
bzr merge ../bzr.dev
1680
To merge changes up to and including revision 82 from bzr.dev
1681
bzr merge -r 82 ../bzr.dev
1683
To merge the changes introduced by 82, without previous changes:
1684
bzr merge -r 81..82 ../bzr.dev
1686
merge refuses to run if there are any uncommitted changes, unless
1689
takes_args = ['branch?']
1690
takes_options = ['revision', 'force', 'merge-type', 'reprocess',
1691
Option('show-base', help="Show base revision text in "
1694
def run(self, branch=None, revision=None, force=False, merge_type=None,
1695
show_base=False, reprocess=False):
1696
from bzrlib._merge_core import ApplyMerge3
1697
if merge_type is None:
1698
merge_type = ApplyMerge3
1700
branch = WorkingTree.open_containing(u'.')[0].branch.get_parent()
1702
raise BzrCommandError("No merge location known or specified.")
1704
print "Using saved location: %s" % branch
1705
if revision is None or len(revision) < 1:
1707
other = [branch, -1]
1709
if len(revision) == 1:
1711
other_branch = Branch.open_containing(branch)[0]
1712
revno = revision[0].in_history(other_branch).revno
1713
other = [branch, revno]
1715
assert len(revision) == 2
1716
if None in revision:
1717
raise BzrCommandError(
1718
"Merge doesn't permit that revision specifier.")
1719
b = Branch.open_containing(branch)[0]
1721
base = [branch, revision[0].in_history(b).revno]
1722
other = [branch, revision[1].in_history(b).revno]
1725
conflict_count = merge(other, base, check_clean=(not force),
1726
merge_type=merge_type, reprocess=reprocess,
1727
show_base=show_base)
1728
if conflict_count != 0:
1732
except bzrlib.errors.AmbiguousBase, e:
1733
m = ("sorry, bzr can't determine the right merge base yet\n"
1734
"candidates are:\n "
1735
+ "\n ".join(e.bases)
1737
"please specify an explicit base with -r,\n"
1738
"and (if you want) report this to the bzr developers\n")
1742
class cmd_remerge(Command):
1745
takes_args = ['file*']
1746
takes_options = ['merge-type', 'reprocess',
1747
Option('show-base', help="Show base revision text in "
1750
def run(self, file_list=None, merge_type=None, show_base=False,
1752
from bzrlib.merge import merge_inner, transform_tree
1753
from bzrlib._merge_core import ApplyMerge3
1754
if merge_type is None:
1755
merge_type = ApplyMerge3
1756
tree, file_list = tree_files(file_list)
1759
pending_merges = tree.pending_merges()
1760
if len(pending_merges) != 1:
1761
raise BzrCommandError("Sorry, remerge only works after normal"
1762
+ " merges. Not cherrypicking or"
1764
repository = tree.branch.repository
1765
base_revision = common_ancestor(tree.branch.last_revision(),
1766
pending_merges[0], repository)
1767
base_tree = repository.revision_tree(base_revision)
1768
other_tree = repository.revision_tree(pending_merges[0])
1769
interesting_ids = None
1770
if file_list is not None:
1771
interesting_ids = set()
1772
for filename in file_list:
1773
file_id = tree.path2id(filename)
1774
interesting_ids.add(file_id)
1775
if tree.kind(file_id) != "directory":
1778
for name, ie in tree.inventory.iter_entries(file_id):
1779
interesting_ids.add(ie.file_id)
1780
transform_tree(tree, tree.basis_tree(), interesting_ids)
1781
if file_list is None:
1782
restore_files = list(tree.iter_conflicts())
1784
restore_files = file_list
1785
for filename in restore_files:
1787
restore(tree.abspath(filename))
1788
except NotConflicted:
1790
conflicts = merge_inner(tree.branch, other_tree, base_tree,
1791
interesting_ids = interesting_ids,
1792
other_rev_id=pending_merges[0],
1793
merge_type=merge_type,
1794
show_base=show_base,
1795
reprocess=reprocess)
1803
class cmd_revert(Command):
1804
"""Reverse all changes since the last commit.
1806
Only versioned files are affected. Specify filenames to revert only
1807
those files. By default, any files that are changed will be backed up
1808
first. Backup files have a '~' appended to their name.
1810
takes_options = ['revision', 'no-backup']
1811
takes_args = ['file*']
1812
aliases = ['merge-revert']
1814
def run(self, revision=None, no_backup=False, file_list=None):
1815
from bzrlib.commands import parse_spec
1816
if file_list is not None:
1817
if len(file_list) == 0:
1818
raise BzrCommandError("No files specified")
1822
tree, file_list = tree_files(file_list)
1823
if revision is None:
1824
# FIXME should be tree.last_revision
1825
rev_id = tree.branch.last_revision()
1826
elif len(revision) != 1:
1827
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1829
rev_id = revision[0].in_history(tree.branch).rev_id
1830
tree.revert(file_list, tree.branch.repository.revision_tree(rev_id),
1834
class cmd_assert_fail(Command):
1835
"""Test reporting of assertion failures"""
1838
assert False, "always fails"
1841
class cmd_help(Command):
1842
"""Show help on a command or other topic.
1844
For a list of all available commands, say 'bzr help commands'."""
1845
takes_options = ['long']
1846
takes_args = ['topic?']
1850
def run(self, topic=None, long=False):
1852
if topic is None and long:
1857
class cmd_shell_complete(Command):
1858
"""Show appropriate completions for context.
1860
For a list of all available commands, say 'bzr shell-complete'."""
1861
takes_args = ['context?']
1866
def run(self, context=None):
1867
import shellcomplete
1868
shellcomplete.shellcomplete(context)
1871
class cmd_fetch(Command):
1872
"""Copy in history from another branch but don't merge it.
1874
This is an internal method used for pull and merge."""
1876
takes_args = ['from_branch', 'to_branch']
1877
def run(self, from_branch, to_branch):
1878
from bzrlib.fetch import Fetcher
1879
from bzrlib.branch import Branch
1880
from_b = Branch.open(from_branch)
1881
to_b = Branch.open(to_branch)
1882
Fetcher(to_b, from_b)
1885
class cmd_missing(Command):
1886
"""Show unmerged/unpulled revisions between two branches.
1888
OTHER_BRANCH may be local or remote."""
1889
takes_args = ['other_branch?']
1890
takes_options = [Option('reverse', 'Reverse the order of revisions'),
1892
'Display changes in the local branch only'),
1893
Option('theirs-only',
1894
'Display changes in the remote branch only'),
1902
def run(self, other_branch=None, reverse=False, mine_only=False,
1903
theirs_only=False, long=True, short=False, line=False,
1904
show_ids=False, verbose=False):
1905
from bzrlib.missing import find_unmerged, iter_log_data
1906
from bzrlib.log import log_formatter
1907
local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
1908
parent = local_branch.get_parent()
1909
if other_branch is None:
1910
other_branch = parent
1911
if other_branch is None:
1912
raise BzrCommandError("No missing location known or specified.")
1913
print "Using last location: " + local_branch.get_parent()
1914
remote_branch = bzrlib.branch.Branch.open(other_branch)
1915
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
1916
log_format = get_log_format(long=long, short=short, line=line)
1917
lf = log_formatter(log_format, sys.stdout,
1919
show_timezone='original')
1920
if reverse is False:
1921
local_extra.reverse()
1922
remote_extra.reverse()
1923
if local_extra and not theirs_only:
1924
print "You have %d extra revision(s):" % len(local_extra)
1925
for data in iter_log_data(local_extra, local_branch.repository,
1928
printed_local = True
1930
printed_local = False
1931
if remote_extra and not mine_only:
1932
if printed_local is True:
1934
print "You are missing %d revision(s):" % len(remote_extra)
1935
for data in iter_log_data(remote_extra, remote_branch.repository,
1938
if not remote_extra and not local_extra:
1940
print "Branches are up to date."
1943
if parent is None and other_branch is not None:
1944
local_branch.set_parent(other_branch)
1948
class cmd_plugins(Command):
1953
import bzrlib.plugin
1954
from inspect import getdoc
1955
for name, plugin in bzrlib.plugin.all_plugins().items():
1956
if hasattr(plugin, '__path__'):
1957
print plugin.__path__[0]
1958
elif hasattr(plugin, '__file__'):
1959
print plugin.__file__
1965
print '\t', d.split('\n')[0]
1968
class cmd_testament(Command):
1969
"""Show testament (signing-form) of a revision."""
1970
takes_options = ['revision', 'long']
1971
takes_args = ['branch?']
1973
def run(self, branch=u'.', revision=None, long=False):
1974
from bzrlib.testament import Testament
1975
b = WorkingTree.open_containing(branch)[0].branch
1978
if revision is None:
1979
rev_id = b.last_revision()
1981
rev_id = revision[0].in_history(b).rev_id
1982
t = Testament.from_revision(b.repository, rev_id)
1984
sys.stdout.writelines(t.as_text_lines())
1986
sys.stdout.write(t.as_short_text())
1991
class cmd_annotate(Command):
1992
"""Show the origin of each line in a file.
1994
This prints out the given file with an annotation on the left side
1995
indicating which revision, author and date introduced the change.
1997
If the origin is the same for a run of consecutive lines, it is
1998
shown only at the top, unless the --all option is given.
2000
# TODO: annotate directories; showing when each file was last changed
2001
# TODO: annotate a previous version of a file
2002
# TODO: if the working copy is modified, show annotations on that
2003
# with new uncommitted lines marked
2004
aliases = ['blame', 'praise']
2005
takes_args = ['filename']
2006
takes_options = [Option('all', help='show annotations on all lines'),
2007
Option('long', help='show date in annotations'),
2011
def run(self, filename, all=False, long=False):
2012
from bzrlib.annotate import annotate_file
2013
tree, relpath = WorkingTree.open_containing(filename)
2014
branch = tree.branch
2017
file_id = tree.inventory.path2id(relpath)
2018
tree = branch.repository.revision_tree(branch.last_revision())
2019
file_version = tree.inventory[file_id].revision
2020
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
2025
class cmd_re_sign(Command):
2026
"""Create a digital signature for an existing revision."""
2027
# TODO be able to replace existing ones.
2029
hidden = True # is this right ?
2030
takes_args = ['revision_id?']
2031
takes_options = ['revision']
2033
def run(self, revision_id=None, revision=None):
2034
import bzrlib.config as config
2035
import bzrlib.gpg as gpg
2036
if revision_id is not None and revision is not None:
2037
raise BzrCommandError('You can only supply one of revision_id or --revision')
2038
if revision_id is None and revision is None:
2039
raise BzrCommandError('You must supply either --revision or a revision_id')
2040
b = WorkingTree.open_containing(u'.')[0].branch
2041
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
2042
if revision_id is not None:
2043
b.repository.sign_revision(revision_id, gpg_strategy)
2044
elif revision is not None:
2045
if len(revision) == 1:
2046
revno, rev_id = revision[0].in_history(b)
2047
b.repository.sign_revision(rev_id, gpg_strategy)
2048
elif len(revision) == 2:
2049
# are they both on rh- if so we can walk between them
2050
# might be nice to have a range helper for arbitrary
2051
# revision paths. hmm.
2052
from_revno, from_revid = revision[0].in_history(b)
2053
to_revno, to_revid = revision[1].in_history(b)
2054
if to_revid is None:
2055
to_revno = b.revno()
2056
if from_revno is None or to_revno is None:
2057
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2058
for revno in range(from_revno, to_revno + 1):
2059
b.repository.sign_revision(b.get_rev_id(revno),
2062
raise BzrCommandError('Please supply either one revision, or a range.')
2065
class cmd_uncommit(bzrlib.commands.Command):
2066
"""Remove the last committed revision.
2068
By supplying the --all flag, it will not only remove the entry
2069
from revision_history, but also remove all of the entries in the
2072
--verbose will print out what is being removed.
2073
--dry-run will go through all the motions, but not actually
2076
In the future, uncommit will create a changeset, which can then
2079
TODO: jam 20060108 Add an option to allow uncommit to remove unreferenced
2080
information in 'branch-as-repostory' branches.
2081
TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2082
information in shared branches as well.
2084
takes_options = ['verbose', 'revision',
2085
Option('dry-run', help='Don\'t actually make changes'),
2086
Option('force', help='Say yes to all questions.')]
2087
takes_args = ['location?']
2090
def run(self, location=None,
2091
dry_run=False, verbose=False,
2092
revision=None, force=False):
2093
from bzrlib.branch import Branch
2094
from bzrlib.log import log_formatter
2096
from bzrlib.uncommit import uncommit
2098
if location is None:
2100
b, relpath = Branch.open_containing(location)
2102
if revision is None:
2104
rev_id = b.last_revision()
2106
revno, rev_id = revision[0].in_history(b)
2108
print 'No revisions to uncommit.'
2110
for r in range(revno, b.revno()+1):
2111
rev_id = b.get_rev_id(r)
2112
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2113
lf.show(r, b.repository.get_revision(rev_id), None)
2116
print 'Dry-run, pretending to remove the above revisions.'
2118
val = raw_input('Press <enter> to continue')
2120
print 'The above revision(s) will be removed.'
2122
val = raw_input('Are you sure [y/N]? ')
2123
if val.lower() not in ('y', 'yes'):
2127
uncommit(b, dry_run=dry_run, verbose=verbose,
2131
def merge(other_revision, base_revision,
2132
check_clean=True, ignore_zero=False,
2133
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
2134
file_list=None, show_base=False, reprocess=False):
2135
"""Merge changes into a tree.
2138
list(path, revno) Base for three-way merge.
2139
If [None, None] then a base will be automatically determined.
2141
list(path, revno) Other revision for three-way merge.
2143
Directory to merge changes into; '.' by default.
2145
If true, this_dir must have no uncommitted changes before the
2147
ignore_zero - If true, suppress the "zero conflicts" message when
2148
there are no conflicts; should be set when doing something we expect
2149
to complete perfectly.
2150
file_list - If supplied, merge only changes to selected files.
2152
All available ancestors of other_revision and base_revision are
2153
automatically pulled into the branch.
2155
The revno may be -1 to indicate the last revision on the branch, which is
2158
This function is intended for use from the command line; programmatic
2159
clients might prefer to call merge.merge_inner(), which has less magic
2162
from bzrlib.merge import Merger, _MergeConflictHandler
2163
if this_dir is None:
2165
this_tree = WorkingTree.open_containing(this_dir)[0]
2166
if show_base and not merge_type is ApplyMerge3:
2167
raise BzrCommandError("Show-base is not supported for this merge"
2168
" type. %s" % merge_type)
2169
if reprocess and not merge_type is ApplyMerge3:
2170
raise BzrCommandError("Reprocess is not supported for this merge"
2171
" type. %s" % merge_type)
2172
if reprocess and show_base:
2173
raise BzrCommandError("Cannot reprocess and show base.")
2174
merger = Merger(this_tree.branch, this_tree=this_tree)
2175
merger.check_basis(check_clean)
2176
merger.set_other(other_revision)
2177
merger.set_base(base_revision)
2178
if merger.base_rev_id == merger.other_rev_id:
2179
note('Nothing to do.')
2181
merger.backup_files = backup_files
2182
merger.merge_type = merge_type
2183
merger.set_interesting_files(file_list)
2184
merger.show_base = show_base
2185
merger.reprocess = reprocess
2186
merger.conflict_handler = _MergeConflictHandler(merger.this_tree,
2189
ignore_zero=ignore_zero)
2190
conflicts = merger.do_merge()
2191
merger.set_pending()
2195
# these get imported and then picked up by the scan for cmd_*
2196
# TODO: Some more consistent way to split command definitions across files;
2197
# we do need to load at least some information about them to know of
2199
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
added
removed
bzrlib/builtins.py
