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
22
from bzrlib.trace import mutter, note, log_error
23
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
24
from bzrlib.osutils import quotefn
25
from bzrlib import Branch, Inventory, InventoryEntry, BZRDIR, \
29
def _squish_command_name(cmd):
30
return 'cmd_' + cmd.replace('-', '_')
33
def _unsquish_command_name(cmd):
34
assert cmd.startswith("cmd_")
35
return cmd[4:].replace('_','-')
37
def _parse_revision_str(revstr):
38
"""This handles a revision string -> revno.
40
There are several possibilities:
43
'234:345' -> [234, 345]
47
In the future we will also support:
48
'uuid:blah-blah-blah' -> ?
49
'hash:blahblahblah' -> ?
53
if revstr.find(':') != -1:
54
revs = revstr.split(':')
56
raise ValueError('More than 2 pieces not supported for --revision: %r' % revstr)
61
revs[0] = int(revs[0])
66
revs[1] = int(revs[1])
72
"""Find all python files which are plugins, and load their commands
73
to add to the list of "all commands"
75
The environment variable BZRPATH is considered a delimited set of
76
paths to look through. Each entry is searched for *.py files.
77
If a directory is found, it is also searched, but they are
78
not searched recursively. This allows you to revctl the plugins.
80
Inside the plugin should be a series of cmd_* function, which inherit from
81
the bzrlib.commands.Command class.
83
bzrpath = os.environ.get('BZRPLUGINPATH', '')
88
_platform_extensions = {
94
if _platform_extensions.has_key(sys.platform):
95
platform_extension = _platform_extensions[sys.platform]
97
platform_extension = None
98
for d in bzrpath.split(os.pathsep):
99
plugin_names = {} # This should really be a set rather than a dict
100
for f in os.listdir(d):
101
if f.endswith('.py'):
103
elif f.endswith('.pyc') or f.endswith('.pyo'):
105
elif platform_extension and f.endswith(platform_extension):
106
f = f[:-len(platform_extension)]
107
if f.endswidth('module'):
108
f = f[:-len('module')]
111
if not plugin_names.has_key(f):
112
plugin_names[f] = True
114
plugin_names = plugin_names.keys()
117
sys.path.insert(0, d)
118
for name in plugin_names:
122
if sys.modules.has_key(name):
123
old_module = sys.modules[name]
124
del sys.modules[name]
125
plugin = __import__(name, locals())
126
for k in dir(plugin):
127
if k.startswith('cmd_'):
128
k_unsquished = _unsquish_command_name(k)
129
if not plugin_cmds.has_key(k_unsquished):
130
plugin_cmds[k_unsquished] = getattr(plugin, k)
132
log_error('Two plugins defined the same command: %r' % k)
133
log_error('Not loading the one in %r in dir %r' % (name, d))
136
sys.modules[name] = old_module
137
except ImportError, e:
138
log_error('Unable to load plugin: %r from %r\n%s' % (name, d, e))
143
def _get_cmd_dict(include_plugins=True):
145
for k, v in globals().iteritems():
146
if k.startswith("cmd_"):
147
d[_unsquish_command_name(k)] = v
149
d.update(_find_plugins())
152
def get_all_cmds(include_plugins=True):
153
"""Return canonical name and class for all registered commands."""
154
for k, v in _get_cmd_dict(include_plugins=include_plugins).iteritems():
158
def get_cmd_class(cmd,include_plugins=True):
159
"""Return the canonical name and command class for a command.
161
cmd = str(cmd) # not unicode
163
# first look up this command under the specified name
164
cmds = _get_cmd_dict(include_plugins=include_plugins)
166
return cmd, cmds[cmd]
170
# look for any command which claims this as an alias
171
for cmdname, cmdclass in cmds.iteritems():
172
if cmd in cmdclass.aliases:
173
return cmdname, cmdclass
175
cmdclass = ExternalCommand.find_command(cmd)
179
raise BzrCommandError("unknown command %r" % cmd)
182
class Command(object):
183
"""Base class for commands.
185
The docstring for an actual command should give a single-line
186
summary, then a complete description of the command. A grammar
187
description will be inserted.
190
List of argument forms, marked with whether they are optional,
194
List of options that may be given for this command.
197
If true, this command isn't advertised.
206
def __init__(self, options, arguments):
207
"""Construct and run the command.
209
Sets self.status to the return value of run()."""
210
assert isinstance(options, dict)
211
assert isinstance(arguments, dict)
212
cmdargs = options.copy()
213
cmdargs.update(arguments)
214
assert self.__doc__ != Command.__doc__, \
215
("No help message set for %r" % self)
216
self.status = self.run(**cmdargs)
220
"""Override this in sub-classes.
222
This is invoked with the options and arguments bound to
225
Return 0 or None if the command was successful, or a shell
231
class ExternalCommand(Command):
232
"""Class to wrap external commands.
234
We cheat a little here, when get_cmd_class() calls us we actually give it back
235
an object we construct that has the appropriate path, help, options etc for the
238
When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
239
method, which we override to call the Command.__init__ method. That then calls
240
our run method which is pretty straight forward.
242
The only wrinkle is that we have to map bzr's dictionary of options and arguments
243
back into command line options and arguments for the script.
246
def find_command(cls, cmd):
248
bzrpath = os.environ.get('BZRPATH', '')
250
for dir in bzrpath.split(os.pathsep):
251
path = os.path.join(dir, cmd)
252
if os.path.isfile(path):
253
return ExternalCommand(path)
257
find_command = classmethod(find_command)
259
def __init__(self, path):
262
pipe = os.popen('%s --bzr-usage' % path, 'r')
263
self.takes_options = pipe.readline().split()
265
for opt in self.takes_options:
266
if not opt in OPTIONS:
267
bailout("Unknown option '%s' returned by external command %s"
270
# TODO: Is there any way to check takes_args is valid here?
271
self.takes_args = pipe.readline().split()
273
if pipe.close() is not None:
274
bailout("Failed funning '%s --bzr-usage'" % path)
276
pipe = os.popen('%s --bzr-help' % path, 'r')
277
self.__doc__ = pipe.read()
278
if pipe.close() is not None:
279
bailout("Failed funning '%s --bzr-help'" % path)
281
def __call__(self, options, arguments):
282
Command.__init__(self, options, arguments)
285
def run(self, **kargs):
293
if OPTIONS.has_key(name):
295
opts.append('--%s' % name)
296
if value is not None and value is not True:
297
opts.append(str(value))
299
# it's an arg, or arg list
300
if type(value) is not list:
306
self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
310
class cmd_status(Command):
311
"""Display status summary.
313
This reports on versioned and unknown files, reporting them
314
grouped by state. Possible states are:
317
Versioned in the working copy but not in the previous revision.
320
Versioned in the previous revision but removed or deleted
324
Path of this file changed from the previous revision;
325
the text may also have changed. This includes files whose
326
parent directory was renamed.
329
Text has changed since the previous revision.
332
Nothing about this file has changed since the previous revision.
333
Only shown with --all.
336
Not versioned and not matching an ignore pattern.
338
To see ignored files use 'bzr ignored'. For details in the
339
changes to file texts, use 'bzr diff'.
341
If no arguments are specified, the status of the entire working
342
directory is shown. Otherwise, only the status of the specified
343
files or directories is reported. If a directory is given, status
344
is reported for everything inside that directory.
346
takes_args = ['file*']
347
takes_options = ['all', 'show-ids']
348
aliases = ['st', 'stat']
350
def run(self, all=False, show_ids=False, file_list=None):
352
b = Branch(file_list[0])
353
file_list = [b.relpath(x) for x in file_list]
354
# special case: only one path was given and it's the root
356
if file_list == ['']:
361
status.show_status(b, show_unchanged=all, show_ids=show_ids,
362
specific_files=file_list)
365
class cmd_cat_revision(Command):
366
"""Write out metadata for a revision."""
369
takes_args = ['revision_id']
371
def run(self, revision_id):
372
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
375
class cmd_revno(Command):
376
"""Show current revision number.
378
This is equal to the number of revisions on this branch."""
380
print Branch('.').revno()
383
class cmd_add(Command):
384
"""Add specified files or directories.
386
In non-recursive mode, all the named items are added, regardless
387
of whether they were previously ignored. A warning is given if
388
any of the named files are already versioned.
390
In recursive mode (the default), files are treated the same way
391
but the behaviour for directories is different. Directories that
392
are already versioned do not give a warning. All directories,
393
whether already versioned or not, are searched for files or
394
subdirectories that are neither versioned or ignored, and these
395
are added. This search proceeds recursively into versioned
398
Therefore simply saying 'bzr add .' will version all files that
399
are currently unknown.
401
TODO: Perhaps adding a file whose directly is not versioned should
402
recursively add that parent, rather than giving an error?
404
takes_args = ['file+']
405
takes_options = ['verbose', 'no-recurse']
407
def run(self, file_list, verbose=False, no_recurse=False):
408
bzrlib.add.smart_add(file_list, verbose, not no_recurse)
411
class cmd_relpath(Command):
412
"""Show path of a file relative to root"""
413
takes_args = ['filename']
416
def run(self, filename):
417
print Branch(filename).relpath(filename)
421
class cmd_inventory(Command):
422
"""Show inventory of the current working copy or a revision."""
423
takes_options = ['revision', 'show-ids']
425
def run(self, revision=None, show_ids=False):
428
inv = b.read_working_inventory()
430
inv = b.get_revision_inventory(b.lookup_revision(revision))
432
for path, entry in inv.entries():
434
print '%-50s %s' % (path, entry.file_id)
439
class cmd_move(Command):
440
"""Move files to a different directory.
445
The destination must be a versioned directory in the same branch.
447
takes_args = ['source$', 'dest']
448
def run(self, source_list, dest):
451
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
454
class cmd_rename(Command):
455
"""Change the name of an entry.
458
bzr rename frob.c frobber.c
459
bzr rename src/frob.c lib/frob.c
461
It is an error if the destination name exists.
463
See also the 'move' command, which moves files into a different
464
directory without changing their name.
466
TODO: Some way to rename multiple files without invoking bzr for each
468
takes_args = ['from_name', 'to_name']
470
def run(self, from_name, to_name):
472
b.rename_one(b.relpath(from_name), b.relpath(to_name))
478
class cmd_pull(Command):
479
"""Pull any changes from another branch into the current one.
481
If the location is omitted, the last-used location will be used.
482
Both the revision history and the working directory will be
485
This command only works on branches that have not diverged. Branches are
486
considered diverged if both branches have had commits without first
487
pulling from the other.
489
If branches have diverged, you can use 'bzr merge' to pull the text changes
490
from one into the other.
492
takes_args = ['location?']
494
def run(self, location=None):
495
from bzrlib.merge import merge
501
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
503
if errno == errno.ENOENT:
506
location = stored_loc
508
raise BzrCommandError("No pull location known or specified.")
509
from branch import find_branch, DivergedBranches
510
br_from = find_branch(location)
511
location = pull_loc(br_from)
512
old_revno = br_to.revno()
514
br_to.update_revisions(br_from)
515
except DivergedBranches:
516
raise BzrCommandError("These branches have diverged. Try merge.")
518
merge(('.', -1), ('.', old_revno), check_clean=False)
519
if location != stored_loc:
520
br_to.controlfile("x-pull", "wb").write(location + "\n")
524
class cmd_branch(Command):
525
"""Create a new copy of a branch.
527
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
528
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
530
To retrieve the branch as of a particular revision, supply the --revision
531
parameter, as in "branch foo/bar -r 5".
533
takes_args = ['from_location', 'to_location?']
534
takes_options = ['revision']
536
def run(self, from_location, to_location=None, revision=None):
538
from bzrlib.merge import merge
539
from branch import find_branch, DivergedBranches, NoSuchRevision
540
from shutil import rmtree
542
br_from = find_branch(from_location)
544
if e.errno == errno.ENOENT:
545
raise BzrCommandError('Source location "%s" does not exist.' %
550
if to_location is None:
551
to_location = os.path.basename(from_location.rstrip("/\\"))
554
os.mkdir(to_location)
556
if e.errno == errno.EEXIST:
557
raise BzrCommandError('Target directory "%s" already exists.' %
559
if e.errno == errno.ENOENT:
560
raise BzrCommandError('Parent of "%s" does not exist.' %
564
br_to = Branch(to_location, init=True)
567
br_to.update_revisions(br_from, stop_revision=revision)
568
except NoSuchRevision:
570
msg = "The branch %s has no revision %d." % (from_location,
572
raise BzrCommandError(msg)
573
merge((to_location, -1), (to_location, 0), this_dir=to_location,
575
from_location = pull_loc(br_from)
576
br_to.controlfile("x-pull", "wb").write(from_location + "\n")
579
def pull_loc(branch):
580
# TODO: Should perhaps just make attribute be 'base' in
581
# RemoteBranch and Branch?
582
if hasattr(branch, "baseurl"):
583
return branch.baseurl
589
class cmd_renames(Command):
590
"""Show list of renamed files.
592
TODO: Option to show renames between two historical versions.
594
TODO: Only show renames under dir, rather than in the whole branch.
596
takes_args = ['dir?']
598
def run(self, dir='.'):
600
old_inv = b.basis_tree().inventory
601
new_inv = b.read_working_inventory()
603
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
605
for old_name, new_name in renames:
606
print "%s => %s" % (old_name, new_name)
609
class cmd_info(Command):
610
"""Show statistical information about a branch."""
611
takes_args = ['branch?']
613
def run(self, branch=None):
616
from branch import find_branch
617
b = find_branch(branch)
621
class cmd_remove(Command):
622
"""Make a file unversioned.
624
This makes bzr stop tracking changes to a versioned file. It does
625
not delete the working copy.
627
takes_args = ['file+']
628
takes_options = ['verbose']
630
def run(self, file_list, verbose=False):
631
b = Branch(file_list[0])
632
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
635
class cmd_file_id(Command):
636
"""Print file_id of a particular file or directory.
638
The file_id is assigned when the file is first added and remains the
639
same through all revisions where the file exists, even when it is
643
takes_args = ['filename']
644
def run(self, filename):
646
i = b.inventory.path2id(b.relpath(filename))
648
bailout("%r is not a versioned file" % filename)
653
class cmd_file_path(Command):
654
"""Print path of file_ids to a file or directory.
656
This prints one line for each directory down to the target,
657
starting at the branch root."""
659
takes_args = ['filename']
660
def run(self, filename):
663
fid = inv.path2id(b.relpath(filename))
665
bailout("%r is not a versioned file" % filename)
666
for fip in inv.get_idpath(fid):
670
class cmd_revision_history(Command):
671
"""Display list of revision ids on this branch."""
674
for patchid in Branch('.').revision_history():
678
class cmd_directories(Command):
679
"""Display list of versioned directories in this branch."""
681
for name, ie in Branch('.').read_working_inventory().directories():
688
class cmd_init(Command):
689
"""Make a directory into a versioned branch.
691
Use this to create an empty branch, or before importing an
694
Recipe for importing a tree of files:
699
bzr commit -m 'imported project'
702
Branch('.', init=True)
705
class cmd_diff(Command):
706
"""Show differences in working tree.
708
If files are listed, only the changes in those files are listed.
709
Otherwise, all changes for the tree are listed.
711
TODO: Given two revision arguments, show the difference between them.
713
TODO: Allow diff across branches.
715
TODO: Option to use external diff command; could be GNU diff, wdiff,
718
TODO: Python difflib is not exactly the same as unidiff; should
719
either fix it up or prefer to use an external diff.
721
TODO: If a directory is given, diff everything under that.
723
TODO: Selected-file diff is inefficient and doesn't show you
726
TODO: This probably handles non-Unix newlines poorly.
729
takes_args = ['file*']
730
takes_options = ['revision', 'diff-options']
731
aliases = ['di', 'dif']
733
def run(self, revision=None, file_list=None, diff_options=None):
734
from bzrlib.diff import show_diff
735
from bzrlib import find_branch
738
b = find_branch(file_list[0])
739
file_list = [b.relpath(f) for f in file_list]
740
if file_list == ['']:
741
# just pointing to top-of-tree
746
show_diff(b, revision, specific_files=file_list,
747
external_diff_options=diff_options)
753
class cmd_deleted(Command):
754
"""List files deleted in the working tree.
756
TODO: Show files deleted since a previous revision, or between two revisions.
758
def run(self, show_ids=False):
761
new = b.working_tree()
763
## TODO: Much more efficient way to do this: read in new
764
## directories with readdir, rather than stating each one. Same
765
## level of effort but possibly much less IO. (Or possibly not,
766
## if the directories are very large...)
768
for path, ie in old.inventory.iter_entries():
769
if not new.has_id(ie.file_id):
771
print '%-50s %s' % (path, ie.file_id)
776
class cmd_modified(Command):
777
"""List files modified in working tree."""
782
inv = b.read_working_inventory()
783
sc = statcache.update_cache(b, inv)
784
basis = b.basis_tree()
785
basis_inv = basis.inventory
787
# We used to do this through iter_entries(), but that's slow
788
# when most of the files are unmodified, as is usually the
789
# case. So instead we iterate by inventory entry, and only
790
# calculate paths as necessary.
792
for file_id in basis_inv:
793
cacheentry = sc.get(file_id)
794
if not cacheentry: # deleted
796
ie = basis_inv[file_id]
797
if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
798
path = inv.id2path(file_id)
803
class cmd_added(Command):
804
"""List files added in working tree."""
808
wt = b.working_tree()
809
basis_inv = b.basis_tree().inventory
812
if file_id in basis_inv:
814
path = inv.id2path(file_id)
815
if not os.access(b.abspath(path), os.F_OK):
821
class cmd_root(Command):
822
"""Show the tree root directory.
824
The root is the nearest enclosing directory with a .bzr control
826
takes_args = ['filename?']
827
def run(self, filename=None):
828
"""Print the branch root."""
829
from branch import find_branch
830
b = find_branch(filename)
831
print getattr(b, 'base', None) or getattr(b, 'baseurl')
834
class cmd_log(Command):
835
"""Show log of this branch.
837
To request a range of logs, you can use the command -r begin:end
838
-r revision requests a specific revision, -r :end or -r begin: are
841
TODO: Make --revision support uuid: and hash: [future tag:] notation.
845
takes_args = ['filename?']
846
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision']
848
def run(self, filename=None, timezone='original',
853
from bzrlib import show_log, find_branch
856
direction = (forward and 'forward') or 'reverse'
859
b = find_branch(filename)
860
fp = b.relpath(filename)
862
file_id = b.read_working_inventory().path2id(fp)
864
file_id = None # points to branch root
870
revision = [None, None]
871
elif isinstance(revision, int):
872
revision = [revision, revision]
877
assert len(revision) == 2
879
mutter('encoding log as %r' % bzrlib.user_encoding)
881
# use 'replace' so that we don't abort if trying to write out
882
# in e.g. the default C locale.
883
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
886
show_timezone=timezone,
891
start_revision=revision[0],
892
end_revision=revision[1])
896
class cmd_touching_revisions(Command):
897
"""Return revision-ids which affected a particular file.
899
A more user-friendly interface is "bzr log FILE"."""
901
takes_args = ["filename"]
902
def run(self, filename):
904
inv = b.read_working_inventory()
905
file_id = inv.path2id(b.relpath(filename))
906
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
907
print "%6d %s" % (revno, what)
910
class cmd_ls(Command):
911
"""List files in a tree.
913
TODO: Take a revision or remote path and list that tree instead.
916
def run(self, revision=None, verbose=False):
919
tree = b.working_tree()
921
tree = b.revision_tree(b.lookup_revision(revision))
923
for fp, fc, kind, fid in tree.list_files():
925
if kind == 'directory':
932
print '%-8s %s%s' % (fc, fp, kindch)
938
class cmd_unknowns(Command):
939
"""List unknown files."""
941
for f in Branch('.').unknowns():
946
class cmd_ignore(Command):
947
"""Ignore a command or pattern.
949
To remove patterns from the ignore list, edit the .bzrignore file.
951
If the pattern contains a slash, it is compared to the whole path
952
from the branch root. Otherwise, it is comapred to only the last
953
component of the path.
955
Ignore patterns are case-insensitive on case-insensitive systems.
957
Note: wildcards must be quoted from the shell on Unix.
960
bzr ignore ./Makefile
963
takes_args = ['name_pattern']
965
def run(self, name_pattern):
966
from bzrlib.atomicfile import AtomicFile
970
ifn = b.abspath('.bzrignore')
972
if os.path.exists(ifn):
975
igns = f.read().decode('utf-8')
981
# TODO: If the file already uses crlf-style termination, maybe
982
# we should use that for the newly added lines?
984
if igns and igns[-1] != '\n':
986
igns += name_pattern + '\n'
989
f = AtomicFile(ifn, 'wt')
990
f.write(igns.encode('utf-8'))
995
inv = b.working_tree().inventory
996
if inv.path2id('.bzrignore'):
997
mutter('.bzrignore is already versioned')
999
mutter('need to make new .bzrignore file versioned')
1000
b.add(['.bzrignore'])
1004
class cmd_ignored(Command):
1005
"""List ignored files and the patterns that matched them.
1007
See also: bzr ignore"""
1009
tree = Branch('.').working_tree()
1010
for path, file_class, kind, file_id in tree.list_files():
1011
if file_class != 'I':
1013
## XXX: Slightly inefficient since this was already calculated
1014
pat = tree.is_ignored(path)
1015
print '%-50s %s' % (path, pat)
1018
class cmd_lookup_revision(Command):
1019
"""Lookup the revision-id from a revision-number
1022
bzr lookup-revision 33
1025
takes_args = ['revno']
1027
def run(self, revno):
1031
raise BzrCommandError("not a valid revision-number: %r" % revno)
1033
print Branch('.').lookup_revision(revno)
1036
class cmd_export(Command):
1037
"""Export past revision to destination directory.
1039
If no revision is specified this exports the last committed revision.
1041
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1042
given, exports to a directory (equivalent to --format=dir)."""
1043
# TODO: list known exporters
1044
takes_args = ['dest']
1045
takes_options = ['revision', 'format']
1046
def run(self, dest, revision=None, format='dir'):
1048
if revision == None:
1049
rh = b.revision_history()[-1]
1051
rh = b.lookup_revision(int(revision))
1052
t = b.revision_tree(rh)
1053
t.export(dest, format)
1056
class cmd_cat(Command):
1057
"""Write a file's text from a previous revision."""
1059
takes_options = ['revision']
1060
takes_args = ['filename']
1062
def run(self, filename, revision=None):
1063
if revision == None:
1064
raise BzrCommandError("bzr cat requires a revision number")
1066
b.print_file(b.relpath(filename), int(revision))
1069
class cmd_local_time_offset(Command):
1070
"""Show the offset in seconds from GMT to local time."""
1073
print bzrlib.osutils.local_time_offset()
1077
class cmd_commit(Command):
1078
"""Commit changes into a new revision.
1080
If selected files are specified, only changes to those files are
1081
committed. If a directory is specified then its contents are also
1084
A selected-file commit may fail in some cases where the committed
1085
tree would be invalid, such as trying to commit a file in a
1086
newly-added directory that is not itself committed.
1088
TODO: Run hooks on tree to-be-committed, and after commit.
1090
TODO: Strict commit that fails if there are unknown or deleted files.
1092
takes_args = ['selected*']
1093
takes_options = ['message', 'file', 'verbose']
1094
aliases = ['ci', 'checkin']
1096
def run(self, message=None, file=None, verbose=True, selected_list=None):
1097
from bzrlib.commit import commit
1099
## Warning: shadows builtin file()
1100
if not message and not file:
1101
raise BzrCommandError("please specify a commit message",
1102
["use either --message or --file"])
1103
elif message and file:
1104
raise BzrCommandError("please specify either --message or --file")
1108
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1111
commit(b, message, verbose=verbose, specific_files=selected_list)
1114
class cmd_check(Command):
1115
"""Validate consistency of branch history.
1117
This command checks various invariants about the branch storage to
1118
detect data corruption or bzr bugs.
1120
If given the --update flag, it will update some optional fields
1121
to help ensure data consistency.
1123
takes_args = ['dir?']
1124
takes_options = ['update']
1126
def run(self, dir='.', update=False):
1128
bzrlib.check.check(Branch(dir), update=update)
1132
class cmd_whoami(Command):
1133
"""Show bzr user id."""
1134
takes_options = ['email']
1136
def run(self, email=False):
1138
print bzrlib.osutils.user_email()
1140
print bzrlib.osutils.username()
1143
class cmd_selftest(Command):
1144
"""Run internal test suite"""
1147
from bzrlib.selftest import selftest
1155
class cmd_version(Command):
1156
"""Show version of bzr."""
1161
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1162
# is bzrlib itself in a branch?
1163
bzrrev = bzrlib.get_bzr_revision()
1165
print " (bzr checkout, revision %d {%s})" % bzrrev
1166
print bzrlib.__copyright__
1167
print "http://bazaar-ng.org/"
1169
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1170
print "you may use, modify and redistribute it under the terms of the GNU"
1171
print "General Public License version 2 or later."
1174
class cmd_rocks(Command):
1175
"""Statement of optimism."""
1178
print "it sure does!"
1180
def parse_spec(spec):
1182
>>> parse_spec(None)
1184
>>> parse_spec("./")
1186
>>> parse_spec("../@")
1188
>>> parse_spec("../f/@35")
1194
parsed = spec.split('/@')
1195
assert len(parsed) == 2
1199
parsed[1] = int(parsed[1])
1200
assert parsed[1] >=0
1202
parsed = [spec, None]
1207
class cmd_merge(Command):
1208
"""Perform a three-way merge of trees.
1210
The SPEC parameters are working tree or revision specifiers. Working trees
1211
are specified using standard paths or urls. No component of a directory
1212
path may begin with '@'.
1214
Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1216
Revisions are specified using a dirname/@revno pair, where dirname is the
1217
branch directory and revno is the revision within that branch. If no revno
1218
is specified, the latest revision is used.
1220
Revision examples: './@127', 'foo/@', '../@1'
1222
The OTHER_SPEC parameter is required. If the BASE_SPEC parameter is
1223
not supplied, the common ancestor of OTHER_SPEC the current branch is used
1226
merge refuses to run if there are any uncommitted changes, unless
1229
takes_args = ['other_spec', 'base_spec?']
1230
takes_options = ['force']
1232
def run(self, other_spec, base_spec=None, force=False):
1233
from bzrlib.merge import merge
1234
merge(parse_spec(other_spec), parse_spec(base_spec),
1235
check_clean=(not force))
1238
class cmd_revert(Command):
1239
"""Reverse all changes since the last commit.
1241
Only versioned files are affected.
1243
TODO: Store backups of any files that will be reverted, so
1244
that the revert can be undone.
1246
takes_options = ['revision']
1248
def run(self, revision=-1):
1249
from bzrlib.merge import merge
1250
merge(('.', revision), parse_spec('.'),
1255
class cmd_assert_fail(Command):
1256
"""Test reporting of assertion failures"""
1259
assert False, "always fails"
1262
class cmd_help(Command):
1263
"""Show help on a command or other topic.
1265
For a list of all available commands, say 'bzr help commands'."""
1266
takes_args = ['topic?']
1269
def run(self, topic=None):
1274
class cmd_update_stat_cache(Command):
1275
"""Update stat-cache mapping inodes to SHA-1 hashes.
1277
For testing only."""
1282
statcache.update_cache(b.base, b.read_working_inventory())
1286
# list of all available options; the rhs can be either None for an
1287
# option that takes no argument, or a constructor function that checks
1291
'diff-options': str,
1300
'revision': _parse_revision_str,
1318
def parse_args(argv):
1319
"""Parse command line.
1321
Arguments and options are parsed at this level before being passed
1322
down to specific command handlers. This routine knows, from a
1323
lookup table, something about the available options, what optargs
1324
they take, and which commands will accept them.
1326
>>> parse_args('--help'.split())
1327
([], {'help': True})
1328
>>> parse_args('--version'.split())
1329
([], {'version': True})
1330
>>> parse_args('status --all'.split())
1331
(['status'], {'all': True})
1332
>>> parse_args('commit --message=biter'.split())
1333
(['commit'], {'message': u'biter'})
1334
>>> parse_args('log -r 500'.split())
1335
(['log'], {'revision': 500})
1336
>>> parse_args('log -r500:600'.split())
1337
(['log'], {'revision': [500, 600]})
1338
>>> parse_args('log -vr500:600'.split())
1339
(['log'], {'verbose': True, 'revision': [500, 600]})
1340
>>> parse_args('log -rv500:600'.split()) #the r takes an argument
1341
Traceback (most recent call last):
1343
ValueError: invalid literal for int(): v500
1348
# TODO: Maybe handle '--' to end options?
1353
# option names must not be unicode
1357
mutter(" got option %r" % a)
1359
optname, optarg = a[2:].split('=', 1)
1362
if optname not in OPTIONS:
1363
bailout('unknown long option %r' % a)
1366
if shortopt in SHORT_OPTIONS:
1367
# Multi-character options must have a space to delimit
1369
optname = SHORT_OPTIONS[shortopt]
1371
# Single character short options, can be chained,
1372
# and have their value appended to their name
1374
if shortopt not in SHORT_OPTIONS:
1375
# We didn't find the multi-character name, and we
1376
# didn't find the single char name
1377
bailout('unknown short option %r' % a)
1378
optname = SHORT_OPTIONS[shortopt]
1381
# There are extra things on this option
1382
# see if it is the value, or if it is another
1384
optargfn = OPTIONS[optname]
1385
if optargfn is None:
1386
# This option does not take an argument, so the
1387
# next entry is another short option, pack it back
1389
argv.insert(0, '-' + a[2:])
1391
# This option takes an argument, so pack it
1396
# XXX: Do we ever want to support this, e.g. for -r?
1397
bailout('repeated option %r' % a)
1399
optargfn = OPTIONS[optname]
1403
bailout('option %r needs an argument' % a)
1405
optarg = argv.pop(0)
1406
opts[optname] = optargfn(optarg)
1409
bailout('option %r takes no argument' % optname)
1410
opts[optname] = True
1419
def _match_argform(cmd, takes_args, args):
1422
# step through args and takes_args, allowing appropriate 0-many matches
1423
for ap in takes_args:
1427
argdict[argname] = args.pop(0)
1428
elif ap[-1] == '*': # all remaining arguments
1430
argdict[argname + '_list'] = args[:]
1433
argdict[argname + '_list'] = None
1436
raise BzrCommandError("command %r needs one or more %s"
1437
% (cmd, argname.upper()))
1439
argdict[argname + '_list'] = args[:]
1441
elif ap[-1] == '$': # all but one
1443
raise BzrCommandError("command %r needs one or more %s"
1444
% (cmd, argname.upper()))
1445
argdict[argname + '_list'] = args[:-1]
1451
raise BzrCommandError("command %r requires argument %s"
1452
% (cmd, argname.upper()))
1454
argdict[argname] = args.pop(0)
1457
raise BzrCommandError("extra argument to command %s: %s"
1465
"""Execute a command.
1467
This is similar to main(), but without all the trappings for
1468
logging and error handling.
1470
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1472
include_plugins=True
1474
args, opts = parse_args(argv[1:])
1482
elif 'version' in opts:
1485
elif args and args[0] == 'builtin':
1486
include_plugins=False
1488
cmd = str(args.pop(0))
1495
canonical_cmd, cmd_class = get_cmd_class(cmd,include_plugins=include_plugins)
1498
if 'profile' in opts:
1504
# check options are reasonable
1505
allowed = cmd_class.takes_options
1507
if oname not in allowed:
1508
raise BzrCommandError("option '--%s' is not allowed for command %r"
1511
# mix arguments and options into one dictionary
1512
cmdargs = _match_argform(cmd, cmd_class.takes_args, args)
1514
for k, v in opts.items():
1515
cmdopts[k.replace('-', '_')] = v
1518
import hotshot, tempfile
1519
pffileno, pfname = tempfile.mkstemp()
1521
prof = hotshot.Profile(pfname)
1522
ret = prof.runcall(cmd_class, cmdopts, cmdargs) or 0
1525
import hotshot.stats
1526
stats = hotshot.stats.load(pfname)
1528
stats.sort_stats('time')
1529
## XXX: Might like to write to stderr or the trace file instead but
1530
## print_stats seems hardcoded to stdout
1531
stats.print_stats(20)
1539
return cmd_class(cmdopts, cmdargs).status
1542
def _report_exception(summary, quiet=False):
1544
log_error('bzr: ' + summary)
1545
bzrlib.trace.log_exception()
1548
tb = sys.exc_info()[2]
1549
exinfo = traceback.extract_tb(tb)
1551
sys.stderr.write(' at %s:%d in %s()\n' % exinfo[-1][:3])
1552
sys.stderr.write(' see ~/.bzr.log for debug information\n')
1559
bzrlib.open_tracefile(argv)
1564
return run_bzr(argv)
1566
# do this here inside the exception wrappers to catch EPIPE
1569
quiet = isinstance(e, (BzrCommandError))
1570
_report_exception('error: ' + e.args[0], quiet=quiet)
1573
# some explanation or hints
1576
except AssertionError, e:
1577
msg = 'assertion failed'
1579
msg += ': ' + str(e)
1580
_report_exception(msg)
1582
except KeyboardInterrupt, e:
1583
_report_exception('interrupted', quiet=True)
1585
except Exception, e:
1587
if (isinstance(e, IOError)
1588
and hasattr(e, 'errno')
1589
and e.errno == errno.EPIPE):
1593
msg = str(e).rstrip('\n')
1594
_report_exception(msg, quiet)
1597
bzrlib.trace.close_trace()
1600
if __name__ == '__main__':
1601
sys.exit(main(sys.argv))