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
23
from bzrlib.trace import mutter, note, log_error, warning
24
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
25
from bzrlib.branch import Branch
26
from bzrlib import BZRDIR
27
from bzrlib.commands import Command
30
class cmd_status(Command):
31
"""Display status summary.
33
This reports on versioned and unknown files, reporting them
34
grouped by state. Possible states are:
37
Versioned in the working copy but not in the previous revision.
40
Versioned in the previous revision but removed or deleted
44
Path of this file changed from the previous revision;
45
the text may also have changed. This includes files whose
46
parent directory was renamed.
49
Text has changed since the previous revision.
52
Nothing about this file has changed since the previous revision.
53
Only shown with --all.
56
Not versioned and not matching an ignore pattern.
58
To see ignored files use 'bzr ignored'. For details in the
59
changes to file texts, use 'bzr diff'.
61
If no arguments are specified, the status of the entire working
62
directory is shown. Otherwise, only the status of the specified
63
files or directories is reported. If a directory is given, status
64
is reported for everything inside that directory.
66
If a revision argument is given, the status is calculated against
67
that revision, or between two revisions if two are provided.
69
# XXX: FIXME: bzr status should accept a -r option to show changes
70
# relative to a revision, or between revisions
72
takes_args = ['file*']
73
takes_options = ['all', 'show-ids', 'revision']
74
aliases = ['st', 'stat']
76
def run(self, all=False, show_ids=False, file_list=None, revision=None):
78
b = Branch.open_containing(file_list[0])
79
file_list = [b.relpath(x) for x in file_list]
80
# special case: only one path was given and it's the root
85
b = Branch.open_containing('.')
87
from bzrlib.status import show_status
88
show_status(b, show_unchanged=all, show_ids=show_ids,
89
specific_files=file_list, revision=revision)
92
class cmd_cat_revision(Command):
93
"""Write out metadata for a revision.
95
The revision to print can either be specified by a specific
96
revision identifier, or you can use --revision.
100
takes_args = ['revision_id?']
101
takes_options = ['revision']
103
def run(self, revision_id=None, revision=None):
104
from bzrlib.revisionspec import RevisionSpec
106
if revision_id is not None and revision is not None:
107
raise BzrCommandError('You can only supply one of revision_id or --revision')
108
if revision_id is None and revision is None:
109
raise BzrCommandError('You must supply either --revision or a revision_id')
110
b = Branch.open_containing('.')
111
if revision_id is not None:
112
sys.stdout.write(b.get_revision_xml_file(revision_id).read())
113
elif revision is not None:
116
raise BzrCommandError('You cannot specify a NULL revision.')
117
revno, rev_id = rev.in_history(b)
118
sys.stdout.write(b.get_revision_xml_file(rev_id).read())
121
class cmd_revno(Command):
122
"""Show current revision number.
124
This is equal to the number of revisions on this branch."""
126
print Branch.open_containing('.').revno()
129
class cmd_revision_info(Command):
130
"""Show revision number and revision id for a given revision identifier.
133
takes_args = ['revision_info*']
134
takes_options = ['revision']
135
def run(self, revision=None, revision_info_list=[]):
136
from bzrlib.revisionspec import RevisionSpec
139
if revision is not None:
140
revs.extend(revision)
141
if revision_info_list is not None:
142
for rev in revision_info_list:
143
revs.append(RevisionSpec(rev))
145
raise BzrCommandError('You must supply a revision identifier')
147
b = Branch.open_containing('.')
150
revinfo = rev.in_history(b)
151
if revinfo.revno is None:
152
print ' %s' % revinfo.rev_id
154
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
157
class cmd_add(Command):
158
"""Add specified files or directories.
160
In non-recursive mode, all the named items are added, regardless
161
of whether they were previously ignored. A warning is given if
162
any of the named files are already versioned.
164
In recursive mode (the default), files are treated the same way
165
but the behaviour for directories is different. Directories that
166
are already versioned do not give a warning. All directories,
167
whether already versioned or not, are searched for files or
168
subdirectories that are neither versioned or ignored, and these
169
are added. This search proceeds recursively into versioned
170
directories. If no names are given '.' is assumed.
172
Therefore simply saying 'bzr add' will version all files that
173
are currently unknown.
175
Adding a file whose parent directory is not versioned will
176
implicitly add the parent, and so on up to the root. This means
177
you should never need to explictly add a directory, they'll just
178
get added when you add a file in the directory.
180
takes_args = ['file*']
181
takes_options = ['verbose', 'no-recurse']
183
def run(self, file_list, verbose=False, no_recurse=False):
184
# verbose currently has no effect
185
from bzrlib.add import smart_add, add_reporter_print
186
smart_add(file_list, not no_recurse, add_reporter_print)
190
class cmd_mkdir(Command):
191
"""Create a new versioned directory.
193
This is equivalent to creating the directory and then adding it.
195
takes_args = ['dir+']
197
def run(self, dir_list):
203
b = Branch.open_containing(d)
208
class cmd_relpath(Command):
209
"""Show path of a file relative to root"""
210
takes_args = ['filename']
213
def run(self, filename):
214
print Branch.open_containing(filename).relpath(filename)
218
class cmd_inventory(Command):
219
"""Show inventory of the current working copy or a revision."""
220
takes_options = ['revision', 'show-ids']
222
def run(self, revision=None, show_ids=False):
223
b = Branch.open_containing('.')
225
inv = b.read_working_inventory()
227
if len(revision) > 1:
228
raise BzrCommandError('bzr inventory --revision takes'
229
' exactly one revision identifier')
230
inv = b.get_revision_inventory(revision[0].in_history(b).rev_id)
232
for path, entry in inv.entries():
234
print '%-50s %s' % (path, entry.file_id)
239
class cmd_move(Command):
240
"""Move files to a different directory.
245
The destination must be a versioned directory in the same branch.
247
takes_args = ['source$', 'dest']
248
def run(self, source_list, dest):
249
b = Branch.open_containing('.')
251
# TODO: glob expansion on windows?
252
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
255
class cmd_rename(Command):
256
"""Change the name of an entry.
259
bzr rename frob.c frobber.c
260
bzr rename src/frob.c lib/frob.c
262
It is an error if the destination name exists.
264
See also the 'move' command, which moves files into a different
265
directory without changing their name.
267
TODO: Some way to rename multiple files without invoking bzr for each
269
takes_args = ['from_name', 'to_name']
271
def run(self, from_name, to_name):
272
b = Branch.open_containing('.')
273
b.rename_one(b.relpath(from_name), b.relpath(to_name))
277
class cmd_mv(Command):
278
"""Move or rename a file.
281
bzr mv OLDNAME NEWNAME
282
bzr mv SOURCE... DESTINATION
284
If the last argument is a versioned directory, all the other names
285
are moved into it. Otherwise, there must be exactly two arguments
286
and the file is changed to a new name, which must not already exist.
288
Files cannot be moved between branches.
290
takes_args = ['names*']
291
def run(self, names_list):
292
if len(names_list) < 2:
293
raise BzrCommandError("missing file argument")
294
b = Branch.open_containing(names_list[0])
296
rel_names = [b.relpath(x) for x in names_list]
298
if os.path.isdir(names_list[-1]):
299
# move into existing directory
300
for pair in b.move(rel_names[:-1], rel_names[-1]):
301
print "%s => %s" % pair
303
if len(names_list) != 2:
304
raise BzrCommandError('to mv multiple files the destination '
305
'must be a versioned directory')
306
b.rename_one(rel_names[0], rel_names[1])
307
print "%s => %s" % (rel_names[0], rel_names[1])
312
class cmd_pull(Command):
313
"""Pull any changes from another branch into the current one.
315
If the location is omitted, the last-used location will be used.
316
Both the revision history and the working directory will be
319
This command only works on branches that have not diverged. Branches are
320
considered diverged if both branches have had commits without first
321
pulling from the other.
323
If branches have diverged, you can use 'bzr merge' to pull the text changes
324
from one into the other.
326
takes_args = ['location?']
328
def run(self, location=None):
329
from bzrlib.merge import merge
331
from shutil import rmtree
334
br_to = Branch.open_containing('.')
335
stored_loc = br_to.get_parent()
337
if stored_loc is None:
338
raise BzrCommandError("No pull location known or specified.")
340
print "Using last location: %s" % stored_loc
341
location = stored_loc
342
cache_root = tempfile.mkdtemp()
343
from bzrlib.errors import DivergedBranches
344
br_from = Branch.open_containing(location)
345
location = br_from.base
346
old_revno = br_to.revno()
348
from bzrlib.errors import DivergedBranches
349
br_from = Branch.open(location)
350
br_from.setup_caching(cache_root)
351
location = br_from.base
352
old_revno = br_to.revno()
354
br_to.update_revisions(br_from)
355
except DivergedBranches:
356
raise BzrCommandError("These branches have diverged."
359
merge(('.', -1), ('.', old_revno), check_clean=False)
360
if location != stored_loc:
361
br_to.set_parent(location)
367
class cmd_branch(Command):
368
"""Create a new copy of a branch.
370
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
371
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
373
To retrieve the branch as of a particular revision, supply the --revision
374
parameter, as in "branch foo/bar -r 5".
376
takes_args = ['from_location', 'to_location?']
377
takes_options = ['revision']
378
aliases = ['get', 'clone']
380
def run(self, from_location, to_location=None, revision=None):
381
from bzrlib.branch import copy_branch
384
from shutil import rmtree
385
cache_root = tempfile.mkdtemp()
389
elif len(revision) > 1:
390
raise BzrCommandError(
391
'bzr branch --revision takes exactly 1 revision value')
393
br_from = Branch.open(from_location)
395
if e.errno == errno.ENOENT:
396
raise BzrCommandError('Source location "%s" does not'
397
' exist.' % to_location)
400
br_from.setup_caching(cache_root)
401
if len(revision) == 1 and revision[0] is not None:
402
revno = revision[0].in_history(br_from)[0]
405
if to_location is None:
406
to_location = os.path.basename(from_location.rstrip("/\\"))
408
os.mkdir(to_location)
410
if e.errno == errno.EEXIST:
411
raise BzrCommandError('Target directory "%s" already'
412
' exists.' % to_location)
413
if e.errno == errno.ENOENT:
414
raise BzrCommandError('Parent of "%s" does not exist.' %
419
copy_branch(br_from, to_location, revno)
420
except bzrlib.errors.NoSuchRevision:
422
msg = "The branch %s has no revision %d." % (from_location, revision[0])
423
raise BzrCommandError(msg)
428
class cmd_renames(Command):
429
"""Show list of renamed files.
431
TODO: Option to show renames between two historical versions.
433
TODO: Only show renames under dir, rather than in the whole branch.
435
takes_args = ['dir?']
437
def run(self, dir='.'):
438
b = Branch.open_containing(dir)
439
old_inv = b.basis_tree().inventory
440
new_inv = b.read_working_inventory()
442
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
444
for old_name, new_name in renames:
445
print "%s => %s" % (old_name, new_name)
448
class cmd_info(Command):
449
"""Show statistical information about a branch."""
450
takes_args = ['branch?']
452
def run(self, branch=None):
455
b = Branch.open_containing(branch)
459
class cmd_remove(Command):
460
"""Make a file unversioned.
462
This makes bzr stop tracking changes to a versioned file. It does
463
not delete the working copy.
465
takes_args = ['file+']
466
takes_options = ['verbose']
468
def run(self, file_list, verbose=False):
469
b = Branch.open_containing(file_list[0])
470
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
473
class cmd_file_id(Command):
474
"""Print file_id of a particular file or directory.
476
The file_id is assigned when the file is first added and remains the
477
same through all revisions where the file exists, even when it is
481
takes_args = ['filename']
482
def run(self, filename):
483
b = Branch.open_containing(filename)
484
i = b.inventory.path2id(b.relpath(filename))
486
raise BzrError("%r is not a versioned file" % filename)
491
class cmd_file_path(Command):
492
"""Print path of file_ids to a file or directory.
494
This prints one line for each directory down to the target,
495
starting at the branch root."""
497
takes_args = ['filename']
498
def run(self, filename):
499
b = Branch.open_containing(filename)
501
fid = inv.path2id(b.relpath(filename))
503
raise BzrError("%r is not a versioned file" % filename)
504
for fip in inv.get_idpath(fid):
508
class cmd_revision_history(Command):
509
"""Display list of revision ids on this branch."""
512
for patchid in Branch.open_containing('.').revision_history():
516
class cmd_directories(Command):
517
"""Display list of versioned directories in this branch."""
519
for name, ie in Branch.open_containing('.').read_working_inventory().directories():
526
class cmd_init(Command):
527
"""Make a directory into a versioned branch.
529
Use this to create an empty branch, or before importing an
532
Recipe for importing a tree of files:
537
bzr commit -m 'imported project'
540
from bzrlib.branch import Branch
541
Branch.initialize('.')
544
class cmd_diff(Command):
545
"""Show differences in working tree.
547
If files are listed, only the changes in those files are listed.
548
Otherwise, all changes for the tree are listed.
550
TODO: Allow diff across branches.
552
TODO: Option to use external diff command; could be GNU diff, wdiff,
555
TODO: Python difflib is not exactly the same as unidiff; should
556
either fix it up or prefer to use an external diff.
558
TODO: If a directory is given, diff everything under that.
560
TODO: Selected-file diff is inefficient and doesn't show you
563
TODO: This probably handles non-Unix newlines poorly.
571
takes_args = ['file*']
572
takes_options = ['revision', 'diff-options']
573
aliases = ['di', 'dif']
575
def run(self, revision=None, file_list=None, diff_options=None):
576
from bzrlib.diff import show_diff
579
b = Branch.open_containing(file_list[0])
580
file_list = [b.relpath(f) for f in file_list]
581
if file_list == ['']:
582
# just pointing to top-of-tree
585
b = Branch.open_containing('.')
587
if revision is not None:
588
if len(revision) == 1:
589
show_diff(b, revision[0], specific_files=file_list,
590
external_diff_options=diff_options)
591
elif len(revision) == 2:
592
show_diff(b, revision[0], specific_files=file_list,
593
external_diff_options=diff_options,
594
revision2=revision[1])
596
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
598
show_diff(b, None, specific_files=file_list,
599
external_diff_options=diff_options)
604
class cmd_deleted(Command):
605
"""List files deleted in the working tree.
607
TODO: Show files deleted since a previous revision, or between two revisions.
609
def run(self, show_ids=False):
610
b = Branch.open_containing('.')
612
new = b.working_tree()
614
## TODO: Much more efficient way to do this: read in new
615
## directories with readdir, rather than stating each one. Same
616
## level of effort but possibly much less IO. (Or possibly not,
617
## if the directories are very large...)
619
for path, ie in old.inventory.iter_entries():
620
if not new.has_id(ie.file_id):
622
print '%-50s %s' % (path, ie.file_id)
627
class cmd_modified(Command):
628
"""List files modified in working tree."""
631
from bzrlib.delta import compare_trees
633
b = Branch.open_containing('.')
634
td = compare_trees(b.basis_tree(), b.working_tree())
636
for path, id, kind in td.modified:
641
class cmd_added(Command):
642
"""List files added in working tree."""
645
b = Branch.open_containing('.')
646
wt = b.working_tree()
647
basis_inv = b.basis_tree().inventory
650
if file_id in basis_inv:
652
path = inv.id2path(file_id)
653
if not os.access(b.abspath(path), os.F_OK):
659
class cmd_root(Command):
660
"""Show the tree root directory.
662
The root is the nearest enclosing directory with a .bzr control
664
takes_args = ['filename?']
665
def run(self, filename=None):
666
"""Print the branch root."""
667
b = Branch.open_containing(filename)
671
class cmd_log(Command):
672
"""Show log of this branch.
674
To request a range of logs, you can use the command -r begin:end
675
-r revision requests a specific revision, -r :end or -r begin: are
678
--message allows you to give a regular expression, which will be evaluated
679
so that only matching entries will be displayed.
681
TODO: Make --revision support uuid: and hash: [future tag:] notation.
685
takes_args = ['filename?']
686
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
687
'long', 'message', 'short',]
689
def run(self, filename=None, timezone='original',
697
from bzrlib.log import log_formatter, show_log
700
direction = (forward and 'forward') or 'reverse'
703
b = Branch.open_containing(filename)
704
fp = b.relpath(filename)
706
file_id = b.read_working_inventory().path2id(fp)
708
file_id = None # points to branch root
710
b = Branch.open_containing('.')
716
elif len(revision) == 1:
717
rev1 = rev2 = revision[0].in_history(b).revno
718
elif len(revision) == 2:
719
rev1 = revision[0].in_history(b).revno
720
rev2 = revision[1].in_history(b).revno
722
raise BzrCommandError('bzr log --revision takes one or two values.')
729
mutter('encoding log as %r' % bzrlib.user_encoding)
731
# use 'replace' so that we don't abort if trying to write out
732
# in e.g. the default C locale.
733
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
739
lf = log_formatter(log_format,
742
show_timezone=timezone)
755
class cmd_touching_revisions(Command):
756
"""Return revision-ids which affected a particular file.
758
A more user-friendly interface is "bzr log FILE"."""
760
takes_args = ["filename"]
761
def run(self, filename):
762
b = Branch.open_containing(filename)
763
inv = b.read_working_inventory()
764
file_id = inv.path2id(b.relpath(filename))
765
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
766
print "%6d %s" % (revno, what)
769
class cmd_ls(Command):
770
"""List files in a tree.
772
TODO: Take a revision or remote path and list that tree instead.
775
def run(self, revision=None, verbose=False):
776
b = Branch.open_containing('.')
778
tree = b.working_tree()
780
tree = b.revision_tree(revision.in_history(b).rev_id)
782
for fp, fc, kind, fid in tree.list_files():
784
if kind == 'directory':
791
print '%-8s %s%s' % (fc, fp, kindch)
797
class cmd_unknowns(Command):
798
"""List unknown files."""
800
from bzrlib.osutils import quotefn
801
for f in Branch.open_containing('.').unknowns():
806
class cmd_ignore(Command):
807
"""Ignore a command or pattern.
809
To remove patterns from the ignore list, edit the .bzrignore file.
811
If the pattern contains a slash, it is compared to the whole path
812
from the branch root. Otherwise, it is comapred to only the last
813
component of the path.
815
Ignore patterns are case-insensitive on case-insensitive systems.
817
Note: wildcards must be quoted from the shell on Unix.
820
bzr ignore ./Makefile
823
takes_args = ['name_pattern']
825
def run(self, name_pattern):
826
from bzrlib.atomicfile import AtomicFile
829
b = Branch.open_containing('.')
830
ifn = b.abspath('.bzrignore')
832
if os.path.exists(ifn):
835
igns = f.read().decode('utf-8')
841
# TODO: If the file already uses crlf-style termination, maybe
842
# we should use that for the newly added lines?
844
if igns and igns[-1] != '\n':
846
igns += name_pattern + '\n'
849
f = AtomicFile(ifn, 'wt')
850
f.write(igns.encode('utf-8'))
855
inv = b.working_tree().inventory
856
if inv.path2id('.bzrignore'):
857
mutter('.bzrignore is already versioned')
859
mutter('need to make new .bzrignore file versioned')
860
b.add(['.bzrignore'])
864
class cmd_ignored(Command):
865
"""List ignored files and the patterns that matched them.
867
See also: bzr ignore"""
869
tree = Branch.open_containing('.').working_tree()
870
for path, file_class, kind, file_id in tree.list_files():
871
if file_class != 'I':
873
## XXX: Slightly inefficient since this was already calculated
874
pat = tree.is_ignored(path)
875
print '%-50s %s' % (path, pat)
878
class cmd_lookup_revision(Command):
879
"""Lookup the revision-id from a revision-number
882
bzr lookup-revision 33
885
takes_args = ['revno']
887
def run(self, revno):
891
raise BzrCommandError("not a valid revision-number: %r" % revno)
893
print Branch.open_containing('.').get_rev_id(revno)
896
class cmd_export(Command):
897
"""Export past revision to destination directory.
899
If no revision is specified this exports the last committed revision.
901
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
902
given, try to find the format with the extension. If no extension
903
is found exports to a directory (equivalent to --format=dir).
905
Root may be the top directory for tar, tgz and tbz2 formats. If none
906
is given, the top directory will be the root name of the file."""
907
# TODO: list known exporters
908
takes_args = ['dest']
909
takes_options = ['revision', 'format', 'root']
910
def run(self, dest, revision=None, format=None, root=None):
912
b = Branch.open_containing('.')
914
rev_id = b.last_patch()
916
if len(revision) != 1:
917
raise BzrError('bzr export --revision takes exactly 1 argument')
918
rev_id = revision[0].in_history(b).rev_id
919
t = b.revision_tree(rev_id)
920
root, ext = os.path.splitext(dest)
924
elif ext in (".gz", ".tgz"):
926
elif ext in (".bz2", ".tbz2"):
930
t.export(dest, format, root)
933
class cmd_cat(Command):
934
"""Write a file's text from a previous revision."""
936
takes_options = ['revision']
937
takes_args = ['filename']
939
def run(self, filename, revision=None):
941
raise BzrCommandError("bzr cat requires a revision number")
942
elif len(revision) != 1:
943
raise BzrCommandError("bzr cat --revision takes exactly one number")
944
b = Branch.open_containing('.')
945
b.print_file(b.relpath(filename), revision[0].in_history(b).revno)
948
class cmd_local_time_offset(Command):
949
"""Show the offset in seconds from GMT to local time."""
952
print bzrlib.osutils.local_time_offset()
956
class cmd_commit(Command):
957
"""Commit changes into a new revision.
959
If no arguments are given, the entire tree is committed.
961
If selected files are specified, only changes to those files are
962
committed. If a directory is specified then the directory and everything
963
within it is committed.
965
A selected-file commit may fail in some cases where the committed
966
tree would be invalid, such as trying to commit a file in a
967
newly-added directory that is not itself committed.
969
TODO: Run hooks on tree to-be-committed, and after commit.
971
TODO: Strict commit that fails if there are unknown or deleted files.
973
takes_args = ['selected*']
974
takes_options = ['message', 'file', 'verbose', 'unchanged']
975
aliases = ['ci', 'checkin']
977
# TODO: Give better message for -s, --summary, used by tla people
979
def run(self, message=None, file=None, verbose=True, selected_list=None,
981
from bzrlib.errors import PointlessCommit
982
from bzrlib.msgeditor import edit_commit_message
983
from bzrlib.status import show_status
984
from cStringIO import StringIO
986
b = Branch.open_containing('.')
988
selected_list = [b.relpath(s) for s in selected_list]
990
if not message and not file:
992
show_status(b, specific_files=selected_list,
994
message = edit_commit_message(catcher.getvalue())
997
raise BzrCommandError("please specify a commit message"
998
" with either --message or --file")
999
elif message and file:
1000
raise BzrCommandError("please specify either --message or --file")
1004
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1007
b.commit(message, verbose=verbose,
1008
specific_files=selected_list,
1009
allow_pointless=unchanged)
1010
except PointlessCommit:
1011
# FIXME: This should really happen before the file is read in;
1012
# perhaps prepare the commit; get the message; then actually commit
1013
raise BzrCommandError("no changes to commit",
1014
["use --unchanged to commit anyhow"])
1017
class cmd_check(Command):
1018
"""Validate consistency of branch history.
1020
This command checks various invariants about the branch storage to
1021
detect data corruption or bzr bugs.
1023
takes_args = ['dir?']
1025
def run(self, dir='.'):
1026
from bzrlib.check import check
1028
check(Branch.open_containing(dir))
1031
class cmd_scan_cache(Command):
1034
from bzrlib.hashcache import HashCache
1040
print '%6d stats' % c.stat_count
1041
print '%6d in hashcache' % len(c._cache)
1042
print '%6d files removed from cache' % c.removed_count
1043
print '%6d hashes updated' % c.update_count
1044
print '%6d files changed too recently to cache' % c.danger_count
1051
class cmd_upgrade(Command):
1052
"""Upgrade branch storage to current format.
1054
The check command or bzr developers may sometimes advise you to run
1057
takes_args = ['dir?']
1059
def run(self, dir='.'):
1060
from bzrlib.upgrade import upgrade
1061
upgrade(Branch.open_containing(dir))
1065
class cmd_whoami(Command):
1066
"""Show bzr user id."""
1067
takes_options = ['email']
1069
def run(self, email=False):
1071
b = bzrlib.branch.Branch.open_containing('.')
1076
print bzrlib.osutils.user_email(b)
1078
print bzrlib.osutils.username(b)
1081
class cmd_selftest(Command):
1082
"""Run internal test suite"""
1084
takes_options = ['verbose', 'pattern']
1085
def run(self, verbose=False, pattern=".*"):
1087
from bzrlib.selftest import selftest
1088
# we don't want progress meters from the tests to go to the
1089
# real output; and we don't want log messages cluttering up
1091
save_ui = bzrlib.ui.ui_factory
1092
bzrlib.trace.info('running tests...')
1094
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1095
result = selftest(verbose=verbose, pattern=pattern)
1097
bzrlib.trace.info('tests passed')
1099
bzrlib.trace.info('tests failed')
1100
return int(not result)
1102
bzrlib.ui.ui_factory = save_ui
1106
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1107
# is bzrlib itself in a branch?
1108
bzrrev = bzrlib.get_bzr_revision()
1110
print " (bzr checkout, revision %d {%s})" % bzrrev
1111
print bzrlib.__copyright__
1112
print "http://bazaar-ng.org/"
1114
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1115
print "you may use, modify and redistribute it under the terms of the GNU"
1116
print "General Public License version 2 or later."
1119
class cmd_version(Command):
1120
"""Show version of bzr."""
1124
class cmd_rocks(Command):
1125
"""Statement of optimism."""
1128
print "it sure does!"
1131
class cmd_find_merge_base(Command):
1132
"""Find and print a base revision for merging two branches.
1134
TODO: Options to specify revisions on either side, as if
1135
merging only part of the history.
1137
takes_args = ['branch', 'other']
1140
def run(self, branch, other):
1141
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1143
branch1 = Branch.open_containing(branch)
1144
branch2 = Branch.open_containing(other)
1146
history_1 = branch1.revision_history()
1147
history_2 = branch2.revision_history()
1149
last1 = branch1.last_patch()
1150
last2 = branch2.last_patch()
1152
source = MultipleRevisionSources(branch1, branch2)
1154
base_rev_id = common_ancestor(last1, last2, source)
1156
print 'merge base is revision %s' % base_rev_id
1160
if base_revno is None:
1161
raise bzrlib.errors.UnrelatedBranches()
1163
print ' r%-6d in %s' % (base_revno, branch)
1165
other_revno = branch2.revision_id_to_revno(base_revid)
1167
print ' r%-6d in %s' % (other_revno, other)
1171
class cmd_merge(Command):
1172
"""Perform a three-way merge.
1174
The branch is the branch you will merge from. By default, it will
1175
merge the latest revision. If you specify a revision, that
1176
revision will be merged. If you specify two revisions, the first
1177
will be used as a BASE, and the second one as OTHER. Revision
1178
numbers are always relative to the specified branch.
1180
By default bzr will try to merge in all new work from the other
1181
branch, automatically determining an appropriate base. If this
1182
fails, you may need to give an explicit base.
1186
To merge the latest revision from bzr.dev
1187
bzr merge ../bzr.dev
1189
To merge changes up to and including revision 82 from bzr.dev
1190
bzr merge -r 82 ../bzr.dev
1192
To merge the changes introduced by 82, without previous changes:
1193
bzr merge -r 81..82 ../bzr.dev
1195
merge refuses to run if there are any uncommitted changes, unless
1198
takes_args = ['branch?']
1199
takes_options = ['revision', 'force', 'merge-type']
1201
def run(self, branch='.', revision=None, force=False,
1203
from bzrlib.merge import merge
1204
from bzrlib.merge_core import ApplyMerge3
1205
if merge_type is None:
1206
merge_type = ApplyMerge3
1208
if revision is None or len(revision) < 1:
1210
other = [branch, -1]
1212
if len(revision) == 1:
1214
other = [branch, revision[0].in_history(branch).revno]
1216
assert len(revision) == 2
1217
if None in revision:
1218
raise BzrCommandError(
1219
"Merge doesn't permit that revision specifier.")
1220
from bzrlib.branch import Branch
1221
b = Branch.open(branch)
1223
base = [branch, revision[0].in_history(b).revno]
1224
other = [branch, revision[1].in_history(b).revno]
1227
merge(other, base, check_clean=(not force), merge_type=merge_type)
1228
except bzrlib.errors.AmbiguousBase, e:
1229
m = ("sorry, bzr can't determine the right merge base yet\n"
1230
"candidates are:\n "
1231
+ "\n ".join(e.bases)
1233
"please specify an explicit base with -r,\n"
1234
"and (if you want) report this to the bzr developers\n")
1238
class cmd_revert(Command):
1239
"""Reverse all changes since the last commit.
1241
Only versioned files are affected. Specify filenames to revert only
1242
those files. By default, any files that are changed will be backed up
1243
first. Backup files have a '~' appended to their name.
1245
takes_options = ['revision', 'no-backup']
1246
takes_args = ['file*']
1247
aliases = ['merge-revert']
1249
def run(self, revision=None, no_backup=False, file_list=None):
1250
from bzrlib.merge import merge
1251
from bzrlib.branch import Branch
1252
from bzrlib.commands import parse_spec
1254
if file_list is not None:
1255
if len(file_list) == 0:
1256
raise BzrCommandError("No files specified")
1257
if revision is None:
1259
elif len(revision) != 1:
1260
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1262
b = Branch.open_containing('.')
1263
revno = revision[0].in_history(b).revno
1264
merge(('.', revno), parse_spec('.'),
1267
backup_files=not no_backup,
1268
file_list=file_list)
1270
Branch.open_containing('.').set_pending_merges([])
1273
class cmd_assert_fail(Command):
1274
"""Test reporting of assertion failures"""
1277
assert False, "always fails"
1280
class cmd_help(Command):
1281
"""Show help on a command or other topic.
1283
For a list of all available commands, say 'bzr help commands'."""
1284
takes_options = ['long']
1285
takes_args = ['topic?']
1288
def run(self, topic=None, long=False):
1290
if topic is None and long:
1295
class cmd_shell_complete(Command):
1296
"""Show appropriate completions for context.
1298
For a list of all available commands, say 'bzr shell-complete'."""
1299
takes_args = ['context?']
1303
def run(self, context=None):
1304
import shellcomplete
1305
shellcomplete.shellcomplete(context)
1308
class cmd_missing(Command):
1309
"""What is missing in this branch relative to other branch.
1311
takes_args = ['remote?']
1312
aliases = ['mis', 'miss']
1313
# We don't have to add quiet to the list, because
1314
# unknown options are parsed as booleans
1315
takes_options = ['verbose', 'quiet']
1317
def run(self, remote=None, verbose=False, quiet=False):
1318
from bzrlib.errors import BzrCommandError
1319
from bzrlib.missing import show_missing
1321
if verbose and quiet:
1322
raise BzrCommandError('Cannot pass both quiet and verbose')
1324
b = Branch.open_containing('.')
1325
parent = b.get_parent()
1328
raise BzrCommandError("No missing location known or specified.")
1331
print "Using last location: %s" % parent
1333
elif parent is None:
1334
# We only update parent if it did not exist, missing
1335
# should not change the parent
1336
b.set_parent(remote)
1337
br_remote = Branch.open_containing(remote)
1339
return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1343
class cmd_plugins(Command):
1347
import bzrlib.plugin
1348
from inspect import getdoc
1349
for plugin in bzrlib.plugin.all_plugins:
1350
if hasattr(plugin, '__path__'):
1351
print plugin.__path__[0]
1352
elif hasattr(plugin, '__file__'):
1353
print plugin.__file__
1359
print '\t', d.split('\n')[0]