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, NotBranchError
25
from bzrlib.errors import DivergedBranches
26
from bzrlib.branch import Branch
27
from bzrlib import BZRDIR
28
from bzrlib.commands import Command
29
from bzrlib.option import Option
30
from bzrlib.workingtree import WorkingTree
33
class cmd_status(Command):
34
"""Display status summary.
36
This reports on versioned and unknown files, reporting them
37
grouped by state. Possible states are:
40
Versioned in the working copy but not in the previous revision.
43
Versioned in the previous revision but removed or deleted
47
Path of this file changed from the previous revision;
48
the text may also have changed. This includes files whose
49
parent directory was renamed.
52
Text has changed since the previous revision.
55
Nothing about this file has changed since the previous revision.
56
Only shown with --all.
59
Not versioned and not matching an ignore pattern.
61
To see ignored files use 'bzr ignored'. For details in the
62
changes to file texts, use 'bzr diff'.
64
If no arguments are specified, the status of the entire working
65
directory is shown. Otherwise, only the status of the specified
66
files or directories is reported. If a directory is given, status
67
is reported for everything inside that directory.
69
If a revision argument is given, the status is calculated against
70
that revision, or between two revisions if two are provided.
72
# XXX: FIXME: bzr status should accept a -r option to show changes
73
# relative to a revision, or between revisions
75
takes_args = ['file*']
76
takes_options = ['all', 'show-ids']
77
aliases = ['st', 'stat']
79
def run(self, all=False, show_ids=False, file_list=None, revision=None):
81
b = Branch.open_containing(file_list[0])
82
tree = WorkingTree(b.base, b)
83
file_list = [tree.relpath(x) for x in file_list]
84
# special case: only one path was given and it's the root
89
b = Branch.open_containing('.')
91
from bzrlib.status import show_status
92
show_status(b, show_unchanged=all, show_ids=show_ids,
93
specific_files=file_list, revision=revision)
96
class cmd_cat_revision(Command):
97
"""Write out metadata for a revision.
99
The revision to print can either be specified by a specific
100
revision identifier, or you can use --revision.
104
takes_args = ['revision_id?']
105
takes_options = ['revision']
107
def run(self, revision_id=None, revision=None):
108
from bzrlib.revisionspec import RevisionSpec
110
if revision_id is not None and revision is not None:
111
raise BzrCommandError('You can only supply one of revision_id or --revision')
112
if revision_id is None and revision is None:
113
raise BzrCommandError('You must supply either --revision or a revision_id')
114
b = Branch.open_containing('.')
115
if revision_id is not None:
116
sys.stdout.write(b.get_revision_xml_file(revision_id).read())
117
elif revision is not None:
120
raise BzrCommandError('You cannot specify a NULL revision.')
121
revno, rev_id = rev.in_history(b)
122
sys.stdout.write(b.get_revision_xml_file(rev_id).read())
125
class cmd_revno(Command):
126
"""Show current revision number.
128
This is equal to the number of revisions on this branch."""
130
print Branch.open_containing('.').revno()
133
class cmd_revision_info(Command):
134
"""Show revision number and revision id for a given revision identifier.
137
takes_args = ['revision_info*']
138
takes_options = ['revision']
139
def run(self, revision=None, revision_info_list=[]):
140
from bzrlib.revisionspec import RevisionSpec
143
if revision is not None:
144
revs.extend(revision)
145
if revision_info_list is not None:
146
for rev in revision_info_list:
147
revs.append(RevisionSpec(rev))
149
raise BzrCommandError('You must supply a revision identifier')
151
b = Branch.open_containing('.')
154
revinfo = rev.in_history(b)
155
if revinfo.revno is None:
156
print ' %s' % revinfo.rev_id
158
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
161
class cmd_add(Command):
162
"""Add specified files or directories.
164
In non-recursive mode, all the named items are added, regardless
165
of whether they were previously ignored. A warning is given if
166
any of the named files are already versioned.
168
In recursive mode (the default), files are treated the same way
169
but the behaviour for directories is different. Directories that
170
are already versioned do not give a warning. All directories,
171
whether already versioned or not, are searched for files or
172
subdirectories that are neither versioned or ignored, and these
173
are added. This search proceeds recursively into versioned
174
directories. If no names are given '.' is assumed.
176
Therefore simply saying 'bzr add' will version all files that
177
are currently unknown.
179
Adding a file whose parent directory is not versioned will
180
implicitly add the parent, and so on up to the root. This means
181
you should never need to explictly add a directory, they'll just
182
get added when you add a file in the directory.
184
takes_args = ['file*']
185
takes_options = ['no-recurse', 'quiet']
187
def run(self, file_list, no_recurse=False, quiet=False):
188
from bzrlib.add import smart_add, add_reporter_print, add_reporter_null
190
reporter = add_reporter_null
192
reporter = add_reporter_print
193
smart_add(file_list, not no_recurse, reporter)
196
class cmd_mkdir(Command):
197
"""Create a new versioned directory.
199
This is equivalent to creating the directory and then adding it.
201
takes_args = ['dir+']
203
def run(self, dir_list):
209
b = Branch.open_containing(d)
214
class cmd_relpath(Command):
215
"""Show path of a file relative to root"""
216
takes_args = ['filename']
219
def run(self, filename):
220
branch = Branch.open_containing(filename)
221
print WorkingTree(branch.base, branch).relpath(filename)
224
class cmd_inventory(Command):
225
"""Show inventory of the current working copy or a revision."""
226
takes_options = ['revision', 'show-ids']
228
def run(self, revision=None, show_ids=False):
229
b = Branch.open_containing('.')
231
inv = b.read_working_inventory()
233
if len(revision) > 1:
234
raise BzrCommandError('bzr inventory --revision takes'
235
' exactly one revision identifier')
236
inv = b.get_revision_inventory(revision[0].in_history(b).rev_id)
238
for path, entry in inv.entries():
240
print '%-50s %s' % (path, entry.file_id)
245
class cmd_move(Command):
246
"""Move files to a different directory.
251
The destination must be a versioned directory in the same branch.
253
takes_args = ['source$', 'dest']
254
def run(self, source_list, dest):
255
b = Branch.open_containing('.')
257
# TODO: glob expansion on windows?
258
tree = WorkingTree(b.base, b)
259
b.move([tree.relpath(s) for s in source_list], tree.relpath(dest))
262
class cmd_rename(Command):
263
"""Change the name of an entry.
266
bzr rename frob.c frobber.c
267
bzr rename src/frob.c lib/frob.c
269
It is an error if the destination name exists.
271
See also the 'move' command, which moves files into a different
272
directory without changing their name.
274
# TODO: Some way to rename multiple files without invoking
275
# bzr for each one?"""
276
takes_args = ['from_name', 'to_name']
278
def run(self, from_name, to_name):
279
b = Branch.open_containing('.')
280
tree = WorkingTree(b.base, b)
281
b.rename_one(tree.relpath(from_name), tree.relpath(to_name))
284
class cmd_mv(Command):
285
"""Move or rename a file.
288
bzr mv OLDNAME NEWNAME
289
bzr mv SOURCE... DESTINATION
291
If the last argument is a versioned directory, all the other names
292
are moved into it. Otherwise, there must be exactly two arguments
293
and the file is changed to a new name, which must not already exist.
295
Files cannot be moved between branches.
297
takes_args = ['names*']
298
def run(self, names_list):
299
if len(names_list) < 2:
300
raise BzrCommandError("missing file argument")
301
b = Branch.open_containing(names_list[0])
302
tree = WorkingTree(b.base, b)
303
rel_names = [tree.relpath(x) for x in names_list]
305
if os.path.isdir(names_list[-1]):
306
# move into existing directory
307
for pair in b.move(rel_names[:-1], rel_names[-1]):
308
print "%s => %s" % pair
310
if len(names_list) != 2:
311
raise BzrCommandError('to mv multiple files the destination '
312
'must be a versioned directory')
313
b.rename_one(rel_names[0], rel_names[1])
314
print "%s => %s" % (rel_names[0], rel_names[1])
319
class cmd_pull(Command):
320
"""Pull any changes from another branch into the current one.
322
If the location is omitted, the last-used location will be used.
323
Both the revision history and the working directory will be
326
This command only works on branches that have not diverged. Branches are
327
considered diverged if both branches have had commits without first
328
pulling from the other.
330
If branches have diverged, you can use 'bzr merge' to pull the text changes
331
from one into the other.
333
takes_options = ['remember']
334
takes_args = ['location?']
336
def run(self, location=None, remember=False):
337
from bzrlib.merge import merge
339
from shutil import rmtree
342
br_to = Branch.open_containing('.')
343
stored_loc = br_to.get_parent()
345
if stored_loc is None:
346
raise BzrCommandError("No pull location known or specified.")
348
print "Using saved location: %s" % stored_loc
349
location = stored_loc
350
cache_root = tempfile.mkdtemp()
351
br_from = Branch.open(location)
354
br_from.setup_caching(cache_root)
355
location = br_from.base
356
old_revno = br_to.revno()
357
old_revision_history = br_to.revision_history()
359
br_to.update_revisions(br_from)
360
except DivergedBranches:
361
raise BzrCommandError("These branches have diverged."
363
new_revision_history = br_to.revision_history()
364
if new_revision_history != old_revision_history:
365
merge(('.', -1), ('.', old_revno), check_clean=False)
366
if stored_loc is None or remember:
367
br_to.set_parent(location)
374
class cmd_branch(Command):
375
"""Create a new copy of a branch.
377
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
378
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
380
To retrieve the branch as of a particular revision, supply the --revision
381
parameter, as in "branch foo/bar -r 5".
383
--basis is to speed up branching from remote branches. When specified, it
384
copies all the file-contents, inventory and revision data from the basis
385
branch before copying anything from the remote branch.
387
takes_args = ['from_location', 'to_location?']
388
takes_options = ['revision', 'basis']
389
aliases = ['get', 'clone']
391
def run(self, from_location, to_location=None, revision=None, basis=None):
392
from bzrlib.clone import copy_branch
395
from shutil import rmtree
396
cache_root = tempfile.mkdtemp()
399
elif len(revision) > 1:
400
raise BzrCommandError(
401
'bzr branch --revision takes exactly 1 revision value')
403
br_from = Branch.open(from_location)
405
if e.errno == errno.ENOENT:
406
raise BzrCommandError('Source location "%s" does not'
407
' exist.' % to_location)
412
br_from.setup_caching(cache_root)
413
if basis is not None:
414
basis_branch = Branch.open_containing(basis)
417
if len(revision) == 1 and revision[0] is not None:
418
revision_id = revision[0].in_history(br_from)[1]
421
if to_location is None:
422
to_location = os.path.basename(from_location.rstrip("/\\"))
424
os.mkdir(to_location)
426
if e.errno == errno.EEXIST:
427
raise BzrCommandError('Target directory "%s" already'
428
' exists.' % to_location)
429
if e.errno == errno.ENOENT:
430
raise BzrCommandError('Parent of "%s" does not exist.' %
435
copy_branch(br_from, to_location, revision_id, basis_branch)
436
except bzrlib.errors.NoSuchRevision:
438
msg = "The branch %s has no revision %d." % (from_location, revision[0])
439
raise BzrCommandError(msg)
440
except bzrlib.errors.UnlistableBranch:
441
msg = "The branch %s cannot be used as a --basis"
447
class cmd_renames(Command):
448
"""Show list of renamed files.
450
# TODO: Option to show renames between two historical versions.
452
# TODO: Only show renames under dir, rather than in the whole branch.
453
takes_args = ['dir?']
455
def run(self, dir='.'):
456
b = Branch.open_containing(dir)
457
old_inv = b.basis_tree().inventory
458
new_inv = b.read_working_inventory()
460
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
462
for old_name, new_name in renames:
463
print "%s => %s" % (old_name, new_name)
466
class cmd_info(Command):
467
"""Show statistical information about a branch."""
468
takes_args = ['branch?']
470
def run(self, branch=None):
472
b = Branch.open_containing(branch)
476
class cmd_remove(Command):
477
"""Make a file unversioned.
479
This makes bzr stop tracking changes to a versioned file. It does
480
not delete the working copy.
482
takes_args = ['file+']
483
takes_options = ['verbose']
486
def run(self, file_list, verbose=False):
487
b = Branch.open_containing(file_list[0])
488
tree = WorkingTree(b.base, b)
489
b.remove([tree.relpath(f) for f in file_list], verbose=verbose)
492
class cmd_file_id(Command):
493
"""Print file_id of a particular file or directory.
495
The file_id is assigned when the file is first added and remains the
496
same through all revisions where the file exists, even when it is
500
takes_args = ['filename']
501
def run(self, filename):
502
b = Branch.open_containing(filename)
503
tree = WorkingTree(b.base, b)
504
i = b.inventory.path2id(tree.relpath(filename))
506
raise BzrError("%r is not a versioned file" % filename)
511
class cmd_file_path(Command):
512
"""Print path of file_ids to a file or directory.
514
This prints one line for each directory down to the target,
515
starting at the branch root."""
517
takes_args = ['filename']
518
def run(self, filename):
519
b = Branch.open_containing(filename)
521
tree = WorkingTree(b.base, b)
522
fid = inv.path2id(tree.relpath(filename))
524
raise BzrError("%r is not a versioned file" % filename)
525
for fip in inv.get_idpath(fid):
529
class cmd_revision_history(Command):
530
"""Display list of revision ids on this branch."""
533
for patchid in Branch.open_containing('.').revision_history():
537
class cmd_ancestry(Command):
538
"""List all revisions merged into this branch."""
542
for revision_id in b.get_ancestry(b.last_revision()):
546
class cmd_directories(Command):
547
"""Display list of versioned directories in this branch."""
549
for name, ie in Branch.open_containing('.').read_working_inventory().directories():
556
class cmd_init(Command):
557
"""Make a directory into a versioned branch.
559
Use this to create an empty branch, or before importing an
562
Recipe for importing a tree of files:
567
bzr commit -m 'imported project'
570
Branch.initialize('.')
573
class cmd_diff(Command):
574
"""Show differences in working tree.
576
If files are listed, only the changes in those files are listed.
577
Otherwise, all changes for the tree are listed.
584
# TODO: Allow diff across branches.
585
# TODO: Option to use external diff command; could be GNU diff, wdiff,
586
# or a graphical diff.
588
# TODO: Python difflib is not exactly the same as unidiff; should
589
# either fix it up or prefer to use an external diff.
591
# TODO: If a directory is given, diff everything under that.
593
# TODO: Selected-file diff is inefficient and doesn't show you
596
# TODO: This probably handles non-Unix newlines poorly.
598
takes_args = ['file*']
599
takes_options = ['revision', 'diff-options']
600
aliases = ['di', 'dif']
602
def run(self, revision=None, file_list=None, diff_options=None):
603
from bzrlib.diff import show_diff
606
b = Branch.open_containing(file_list[0])
607
tree = WorkingTree(b.base, b)
608
file_list = [tree.relpath(f) for f in file_list]
609
if file_list == ['']:
610
# just pointing to top-of-tree
613
b = Branch.open_containing('.')
615
if revision is not None:
616
if len(revision) == 1:
617
show_diff(b, revision[0], specific_files=file_list,
618
external_diff_options=diff_options)
619
elif len(revision) == 2:
620
show_diff(b, revision[0], specific_files=file_list,
621
external_diff_options=diff_options,
622
revision2=revision[1])
624
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
626
show_diff(b, None, specific_files=file_list,
627
external_diff_options=diff_options)
632
class cmd_deleted(Command):
633
"""List files deleted in the working tree.
635
# TODO: Show files deleted since a previous revision, or
636
# between two revisions.
637
# TODO: Much more efficient way to do this: read in new
638
# directories with readdir, rather than stating each one. Same
639
# level of effort but possibly much less IO. (Or possibly not,
640
# if the directories are very large...)
641
def run(self, show_ids=False):
642
b = Branch.open_containing('.')
644
new = b.working_tree()
645
for path, ie in old.inventory.iter_entries():
646
if not new.has_id(ie.file_id):
648
print '%-50s %s' % (path, ie.file_id)
653
class cmd_modified(Command):
654
"""List files modified in working tree."""
657
from bzrlib.delta import compare_trees
659
b = Branch.open_containing('.')
660
td = compare_trees(b.basis_tree(), b.working_tree())
662
for path, id, kind, text_modified, meta_modified in td.modified:
667
class cmd_added(Command):
668
"""List files added in working tree."""
671
b = Branch.open_containing('.')
672
wt = b.working_tree()
673
basis_inv = b.basis_tree().inventory
676
if file_id in basis_inv:
678
path = inv.id2path(file_id)
679
if not os.access(b.abspath(path), os.F_OK):
685
class cmd_root(Command):
686
"""Show the tree root directory.
688
The root is the nearest enclosing directory with a .bzr control
690
takes_args = ['filename?']
691
def run(self, filename=None):
692
"""Print the branch root."""
693
b = Branch.open_containing(filename)
697
class cmd_log(Command):
698
"""Show log of this branch.
700
To request a range of logs, you can use the command -r begin:end
701
-r revision requests a specific revision, -r :end or -r begin: are
705
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
707
takes_args = ['filename?']
708
takes_options = [Option('forward',
709
help='show from oldest to newest'),
710
'timezone', 'verbose',
711
'show-ids', 'revision',
712
Option('line', help='format with one line per revision'),
715
help='show revisions whose message matches this regexp',
717
Option('short', help='use moderately short format'),
720
def run(self, filename=None, timezone='original',
729
from bzrlib.log import log_formatter, show_log
731
assert message is None or isinstance(message, basestring), \
732
"invalid message argument %r" % message
733
direction = (forward and 'forward') or 'reverse'
736
b = Branch.open_containing(filename)
737
tree = WorkingTree(b.base, b)
738
fp = tree.relpath(filename)
740
file_id = b.read_working_inventory().path2id(fp)
742
file_id = None # points to branch root
744
b = Branch.open_containing('.')
750
elif len(revision) == 1:
751
rev1 = rev2 = revision[0].in_history(b).revno
752
elif len(revision) == 2:
753
rev1 = revision[0].in_history(b).revno
754
rev2 = revision[1].in_history(b).revno
756
raise BzrCommandError('bzr log --revision takes one or two values.')
763
mutter('encoding log as %r' % bzrlib.user_encoding)
765
# use 'replace' so that we don't abort if trying to write out
766
# in e.g. the default C locale.
767
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
774
lf = log_formatter(log_format,
777
show_timezone=timezone)
790
class cmd_touching_revisions(Command):
791
"""Return revision-ids which affected a particular file.
793
A more user-friendly interface is "bzr log FILE"."""
795
takes_args = ["filename"]
796
def run(self, filename):
797
b = Branch.open_containing(filename)
798
inv = b.read_working_inventory()
799
tree = WorkingTree(b.base, b)
800
file_id = inv.path2id(tree.relpath(filename))
801
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
802
print "%6d %s" % (revno, what)
805
class cmd_ls(Command):
806
"""List files in a tree.
808
# TODO: Take a revision or remote path and list that tree instead.
810
def run(self, revision=None, verbose=False):
811
b = Branch.open_containing('.')
813
tree = b.working_tree()
815
tree = b.revision_tree(revision.in_history(b).rev_id)
816
for fp, fc, kind, fid, entry in tree.list_files():
818
kindch = entry.kind_character()
819
print '%-8s %s%s' % (fc, fp, kindch)
825
class cmd_unknowns(Command):
826
"""List unknown files."""
828
from bzrlib.osutils import quotefn
829
for f in Branch.open_containing('.').unknowns():
834
class cmd_ignore(Command):
835
"""Ignore a command or pattern.
837
To remove patterns from the ignore list, edit the .bzrignore file.
839
If the pattern contains a slash, it is compared to the whole path
840
from the branch root. Otherwise, it is compared to only the last
841
component of the path. To match a file only in the root directory,
844
Ignore patterns are case-insensitive on case-insensitive systems.
846
Note: wildcards must be quoted from the shell on Unix.
849
bzr ignore ./Makefile
852
# TODO: Complain if the filename is absolute
853
takes_args = ['name_pattern']
855
def run(self, name_pattern):
856
from bzrlib.atomicfile import AtomicFile
859
b = Branch.open_containing('.')
860
ifn = b.abspath('.bzrignore')
862
if os.path.exists(ifn):
865
igns = f.read().decode('utf-8')
871
# TODO: If the file already uses crlf-style termination, maybe
872
# we should use that for the newly added lines?
874
if igns and igns[-1] != '\n':
876
igns += name_pattern + '\n'
879
f = AtomicFile(ifn, 'wt')
880
f.write(igns.encode('utf-8'))
885
inv = b.working_tree().inventory
886
if inv.path2id('.bzrignore'):
887
mutter('.bzrignore is already versioned')
889
mutter('need to make new .bzrignore file versioned')
890
b.add(['.bzrignore'])
894
class cmd_ignored(Command):
895
"""List ignored files and the patterns that matched them.
897
See also: bzr ignore"""
899
tree = Branch.open_containing('.').working_tree()
900
for path, file_class, kind, file_id, entry in tree.list_files():
901
if file_class != 'I':
903
## XXX: Slightly inefficient since this was already calculated
904
pat = tree.is_ignored(path)
905
print '%-50s %s' % (path, pat)
908
class cmd_lookup_revision(Command):
909
"""Lookup the revision-id from a revision-number
912
bzr lookup-revision 33
915
takes_args = ['revno']
917
def run(self, revno):
921
raise BzrCommandError("not a valid revision-number: %r" % revno)
923
print Branch.open_containing('.').get_rev_id(revno)
926
class cmd_export(Command):
927
"""Export past revision to destination directory.
929
If no revision is specified this exports the last committed revision.
931
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
932
given, try to find the format with the extension. If no extension
933
is found exports to a directory (equivalent to --format=dir).
935
Root may be the top directory for tar, tgz and tbz2 formats. If none
936
is given, the top directory will be the root name of the file."""
937
# TODO: list known exporters
938
takes_args = ['dest']
939
takes_options = ['revision', 'format', 'root']
940
def run(self, dest, revision=None, format=None, root=None):
942
b = Branch.open_containing('.')
944
rev_id = b.last_revision()
946
if len(revision) != 1:
947
raise BzrError('bzr export --revision takes exactly 1 argument')
948
rev_id = revision[0].in_history(b).rev_id
949
t = b.revision_tree(rev_id)
950
arg_root, ext = os.path.splitext(os.path.basename(dest))
951
if ext in ('.gz', '.bz2'):
952
new_root, new_ext = os.path.splitext(arg_root)
953
if new_ext == '.tar':
961
elif ext in (".tar.gz", ".tgz"):
963
elif ext in (".tar.bz2", ".tbz2"):
967
t.export(dest, format, root)
970
class cmd_cat(Command):
971
"""Write a file's text from a previous revision."""
973
takes_options = ['revision']
974
takes_args = ['filename']
976
def run(self, filename, revision=None):
978
raise BzrCommandError("bzr cat requires a revision number")
979
elif len(revision) != 1:
980
raise BzrCommandError("bzr cat --revision takes exactly one number")
981
b = Branch.open_containing('.')
982
tree = WorkingTree(b.base, b)
983
b.print_file(tree.relpath(filename), revision[0].in_history(b).revno)
986
class cmd_local_time_offset(Command):
987
"""Show the offset in seconds from GMT to local time."""
990
print bzrlib.osutils.local_time_offset()
994
class cmd_commit(Command):
995
"""Commit changes into a new revision.
997
If no arguments are given, the entire tree is committed.
999
If selected files are specified, only changes to those files are
1000
committed. If a directory is specified then the directory and everything
1001
within it is committed.
1003
A selected-file commit may fail in some cases where the committed
1004
tree would be invalid, such as trying to commit a file in a
1005
newly-added directory that is not itself committed.
1007
# TODO: Run hooks on tree to-be-committed, and after commit.
1009
# TODO: Strict commit that fails if there are deleted files.
1010
# (what does "deleted files" mean ??)
1012
# TODO: Give better message for -s, --summary, used by tla people
1014
# XXX: verbose currently does nothing
1016
takes_args = ['selected*']
1017
takes_options = ['message', 'verbose',
1019
help='commit even if nothing has changed'),
1020
Option('file', type=str,
1022
help='file containing commit message'),
1024
help="refuse to commit if there are unknown "
1025
"files in the working tree."),
1027
aliases = ['ci', 'checkin']
1029
def run(self, message=None, file=None, verbose=True, selected_list=None,
1030
unchanged=False, strict=False):
1031
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1033
from bzrlib.msgeditor import edit_commit_message
1034
from bzrlib.status import show_status
1035
from cStringIO import StringIO
1037
b = Branch.open_containing('.')
1038
tree = WorkingTree(b.base, b)
1040
selected_list = [tree.relpath(s) for s in selected_list]
1041
if message is None and not file:
1042
catcher = StringIO()
1043
show_status(b, specific_files=selected_list,
1045
message = edit_commit_message(catcher.getvalue())
1048
raise BzrCommandError("please specify a commit message"
1049
" with either --message or --file")
1050
elif message and file:
1051
raise BzrCommandError("please specify either --message or --file")
1055
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1058
raise BzrCommandError("empty commit message specified")
1061
b.commit(message, specific_files=selected_list,
1062
allow_pointless=unchanged, strict=strict)
1063
except PointlessCommit:
1064
# FIXME: This should really happen before the file is read in;
1065
# perhaps prepare the commit; get the message; then actually commit
1066
raise BzrCommandError("no changes to commit",
1067
["use --unchanged to commit anyhow"])
1068
except ConflictsInTree:
1069
raise BzrCommandError("Conflicts detected in working tree. "
1070
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1071
except StrictCommitFailed:
1072
raise BzrCommandError("Commit refused because there are unknown "
1073
"files in the working tree.")
1076
class cmd_check(Command):
1077
"""Validate consistency of branch history.
1079
This command checks various invariants about the branch storage to
1080
detect data corruption or bzr bugs.
1082
takes_args = ['dir?']
1083
takes_options = ['verbose']
1085
def run(self, dir='.', verbose=False):
1086
from bzrlib.check import check
1087
check(Branch.open_containing(dir), verbose)
1090
class cmd_scan_cache(Command):
1093
from bzrlib.hashcache import HashCache
1099
print '%6d stats' % c.stat_count
1100
print '%6d in hashcache' % len(c._cache)
1101
print '%6d files removed from cache' % c.removed_count
1102
print '%6d hashes updated' % c.update_count
1103
print '%6d files changed too recently to cache' % c.danger_count
1110
class cmd_upgrade(Command):
1111
"""Upgrade branch storage to current format.
1113
The check command or bzr developers may sometimes advise you to run
1116
This version of this command upgrades from the full-text storage
1117
used by bzr 0.0.8 and earlier to the weave format (v5).
1119
takes_args = ['dir?']
1121
def run(self, dir='.'):
1122
from bzrlib.upgrade import upgrade
1126
class cmd_whoami(Command):
1127
"""Show bzr user id."""
1128
takes_options = ['email']
1130
def run(self, email=False):
1132
b = bzrlib.branch.Branch.open_containing('.')
1133
config = bzrlib.config.BranchConfig(b)
1134
except NotBranchError:
1135
config = bzrlib.config.GlobalConfig()
1138
print config.user_email()
1140
print config.username()
1143
class cmd_selftest(Command):
1144
"""Run internal test suite.
1146
This creates temporary test directories in the working directory,
1147
but not existing data is affected. These directories are deleted
1148
if the tests pass, or left behind to help in debugging if they
1151
If arguments are given, they are regular expressions that say
1152
which tests should run.
1154
# TODO: --list should give a list of all available tests
1156
takes_args = ['testspecs*']
1157
takes_options = ['verbose',
1158
Option('one', help='stop when one test fails'),
1161
def run(self, testspecs_list=None, verbose=False, one=False):
1163
from bzrlib.selftest import selftest
1164
# we don't want progress meters from the tests to go to the
1165
# real output; and we don't want log messages cluttering up
1167
save_ui = bzrlib.ui.ui_factory
1168
bzrlib.trace.info('running tests...')
1170
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1171
if testspecs_list is not None:
1172
pattern = '|'.join(testspecs_list)
1175
result = selftest(verbose=verbose,
1177
stop_on_failure=one)
1179
bzrlib.trace.info('tests passed')
1181
bzrlib.trace.info('tests failed')
1182
return int(not result)
1184
bzrlib.ui.ui_factory = save_ui
1188
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1189
# is bzrlib itself in a branch?
1190
bzrrev = bzrlib.get_bzr_revision()
1192
print " (bzr checkout, revision %d {%s})" % bzrrev
1193
print bzrlib.__copyright__
1194
print "http://bazaar-ng.org/"
1196
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1197
print "you may use, modify and redistribute it under the terms of the GNU"
1198
print "General Public License version 2 or later."
1201
class cmd_version(Command):
1202
"""Show version of bzr."""
1206
class cmd_rocks(Command):
1207
"""Statement of optimism."""
1210
print "it sure does!"
1213
class cmd_find_merge_base(Command):
1214
"""Find and print a base revision for merging two branches.
1216
# TODO: Options to specify revisions on either side, as if
1217
# merging only part of the history.
1218
takes_args = ['branch', 'other']
1221
def run(self, branch, other):
1222
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1224
branch1 = Branch.open_containing(branch)
1225
branch2 = Branch.open_containing(other)
1227
history_1 = branch1.revision_history()
1228
history_2 = branch2.revision_history()
1230
last1 = branch1.last_revision()
1231
last2 = branch2.last_revision()
1233
source = MultipleRevisionSources(branch1, branch2)
1235
base_rev_id = common_ancestor(last1, last2, source)
1237
print 'merge base is revision %s' % base_rev_id
1241
if base_revno is None:
1242
raise bzrlib.errors.UnrelatedBranches()
1244
print ' r%-6d in %s' % (base_revno, branch)
1246
other_revno = branch2.revision_id_to_revno(base_revid)
1248
print ' r%-6d in %s' % (other_revno, other)
1252
class cmd_merge(Command):
1253
"""Perform a three-way merge.
1255
The branch is the branch you will merge from. By default, it will
1256
merge the latest revision. If you specify a revision, that
1257
revision will be merged. If you specify two revisions, the first
1258
will be used as a BASE, and the second one as OTHER. Revision
1259
numbers are always relative to the specified branch.
1261
By default bzr will try to merge in all new work from the other
1262
branch, automatically determining an appropriate base. If this
1263
fails, you may need to give an explicit base.
1267
To merge the latest revision from bzr.dev
1268
bzr merge ../bzr.dev
1270
To merge changes up to and including revision 82 from bzr.dev
1271
bzr merge -r 82 ../bzr.dev
1273
To merge the changes introduced by 82, without previous changes:
1274
bzr merge -r 81..82 ../bzr.dev
1276
merge refuses to run if there are any uncommitted changes, unless
1279
takes_args = ['branch?']
1280
takes_options = ['revision', 'force', 'merge-type']
1282
def run(self, branch=None, revision=None, force=False,
1284
from bzrlib.merge import merge
1285
from bzrlib.merge_core import ApplyMerge3
1286
if merge_type is None:
1287
merge_type = ApplyMerge3
1289
branch = Branch.open_containing('.').get_parent()
1291
raise BzrCommandError("No merge location known or specified.")
1293
print "Using saved location: %s" % branch
1294
if revision is None or len(revision) < 1:
1296
other = [branch, -1]
1298
if len(revision) == 1:
1300
other = [branch, revision[0].in_history(branch).revno]
1302
assert len(revision) == 2
1303
if None in revision:
1304
raise BzrCommandError(
1305
"Merge doesn't permit that revision specifier.")
1306
b = Branch.open(branch)
1308
base = [branch, revision[0].in_history(b).revno]
1309
other = [branch, revision[1].in_history(b).revno]
1312
merge(other, base, check_clean=(not force), merge_type=merge_type)
1313
except bzrlib.errors.AmbiguousBase, e:
1314
m = ("sorry, bzr can't determine the right merge base yet\n"
1315
"candidates are:\n "
1316
+ "\n ".join(e.bases)
1318
"please specify an explicit base with -r,\n"
1319
"and (if you want) report this to the bzr developers\n")
1323
class cmd_revert(Command):
1324
"""Reverse all changes since the last commit.
1326
Only versioned files are affected. Specify filenames to revert only
1327
those files. By default, any files that are changed will be backed up
1328
first. Backup files have a '~' appended to their name.
1330
takes_options = ['revision', 'no-backup']
1331
takes_args = ['file*']
1332
aliases = ['merge-revert']
1334
def run(self, revision=None, no_backup=False, file_list=None):
1335
from bzrlib.merge import merge
1336
from bzrlib.commands import parse_spec
1338
if file_list is not None:
1339
if len(file_list) == 0:
1340
raise BzrCommandError("No files specified")
1341
if revision is None:
1343
elif len(revision) != 1:
1344
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1346
b = Branch.open_containing('.')
1347
revno = revision[0].in_history(b).revno
1348
merge(('.', revno), parse_spec('.'),
1351
backup_files=not no_backup,
1352
file_list=file_list)
1354
Branch.open_containing('.').set_pending_merges([])
1357
class cmd_assert_fail(Command):
1358
"""Test reporting of assertion failures"""
1361
assert False, "always fails"
1364
class cmd_help(Command):
1365
"""Show help on a command or other topic.
1367
For a list of all available commands, say 'bzr help commands'."""
1368
takes_options = ['long']
1369
takes_args = ['topic?']
1372
def run(self, topic=None, long=False):
1374
if topic is None and long:
1379
class cmd_shell_complete(Command):
1380
"""Show appropriate completions for context.
1382
For a list of all available commands, say 'bzr shell-complete'."""
1383
takes_args = ['context?']
1387
def run(self, context=None):
1388
import shellcomplete
1389
shellcomplete.shellcomplete(context)
1392
class cmd_fetch(Command):
1393
"""Copy in history from another branch but don't merge it.
1395
This is an internal method used for pull and merge."""
1397
takes_args = ['from_branch', 'to_branch']
1398
def run(self, from_branch, to_branch):
1399
from bzrlib.fetch import Fetcher
1400
from bzrlib.branch import Branch
1401
from_b = Branch(from_branch)
1402
to_b = Branch(to_branch)
1403
Fetcher(to_b, from_b)
1407
class cmd_missing(Command):
1408
"""What is missing in this branch relative to other branch.
1410
# TODO: rewrite this in terms of ancestry so that it shows only
1413
takes_args = ['remote?']
1414
aliases = ['mis', 'miss']
1415
# We don't have to add quiet to the list, because
1416
# unknown options are parsed as booleans
1417
takes_options = ['verbose', 'quiet']
1419
def run(self, remote=None, verbose=False, quiet=False):
1420
from bzrlib.errors import BzrCommandError
1421
from bzrlib.missing import show_missing
1423
if verbose and quiet:
1424
raise BzrCommandError('Cannot pass both quiet and verbose')
1426
b = Branch.open_containing('.')
1427
parent = b.get_parent()
1430
raise BzrCommandError("No missing location known or specified.")
1433
print "Using last location: %s" % parent
1435
elif parent is None:
1436
# We only update parent if it did not exist, missing
1437
# should not change the parent
1438
b.set_parent(remote)
1439
br_remote = Branch.open_containing(remote)
1440
return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1443
class cmd_plugins(Command):
1447
import bzrlib.plugin
1448
from inspect import getdoc
1449
for plugin in bzrlib.plugin.all_plugins:
1450
if hasattr(plugin, '__path__'):
1451
print plugin.__path__[0]
1452
elif hasattr(plugin, '__file__'):
1453
print plugin.__file__
1459
print '\t', d.split('\n')[0]
1462
class cmd_testament(Command):
1463
"""Show testament (signing-form) of a revision."""
1464
takes_options = ['revision', 'long']
1465
takes_args = ['branch?']
1466
def run(self, branch='.', revision=None, long=False):
1467
from bzrlib.testament import Testament
1468
b = Branch.open_containing(branch)
1471
if revision is None:
1472
rev_id = b.last_revision()
1474
rev_id = revision[0].in_history(b).rev_id
1475
t = Testament.from_revision(b, rev_id)
1477
sys.stdout.writelines(t.as_text_lines())
1479
sys.stdout.write(t.as_short_text())
1484
class cmd_annotate(Command):
1485
"""Show the origin of each line in a file.
1487
This prints out the given file with an annotation on the left side
1488
indicating which revision, author and date introduced the change.
1490
If the origin is the same for a run of consecutive lines, it is
1491
shown only at the top, unless the --all option is given.
1493
# TODO: annotate directories; showing when each file was last changed
1494
# TODO: annotate a previous version of a file
1495
# TODO: if the working copy is modified, show annotations on that
1496
# with new uncommitted lines marked
1497
aliases = ['blame', 'praise']
1498
takes_args = ['filename']
1499
takes_options = [Option('all', help='show annotations on all lines'),
1500
Option('long', help='show date in annotations'),
1503
def run(self, filename, all=False, long=False):
1504
from bzrlib.annotate import annotate_file
1505
b = Branch.open_containing(filename)
1508
tree = WorkingTree(b.base, b)
1509
rp = tree.relpath(filename)
1510
tree = b.revision_tree(b.last_revision())
1511
file_id = tree.inventory.path2id(rp)
1512
file_version = tree.inventory[file_id].revision
1513
annotate_file(b, file_version, file_id, long, all, sys.stdout)
1517
# these get imported and then picked up by the scan for cmd_*
1518
# TODO: Some more consistent way to split command definitions across files;
1519
# we do need to load at least some information about them to know of
1521
from bzrlib.conflicts import cmd_resolve, cmd_conflicts
added
removed
bzrlib/builtins.py
