« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 331
- compare with another revision
- download diff
- download tarball
- view history from revision 331
- Committer: Martin Pool
- Date: 2005-05-03 07:48:54 UTC
- Revision ID: mbp@sourcefrog.net-20050503074854-adb6f9d6382e27a9
- sketchy experiments in bash and zsh completion
- files added:
- bzrlib/tests.py
- files removed:
- bzr-man.py
- bzrlib/selftest
- patches
- files renamed:
- contrib/bash/bzr.simple => contrib/bash/bzr
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
18
19
import sys, os
17
"""Bazaar-NG -- a free distributed version-control tool
18
http://bazaar-ng.org/
19
20
**WARNING: THIS IS AN UNSTABLE DEVELOPMENT VERSION**
21
22
* Metadata format is not stable yet -- you may need to
23
discard history in the future.
24
25
* Many commands unimplemented or partially implemented.
26
27
* Space-inefficient storage.
28
29
* No merge operators yet.
30
31
Interesting commands:
32
33
bzr help [COMMAND]
34
Show help screen
35
bzr version
36
Show software version/licence/non-warranty.
37
bzr init
38
Start versioning the current directory
39
bzr add FILE...
40
Make files versioned.
41
bzr log
42
Show revision history.
43
bzr rename FROM TO
44
Rename one file.
45
bzr move FROM... DESTDIR
46
Move one or more files to a different directory.
47
bzr diff [FILE...]
48
Show changes from last revision to working copy.
49
bzr commit -m 'MESSAGE'
50
Store current state as new revision.
51
bzr export [-r REVNO] DESTINATION
52
Export the branch state at a previous version.
53
bzr status
54
Show summary of pending changes.
55
bzr remove FILE...
56
Make a file not versioned.
57
bzr info
58
Show statistics about this branch.
59
bzr check
60
Verify history is stored safely.
61
(for more type 'bzr help commands')
62
"""
63
64
65
66
67
import sys, os, time, types, shutil, tempfile, fnmatch, difflib, os.path
68
from sets import Set
69
from pprint import pprint
70
from stat import *
71
from glob import glob
20
72
21
73
import bzrlib
74
from bzrlib.store import ImmutableStore
22
75
from bzrlib.trace import mutter, note, log_error
23
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
24
from bzrlib.osutils import quotefn
25
from bzrlib import Branch, Inventory, InventoryEntry, BZRDIR, \
76
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
77
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
78
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
79
from bzrlib.revision import Revision
80
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
26
81
format_date
27
82
28
29
def _squish_command_name(cmd):
30
return 'cmd_' + cmd.replace('-', '_')
31
32
33
def _unsquish_command_name(cmd):
34
assert cmd.startswith("cmd_")
35
return cmd[4:].replace('_','-')
36
37
def _parse_revision_str(revstr):
38
"""This handles a revision string -> revno.
39
40
There are several possibilities:
41
42
'234' -> 234
43
'234:345' -> [234, 345]
44
':234' -> [None, 234]
45
'234:' -> [234, None]
46
47
In the future we will also support:
48
'uuid:blah-blah-blah' -> ?
49
'hash:blahblahblah' -> ?
50
potentially:
51
'tag:mytag' -> ?
52
"""
53
if revstr.find(':') != -1:
54
revs = revstr.split(':')
55
if len(revs) > 2:
56
raise ValueError('More than 2 pieces not supported for --revision: %r' % revstr)
57
58
if not revs[0]:
59
revs[0] = None
60
else:
61
revs[0] = int(revs[0])
62
63
if not revs[1]:
64
revs[1] = None
65
else:
66
revs[1] = int(revs[1])
67
else:
68
revs = int(revstr)
69
return revs
70
71
def _find_plugins():
72
"""Find all python files which are plugins, and load their commands
73
to add to the list of "all commands"
74
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.
79
80
Inside the plugin should be a series of cmd_* function, which inherit from
81
the bzrlib.commands.Command class.
82
"""
83
bzrpath = os.environ.get('BZRPLUGINPATH', '')
84
85
plugin_cmds = {}
86
if not bzrpath:
87
return plugin_cmds
88
_platform_extensions = {
89
'win32':'.pyd',
90
'cygwin':'.dll',
91
'darwin':'.dylib',
92
'linux2':'.so'
93
}
94
if _platform_extensions.has_key(sys.platform):
95
platform_extension = _platform_extensions[sys.platform]
96
else:
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'):
102
f = f[:-3]
103
elif f.endswith('.pyc') or f.endswith('.pyo'):
104
f = f[:-4]
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')]
109
else:
110
continue
111
if not plugin_names.has_key(f):
112
plugin_names[f] = True
113
114
plugin_names = plugin_names.keys()
115
plugin_names.sort()
116
try:
117
sys.path.insert(0, d)
118
for name in plugin_names:
119
try:
120
old_module = None
121
try:
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)
131
else:
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))
134
finally:
135
if old_module:
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))
139
finally:
140
sys.path.pop(0)
141
return plugin_cmds
142
143
def _get_cmd_dict(include_plugins=True):
144
d = {}
145
for k, v in globals().iteritems():
146
if k.startswith("cmd_"):
147
d[_unsquish_command_name(k)] = v
148
if include_plugins:
149
d.update(_find_plugins())
150
return d
151
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():
155
yield k,v
156
157
158
def get_cmd_class(cmd,include_plugins=True):
159
"""Return the canonical name and command class for a command.
160
"""
161
cmd = str(cmd) # not unicode
162
163
# first look up this command under the specified name
164
cmds = _get_cmd_dict(include_plugins=include_plugins)
83
BZR_DIFF_FORMAT = "## Bazaar-NG diff, format 0 ##\n"
84
BZR_PATCHNAME_FORMAT = 'cset:sha1:%s'
85
86
## standard representation
87
NONE_STRING = '(none)'
88
EMPTY = 'empty'
89
90
91
CMD_ALIASES = {
92
'?': 'help',
93
'ci': 'commit',
94
'checkin': 'commit',
95
'di': 'diff',
96
'st': 'status',
97
'stat': 'status',
98
}
99
100
101
def get_cmd_class(cmd):
102
cmd = str(cmd)
103
104
cmd = CMD_ALIASES.get(cmd, cmd)
105
165
106
try:
166
return cmd, cmds[cmd]
107
cmd_class = globals()['cmd_' + cmd.replace('-', '_')]
167
108
except KeyError:
168
pass
169
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
174
175
cmdclass = ExternalCommand.find_command(cmd)
176
if cmdclass:
177
return cmd, cmdclass
178
179
raise BzrCommandError("unknown command %r" % cmd)
180
181
182
class Command(object):
109
raise BzrError("unknown command %r" % cmd)
110
111
return cmd, cmd_class
112
113
114
115
class Command:
183
116
"""Base class for commands.
184
117
185
118
The docstring for an actual command should give a single-line
222
155
This is invoked with the options and arguments bound to
223
156
keyword parameters.
224
157
225
Return 0 or None if the command was successful, or a shell
226
error code if not.
158
Return True if the command was successful, False if not.
227
159
"""
228
return 0
229
230
231
class ExternalCommand(Command):
232
"""Class to wrap external commands.
233
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
236
specified command.
237
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.
241
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.
244
"""
245
246
def find_command(cls, cmd):
247
import os.path
248
bzrpath = os.environ.get('BZRPATH', '')
249
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)
254
255
return None
256
257
find_command = classmethod(find_command)
258
259
def __init__(self, path):
260
self.path = path
261
262
pipe = os.popen('%s --bzr-usage' % path, 'r')
263
self.takes_options = pipe.readline().split()
264
265
for opt in self.takes_options:
266
if not opt in OPTIONS:
267
raise BzrError("Unknown option '%s' returned by external command %s"
268
% (opt, path))
269
270
# TODO: Is there any way to check takes_args is valid here?
271
self.takes_args = pipe.readline().split()
272
273
if pipe.close() is not None:
274
raise BzrError("Failed funning '%s --bzr-usage'" % path)
275
276
pipe = os.popen('%s --bzr-help' % path, 'r')
277
self.__doc__ = pipe.read()
278
if pipe.close() is not None:
279
raise BzrError("Failed funning '%s --bzr-help'" % path)
280
281
def __call__(self, options, arguments):
282
Command.__init__(self, options, arguments)
283
return self
284
285
def run(self, **kargs):
286
opts = []
287
args = []
288
289
keys = kargs.keys()
290
keys.sort()
291
for name in keys:
292
optname = name.replace('_','-')
293
value = kargs[name]
294
if OPTIONS.has_key(optname):
295
# it's an option
296
opts.append('--%s' % optname)
297
if value is not None and value is not True:
298
opts.append(str(value))
299
else:
300
# it's an arg, or arg list
301
if type(value) is not list:
302
value = [value]
303
for v in value:
304
if v is not None:
305
args.append(str(v))
306
307
self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
308
return self.status
160
return True
161
309
162
310
163
311
164
class cmd_status(Command):
312
165
"""Display status summary.
313
166
314
This reports on versioned and unknown files, reporting them
315
grouped by state. Possible states are:
316
317
added
318
Versioned in the working copy but not in the previous revision.
319
320
removed
321
Versioned in the previous revision but removed or deleted
322
in the working copy.
323
324
renamed
325
Path of this file changed from the previous revision;
326
the text may also have changed. This includes files whose
327
parent directory was renamed.
328
329
modified
330
Text has changed since the previous revision.
331
332
unchanged
333
Nothing about this file has changed since the previous revision.
334
Only shown with --all.
335
336
unknown
337
Not versioned and not matching an ignore pattern.
338
339
To see ignored files use 'bzr ignored'. For details in the
340
changes to file texts, use 'bzr diff'.
341
342
If no arguments are specified, the status of the entire working
343
directory is shown. Otherwise, only the status of the specified
344
files or directories is reported. If a directory is given, status
345
is reported for everything inside that directory.
167
For each file there is a single line giving its file state and name.
168
The name is that in the current revision unless it is deleted or
169
missing, in which case the old name is shown.
346
170
"""
347
takes_args = ['file*']
348
takes_options = ['all', 'show-ids']
349
aliases = ['st', 'stat']
171
takes_options = ['all']
350
172
351
def run(self, all=False, show_ids=False, file_list=None):
352
if file_list:
353
b = Branch(file_list[0])
354
file_list = [b.relpath(x) for x in file_list]
355
# special case: only one path was given and it's the root
356
# of the branch
357
if file_list == ['']:
358
file_list = None
359
else:
360
b = Branch('.')
361
import status
362
status.show_status(b, show_unchanged=all, show_ids=show_ids,
363
specific_files=file_list)
173
def run(self, all=False):
174
#import bzrlib.status
175
#bzrlib.status.tree_status(Branch('.'))
176
Branch('.').show_status(show_all=all)
364
177
365
178
366
179
class cmd_cat_revision(Command):
403
216
recursively add that parent, rather than giving an error?
404
217
"""
405
218
takes_args = ['file+']
406
takes_options = ['verbose', 'no-recurse']
219
takes_options = ['verbose']
407
220
408
def run(self, file_list, verbose=False, no_recurse=False):
409
bzrlib.add.smart_add(file_list, verbose, not no_recurse)
410
411
412
class cmd_relpath(Command):
221
def run(self, file_list, verbose=False):
222
bzrlib.add.smart_add(file_list, verbose)
223
224
225
def Relpath(Command):
413
226
"""Show path of a file relative to root"""
414
takes_args = ['filename']
415
hidden = True
227
takes_args = ('filename')
416
228
417
def run(self, filename):
418
print Branch(filename).relpath(filename)
229
def run(self):
230
print Branch(self.args['filename']).relpath(filename)
419
231
420
232
421
233
422
234
class cmd_inventory(Command):
423
235
"""Show inventory of the current working copy or a revision."""
424
takes_options = ['revision', 'show-ids']
236
takes_options = ['revision']
425
237
426
def run(self, revision=None, show_ids=False):
238
def run(self, revision=None):
427
239
b = Branch('.')
428
240
if revision == None:
429
241
inv = b.read_working_inventory()
430
242
else:
431
243
inv = b.get_revision_inventory(b.lookup_revision(revision))
432
244
433
for path, entry in inv.entries():
434
if show_ids:
435
print '%-50s %s' % (path, entry.file_id)
436
else:
437
print path
245
for path, entry in inv.iter_entries():
246
print '%-50s %s' % (entry.file_id, path)
438
247
439
248
440
249
class cmd_move(Command):
474
283
475
284
476
285
477
478
479
class cmd_pull(Command):
480
"""Pull any changes from another branch into the current one.
481
482
If the location is omitted, the last-used location will be used.
483
Both the revision history and the working directory will be
484
updated.
485
486
This command only works on branches that have not diverged. Branches are
487
considered diverged if both branches have had commits without first
488
pulling from the other.
489
490
If branches have diverged, you can use 'bzr merge' to pull the text changes
491
from one into the other.
492
"""
493
takes_args = ['location?']
494
495
def run(self, location=None):
496
from bzrlib.merge import merge
497
import errno
498
499
br_to = Branch('.')
500
stored_loc = None
501
try:
502
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
503
except IOError, e:
504
if errno == errno.ENOENT:
505
raise
506
if location is None:
507
location = stored_loc
508
if location is None:
509
raise BzrCommandError("No pull location known or specified.")
510
from branch import find_branch, DivergedBranches
511
br_from = find_branch(location)
512
location = pull_loc(br_from)
513
old_revno = br_to.revno()
514
try:
515
br_to.update_revisions(br_from)
516
except DivergedBranches:
517
raise BzrCommandError("These branches have diverged. Try merge.")
518
519
merge(('.', -1), ('.', old_revno), check_clean=False)
520
if location != stored_loc:
521
br_to.controlfile("x-pull", "wb").write(location + "\n")
522
523
524
525
class cmd_branch(Command):
526
"""Create a new copy of a branch.
527
528
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
529
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
530
531
To retrieve the branch as of a particular revision, supply the --revision
532
parameter, as in "branch foo/bar -r 5".
533
"""
534
takes_args = ['from_location', 'to_location?']
535
takes_options = ['revision']
536
537
def run(self, from_location, to_location=None, revision=None):
538
import errno
539
from bzrlib.merge import merge
540
from branch import find_branch, DivergedBranches, NoSuchRevision
541
from shutil import rmtree
542
try:
543
br_from = find_branch(from_location)
544
except OSError, e:
545
if e.errno == errno.ENOENT:
546
raise BzrCommandError('Source location "%s" does not exist.' %
547
to_location)
548
else:
549
raise
550
551
if to_location is None:
552
to_location = os.path.basename(from_location.rstrip("/\\"))
553
554
try:
555
os.mkdir(to_location)
556
except OSError, e:
557
if e.errno == errno.EEXIST:
558
raise BzrCommandError('Target directory "%s" already exists.' %
559
to_location)
560
if e.errno == errno.ENOENT:
561
raise BzrCommandError('Parent of "%s" does not exist.' %
562
to_location)
563
else:
564
raise
565
br_to = Branch(to_location, init=True)
566
567
try:
568
br_to.update_revisions(br_from, stop_revision=revision)
569
except NoSuchRevision:
570
rmtree(to_location)
571
msg = "The branch %s has no revision %d." % (from_location,
572
revision)
573
raise BzrCommandError(msg)
574
merge((to_location, -1), (to_location, 0), this_dir=to_location,
575
check_clean=False, ignore_zero=True)
576
from_location = pull_loc(br_from)
577
br_to.controlfile("x-pull", "wb").write(from_location + "\n")
578
579
580
def pull_loc(branch):
581
# TODO: Should perhaps just make attribute be 'base' in
582
# RemoteBranch and Branch?
583
if hasattr(branch, "baseurl"):
584
return branch.baseurl
585
else:
586
return branch.base
587
588
589
590
286
class cmd_renames(Command):
591
287
"""Show list of renamed files.
592
288
608
304
609
305
610
306
class cmd_info(Command):
611
"""Show statistical information about a branch."""
612
takes_args = ['branch?']
613
614
def run(self, branch=None):
307
"""Show statistical information for this branch"""
308
def run(self):
615
309
import info
616
617
from branch import find_branch
618
b = find_branch(branch)
619
info.show_info(b)
310
info.show_info(Branch('.'))
620
311
621
312
622
313
class cmd_remove(Command):
646
337
b = Branch(filename)
647
338
i = b.inventory.path2id(b.relpath(filename))
648
339
if i == None:
649
raise BzrError("%r is not a versioned file" % filename)
340
bailout("%r is not a versioned file" % filename)
650
341
else:
651
342
print i
652
343
663
354
inv = b.inventory
664
355
fid = inv.path2id(b.relpath(filename))
665
356
if fid == None:
666
raise BzrError("%r is not a versioned file" % filename)
357
bailout("%r is not a versioned file" % filename)
667
358
for fip in inv.get_idpath(fid):
668
359
print fip
669
360
670
361
671
362
class cmd_revision_history(Command):
672
363
"""Display list of revision ids on this branch."""
673
hidden = True
674
364
def run(self):
675
365
for patchid in Branch('.').revision_history():
676
366
print patchid
728
418
"""
729
419
730
420
takes_args = ['file*']
731
takes_options = ['revision', 'diff-options']
732
aliases = ['di', 'dif']
421
takes_options = ['revision']
733
422
734
def run(self, revision=None, file_list=None, diff_options=None):
423
def run(self, revision=None, file_list=None):
735
424
from bzrlib.diff import show_diff
736
from bzrlib import find_branch
737
738
if file_list:
739
b = find_branch(file_list[0])
740
file_list = [b.relpath(f) for f in file_list]
741
if file_list == ['']:
742
# just pointing to top-of-tree
743
file_list = None
744
else:
745
b = Branch('.')
746
425
747
show_diff(b, revision, specific_files=file_list,
748
external_diff_options=diff_options)
749
750
751
426
show_diff(Branch('.'), revision, file_list)
752
427
753
428
754
429
class cmd_deleted(Command):
773
448
else:
774
449
print path
775
450
776
777
class cmd_modified(Command):
778
"""List files modified in working tree."""
779
hidden = True
780
def run(self):
781
import statcache
782
b = Branch('.')
783
inv = b.read_working_inventory()
784
sc = statcache.update_cache(b, inv)
785
basis = b.basis_tree()
786
basis_inv = basis.inventory
787
788
# We used to do this through iter_entries(), but that's slow
789
# when most of the files are unmodified, as is usually the
790
# case. So instead we iterate by inventory entry, and only
791
# calculate paths as necessary.
792
793
for file_id in basis_inv:
794
cacheentry = sc.get(file_id)
795
if not cacheentry: # deleted
796
continue
797
ie = basis_inv[file_id]
798
if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
799
path = inv.id2path(file_id)
800
print path
801
802
803
804
class cmd_added(Command):
805
"""List files added in working tree."""
806
hidden = True
807
def run(self):
808
b = Branch('.')
809
wt = b.working_tree()
810
basis_inv = b.basis_tree().inventory
811
inv = wt.inventory
812
for file_id in inv:
813
if file_id in basis_inv:
814
continue
815
path = inv.id2path(file_id)
816
if not os.access(b.abspath(path), os.F_OK):
817
continue
818
print path
819
820
821
822
451
class cmd_root(Command):
823
452
"""Show the tree root directory.
824
453
827
456
takes_args = ['filename?']
828
457
def run(self, filename=None):
829
458
"""Print the branch root."""
830
from branch import find_branch
831
b = find_branch(filename)
832
print getattr(b, 'base', None) or getattr(b, 'baseurl')
459
print bzrlib.branch.find_branch_root(filename)
460
833
461
834
462
835
463
class cmd_log(Command):
836
464
"""Show log of this branch.
837
465
838
To request a range of logs, you can use the command -r begin:end
839
-r revision requests a specific revision, -r :end or -r begin: are
840
also valid.
841
842
TODO: Make --revision support uuid: and hash: [future tag:] notation.
843
466
TODO: Options to show ids; to limit range; etc.
844
467
"""
845
846
takes_args = ['filename?']
847
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision']
848
849
def run(self, filename=None, timezone='original',
850
verbose=False,
851
show_ids=False,
852
forward=False,
853
revision=None):
854
from bzrlib import show_log, find_branch
855
import codecs
856
857
direction = (forward and 'forward') or 'reverse'
858
859
if filename:
860
b = find_branch(filename)
861
fp = b.relpath(filename)
862
if fp:
863
file_id = b.read_working_inventory().path2id(fp)
864
else:
865
file_id = None # points to branch root
866
else:
867
b = find_branch('.')
868
file_id = None
869
870
if revision == None:
871
revision = [None, None]
872
elif isinstance(revision, int):
873
revision = [revision, revision]
874
else:
875
# pair of revisions?
876
pass
877
878
assert len(revision) == 2
879
880
mutter('encoding log as %r' % bzrlib.user_encoding)
881
882
# use 'replace' so that we don't abort if trying to write out
883
# in e.g. the default C locale.
884
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
885
886
show_log(b, file_id,
887
show_timezone=timezone,
888
verbose=verbose,
889
show_ids=show_ids,
890
to_file=outf,
891
direction=direction,
892
start_revision=revision[0],
893
end_revision=revision[1])
894
895
896
897
class cmd_touching_revisions(Command):
898
"""Return revision-ids which affected a particular file.
899
900
A more user-friendly interface is "bzr log FILE"."""
901
hidden = True
902
takes_args = ["filename"]
903
def run(self, filename):
904
b = Branch(filename)
905
inv = b.read_working_inventory()
906
file_id = inv.path2id(b.relpath(filename))
907
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
908
print "%6d %s" % (revno, what)
468
takes_options = ['timezone', 'verbose']
469
def run(self, timezone='original', verbose=False):
470
Branch('.').write_log(show_timezone=timezone, verbose=verbose)
909
471
910
472
911
473
class cmd_ls(Command):
937
499
938
500
939
501
class cmd_unknowns(Command):
940
"""List unknown files."""
502
"""List unknown files"""
941
503
def run(self):
942
504
for f in Branch('.').unknowns():
943
505
print quotefn(f)
945
507
946
508
947
509
class cmd_ignore(Command):
948
"""Ignore a command or pattern.
949
950
To remove patterns from the ignore list, edit the .bzrignore file.
951
952
If the pattern contains a slash, it is compared to the whole path
953
from the branch root. Otherwise, it is comapred to only the last
954
component of the path.
955
956
Ignore patterns are case-insensitive on case-insensitive systems.
957
958
Note: wildcards must be quoted from the shell on Unix.
959
960
examples:
961
bzr ignore ./Makefile
962
bzr ignore '*.class'
963
"""
510
"""Ignore a command or pattern"""
964
511
takes_args = ['name_pattern']
965
512
966
513
def run(self, name_pattern):
967
from bzrlib.atomicfile import AtomicFile
968
import os.path
969
970
514
b = Branch('.')
971
ifn = b.abspath('.bzrignore')
972
973
if os.path.exists(ifn):
974
f = open(ifn, 'rt')
975
try:
976
igns = f.read().decode('utf-8')
977
finally:
978
f.close()
979
else:
980
igns = ''
981
982
# TODO: If the file already uses crlf-style termination, maybe
983
# we should use that for the newly added lines?
984
985
if igns and igns[-1] != '\n':
986
igns += '\n'
987
igns += name_pattern + '\n'
988
989
try:
990
f = AtomicFile(ifn, 'wt')
991
f.write(igns.encode('utf-8'))
992
f.commit()
993
finally:
994
f.close()
515
516
# XXX: This will fail if it's a hardlink; should use an AtomicFile class.
517
f = open(b.abspath('.bzrignore'), 'at')
518
f.write(name_pattern + '\n')
519
f.close()
995
520
996
521
inv = b.working_tree().inventory
997
522
if inv.path2id('.bzrignore'):
1003
528
1004
529
1005
530
class cmd_ignored(Command):
1006
"""List ignored files and the patterns that matched them.
1007
1008
See also: bzr ignore"""
531
"""List ignored files and the patterns that matched them."""
1009
532
def run(self):
1010
533
tree = Branch('.').working_tree()
1011
534
for path, file_class, kind, file_id in tree.list_files():
1021
544
1022
545
example:
1023
546
bzr lookup-revision 33
1024
"""
547
"""
1025
548
hidden = True
1026
takes_args = ['revno']
1027
1028
549
def run(self, revno):
1029
550
try:
1030
551
revno = int(revno)
1031
552
except ValueError:
1032
raise BzrCommandError("not a valid revision-number: %r" % revno)
1033
1034
print Branch('.').lookup_revision(revno)
553
raise BzrError("not a valid revision-number: %r" % revno)
554
555
print Branch('.').lookup_revision(revno) or NONE_STRING
556
1035
557
1036
558
1037
559
class cmd_export(Command):
1038
560
"""Export past revision to destination directory.
1039
561
1040
If no revision is specified this exports the last committed revision.
1041
1042
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1043
given, exports to a directory (equivalent to --format=dir)."""
1044
# TODO: list known exporters
562
If no revision is specified this exports the last committed revision."""
1045
563
takes_args = ['dest']
1046
takes_options = ['revision', 'format']
1047
def run(self, dest, revision=None, format='dir'):
564
takes_options = ['revision']
565
def run(self, dest, revno=None):
1048
566
b = Branch('.')
1049
if revision == None:
1050
rh = b.revision_history()[-1]
567
if revno == None:
568
rh = b.revision_history[-1]
1051
569
else:
1052
rh = b.lookup_revision(int(revision))
570
rh = b.lookup_revision(int(revno))
1053
571
t = b.revision_tree(rh)
1054
t.export(dest, format)
572
t.export(dest)
1055
573
1056
574
1057
575
class cmd_cat(Command):
1078
596
class cmd_commit(Command):
1079
597
"""Commit changes into a new revision.
1080
598
1081
If selected files are specified, only changes to those files are
1082
committed. If a directory is specified then its contents are also
1083
committed.
1084
1085
A selected-file commit may fail in some cases where the committed
1086
tree would be invalid, such as trying to commit a file in a
1087
newly-added directory that is not itself committed.
599
TODO: Commit only selected files.
1088
600
1089
601
TODO: Run hooks on tree to-be-committed, and after commit.
1090
602
1091
603
TODO: Strict commit that fails if there are unknown or deleted files.
1092
604
"""
1093
takes_args = ['selected*']
1094
takes_options = ['message', 'file', 'verbose']
1095
aliases = ['ci', 'checkin']
1096
1097
def run(self, message=None, file=None, verbose=True, selected_list=None):
1098
from bzrlib.commit import commit
1099
1100
## Warning: shadows builtin file()
1101
if not message and not file:
1102
raise BzrCommandError("please specify a commit message",
1103
["use either --message or --file"])
1104
elif message and file:
1105
raise BzrCommandError("please specify either --message or --file")
1106
1107
if file:
1108
import codecs
1109
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1110
1111
b = Branch('.')
1112
commit(b, message, verbose=verbose, specific_files=selected_list)
605
takes_options = ['message', 'verbose']
606
607
def run(self, message=None, verbose=False):
608
if not message:
609
raise BzrCommandError("please specify a commit message")
610
Branch('.').commit(message, verbose=verbose)
1113
611
1114
612
1115
613
class cmd_check(Command):
1117
615
1118
616
This command checks various invariants about the branch storage to
1119
617
detect data corruption or bzr bugs.
1120
1121
If given the --update flag, it will update some optional fields
1122
to help ensure data consistency.
1123
618
"""
1124
619
takes_args = ['dir?']
1125
1126
620
def run(self, dir='.'):
1127
621
import bzrlib.check
1128
bzrlib.check.check(Branch(dir))
1129
1130
1131
1132
class cmd_upgrade(Command):
1133
"""Upgrade branch storage to current format.
1134
1135
This should normally be used only after the check command tells
1136
you to run it.
1137
"""
1138
takes_args = ['dir?']
1139
1140
def run(self, dir='.'):
1141
from bzrlib.upgrade import upgrade
1142
upgrade(Branch(dir))
622
bzrlib.check.check(Branch(dir, find_root=False))
1143
623
1144
624
1145
625
1158
638
"""Run internal test suite"""
1159
639
hidden = True
1160
640
def run(self):
1161
from bzrlib.selftest import selftest
1162
return int(not selftest())
641
failures, tests = 0, 0
642
643
import doctest, bzrlib.store, bzrlib.tests
644
bzrlib.trace.verbose = False
645
646
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
647
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
648
mf, mt = doctest.testmod(m)
649
failures += mf
650
tests += mt
651
print '%-40s %3d tests' % (m.__name__, mt),
652
if mf:
653
print '%3d FAILED!' % mf
654
else:
655
print
656
657
print '%-40s %3d tests' % ('total', tests),
658
if failures:
659
print '%3d FAILED!' % failures
660
else:
661
print
662
1163
663
1164
664
1165
665
class cmd_version(Command):
1166
"""Show version of bzr."""
666
"""Show version of bzr"""
1167
667
def run(self):
1168
668
show_version()
1169
669
1170
670
def show_version():
1171
671
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1172
# is bzrlib itself in a branch?
1173
bzrrev = bzrlib.get_bzr_revision()
1174
if bzrrev:
1175
print " (bzr checkout, revision %d {%s})" % bzrrev
1176
672
print bzrlib.__copyright__
1177
673
print "http://bazaar-ng.org/"
1178
674
print
1187
683
def run(self):
1188
684
print "it sure does!"
1189
685
1190
def parse_spec(spec):
1191
"""
1192
>>> parse_spec(None)
1193
[None, None]
1194
>>> parse_spec("./")
1195
['./', None]
1196
>>> parse_spec("../@")
1197
['..', -1]
1198
>>> parse_spec("../f/@35")
1199
['../f', 35]
1200
"""
1201
if spec is None:
1202
return [None, None]
1203
if '/@' in spec:
1204
parsed = spec.split('/@')
1205
assert len(parsed) == 2
1206
if parsed[1] == "":
1207
parsed[1] = -1
1208
else:
1209
parsed[1] = int(parsed[1])
1210
assert parsed[1] >=0
1211
else:
1212
parsed = [spec, None]
1213
return parsed
1214
1215
1216
1217
class cmd_merge(Command):
1218
"""Perform a three-way merge of trees.
1219
1220
The SPEC parameters are working tree or revision specifiers. Working trees
1221
are specified using standard paths or urls. No component of a directory
1222
path may begin with '@'.
1223
1224
Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1225
1226
Revisions are specified using a dirname/@revno pair, where dirname is the
1227
branch directory and revno is the revision within that branch. If no revno
1228
is specified, the latest revision is used.
1229
1230
Revision examples: './@127', 'foo/@', '../@1'
1231
1232
The OTHER_SPEC parameter is required. If the BASE_SPEC parameter is
1233
not supplied, the common ancestor of OTHER_SPEC the current branch is used
1234
as the BASE.
1235
1236
merge refuses to run if there are any uncommitted changes, unless
1237
--force is given.
1238
"""
1239
takes_args = ['other_spec', 'base_spec?']
1240
takes_options = ['force']
1241
1242
def run(self, other_spec, base_spec=None, force=False):
1243
from bzrlib.merge import merge
1244
merge(parse_spec(other_spec), parse_spec(base_spec),
1245
check_clean=(not force))
1246
1247
1248
class cmd_revert(Command):
1249
"""Reverse all changes since the last commit.
1250
1251
Only versioned files are affected.
1252
1253
TODO: Store backups of any files that will be reverted, so
1254
that the revert can be undone.
1255
"""
1256
takes_options = ['revision']
1257
1258
def run(self, revision=-1):
1259
from bzrlib.merge import merge
1260
merge(('.', revision), parse_spec('.'),
1261
check_clean=False,
1262
ignore_zero=True)
1263
1264
686
1265
687
class cmd_assert_fail(Command):
1266
688
"""Test reporting of assertion failures"""
1274
696
1275
697
For a list of all available commands, say 'bzr help commands'."""
1276
698
takes_args = ['topic?']
1277
aliases = ['?']
1278
699
1279
700
def run(self, topic=None):
1280
import help
1281
help.help(topic)
1282
1283
1284
class cmd_update_stat_cache(Command):
1285
"""Update stat-cache mapping inodes to SHA-1 hashes.
1286
1287
For testing only."""
1288
hidden = True
1289
def run(self):
1290
import statcache
1291
b = Branch('.')
1292
statcache.update_cache(b.base, b.read_working_inventory())
1293
701
help(topic)
702
703
704
def help(topic=None):
705
if topic == None:
706
print __doc__
707
elif topic == 'commands':
708
help_commands()
709
else:
710
help_on_command(topic)
711
712
713
def help_on_command(cmdname):
714
cmdname = str(cmdname)
715
716
from inspect import getdoc
717
topic, cmdclass = get_cmd_class(cmdname)
718
719
doc = getdoc(cmdclass)
720
if doc == None:
721
raise NotImplementedError("sorry, no detailed help yet for %r" % cmdname)
722
723
if '\n' in doc:
724
short, rest = doc.split('\n', 1)
725
else:
726
short = doc
727
rest = ''
728
729
print 'usage: bzr ' + topic,
730
for aname in cmdclass.takes_args:
731
aname = aname.upper()
732
if aname[-1] in ['$', '+']:
733
aname = aname[:-1] + '...'
734
elif aname[-1] == '?':
735
aname = '[' + aname[:-1] + ']'
736
elif aname[-1] == '*':
737
aname = '[' + aname[:-1] + '...]'
738
print aname,
739
print
740
print short
741
if rest:
742
print rest
743
744
if cmdclass.takes_options:
745
print
746
print 'options:'
747
for on in cmdclass.takes_options:
748
print ' --%s' % on
749
750
751
def help_commands():
752
"""List all commands"""
753
import inspect
754
755
accu = []
756
for k, v in globals().items():
757
if k.startswith('cmd_'):
758
accu.append((k[4:].replace('_','-'), v))
759
accu.sort()
760
for cmdname, cmdclass in accu:
761
if cmdclass.hidden:
762
continue
763
print cmdname
764
help = inspect.getdoc(cmdclass)
765
if help:
766
print " " + help.split('\n', 1)[0]
767
768
769
######################################################################
770
# main routine
1294
771
1295
772
1296
773
# list of all available options; the rhs can be either None for an
1298
775
# the type.
1299
776
OPTIONS = {
1300
777
'all': None,
1301
'diff-options': str,
1302
778
'help': None,
1303
'file': unicode,
1304
'force': None,
1305
'format': unicode,
1306
'forward': None,
1307
779
'message': unicode,
1308
'no-recurse': None,
1309
780
'profile': None,
1310
'revision': _parse_revision_str,
781
'revision': int,
1311
782
'show-ids': None,
1312
783
'timezone': str,
1313
784
'verbose': None,
1314
785
'version': None,
1315
786
'email': None,
1316
'update': None,
1317
787
}
1318
788
1319
789
SHORT_OPTIONS = {
1320
'F': 'file',
1321
'h': 'help',
1322
790
'm': 'message',
1323
791
'r': 'revision',
1324
792
'v': 'verbose',
1341
809
(['status'], {'all': True})
1342
810
>>> parse_args('commit --message=biter'.split())
1343
811
(['commit'], {'message': u'biter'})
1344
>>> parse_args('log -r 500'.split())
1345
(['log'], {'revision': 500})
1346
>>> parse_args('log -r500:600'.split())
1347
(['log'], {'revision': [500, 600]})
1348
>>> parse_args('log -vr500:600'.split())
1349
(['log'], {'verbose': True, 'revision': [500, 600]})
1350
>>> parse_args('log -rv500:600'.split()) #the r takes an argument
1351
Traceback (most recent call last):
1352
...
1353
ValueError: invalid literal for int(): v500
1354
812
"""
1355
813
args = []
1356
814
opts = {}
1370
828
else:
1371
829
optname = a[2:]
1372
830
if optname not in OPTIONS:
1373
raise BzrError('unknown long option %r' % a)
831
bailout('unknown long option %r' % a)
1374
832
else:
1375
833
shortopt = a[1:]
1376
if shortopt in SHORT_OPTIONS:
1377
# Multi-character options must have a space to delimit
1378
# their value
1379
optname = SHORT_OPTIONS[shortopt]
1380
else:
1381
# Single character short options, can be chained,
1382
# and have their value appended to their name
1383
shortopt = a[1:2]
1384
if shortopt not in SHORT_OPTIONS:
1385
# We didn't find the multi-character name, and we
1386
# didn't find the single char name
1387
raise BzrError('unknown short option %r' % a)
1388
optname = SHORT_OPTIONS[shortopt]
1389
1390
if a[2:]:
1391
# There are extra things on this option
1392
# see if it is the value, or if it is another
1393
# short option
1394
optargfn = OPTIONS[optname]
1395
if optargfn is None:
1396
# This option does not take an argument, so the
1397
# next entry is another short option, pack it back
1398
# into the list
1399
argv.insert(0, '-' + a[2:])
1400
else:
1401
# This option takes an argument, so pack it
1402
# into the array
1403
optarg = a[2:]
834
if shortopt not in SHORT_OPTIONS:
835
bailout('unknown short option %r' % a)
836
optname = SHORT_OPTIONS[shortopt]
1404
837
1405
838
if optname in opts:
1406
839
# XXX: Do we ever want to support this, e.g. for -r?
1407
raise BzrError('repeated option %r' % a)
840
bailout('repeated option %r' % a)
1408
841
1409
842
optargfn = OPTIONS[optname]
1410
843
if optargfn:
1411
844
if optarg == None:
1412
845
if not argv:
1413
raise BzrError('option %r needs an argument' % a)
846
bailout('option %r needs an argument' % a)
1414
847
else:
1415
848
optarg = argv.pop(0)
1416
849
opts[optname] = optargfn(optarg)
1417
850
else:
1418
851
if optarg != None:
1419
raise BzrError('option %r takes no argument' % optname)
852
bailout('option %r takes no argument' % optname)
1420
853
opts[optname] = True
1421
854
else:
1422
855
args.append(a)
1477
910
This is similar to main(), but without all the trappings for
1478
911
logging and error handling.
1479
912
"""
913
1480
914
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1481
915
1482
include_plugins=True
1483
916
try:
1484
917
args, opts = parse_args(argv[1:])
1485
918
if 'help' in opts:
1486
import help
1487
919
if args:
1488
help.help(args[0])
920
help(args[0])
1489
921
else:
1490
help.help()
922
help()
1491
923
return 0
1492
924
elif 'version' in opts:
1493
show_version()
925
cmd_version([], [])
1494
926
return 0
1495
elif args and args[0] == 'builtin':
1496
include_plugins=False
1497
args = args[1:]
1498
927
cmd = str(args.pop(0))
1499
928
except IndexError:
1500
import help
1501
help.help()
929
log_error('usage: bzr COMMAND')
930
log_error(' try "bzr help"')
1502
931
return 1
1503
1504
932
1505
canonical_cmd, cmd_class = get_cmd_class(cmd,include_plugins=include_plugins)
933
canonical_cmd, cmd_class = get_cmd_class(cmd)
1506
934
1507
935
# global option
1508
936
if 'profile' in opts:
1515
943
allowed = cmd_class.takes_options
1516
944
for oname in opts:
1517
945
if oname not in allowed:
1518
raise BzrCommandError("option '--%s' is not allowed for command %r"
946
raise BzrCommandError("option %r is not allowed for command %r"
1519
947
% (oname, cmd))
1520
948
1521
949
# mix arguments and options into one dictionary
1525
953
cmdopts[k.replace('-', '_')] = v
1526
954
1527
955
if profile:
1528
import hotshot, tempfile
956
import hotshot
1529
957
pffileno, pfname = tempfile.mkstemp()
1530
958
try:
1531
959
prof = hotshot.Profile(pfname)
1540
968
## print_stats seems hardcoded to stdout
1541
969
stats.print_stats(20)
1542
970
1543
return ret.status
971
return ret
1544
972
1545
973
finally:
1546
974
os.close(pffileno)
1547
975
os.remove(pfname)
1548
976
else:
1549
return cmd_class(cmdopts, cmdargs).status
1550
1551
1552
def _report_exception(summary, quiet=False):
977
cmdobj = cmd_class(cmdopts, cmdargs) or 0
978
979
980
981
def _report_exception(e, summary, quiet=False):
1553
982
import traceback
1554
983
log_error('bzr: ' + summary)
1555
bzrlib.trace.log_exception()
984
bzrlib.trace.log_exception(e)
1556
985
1557
986
if not quiet:
1558
987
tb = sys.exc_info()[2]
1566
995
def main(argv):
1567
996
import errno
1568
997
1569
bzrlib.open_tracefile(argv)
998
bzrlib.trace.create_tracefile(argv)
1570
999
1571
1000
try:
1572
1001
try:
1573
try:
1574
return run_bzr(argv)
1575
finally:
1576
# do this here inside the exception wrappers to catch EPIPE
1577
sys.stdout.flush()
1002
ret = run_bzr(argv)
1003
# do this here to catch EPIPE
1004
sys.stdout.flush()
1005
return ret
1578
1006
except BzrError, e:
1579
1007
quiet = isinstance(e, (BzrCommandError))
1580
_report_exception('error: ' + e.args[0], quiet=quiet)
1008
_report_exception(e, 'error: ' + e.args[0], quiet=quiet)
1581
1009
if len(e.args) > 1:
1582
1010
for h in e.args[1]:
1583
1011
# some explanation or hints
1587
1015
msg = 'assertion failed'
1588
1016
if str(e):
1589
1017
msg += ': ' + str(e)
1590
_report_exception(msg)
1018
_report_exception(e, msg)
1591
1019
return 2
1592
1020
except KeyboardInterrupt, e:
1593
_report_exception('interrupted', quiet=True)
1021
_report_exception(e, 'interrupted', quiet=True)
1594
1022
return 2
1595
1023
except Exception, e:
1596
1024
quiet = False
1597
if (isinstance(e, IOError)
1598
and hasattr(e, 'errno')
1599
and e.errno == errno.EPIPE):
1025
if isinstance(e, IOError) and e.errno == errno.EPIPE:
1600
1026
quiet = True
1601
1027
msg = 'broken pipe'
1602
1028
else:
1603
1029
msg = str(e).rstrip('\n')
1604
_report_exception(msg, quiet)
1030
_report_exception(e, msg, quiet)
1605
1031
return 2
1606
1032
finally:
1607
1033
bzrlib.trace.close_trace()
Loggerhead is a web-based interface for Breezy
Version: 2.0.1