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.
67
takes_args = ['file*']
68
takes_options = ['all', 'show-ids']
69
aliases = ['st', 'stat']
71
def run(self, all=False, show_ids=False, file_list=None):
73
b = Branch.open_containing(file_list[0])
74
file_list = [b.relpath(x) for x in file_list]
75
# special case: only one path was given and it's the root
80
b = Branch.open_containing('.')
82
from bzrlib.status import show_status
83
show_status(b, show_unchanged=all, show_ids=show_ids,
84
specific_files=file_list)
87
class cmd_cat_revision(Command):
88
"""Write out metadata for a revision."""
91
takes_args = ['revision_id']
93
def run(self, revision_id):
94
b = Branch.open_containing('.')
95
sys.stdout.write(b.get_revision_xml_file(revision_id).read())
98
class cmd_revno(Command):
99
"""Show current revision number.
101
This is equal to the number of revisions on this branch."""
103
print Branch.open_containing('.').revno()
106
class cmd_revision_info(Command):
107
"""Show revision number and revision id for a given revision identifier.
110
takes_args = ['revision_info*']
111
takes_options = ['revision']
112
def run(self, revision=None, revision_info_list=()):
113
from bzrlib.revisionspec import RevisionSpec
116
if revision is not None:
117
revs.extend(revision)
118
for rev in revision_info_list:
119
revs.append(RevisionSpec(revision_info_list))
121
raise BzrCommandError('You must supply a revision identifier')
123
b = Branch.open_containing('.')
126
print '%4d %s' % rev.in_history(b)
129
class cmd_add(Command):
130
"""Add specified files or directories.
132
In non-recursive mode, all the named items are added, regardless
133
of whether they were previously ignored. A warning is given if
134
any of the named files are already versioned.
136
In recursive mode (the default), files are treated the same way
137
but the behaviour for directories is different. Directories that
138
are already versioned do not give a warning. All directories,
139
whether already versioned or not, are searched for files or
140
subdirectories that are neither versioned or ignored, and these
141
are added. This search proceeds recursively into versioned
142
directories. If no names are given '.' is assumed.
144
Therefore simply saying 'bzr add' will version all files that
145
are currently unknown.
147
Adding a file whose parent directory is not versioned will
148
implicitly add the parent, and so on up to the root. This means
149
you should never need to explictly add a directory, they'll just
150
get added when you add a file in the directory.
152
takes_args = ['file*']
153
takes_options = ['verbose', 'no-recurse']
155
def run(self, file_list, verbose=False, no_recurse=False):
156
# verbose currently has no effect
157
from bzrlib.add import smart_add, add_reporter_print
158
smart_add(file_list, not no_recurse, add_reporter_print)
162
class cmd_mkdir(Command):
163
"""Create a new versioned directory.
165
This is equivalent to creating the directory and then adding it.
167
takes_args = ['dir+']
169
def run(self, dir_list):
175
b = Branch.open_containing(d)
180
class cmd_relpath(Command):
181
"""Show path of a file relative to root"""
182
takes_args = ['filename']
185
def run(self, filename):
186
print Branch.open_containing(filename).relpath(filename)
190
class cmd_inventory(Command):
191
"""Show inventory of the current working copy or a revision."""
192
takes_options = ['revision', 'show-ids']
194
def run(self, revision=None, show_ids=False):
195
b = Branch.open_containing('.')
197
inv = b.read_working_inventory()
199
if len(revision) > 1:
200
raise BzrCommandError('bzr inventory --revision takes'
201
' exactly one revision identifier')
202
inv = b.get_revision_inventory(revision[0].in_history(b).rev_id)
204
for path, entry in inv.entries():
206
print '%-50s %s' % (path, entry.file_id)
211
class cmd_move(Command):
212
"""Move files to a different directory.
217
The destination must be a versioned directory in the same branch.
219
takes_args = ['source$', 'dest']
220
def run(self, source_list, dest):
221
b = Branch.open_containing('.')
223
# TODO: glob expansion on windows?
224
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
227
class cmd_rename(Command):
228
"""Change the name of an entry.
231
bzr rename frob.c frobber.c
232
bzr rename src/frob.c lib/frob.c
234
It is an error if the destination name exists.
236
See also the 'move' command, which moves files into a different
237
directory without changing their name.
239
TODO: Some way to rename multiple files without invoking bzr for each
241
takes_args = ['from_name', 'to_name']
243
def run(self, from_name, to_name):
244
b = Branch.open_containing('.')
245
b.rename_one(b.relpath(from_name), b.relpath(to_name))
249
class cmd_mv(Command):
250
"""Move or rename a file.
253
bzr mv OLDNAME NEWNAME
254
bzr mv SOURCE... DESTINATION
256
If the last argument is a versioned directory, all the other names
257
are moved into it. Otherwise, there must be exactly two arguments
258
and the file is changed to a new name, which must not already exist.
260
Files cannot be moved between branches.
262
takes_args = ['names*']
263
def run(self, names_list):
264
if len(names_list) < 2:
265
raise BzrCommandError("missing file argument")
266
b = Branch.open_containing(names_list[0])
268
rel_names = [b.relpath(x) for x in names_list]
270
if os.path.isdir(names_list[-1]):
271
# move into existing directory
272
for pair in b.move(rel_names[:-1], rel_names[-1]):
273
print "%s => %s" % pair
275
if len(names_list) != 2:
276
raise BzrCommandError('to mv multiple files the destination '
277
'must be a versioned directory')
278
b.rename_one(rel_names[0], rel_names[1])
279
print "%s => %s" % (rel_names[0], rel_names[1])
284
class cmd_pull(Command):
285
"""Pull any changes from another branch into the current one.
287
If the location is omitted, the last-used location will be used.
288
Both the revision history and the working directory will be
291
This command only works on branches that have not diverged. Branches are
292
considered diverged if both branches have had commits without first
293
pulling from the other.
295
If branches have diverged, you can use 'bzr merge' to pull the text changes
296
from one into the other.
298
takes_args = ['location?']
300
def run(self, location=None):
301
from bzrlib.merge import merge
303
from shutil import rmtree
306
br_to = Branch.open_containing('.')
309
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
311
if e.errno != errno.ENOENT:
314
if stored_loc is None:
315
raise BzrCommandError("No pull location known or specified.")
317
print "Using last location: %s" % stored_loc
318
location = stored_loc
319
cache_root = tempfile.mkdtemp()
320
from bzrlib.errors import DivergedBranches
321
br_from = Branch.open_containing(location)
322
location = br_from.base
323
old_revno = br_to.revno()
325
from bzrlib.errors import DivergedBranches
326
br_from = Branch.open(location)
327
br_from.setup_caching(cache_root)
328
location = br_from.base
329
old_revno = br_to.revno()
331
br_to.update_revisions(br_from)
332
except DivergedBranches:
333
raise BzrCommandError("These branches have diverged."
336
merge(('.', -1), ('.', old_revno), check_clean=False)
337
if location != stored_loc:
338
br_to.controlfile("x-pull", "wb").write(location + "\n")
344
class cmd_branch(Command):
345
"""Create a new copy of a branch.
347
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
348
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
350
To retrieve the branch as of a particular revision, supply the --revision
351
parameter, as in "branch foo/bar -r 5".
353
takes_args = ['from_location', 'to_location?']
354
takes_options = ['revision']
355
aliases = ['get', 'clone']
357
def run(self, from_location, to_location=None, revision=None):
358
from bzrlib.branch import copy_branch
361
from shutil import rmtree
362
cache_root = tempfile.mkdtemp()
366
elif len(revision) > 1:
367
raise BzrCommandError(
368
'bzr branch --revision takes exactly 1 revision value')
370
br_from = Branch.open(from_location)
372
if e.errno == errno.ENOENT:
373
raise BzrCommandError('Source location "%s" does not'
374
' exist.' % to_location)
377
br_from.setup_caching(cache_root)
378
if to_location is None:
379
to_location = os.path.basename(from_location.rstrip("/\\"))
381
os.mkdir(to_location)
383
if e.errno == errno.EEXIST:
384
raise BzrCommandError('Target directory "%s" already'
385
' exists.' % to_location)
386
if e.errno == errno.ENOENT:
387
raise BzrCommandError('Parent of "%s" does not exist.' %
392
copy_branch(br_from, to_location, revision[0])
393
except bzrlib.errors.NoSuchRevision:
395
msg = "The branch %s has no revision %d." % (from_location, revision[0])
396
raise BzrCommandError(msg)
401
class cmd_renames(Command):
402
"""Show list of renamed files.
404
TODO: Option to show renames between two historical versions.
406
TODO: Only show renames under dir, rather than in the whole branch.
408
takes_args = ['dir?']
410
def run(self, dir='.'):
411
b = Branch.open_containing(dir)
412
old_inv = b.basis_tree().inventory
413
new_inv = b.read_working_inventory()
415
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
417
for old_name, new_name in renames:
418
print "%s => %s" % (old_name, new_name)
421
class cmd_info(Command):
422
"""Show statistical information about a branch."""
423
takes_args = ['branch?']
425
def run(self, branch=None):
428
b = Branch.open_containing(branch)
432
class cmd_remove(Command):
433
"""Make a file unversioned.
435
This makes bzr stop tracking changes to a versioned file. It does
436
not delete the working copy.
438
takes_args = ['file+']
439
takes_options = ['verbose']
441
def run(self, file_list, verbose=False):
442
b = Branch.open_containing(file_list[0])
443
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
446
class cmd_file_id(Command):
447
"""Print file_id of a particular file or directory.
449
The file_id is assigned when the file is first added and remains the
450
same through all revisions where the file exists, even when it is
454
takes_args = ['filename']
455
def run(self, filename):
456
b = Branch.open_containing(filename)
457
i = b.inventory.path2id(b.relpath(filename))
459
raise BzrError("%r is not a versioned file" % filename)
464
class cmd_file_path(Command):
465
"""Print path of file_ids to a file or directory.
467
This prints one line for each directory down to the target,
468
starting at the branch root."""
470
takes_args = ['filename']
471
def run(self, filename):
472
b = Branch.open_containing(filename)
474
fid = inv.path2id(b.relpath(filename))
476
raise BzrError("%r is not a versioned file" % filename)
477
for fip in inv.get_idpath(fid):
481
class cmd_revision_history(Command):
482
"""Display list of revision ids on this branch."""
485
for patchid in Branch.open_containing('.').revision_history():
489
class cmd_directories(Command):
490
"""Display list of versioned directories in this branch."""
492
for name, ie in Branch.open_containing('.').read_working_inventory().directories():
499
class cmd_init(Command):
500
"""Make a directory into a versioned branch.
502
Use this to create an empty branch, or before importing an
505
Recipe for importing a tree of files:
510
bzr commit -m 'imported project'
513
from bzrlib.branch import Branch
514
Branch.initialize('.')
517
class cmd_diff(Command):
518
"""Show differences in working tree.
520
If files are listed, only the changes in those files are listed.
521
Otherwise, all changes for the tree are listed.
523
TODO: Allow diff across branches.
525
TODO: Option to use external diff command; could be GNU diff, wdiff,
528
TODO: Python difflib is not exactly the same as unidiff; should
529
either fix it up or prefer to use an external diff.
531
TODO: If a directory is given, diff everything under that.
533
TODO: Selected-file diff is inefficient and doesn't show you
536
TODO: This probably handles non-Unix newlines poorly.
544
takes_args = ['file*']
545
takes_options = ['revision', 'diff-options']
546
aliases = ['di', 'dif']
548
def run(self, revision=None, file_list=None, diff_options=None):
549
from bzrlib.diff import show_diff
552
b = Branch.open_containing(file_list[0])
553
file_list = [b.relpath(f) for f in file_list]
554
if file_list == ['']:
555
# just pointing to top-of-tree
558
b = Branch.open_containing('.')
560
if revision is not None:
561
if len(revision) == 1:
562
show_diff(b, revision[0], specific_files=file_list,
563
external_diff_options=diff_options)
564
elif len(revision) == 2:
565
show_diff(b, revision[0], specific_files=file_list,
566
external_diff_options=diff_options,
567
revision2=revision[1])
569
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
571
show_diff(b, None, specific_files=file_list,
572
external_diff_options=diff_options)
577
class cmd_deleted(Command):
578
"""List files deleted in the working tree.
580
TODO: Show files deleted since a previous revision, or between two revisions.
582
def run(self, show_ids=False):
583
b = Branch.open_containing('.')
585
new = b.working_tree()
587
## TODO: Much more efficient way to do this: read in new
588
## directories with readdir, rather than stating each one. Same
589
## level of effort but possibly much less IO. (Or possibly not,
590
## if the directories are very large...)
592
for path, ie in old.inventory.iter_entries():
593
if not new.has_id(ie.file_id):
595
print '%-50s %s' % (path, ie.file_id)
600
class cmd_modified(Command):
601
"""List files modified in working tree."""
604
from bzrlib.delta import compare_trees
606
b = Branch.open_containing('.')
607
td = compare_trees(b.basis_tree(), b.working_tree())
609
for path, id, kind in td.modified:
614
class cmd_added(Command):
615
"""List files added in working tree."""
618
b = Branch.open_containing('.')
619
wt = b.working_tree()
620
basis_inv = b.basis_tree().inventory
623
if file_id in basis_inv:
625
path = inv.id2path(file_id)
626
if not os.access(b.abspath(path), os.F_OK):
632
class cmd_root(Command):
633
"""Show the tree root directory.
635
The root is the nearest enclosing directory with a .bzr control
637
takes_args = ['filename?']
638
def run(self, filename=None):
639
"""Print the branch root."""
640
b = Branch.open_containing(filename)
644
class cmd_log(Command):
645
"""Show log of this branch.
647
To request a range of logs, you can use the command -r begin:end
648
-r revision requests a specific revision, -r :end or -r begin: are
651
--message allows you to give a regular expression, which will be evaluated
652
so that only matching entries will be displayed.
654
TODO: Make --revision support uuid: and hash: [future tag:] notation.
658
takes_args = ['filename?']
659
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
660
'long', 'message', 'short',]
662
def run(self, filename=None, timezone='original',
670
from bzrlib.log import log_formatter, show_log
673
direction = (forward and 'forward') or 'reverse'
676
b = Branch.open_containing(filename)
677
fp = b.relpath(filename)
679
file_id = b.read_working_inventory().path2id(fp)
681
file_id = None # points to branch root
683
b = Branch.open_containing('.')
689
elif len(revision) == 1:
690
rev1 = rev2 = revision[0].in_history(b).revno
691
elif len(revision) == 2:
692
rev1 = revision[0].in_history(b).revno
693
rev2 = revision[1].in_history(b).revno
695
raise BzrCommandError('bzr log --revision takes one or two values.')
702
mutter('encoding log as %r' % bzrlib.user_encoding)
704
# use 'replace' so that we don't abort if trying to write out
705
# in e.g. the default C locale.
706
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
712
lf = log_formatter(log_format,
715
show_timezone=timezone)
728
class cmd_touching_revisions(Command):
729
"""Return revision-ids which affected a particular file.
731
A more user-friendly interface is "bzr log FILE"."""
733
takes_args = ["filename"]
734
def run(self, filename):
735
b = Branch.open_containing(filename)
736
inv = b.read_working_inventory()
737
file_id = inv.path2id(b.relpath(filename))
738
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
739
print "%6d %s" % (revno, what)
742
class cmd_ls(Command):
743
"""List files in a tree.
745
TODO: Take a revision or remote path and list that tree instead.
748
def run(self, revision=None, verbose=False):
749
b = Branch.open_containing('.')
751
tree = b.working_tree()
753
tree = b.revision_tree(revision.in_history(b).rev_id)
755
for fp, fc, kind, fid in tree.list_files():
757
if kind == 'directory':
764
print '%-8s %s%s' % (fc, fp, kindch)
770
class cmd_unknowns(Command):
771
"""List unknown files."""
773
from bzrlib.osutils import quotefn
774
for f in Branch.open_containing('.').unknowns():
779
class cmd_ignore(Command):
780
"""Ignore a command or pattern.
782
To remove patterns from the ignore list, edit the .bzrignore file.
784
If the pattern contains a slash, it is compared to the whole path
785
from the branch root. Otherwise, it is comapred to only the last
786
component of the path.
788
Ignore patterns are case-insensitive on case-insensitive systems.
790
Note: wildcards must be quoted from the shell on Unix.
793
bzr ignore ./Makefile
796
takes_args = ['name_pattern']
798
def run(self, name_pattern):
799
from bzrlib.atomicfile import AtomicFile
802
b = Branch.open_containing('.')
803
ifn = b.abspath('.bzrignore')
805
if os.path.exists(ifn):
808
igns = f.read().decode('utf-8')
814
# TODO: If the file already uses crlf-style termination, maybe
815
# we should use that for the newly added lines?
817
if igns and igns[-1] != '\n':
819
igns += name_pattern + '\n'
822
f = AtomicFile(ifn, 'wt')
823
f.write(igns.encode('utf-8'))
828
inv = b.working_tree().inventory
829
if inv.path2id('.bzrignore'):
830
mutter('.bzrignore is already versioned')
832
mutter('need to make new .bzrignore file versioned')
833
b.add(['.bzrignore'])
837
class cmd_ignored(Command):
838
"""List ignored files and the patterns that matched them.
840
See also: bzr ignore"""
842
tree = Branch.open_containing('.').working_tree()
843
for path, file_class, kind, file_id in tree.list_files():
844
if file_class != 'I':
846
## XXX: Slightly inefficient since this was already calculated
847
pat = tree.is_ignored(path)
848
print '%-50s %s' % (path, pat)
851
class cmd_lookup_revision(Command):
852
"""Lookup the revision-id from a revision-number
855
bzr lookup-revision 33
858
takes_args = ['revno']
860
def run(self, revno):
864
raise BzrCommandError("not a valid revision-number: %r" % revno)
866
print Branch.open_containing('.').get_rev_id(revno)
869
class cmd_export(Command):
870
"""Export past revision to destination directory.
872
If no revision is specified this exports the last committed revision.
874
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
875
given, try to find the format with the extension. If no extension
876
is found exports to a directory (equivalent to --format=dir).
878
Root may be the top directory for tar, tgz and tbz2 formats. If none
879
is given, the top directory will be the root name of the file."""
880
# TODO: list known exporters
881
takes_args = ['dest']
882
takes_options = ['revision', 'format', 'root']
883
def run(self, dest, revision=None, format=None, root=None):
885
b = Branch.open_containing('.')
887
rev_id = b.last_patch()
889
if len(revision) != 1:
890
raise BzrError('bzr export --revision takes exactly 1 argument')
891
rev_id = revision[0].in_history(b).rev_id
892
t = b.revision_tree(rev_id)
893
root, ext = os.path.splitext(dest)
897
elif ext in (".gz", ".tgz"):
899
elif ext in (".bz2", ".tbz2"):
903
t.export(dest, format, root)
906
class cmd_cat(Command):
907
"""Write a file's text from a previous revision."""
909
takes_options = ['revision']
910
takes_args = ['filename']
912
def run(self, filename, revision=None):
914
raise BzrCommandError("bzr cat requires a revision number")
915
elif len(revision) != 1:
916
raise BzrCommandError("bzr cat --revision takes exactly one number")
917
b = Branch.open_containing('.')
918
b.print_file(b.relpath(filename), revision[0].in_history(b).revno)
921
class cmd_local_time_offset(Command):
922
"""Show the offset in seconds from GMT to local time."""
925
print bzrlib.osutils.local_time_offset()
929
class cmd_commit(Command):
930
"""Commit changes into a new revision.
932
If no arguments are given, the entire tree is committed.
934
If selected files are specified, only changes to those files are
935
committed. If a directory is specified then the directory and everything
936
within it is committed.
938
A selected-file commit may fail in some cases where the committed
939
tree would be invalid, such as trying to commit a file in a
940
newly-added directory that is not itself committed.
942
TODO: Run hooks on tree to-be-committed, and after commit.
944
TODO: Strict commit that fails if there are unknown or deleted files.
946
takes_args = ['selected*']
947
takes_options = ['message', 'file', 'verbose', 'unchanged']
948
aliases = ['ci', 'checkin']
950
# TODO: Give better message for -s, --summary, used by tla people
952
def run(self, message=None, file=None, verbose=True, selected_list=None,
954
from bzrlib.errors import PointlessCommit
955
from bzrlib.msgeditor import edit_commit_message
956
from bzrlib.status import show_status
957
from cStringIO import StringIO
959
b = Branch.open_containing('.')
961
selected_list = [b.relpath(s) for s in selected_list]
963
if not message and not file:
965
show_status(b, specific_files=selected_list,
967
message = edit_commit_message(catcher.getvalue())
970
raise BzrCommandError("please specify a commit message"
971
" with either --message or --file")
972
elif message and file:
973
raise BzrCommandError("please specify either --message or --file")
977
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
980
b.commit(message, verbose=verbose,
981
specific_files=selected_list,
982
allow_pointless=unchanged)
983
except PointlessCommit:
984
# FIXME: This should really happen before the file is read in;
985
# perhaps prepare the commit; get the message; then actually commit
986
raise BzrCommandError("no changes to commit",
987
["use --unchanged to commit anyhow"])
990
class cmd_check(Command):
991
"""Validate consistency of branch history.
993
This command checks various invariants about the branch storage to
994
detect data corruption or bzr bugs.
996
If given the --update flag, it will update some optional fields
997
to help ensure data consistency.
999
takes_args = ['dir?']
1001
def run(self, dir='.'):
1002
from bzrlib.check import check
1004
check(Branch.open_containing(dir))
1007
class cmd_scan_cache(Command):
1010
from bzrlib.hashcache import HashCache
1016
print '%6d stats' % c.stat_count
1017
print '%6d in hashcache' % len(c._cache)
1018
print '%6d files removed from cache' % c.removed_count
1019
print '%6d hashes updated' % c.update_count
1020
print '%6d files changed too recently to cache' % c.danger_count
1027
class cmd_upgrade(Command):
1028
"""Upgrade branch storage to current format.
1030
The check command or bzr developers may sometimes advise you to run
1033
takes_args = ['dir?']
1035
def run(self, dir='.'):
1036
from bzrlib.upgrade import upgrade
1037
upgrade(Branch.open_containing(dir))
1041
class cmd_whoami(Command):
1042
"""Show bzr user id."""
1043
takes_options = ['email']
1045
def run(self, email=False):
1047
b = bzrlib.branch.Branch.open_containing('.')
1052
print bzrlib.osutils.user_email(b)
1054
print bzrlib.osutils.username(b)
1057
class cmd_selftest(Command):
1058
"""Run internal test suite"""
1060
takes_options = ['verbose', 'pattern']
1061
def run(self, verbose=False, pattern=".*"):
1063
from bzrlib.selftest import selftest
1064
# we don't want progress meters from the tests to go to the
1065
# real output; and we don't want log messages cluttering up
1067
save_ui = bzrlib.ui.ui_factory
1068
bzrlib.trace.info('running tests...')
1070
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1071
result = selftest(verbose=verbose, pattern=pattern)
1073
bzrlib.trace.info('tests passed')
1075
bzrlib.trace.info('tests failed')
1076
return int(not result)
1078
bzrlib.ui.ui_factory = save_ui
1082
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1083
# is bzrlib itself in a branch?
1084
bzrrev = bzrlib.get_bzr_revision()
1086
print " (bzr checkout, revision %d {%s})" % bzrrev
1087
print bzrlib.__copyright__
1088
print "http://bazaar-ng.org/"
1090
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1091
print "you may use, modify and redistribute it under the terms of the GNU"
1092
print "General Public License version 2 or later."
1095
class cmd_version(Command):
1096
"""Show version of bzr."""
1100
class cmd_rocks(Command):
1101
"""Statement of optimism."""
1104
print "it sure does!"
1107
class cmd_find_merge_base(Command):
1108
"""Find and print a base revision for merging two branches.
1110
TODO: Options to specify revisions on either side, as if
1111
merging only part of the history.
1113
takes_args = ['branch', 'other']
1116
def run(self, branch, other):
1117
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1119
branch1 = Branch.open_containing(branch)
1120
branch2 = Branch.open_containing(other)
1122
history_1 = branch1.revision_history()
1123
history_2 = branch2.revision_history()
1125
last1 = branch1.last_patch()
1126
last2 = branch2.last_patch()
1128
source = MultipleRevisionSources(branch1, branch2)
1130
base_rev_id = common_ancestor(last1, last2, source)
1132
print 'merge base is revision %s' % base_rev_id
1136
if base_revno is None:
1137
raise bzrlib.errors.UnrelatedBranches()
1139
print ' r%-6d in %s' % (base_revno, branch)
1141
other_revno = branch2.revision_id_to_revno(base_revid)
1143
print ' r%-6d in %s' % (other_revno, other)
1147
class cmd_merge(Command):
1148
"""Perform a three-way merge.
1150
The branch is the branch you will merge from. By default, it will
1151
merge the latest revision. If you specify a revision, that
1152
revision will be merged. If you specify two revisions, the first
1153
will be used as a BASE, and the second one as OTHER. Revision
1154
numbers are always relative to the specified branch.
1156
By default bzr will try to merge in all new work from the other
1157
branch, automatically determining an appropriate base. If this
1158
fails, you may need to give an explicit base.
1162
To merge the latest revision from bzr.dev
1163
bzr merge ../bzr.dev
1165
To merge changes up to and including revision 82 from bzr.dev
1166
bzr merge -r 82 ../bzr.dev
1168
To merge the changes introduced by 82, without previous changes:
1169
bzr merge -r 81..82 ../bzr.dev
1171
merge refuses to run if there are any uncommitted changes, unless
1174
takes_args = ['branch?']
1175
takes_options = ['revision', 'force', 'merge-type']
1177
def run(self, branch='.', revision=None, force=False,
1179
from bzrlib.merge import merge
1180
from bzrlib.merge_core import ApplyMerge3
1181
if merge_type is None:
1182
merge_type = ApplyMerge3
1184
if revision is None or len(revision) < 1:
1186
other = [branch, -1]
1188
if len(revision) == 1:
1190
other = [branch, revision[0].in_history(branch).revno]
1192
assert len(revision) == 2
1193
if None in revision:
1194
raise BzrCommandError(
1195
"Merge doesn't permit that revision specifier.")
1196
base = [branch, revision[0].in_history(branch).revno]
1197
other = [branch, revision[1].in_history(branch).revno]
1200
merge(other, base, check_clean=(not force), merge_type=merge_type)
1201
except bzrlib.errors.AmbiguousBase, e:
1202
m = ("sorry, bzr can't determine the right merge base yet\n"
1203
"candidates are:\n "
1204
+ "\n ".join(e.bases)
1206
"please specify an explicit base with -r,\n"
1207
"and (if you want) report this to the bzr developers\n")
1211
class cmd_revert(Command):
1212
"""Reverse all changes since the last commit.
1214
Only versioned files are affected. Specify filenames to revert only
1215
those files. By default, any files that are changed will be backed up
1216
first. Backup files have a '~' appended to their name.
1218
takes_options = ['revision', 'no-backup']
1219
takes_args = ['file*']
1220
aliases = ['merge-revert']
1222
def run(self, revision=None, no_backup=False, file_list=None):
1223
from bzrlib.merge import merge
1224
from bzrlib.branch import Branch
1225
from bzrlib.commands import parse_spec
1227
if file_list is not None:
1228
if len(file_list) == 0:
1229
raise BzrCommandError("No files specified")
1230
if revision is None:
1232
elif len(revision) != 1:
1233
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1234
merge(('.', revision[0]), parse_spec('.'),
1237
backup_files=not no_backup,
1238
file_list=file_list)
1240
Branch.open_containing('.').set_pending_merges([])
1243
class cmd_assert_fail(Command):
1244
"""Test reporting of assertion failures"""
1247
assert False, "always fails"
1250
class cmd_help(Command):
1251
"""Show help on a command or other topic.
1253
For a list of all available commands, say 'bzr help commands'."""
1254
takes_options = ['long']
1255
takes_args = ['topic?']
1258
def run(self, topic=None, long=False):
1260
if topic is None and long:
1265
class cmd_shell_complete(Command):
1266
"""Show appropriate completions for context.
1268
For a list of all available commands, say 'bzr shell-complete'."""
1269
takes_args = ['context?']
1273
def run(self, context=None):
1274
import shellcomplete
1275
shellcomplete.shellcomplete(context)
1278
class cmd_missing(Command):
1279
"""What is missing in this branch relative to other branch.
1281
takes_args = ['remote?']
1282
aliases = ['mis', 'miss']
1283
# We don't have to add quiet to the list, because
1284
# unknown options are parsed as booleans
1285
takes_options = ['verbose', 'quiet']
1287
def run(self, remote=None, verbose=False, quiet=False):
1288
from bzrlib.errors import BzrCommandError
1289
from bzrlib.missing import show_missing
1291
if verbose and quiet:
1292
raise BzrCommandError('Cannot pass both quiet and verbose')
1294
b = Branch.open_containing('.')
1295
parent = b.get_parent()
1298
raise BzrCommandError("No missing location known or specified.")
1301
print "Using last location: %s" % parent
1303
elif parent is None:
1304
# We only update x-pull if it did not exist, missing should not change the parent
1305
b.controlfile('x-pull', 'wb').write(remote + '\n')
1306
br_remote = Branch.open_containing(remote)
1308
return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1312
class cmd_plugins(Command):
1316
import bzrlib.plugin
1317
from inspect import getdoc
1318
for plugin in bzrlib.plugin.all_plugins:
1319
if hasattr(plugin, '__path__'):
1320
print plugin.__path__[0]
1321
elif hasattr(plugin, '__file__'):
1322
print plugin.__file__
1328
print '\t', d.split('\n')[0]
added
removed
bzrlib/builtins.py
