« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 621
- compare with another revision
- download diff
- download tarball
- view history from revision 621
- Committer: Martin Pool
- Date: 2005-06-06 04:15:44 UTC
- Revision ID: mbp@sourcefrog.net-20050606041544-83be94eb35eef7de
- script to create rollups, from John
- files added:
- .rsyncexclude
- contrib
- contrib/bash
- contrib/zsh
- patches
- urlgrabber
- files removed:
- bzrlib/tests.py
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
1
# Copyright (C) 2004, 2005 by Martin Pool
2
# Copyright (C) 2005 by Canonical Ltd
3
1
# Copyright (C) 2004, 2005 by Canonical Ltd
4
2
5
3
# This program is free software; you can redistribute it and/or modify
6
4
# it under the terms of the GNU General Public License as published by
16
14
# along with this program; if not, write to the Free Software
17
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
16
19
"""Bazaar-NG -- a free distributed version-control tool
20
21
**WARNING: THIS IS AN UNSTABLE DEVELOPMENT VERSION**
22
23
Current limitation include:
24
25
* Metadata format is not stable yet -- you may need to
26
discard history in the future.
27
28
* No handling of subdirectories, symlinks or any non-text files.
29
30
* Insufficient error handling.
31
32
* Many commands unimplemented or partially implemented.
33
34
* Space-inefficient storage.
35
36
* No merge operators yet.
37
38
Interesting commands::
39
40
bzr help
41
Show summary help screen
42
bzr version
43
Show software version/licence/non-warranty.
44
bzr init
45
Start versioning the current directory
46
bzr add FILE...
47
Make files versioned.
48
bzr log
49
Show revision history.
50
bzr diff
51
Show changes from last revision to working copy.
52
bzr commit -m 'MESSAGE'
53
Store current state as new revision.
54
bzr export REVNO DESTINATION
55
Export the branch state at a previous version.
56
bzr status
57
Show summary of pending changes.
58
bzr remove FILE...
59
Make a file not versioned.
60
bzr info
61
Show statistics about this branch.
62
"""
63
64
65
66
__copyright__ = "Copyright 2005 Canonical Development Ltd."
67
__author__ = "Martin Pool <mbp@canonical.com>"
68
__docformat__ = "restructuredtext en"
69
__version__ = '0.0.0'
70
71
72
import sys, os, random, time, sha, sets, types, re, shutil, tempfile
73
import traceback, socket, fnmatch, difflib
74
from os import path
75
from sets import Set
76
from pprint import pprint
77
from stat import *
78
from glob import glob
17
18
19
import sys, os
79
20
80
21
import bzrlib
81
from bzrlib.store import ImmutableStore
82
22
from bzrlib.trace import mutter, note, log_error
83
from bzrlib.errors import bailout, BzrError
84
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
85
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
86
from bzrlib.revision import Revision
87
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
23
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
24
from bzrlib.osutils import quotefn
25
from bzrlib import Branch, Inventory, InventoryEntry, BZRDIR, \
88
26
format_date
89
27
90
BZR_DIFF_FORMAT = "## Bazaar-NG diff, format 0 ##\n"
91
BZR_PATCHNAME_FORMAT = 'cset:sha1:%s'
92
93
## standard representation
94
NONE_STRING = '(none)'
95
EMPTY = 'empty'
96
97
98
## TODO: Perhaps a different version of inventory commands that
99
## returns iterators...
100
101
## TODO: Perhaps an AtomicFile class that writes to a temporary file and then renames.
102
103
## TODO: Some kind of locking on branches. Perhaps there should be a
104
## parameter to the branch object saying whether we want a read or
105
## write lock; release it from destructor. Perhaps don't even need a
106
## read lock to look at immutable objects?
107
108
## TODO: Perhaps make UUIDs predictable in test mode to make it easier
109
## to compare output?
110
111
## TODO: Some kind of global code to generate the right Branch object
112
## to work on. Almost, but not quite all, commands need one, and it
113
## can be taken either from their parameters or their working
114
## directory.
115
116
## TODO: rename command, needed soon: check destination doesn't exist
117
## either in working copy or tree; move working copy; update
118
## inventory; write out
119
120
## TODO: move command; check destination is a directory and will not
121
## clash; move it.
122
123
## TODO: command to show renames, one per line, as to->from
124
125
126
127
128
def cmd_status(all=False):
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 get_all_cmds():
72
"""Return canonical name and class for all registered commands."""
73
for k, v in globals().iteritems():
74
if k.startswith("cmd_"):
75
yield _unsquish_command_name(k), v
76
77
def get_cmd_class(cmd):
78
"""Return the canonical name and command class for a command.
79
"""
80
cmd = str(cmd) # not unicode
81
82
# first look up this command under the specified name
83
try:
84
return cmd, globals()[_squish_command_name(cmd)]
85
except KeyError:
86
pass
87
88
# look for any command which claims this as an alias
89
for cmdname, cmdclass in get_all_cmds():
90
if cmd in cmdclass.aliases:
91
return cmdname, cmdclass
92
93
cmdclass = ExternalCommand.find_command(cmd)
94
if cmdclass:
95
return cmd, cmdclass
96
97
raise BzrCommandError("unknown command %r" % cmd)
98
99
100
class Command(object):
101
"""Base class for commands.
102
103
The docstring for an actual command should give a single-line
104
summary, then a complete description of the command. A grammar
105
description will be inserted.
106
107
takes_args
108
List of argument forms, marked with whether they are optional,
109
repeated, etc.
110
111
takes_options
112
List of options that may be given for this command.
113
114
hidden
115
If true, this command isn't advertised.
116
"""
117
aliases = []
118
119
takes_args = []
120
takes_options = []
121
122
hidden = False
123
124
def __init__(self, options, arguments):
125
"""Construct and run the command.
126
127
Sets self.status to the return value of run()."""
128
assert isinstance(options, dict)
129
assert isinstance(arguments, dict)
130
cmdargs = options.copy()
131
cmdargs.update(arguments)
132
assert self.__doc__ != Command.__doc__, \
133
("No help message set for %r" % self)
134
self.status = self.run(**cmdargs)
135
136
137
def run(self):
138
"""Override this in sub-classes.
139
140
This is invoked with the options and arguments bound to
141
keyword parameters.
142
143
Return 0 or None if the command was successful, or a shell
144
error code if not.
145
"""
146
return 0
147
148
149
class ExternalCommand(Command):
150
"""Class to wrap external commands.
151
152
We cheat a little here, when get_cmd_class() calls us we actually give it back
153
an object we construct that has the appropriate path, help, options etc for the
154
specified command.
155
156
When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
157
method, which we override to call the Command.__init__ method. That then calls
158
our run method which is pretty straight forward.
159
160
The only wrinkle is that we have to map bzr's dictionary of options and arguments
161
back into command line options and arguments for the script.
162
"""
163
164
def find_command(cls, cmd):
165
import os.path
166
bzrpath = os.environ.get('BZRPATH', '')
167
168
for dir in bzrpath.split(':'):
169
path = os.path.join(dir, cmd)
170
if os.path.isfile(path):
171
return ExternalCommand(path)
172
173
return None
174
175
find_command = classmethod(find_command)
176
177
def __init__(self, path):
178
self.path = path
179
180
# TODO: If either of these fail, we should detect that and
181
# assume that path is not really a bzr plugin after all.
182
183
pipe = os.popen('%s --bzr-usage' % path, 'r')
184
self.takes_options = pipe.readline().split()
185
self.takes_args = pipe.readline().split()
186
pipe.close()
187
188
pipe = os.popen('%s --bzr-help' % path, 'r')
189
self.__doc__ = pipe.read()
190
pipe.close()
191
192
def __call__(self, options, arguments):
193
Command.__init__(self, options, arguments)
194
return self
195
196
def run(self, **kargs):
197
opts = []
198
args = []
199
200
keys = kargs.keys()
201
keys.sort()
202
for name in keys:
203
value = kargs[name]
204
if OPTIONS.has_key(name):
205
# it's an option
206
opts.append('--%s' % name)
207
if value is not None and value is not True:
208
opts.append(str(value))
209
else:
210
# it's an arg, or arg list
211
if type(value) is not list:
212
value = [value]
213
for v in value:
214
if v is not None:
215
args.append(str(v))
216
217
self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
218
return self.status
219
220
221
class cmd_status(Command):
129
222
"""Display status summary.
130
223
131
For each file there is a single line giving its file state and name.
132
The name is that in the current revision unless it is deleted or
133
missing, in which case the old name is shown.
134
135
:todo: Don't show unchanged files unless ``--all`` is given?
224
This reports on versioned and unknown files, reporting them
225
grouped by state. Possible states are:
226
227
added
228
Versioned in the working copy but not in the previous revision.
229
230
removed
231
Versioned in the previous revision but removed or deleted
232
in the working copy.
233
234
renamed
235
Path of this file changed from the previous revision;
236
the text may also have changed. This includes files whose
237
parent directory was renamed.
238
239
modified
240
Text has changed since the previous revision.
241
242
unchanged
243
Nothing about this file has changed since the previous revision.
244
Only shown with --all.
245
246
unknown
247
Not versioned and not matching an ignore pattern.
248
249
To see ignored files use 'bzr ignored'. For details in the
250
changes to file texts, use 'bzr diff'.
251
252
If no arguments are specified, the status of the entire working
253
directory is shown. Otherwise, only the status of the specified
254
files or directories is reported. If a directory is given, status
255
is reported for everything inside that directory.
136
256
"""
137
Branch('.').show_status(show_all=all)
138
139
140
141
######################################################################
142
# examining history
143
def cmd_get_revision(revision_id):
144
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
145
146
147
def cmd_get_file_text(text_id):
148
"""Get contents of a file by hash."""
149
sf = Branch('.').text_store[text_id]
150
pumpfile(sf, sys.stdout)
151
152
153
154
######################################################################
155
# commands
156
157
158
def cmd_revno():
159
"""Show number of revisions on this branch"""
160
print Branch('.').revno()
161
162
163
164
def cmd_add(file_list, verbose=False):
257
takes_args = ['file*']
258
takes_options = ['all', 'show-ids']
259
aliases = ['st', 'stat']
260
261
def run(self, all=False, show_ids=False, file_list=None):
262
if file_list:
263
b = Branch(file_list[0])
264
file_list = [b.relpath(x) for x in file_list]
265
# special case: only one path was given and it's the root
266
# of the branch
267
if file_list == ['']:
268
file_list = None
269
else:
270
b = Branch('.')
271
import status
272
status.show_status(b, show_unchanged=all, show_ids=show_ids,
273
specific_files=file_list)
274
275
276
class cmd_cat_revision(Command):
277
"""Write out metadata for a revision."""
278
279
hidden = True
280
takes_args = ['revision_id']
281
282
def run(self, revision_id):
283
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
284
285
286
class cmd_revno(Command):
287
"""Show current revision number.
288
289
This is equal to the number of revisions on this branch."""
290
def run(self):
291
print Branch('.').revno()
292
293
294
class cmd_add(Command):
165
295
"""Add specified files or directories.
166
296
167
297
In non-recursive mode, all the named items are added, regardless
178
308
179
309
Therefore simply saying 'bzr add .' will version all files that
180
310
are currently unknown.
181
"""
182
if True:
183
bzrlib.add.smart_add(file_list, verbose)
184
else:
185
# old way
186
assert file_list
187
b = Branch(file_list[0], find_root=True)
188
b.add([b.relpath(f) for f in file_list], verbose=verbose)
189
190
191
192
def cmd_relpath(filename):
193
print Branch(filename).relpath(filename)
194
195
196
def cmd_inventory(revision=None):
197
"""Show inventory of the current working copy."""
198
## TODO: Also optionally show a previous inventory
199
## TODO: Format options
200
b = Branch('.')
201
if revision == None:
311
312
TODO: Perhaps adding a file whose directly is not versioned should
313
recursively add that parent, rather than giving an error?
314
"""
315
takes_args = ['file+']
316
takes_options = ['verbose', 'no-recurse']
317
318
def run(self, file_list, verbose=False, no_recurse=False):
319
bzrlib.add.smart_add(file_list, verbose, not no_recurse)
320
321
322
class cmd_relpath(Command):
323
"""Show path of a file relative to root"""
324
takes_args = ['filename']
325
hidden = True
326
327
def run(self, filename):
328
print Branch(filename).relpath(filename)
329
330
331
332
class cmd_inventory(Command):
333
"""Show inventory of the current working copy or a revision."""
334
takes_options = ['revision', 'show-ids']
335
336
def run(self, revision=None, show_ids=False):
337
b = Branch('.')
338
if revision == None:
339
inv = b.read_working_inventory()
340
else:
341
inv = b.get_revision_inventory(b.lookup_revision(revision))
342
343
for path, entry in inv.entries():
344
if show_ids:
345
print '%-50s %s' % (path, entry.file_id)
346
else:
347
print path
348
349
350
class cmd_move(Command):
351
"""Move files to a different directory.
352
353
examples:
354
bzr move *.txt doc
355
356
The destination must be a versioned directory in the same branch.
357
"""
358
takes_args = ['source$', 'dest']
359
def run(self, source_list, dest):
360
b = Branch('.')
361
362
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
363
364
365
class cmd_rename(Command):
366
"""Change the name of an entry.
367
368
examples:
369
bzr rename frob.c frobber.c
370
bzr rename src/frob.c lib/frob.c
371
372
It is an error if the destination name exists.
373
374
See also the 'move' command, which moves files into a different
375
directory without changing their name.
376
377
TODO: Some way to rename multiple files without invoking bzr for each
378
one?"""
379
takes_args = ['from_name', 'to_name']
380
381
def run(self, from_name, to_name):
382
b = Branch('.')
383
b.rename_one(b.relpath(from_name), b.relpath(to_name))
384
385
386
387
class cmd_renames(Command):
388
"""Show list of renamed files.
389
390
TODO: Option to show renames between two historical versions.
391
392
TODO: Only show renames under dir, rather than in the whole branch.
393
"""
394
takes_args = ['dir?']
395
396
def run(self, dir='.'):
397
b = Branch(dir)
398
old_inv = b.basis_tree().inventory
399
new_inv = b.read_working_inventory()
400
401
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
402
renames.sort()
403
for old_name, new_name in renames:
404
print "%s => %s" % (old_name, new_name)
405
406
407
class cmd_info(Command):
408
"""Show statistical information about a branch."""
409
takes_args = ['branch?']
410
411
def run(self, branch=None):
412
import info
413
414
from branch import find_branch
415
b = find_branch(branch)
416
info.show_info(b)
417
418
419
class cmd_remove(Command):
420
"""Make a file unversioned.
421
422
This makes bzr stop tracking changes to a versioned file. It does
423
not delete the working copy.
424
"""
425
takes_args = ['file+']
426
takes_options = ['verbose']
427
428
def run(self, file_list, verbose=False):
429
b = Branch(file_list[0])
430
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
431
432
433
class cmd_file_id(Command):
434
"""Print file_id of a particular file or directory.
435
436
The file_id is assigned when the file is first added and remains the
437
same through all revisions where the file exists, even when it is
438
moved or renamed.
439
"""
440
hidden = True
441
takes_args = ['filename']
442
def run(self, filename):
443
b = Branch(filename)
444
i = b.inventory.path2id(b.relpath(filename))
445
if i == None:
446
bailout("%r is not a versioned file" % filename)
447
else:
448
print i
449
450
451
class cmd_file_path(Command):
452
"""Print path of file_ids to a file or directory.
453
454
This prints one line for each directory down to the target,
455
starting at the branch root."""
456
hidden = True
457
takes_args = ['filename']
458
def run(self, filename):
459
b = Branch(filename)
460
inv = b.inventory
461
fid = inv.path2id(b.relpath(filename))
462
if fid == None:
463
bailout("%r is not a versioned file" % filename)
464
for fip in inv.get_idpath(fid):
465
print fip
466
467
468
class cmd_revision_history(Command):
469
"""Display list of revision ids on this branch."""
470
hidden = True
471
def run(self):
472
for patchid in Branch('.').revision_history():
473
print patchid
474
475
476
class cmd_directories(Command):
477
"""Display list of versioned directories in this branch."""
478
def run(self):
479
for name, ie in Branch('.').read_working_inventory().directories():
480
if name == '':
481
print '.'
482
else:
483
print name
484
485
486
class cmd_init(Command):
487
"""Make a directory into a versioned branch.
488
489
Use this to create an empty branch, or before importing an
490
existing project.
491
492
Recipe for importing a tree of files:
493
cd ~/project
494
bzr init
495
bzr add -v .
496
bzr status
497
bzr commit -m 'imported project'
498
"""
499
def run(self):
500
Branch('.', init=True)
501
502
503
class cmd_diff(Command):
504
"""Show differences in working tree.
505
506
If files are listed, only the changes in those files are listed.
507
Otherwise, all changes for the tree are listed.
508
509
TODO: Given two revision arguments, show the difference between them.
510
511
TODO: Allow diff across branches.
512
513
TODO: Option to use external diff command; could be GNU diff, wdiff,
514
or a graphical diff.
515
516
TODO: Python difflib is not exactly the same as unidiff; should
517
either fix it up or prefer to use an external diff.
518
519
TODO: If a directory is given, diff everything under that.
520
521
TODO: Selected-file diff is inefficient and doesn't show you
522
deleted files.
523
524
TODO: This probably handles non-Unix newlines poorly.
525
"""
526
527
takes_args = ['file*']
528
takes_options = ['revision', 'diff-options']
529
aliases = ['di']
530
531
def run(self, revision=None, file_list=None, diff_options=None):
532
from bzrlib.diff import show_diff
533
from bzrlib import find_branch
534
535
if file_list:
536
b = find_branch(file_list[0])
537
file_list = [b.relpath(f) for f in file_list]
538
if file_list == ['']:
539
# just pointing to top-of-tree
540
file_list = None
541
else:
542
b = Branch('.')
543
544
show_diff(b, revision, specific_files=file_list,
545
external_diff_options=diff_options)
546
547
548
549
550
551
class cmd_deleted(Command):
552
"""List files deleted in the working tree.
553
554
TODO: Show files deleted since a previous revision, or between two revisions.
555
"""
556
def run(self, show_ids=False):
557
b = Branch('.')
558
old = b.basis_tree()
559
new = b.working_tree()
560
561
## TODO: Much more efficient way to do this: read in new
562
## directories with readdir, rather than stating each one. Same
563
## level of effort but possibly much less IO. (Or possibly not,
564
## if the directories are very large...)
565
566
for path, ie in old.inventory.iter_entries():
567
if not new.has_id(ie.file_id):
568
if show_ids:
569
print '%-50s %s' % (path, ie.file_id)
570
else:
571
print path
572
573
574
class cmd_modified(Command):
575
"""List files modified in working tree."""
576
hidden = True
577
def run(self):
578
import statcache
579
b = Branch('.')
202
580
inv = b.read_working_inventory()
203
else:
204
inv = b.get_revision_inventory(b.lookup_revision(revision))
205
206
for path, entry in inv.iter_entries():
207
print '%-50s %s' % (entry.file_id, path)
208
209
210
211
def cmd_info():
212
import info
213
info.show_info(Branch('.'))
214
215
216
217
def cmd_remove(file_list, verbose=False):
218
b = Branch(file_list[0])
219
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
220
221
222
223
def cmd_file_id(filename):
224
b = Branch(filename)
225
i = b.inventory.path2id(b.relpath(filename))
226
if i is None:
227
bailout("%s is not a versioned file" % filename)
228
else:
229
print i
230
231
232
def cmd_find_filename(fileid):
233
n = find_filename(fileid)
234
if n is None:
235
bailout("%s is not a live file id" % fileid)
236
else:
237
print n
238
239
240
def cmd_revision_history():
241
for patchid in Branch('.').revision_history():
242
print patchid
243
244
245
246
def cmd_init():
247
# TODO: Check we're not already in a working directory? At the
248
# moment you'll get an ugly error.
249
250
# TODO: What if we're in a subdirectory of a branch? Would like
251
# to allow that, but then the parent may need to understand that
252
# the children have disappeared, or should they be versioned in
253
# both?
254
255
# TODO: Take an argument/option for branch name.
256
Branch('.', init=True)
257
258
259
def cmd_diff(revision=None):
260
"""Show diff from basis to working copy.
261
262
:todo: Take one or two revision arguments, look up those trees,
263
and diff them.
264
265
:todo: Allow diff across branches.
266
267
:todo: Mangle filenames in diff to be more relevant.
268
269
:todo: Shouldn't be in the cmd function.
270
"""
271
272
b = Branch('.')
273
274
if revision == None:
275
old_tree = b.basis_tree()
276
else:
277
old_tree = b.revision_tree(b.lookup_revision(revision))
278
279
new_tree = b.working_tree()
280
old_inv = old_tree.inventory
281
new_inv = new_tree.inventory
282
283
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
284
old_label = ''
285
new_label = ''
286
287
DEVNULL = '/dev/null'
288
# Windows users, don't panic about this filename -- it is a
289
# special signal to GNU patch that the file should be created or
290
# deleted respectively.
291
292
# TODO: Generation of pseudo-diffs for added/deleted files could
293
# be usefully made into a much faster special case.
294
295
# TODO: Better to return them in sorted order I think.
296
297
for file_state, fid, old_name, new_name, kind in bzrlib.diff_trees(old_tree, new_tree):
298
d = None
299
300
# Don't show this by default; maybe do it if an option is passed
301
# idlabel = ' {%s}' % fid
302
idlabel = ''
303
304
# FIXME: Something about the diff format makes patch unhappy
305
# with newly-added files.
306
307
def diffit(*a, **kw):
308
sys.stdout.writelines(difflib.unified_diff(*a, **kw))
309
print
310
311
if file_state in ['.', '?', 'I']:
312
continue
313
elif file_state == 'A':
314
print '*** added %s %r' % (kind, new_name)
315
if kind == 'file':
316
diffit([],
317
new_tree.get_file(fid).readlines(),
318
fromfile=DEVNULL,
319
tofile=new_label + new_name + idlabel)
320
elif file_state == 'D':
321
assert isinstance(old_name, types.StringTypes)
322
print '*** deleted %s %r' % (kind, old_name)
323
if kind == 'file':
324
diffit(old_tree.get_file(fid).readlines(), [],
325
fromfile=old_label + old_name + idlabel,
326
tofile=DEVNULL)
327
elif file_state in ['M', 'R']:
328
if file_state == 'M':
329
assert kind == 'file'
330
assert old_name == new_name
331
print '*** modified %s %r' % (kind, new_name)
332
elif file_state == 'R':
333
print '*** renamed %s %r => %r' % (kind, old_name, new_name)
334
335
if kind == 'file':
336
diffit(old_tree.get_file(fid).readlines(),
337
new_tree.get_file(fid).readlines(),
338
fromfile=old_label + old_name + idlabel,
339
tofile=new_label + new_name)
340
else:
341
bailout("can't represent state %s {%s}" % (file_state, fid))
342
343
344
345
def cmd_root(filename=None):
346
"""Print the branch root."""
347
print bzrlib.branch.find_branch_root(filename)
348
349
350
def cmd_log(timezone='original'):
581
sc = statcache.update_cache(b, inv)
582
basis = b.basis_tree()
583
basis_inv = basis.inventory
584
585
# We used to do this through iter_entries(), but that's slow
586
# when most of the files are unmodified, as is usually the
587
# case. So instead we iterate by inventory entry, and only
588
# calculate paths as necessary.
589
590
for file_id in basis_inv:
591
cacheentry = sc.get(file_id)
592
if not cacheentry: # deleted
593
continue
594
ie = basis_inv[file_id]
595
if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
596
path = inv.id2path(file_id)
597
print path
598
599
600
601
class cmd_added(Command):
602
"""List files added in working tree."""
603
hidden = True
604
def run(self):
605
b = Branch('.')
606
wt = b.working_tree()
607
basis_inv = b.basis_tree().inventory
608
inv = wt.inventory
609
for file_id in inv:
610
if file_id in basis_inv:
611
continue
612
path = inv.id2path(file_id)
613
if not os.access(b.abspath(path), os.F_OK):
614
continue
615
print path
616
617
618
619
class cmd_root(Command):
620
"""Show the tree root directory.
621
622
The root is the nearest enclosing directory with a .bzr control
623
directory."""
624
takes_args = ['filename?']
625
def run(self, filename=None):
626
"""Print the branch root."""
627
from branch import find_branch
628
b = find_branch(filename)
629
print getattr(b, 'base', None) or getattr(b, 'baseurl')
630
631
632
class cmd_log(Command):
351
633
"""Show log of this branch.
352
634
353
:todo: Options for utc; to show ids; to limit range; etc.
635
To request a range of logs, you can use the command -r begin:end
636
-r revision requests a specific revision, -r :end or -r begin: are
637
also valid.
638
639
TODO: Make --revision support uuid: and hash: [future tag:] notation.
640
354
641
"""
355
Branch('.').write_log(show_timezone=timezone)
356
357
358
def cmd_ls(revision=None, verbose=False):
642
643
takes_args = ['filename?']
644
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision']
645
646
def run(self, filename=None, timezone='original',
647
verbose=False,
648
show_ids=False,
649
forward=False,
650
revision=None):
651
from bzrlib import show_log, find_branch
652
import codecs
653
654
direction = (forward and 'forward') or 'reverse'
655
656
if filename:
657
b = find_branch(filename)
658
fp = b.relpath(filename)
659
if fp:
660
file_id = b.read_working_inventory().path2id(fp)
661
else:
662
file_id = None # points to branch root
663
else:
664
b = find_branch('.')
665
file_id = None
666
667
if revision == None:
668
revision = [None, None]
669
elif isinstance(revision, int):
670
revision = [revision, revision]
671
else:
672
# pair of revisions?
673
pass
674
675
assert len(revision) == 2
676
677
mutter('encoding log as %r' % bzrlib.user_encoding)
678
679
# use 'replace' so that we don't abort if trying to write out
680
# in e.g. the default C locale.
681
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
682
683
show_log(b, file_id,
684
show_timezone=timezone,
685
verbose=verbose,
686
show_ids=show_ids,
687
to_file=outf,
688
direction=direction,
689
start_revision=revision[0],
690
end_revision=revision[1])
691
692
693
694
class cmd_touching_revisions(Command):
695
"""Return revision-ids which affected a particular file.
696
697
A more user-friendly interface is "bzr log FILE"."""
698
hidden = True
699
takes_args = ["filename"]
700
def run(self, filename):
701
b = Branch(filename)
702
inv = b.read_working_inventory()
703
file_id = inv.path2id(b.relpath(filename))
704
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
705
print "%6d %s" % (revno, what)
706
707
708
class cmd_ls(Command):
359
709
"""List files in a tree.
360
710
361
:todo: Take a revision or remote path and list that tree instead.
711
TODO: Take a revision or remote path and list that tree instead.
362
712
"""
363
b = Branch('.')
364
if revision == None:
365
tree = b.working_tree()
366
else:
367
tree = b.revision_tree(b.lookup_revision(revision))
368
369
for fp, fc, kind, fid in tree.list_files():
370
if verbose:
371
if kind == 'directory':
372
kindch = '/'
373
elif kind == 'file':
374
kindch = ''
713
hidden = True
714
def run(self, revision=None, verbose=False):
715
b = Branch('.')
716
if revision == None:
717
tree = b.working_tree()
718
else:
719
tree = b.revision_tree(b.lookup_revision(revision))
720
721
for fp, fc, kind, fid in tree.list_files():
722
if verbose:
723
if kind == 'directory':
724
kindch = '/'
725
elif kind == 'file':
726
kindch = ''
727
else:
728
kindch = '???'
729
730
print '%-8s %s%s' % (fc, fp, kindch)
375
731
else:
376
kindch = '???'
377
378
print '%-8s %s%s' % (fc, fp, kindch)
379
else:
380
print fp
381
382
383
384
def cmd_unknowns():
732
print fp
733
734
735
736
class cmd_unknowns(Command):
385
737
"""List unknown files"""
386
for f in Branch('.').unknowns():
387
print quotefn(f)
388
389
390
def cmd_lookup_revision(revno):
391
try:
392
revno = int(revno)
393
except ValueError:
394
bailout("usage: lookup-revision REVNO",
395
["REVNO is a non-negative revision number for this branch"])
396
397
print Branch('.').lookup_revision(revno) or NONE_STRING
398
399
400
401
def cmd_export(revno, dest):
402
"""Export past revision to destination directory."""
403
b = Branch('.')
404
rh = b.lookup_revision(int(revno))
405
t = b.revision_tree(rh)
406
t.export(dest)
407
408
409
410
######################################################################
411
# internal/test commands
412
413
414
def cmd_uuid():
415
"""Print a newly-generated UUID."""
416
print bzrlib.osutils.uuid()
417
418
419
420
def cmd_local_time_offset():
421
print bzrlib.osutils.local_time_offset()
422
423
424
425
def cmd_commit(message=None, verbose=False):
426
if not message:
427
bailout("please specify a commit message")
428
Branch('.').commit(message, verbose=verbose)
429
430
431
def cmd_check():
432
"""Check consistency of the branch."""
433
check()
434
435
436
def cmd_is(pred, *rest):
437
"""Test whether PREDICATE is true."""
438
try:
439
cmd_handler = globals()['assert_' + pred.replace('-', '_')]
440
except KeyError:
441
bailout("unknown predicate: %s" % quotefn(pred))
738
def run(self):
739
for f in Branch('.').unknowns():
740
print quotefn(f)
741
742
743
744
class cmd_ignore(Command):
745
"""Ignore a command or pattern
746
747
To remove patterns from the ignore list, edit the .bzrignore file.
748
749
If the pattern contains a slash, it is compared to the whole path
750
from the branch root. Otherwise, it is comapred to only the last
751
component of the path.
752
753
Ignore patterns are case-insensitive on case-insensitive systems.
754
755
Note: wildcards must be quoted from the shell on Unix.
756
757
examples:
758
bzr ignore ./Makefile
759
bzr ignore '*.class'
760
"""
761
takes_args = ['name_pattern']
762
763
def run(self, name_pattern):
764
from bzrlib.atomicfile import AtomicFile
765
import os.path
766
767
b = Branch('.')
768
ifn = b.abspath('.bzrignore')
769
770
if os.path.exists(ifn):
771
f = open(ifn, 'rt')
772
try:
773
igns = f.read().decode('utf-8')
774
finally:
775
f.close()
776
else:
777
igns = ''
778
779
# TODO: If the file already uses crlf-style termination, maybe
780
# we should use that for the newly added lines?
781
782
if igns and igns[-1] != '\n':
783
igns += '\n'
784
igns += name_pattern + '\n'
785
786
try:
787
f = AtomicFile(ifn, 'wt')
788
f.write(igns.encode('utf-8'))
789
f.commit()
790
finally:
791
f.close()
792
793
inv = b.working_tree().inventory
794
if inv.path2id('.bzrignore'):
795
mutter('.bzrignore is already versioned')
796
else:
797
mutter('need to make new .bzrignore file versioned')
798
b.add(['.bzrignore'])
799
800
801
802
class cmd_ignored(Command):
803
"""List ignored files and the patterns that matched them.
804
805
See also: bzr ignore"""
806
def run(self):
807
tree = Branch('.').working_tree()
808
for path, file_class, kind, file_id in tree.list_files():
809
if file_class != 'I':
810
continue
811
## XXX: Slightly inefficient since this was already calculated
812
pat = tree.is_ignored(path)
813
print '%-50s %s' % (path, pat)
814
815
816
class cmd_lookup_revision(Command):
817
"""Lookup the revision-id from a revision-number
818
819
example:
820
bzr lookup-revision 33
821
"""
822
hidden = True
823
takes_args = ['revno']
824
825
def run(self, revno):
826
try:
827
revno = int(revno)
828
except ValueError:
829
raise BzrCommandError("not a valid revision-number: %r" % revno)
830
831
print Branch('.').lookup_revision(revno)
832
833
834
class cmd_export(Command):
835
"""Export past revision to destination directory.
836
837
If no revision is specified this exports the last committed revision."""
838
takes_args = ['dest']
839
takes_options = ['revision']
840
def run(self, dest, revision=None):
841
b = Branch('.')
842
if revision == None:
843
rh = b.revision_history()[-1]
844
else:
845
rh = b.lookup_revision(int(revision))
846
t = b.revision_tree(rh)
847
t.export(dest)
848
849
850
class cmd_cat(Command):
851
"""Write a file's text from a previous revision."""
852
853
takes_options = ['revision']
854
takes_args = ['filename']
855
856
def run(self, filename, revision=None):
857
if revision == None:
858
raise BzrCommandError("bzr cat requires a revision number")
859
b = Branch('.')
860
b.print_file(b.relpath(filename), int(revision))
861
862
863
class cmd_local_time_offset(Command):
864
"""Show the offset in seconds from GMT to local time."""
865
hidden = True
866
def run(self):
867
print bzrlib.osutils.local_time_offset()
868
869
870
871
class cmd_commit(Command):
872
"""Commit changes into a new revision.
873
874
If selected files are specified, only changes to those files are
875
committed. If a directory is specified then its contents are also
876
committed.
877
878
A selected-file commit may fail in some cases where the committed
879
tree would be invalid, such as trying to commit a file in a
880
newly-added directory that is not itself committed.
881
882
TODO: Run hooks on tree to-be-committed, and after commit.
883
884
TODO: Strict commit that fails if there are unknown or deleted files.
885
"""
886
takes_args = ['selected*']
887
takes_options = ['message', 'file', 'verbose']
888
aliases = ['ci', 'checkin']
889
890
def run(self, message=None, file=None, verbose=True, selected_list=None):
891
from bzrlib.commit import commit
892
893
## Warning: shadows builtin file()
894
if not message and not file:
895
raise BzrCommandError("please specify a commit message",
896
["use either --message or --file"])
897
elif message and file:
898
raise BzrCommandError("please specify either --message or --file")
442
899
443
try:
444
cmd_handler(*rest)
445
except BzrCheckError:
446
# by default we don't print the message so that this can
447
# be used from shell scripts without producing noise
448
sys.exit(1)
449
450
451
def cmd_username():
452
print bzrlib.osutils.username()
453
454
455
def cmd_user_email():
456
print bzrlib.osutils.user_email()
457
458
459
def cmd_gen_revision_id():
460
import time
461
print bzrlib.branch._gen_revision_id(time.time())
462
463
464
def cmd_selftest(verbose=False):
900
if file:
901
import codecs
902
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
903
904
b = Branch('.')
905
commit(b, message, verbose=verbose, specific_files=selected_list)
906
907
908
class cmd_check(Command):
909
"""Validate consistency of branch history.
910
911
This command checks various invariants about the branch storage to
912
detect data corruption or bzr bugs.
913
"""
914
takes_args = ['dir?']
915
def run(self, dir='.'):
916
import bzrlib.check
917
bzrlib.check.check(Branch(dir))
918
919
920
921
class cmd_whoami(Command):
922
"""Show bzr user id."""
923
takes_options = ['email']
924
925
def run(self, email=False):
926
if email:
927
print bzrlib.osutils.user_email()
928
else:
929
print bzrlib.osutils.username()
930
931
932
class cmd_selftest(Command):
465
933
"""Run internal test suite"""
466
## -v, if present, is seen by doctest; the argument is just here
467
## so our parser doesn't complain
468
469
## TODO: --verbose option
470
471
failures, tests = 0, 0
472
473
import doctest, bzrlib.store, bzrlib.tests
474
bzrlib.trace.verbose = False
475
476
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
477
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
478
mf, mt = doctest.testmod(m)
479
failures += mf
480
tests += mt
481
print '%-40s %3d tests' % (m.__name__, mt),
482
if mf:
483
print '%3d FAILED!' % mf
934
hidden = True
935
def run(self):
936
from bzrlib.selftest import selftest
937
if selftest():
938
return 0
484
939
else:
485
print
486
487
print '%-40s %3d tests' % ('total', tests),
488
if failures:
489
print '%3d FAILED!' % failures
490
else:
491
print
492
493
494
495
# deprecated
496
cmd_doctest = cmd_selftest
497
498
499
######################################################################
500
# help
501
502
503
def cmd_help():
504
# TODO: Specific help for particular commands
505
print __doc__
506
507
508
def cmd_version():
509
print "bzr (bazaar-ng) %s" % __version__
510
print __copyright__
940
return 1
941
942
943
944
class cmd_version(Command):
945
"""Show version of bzr"""
946
def run(self):
947
show_version()
948
949
def show_version():
950
print "bzr (bazaar-ng) %s" % bzrlib.__version__
951
# is bzrlib itself in a branch?
952
bzrrev = bzrlib.get_bzr_revision()
953
if bzrrev:
954
print " (bzr checkout, revision %d {%s})" % bzrrev
955
print bzrlib.__copyright__
511
956
print "http://bazaar-ng.org/"
512
957
print
513
print \
514
"""bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
515
you may use, modify and redistribute it under the terms of the GNU
516
General Public License version 2 or later."""
517
518
519
def cmd_rocks():
958
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
959
print "you may use, modify and redistribute it under the terms of the GNU"
960
print "General Public License version 2 or later."
961
962
963
class cmd_rocks(Command):
520
964
"""Statement of optimism."""
521
print "it sure does!"
522
523
524
525
######################################################################
526
# main routine
965
hidden = True
966
def run(self):
967
print "it sure does!"
968
969
def parse_spec(spec):
970
if '/@' in spec:
971
parsed = spec.split('/@')
972
assert len(parsed) == 2
973
if parsed[1] == "":
974
parsed[1] = -1
975
else:
976
parsed[1] = int(parsed[1])
977
assert parsed[1] >=0
978
else:
979
parsed = [spec, None]
980
return parsed
981
982
class cmd_merge(Command):
983
"""Perform a three-way merge of trees."""
984
takes_args = ['other_spec', 'base_spec']
985
986
def run(self, other_spec, base_spec):
987
from bzrlib.merge import merge
988
merge(parse_spec(other_spec), parse_spec(base_spec))
989
990
class cmd_assert_fail(Command):
991
"""Test reporting of assertion failures"""
992
hidden = True
993
def run(self):
994
assert False, "always fails"
995
996
997
class cmd_help(Command):
998
"""Show help on a command or other topic.
999
1000
For a list of all available commands, say 'bzr help commands'."""
1001
takes_args = ['topic?']
1002
aliases = ['?']
1003
1004
def run(self, topic=None):
1005
import help
1006
help.help(topic)
1007
1008
1009
class cmd_update_stat_cache(Command):
1010
"""Update stat-cache mapping inodes to SHA-1 hashes.
1011
1012
For testing only."""
1013
hidden = True
1014
def run(self):
1015
import statcache
1016
b = Branch('.')
1017
statcache.update_cache(b.base, b.read_working_inventory())
1018
527
1019
528
1020
529
1021
# list of all available options; the rhs can be either None for an
531
1023
# the type.
532
1024
OPTIONS = {
533
1025
'all': None,
1026
'diff-options': str,
534
1027
'help': None,
1028
'file': unicode,
1029
'forward': None,
535
1030
'message': unicode,
536
'revision': int,
1031
'no-recurse': None,
1032
'profile': None,
1033
'revision': _parse_revision_str,
537
1034
'show-ids': None,
538
1035
'timezone': str,
539
1036
'verbose': None,
540
1037
'version': None,
1038
'email': None,
541
1039
}
542
1040
543
1041
SHORT_OPTIONS = {
1042
'F': 'file',
1043
'h': 'help',
544
1044
'm': 'message',
545
1045
'r': 'revision',
546
1046
'v': 'verbose',
547
1047
}
548
1048
549
# List of options that apply to particular commands; commands not
550
# listed take none.
551
cmd_options = {
552
'add': ['verbose'],
553
'commit': ['message', 'verbose'],
554
'diff': ['revision'],
555
'inventory': ['revision'],
556
'log': ['show-ids', 'timezone'],
557
'ls': ['revision', 'verbose'],
558
'remove': ['verbose'],
559
'status': ['all'],
560
}
561
562
563
cmd_args = {
564
'init': [],
565
'add': ['file+'],
566
'commit': [],
567
'diff': [],
568
'file-id': ['filename'],
569
'root': ['filename?'],
570
'relpath': ['filename'],
571
'get-file-text': ['text_id'],
572
'get-inventory': ['inventory_id'],
573
'get-revision': ['revision_id'],
574
'get-revision-inventory': ['revision_id'],
575
'log': [],
576
'lookup-revision': ['revno'],
577
'export': ['revno', 'dest'],
578
'remove': ['file+'],
579
'status': [],
580
}
581
582
1049
583
1050
def parse_args(argv):
584
1051
"""Parse command line.
605
1072
while argv:
606
1073
a = argv.pop(0)
607
1074
if a[0] == '-':
1075
# option names must not be unicode
1076
a = str(a)
608
1077
optarg = None
609
1078
if a[1] == '-':
610
1079
mutter(" got option %r" % a)
632
1101
else:
633
1102
optarg = argv.pop(0)
634
1103
opts[optname] = optargfn(optarg)
635
mutter(" option argument %r" % opts[optname])
636
1104
else:
637
1105
if optarg != None:
638
1106
bailout('option %r takes no argument' % optname)
644
1112
645
1113
646
1114
647
def _match_args(cmd, args):
648
"""Check non-option arguments match required pattern.
649
1115
650
>>> _match_args('status', ['asdasdsadasd'])
651
Traceback (most recent call last):
652
...
653
BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
654
>>> _match_args('add', ['asdasdsadasd'])
655
{'file_list': ['asdasdsadasd']}
656
>>> _match_args('add', 'abc def gj'.split())
657
{'file_list': ['abc', 'def', 'gj']}
658
"""
659
# match argument pattern
660
argform = cmd_args.get(cmd, [])
1116
def _match_argform(cmd, takes_args, args):
661
1117
argdict = {}
662
# TODO: Need a way to express 'cp SRC... DEST', where it matches
663
# all but one.
664
1118
665
# step through args and argform, allowing appropriate 0-many matches
666
for ap in argform:
1119
# step through args and takes_args, allowing appropriate 0-many matches
1120
for ap in takes_args:
667
1121
argname = ap[:-1]
668
1122
if ap[-1] == '?':
669
1123
if args:
670
1124
argdict[argname] = args.pop(0)
671
elif ap[-1] == '*':
672
assert 0
1125
elif ap[-1] == '*': # all remaining arguments
1126
if args:
1127
argdict[argname + '_list'] = args[:]
1128
args = []
1129
else:
1130
argdict[argname + '_list'] = None
673
1131
elif ap[-1] == '+':
674
1132
if not args:
675
bailout("command %r needs one or more %s"
1133
raise BzrCommandError("command %r needs one or more %s"
676
1134
% (cmd, argname.upper()))
677
1135
else:
678
1136
argdict[argname + '_list'] = args[:]
679
1137
args = []
1138
elif ap[-1] == '$': # all but one
1139
if len(args) < 2:
1140
raise BzrCommandError("command %r needs one or more %s"
1141
% (cmd, argname.upper()))
1142
argdict[argname + '_list'] = args[:-1]
1143
args[:-1] = []
680
1144
else:
681
1145
# just a plain arg
682
1146
argname = ap
683
1147
if not args:
684
bailout("command %r requires argument %s"
1148
raise BzrCommandError("command %r requires argument %s"
685
1149
% (cmd, argname.upper()))
686
1150
else:
687
1151
argdict[argname] = args.pop(0)
688
1152
689
1153
if args:
690
bailout("extra arguments to command %s: %r"
691
% (cmd, args))
1154
raise BzrCommandError("extra argument to command %s: %s"
1155
% (cmd, args[0]))
692
1156
693
1157
return argdict
694
1158
698
1162
"""Execute a command.
699
1163
700
1164
This is similar to main(), but without all the trappings for
701
logging and error handling.
1165
logging and error handling.
702
1166
"""
1167
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1168
703
1169
try:
704
1170
args, opts = parse_args(argv[1:])
705
1171
if 'help' in opts:
706
# TODO: pass down other arguments in case they asked for
707
# help on a command name?
708
cmd_help()
1172
import help
1173
if args:
1174
help.help(args[0])
1175
else:
1176
help.help()
709
1177
return 0
710
1178
elif 'version' in opts:
711
cmd_version()
1179
show_version()
712
1180
return 0
713
cmd = args.pop(0)
1181
cmd = str(args.pop(0))
714
1182
except IndexError:
715
log_error('usage: bzr COMMAND\n')
716
log_error(' try "bzr help"\n')
1183
import help
1184
help.help()
717
1185
return 1
718
719
try:
720
cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
721
except KeyError:
722
bailout("unknown command " + `cmd`)
723
724
# TODO: special --profile option to turn on the Python profiler
1186
1187
1188
canonical_cmd, cmd_class = get_cmd_class(cmd)
1189
1190
# global option
1191
if 'profile' in opts:
1192
profile = True
1193
del opts['profile']
1194
else:
1195
profile = False
725
1196
726
1197
# check options are reasonable
727
allowed = cmd_options.get(cmd, [])
1198
allowed = cmd_class.takes_options
728
1199
for oname in opts:
729
1200
if oname not in allowed:
730
bailout("option %r is not allowed for command %r"
731
% (oname, cmd))
732
733
cmdargs = _match_args(cmd, args)
734
cmdargs.update(opts)
735
736
ret = cmd_handler(**cmdargs) or 0
1201
raise BzrCommandError("option '--%s' is not allowed for command %r"
1202
% (oname, cmd))
1203
1204
# mix arguments and options into one dictionary
1205
cmdargs = _match_argform(cmd, cmd_class.takes_args, args)
1206
cmdopts = {}
1207
for k, v in opts.items():
1208
cmdopts[k.replace('-', '_')] = v
1209
1210
if profile:
1211
import hotshot, tempfile
1212
pffileno, pfname = tempfile.mkstemp()
1213
try:
1214
prof = hotshot.Profile(pfname)
1215
ret = prof.runcall(cmd_class, cmdopts, cmdargs) or 0
1216
prof.close()
1217
1218
import hotshot.stats
1219
stats = hotshot.stats.load(pfname)
1220
#stats.strip_dirs()
1221
stats.sort_stats('time')
1222
## XXX: Might like to write to stderr or the trace file instead but
1223
## print_stats seems hardcoded to stdout
1224
stats.print_stats(20)
1225
1226
return ret.status
1227
1228
finally:
1229
os.close(pffileno)
1230
os.remove(pfname)
1231
else:
1232
return cmd_class(cmdopts, cmdargs).status
1233
1234
1235
def _report_exception(summary, quiet=False):
1236
import traceback
1237
log_error('bzr: ' + summary)
1238
bzrlib.trace.log_exception()
1239
1240
if not quiet:
1241
tb = sys.exc_info()[2]
1242
exinfo = traceback.extract_tb(tb)
1243
if exinfo:
1244
sys.stderr.write(' at %s:%d in %s()\n' % exinfo[-1][:3])
1245
sys.stderr.write(' see ~/.bzr.log for debug information\n')
737
1246
738
1247
739
1248
740
1249
def main(argv):
741
## TODO: Handle command-line options; probably know what options are valid for
742
## each command
743
744
## TODO: If the arguments are wrong, give a usage message rather
745
## than just a backtrace.
746
747
bzrlib.trace.create_tracefile(argv)
1250
import errno
748
1251
1252
bzrlib.open_tracefile(argv)
1253
749
1254
try:
750
ret = run_bzr(argv)
751
return ret
752
except BzrError, e:
753
log_error('bzr: error: ' + e.args[0] + '\n')
754
if len(e.args) > 1:
755
for h in e.args[1]:
756
log_error(' ' + h + '\n')
757
return 1
758
except Exception, e:
759
log_error('bzr: exception: %s\n' % e)
760
log_error(' see .bzr.log for details\n')
761
traceback.print_exc(None, bzrlib.trace._tracefile)
762
traceback.print_exc(None, sys.stderr)
763
return 1
764
765
# TODO: Maybe nicer handling of IOError?
766
1255
try:
1256
try:
1257
return run_bzr(argv)
1258
finally:
1259
# do this here inside the exception wrappers to catch EPIPE
1260
sys.stdout.flush()
1261
except BzrError, e:
1262
quiet = isinstance(e, (BzrCommandError))
1263
_report_exception('error: ' + e.args[0], quiet=quiet)
1264
if len(e.args) > 1:
1265
for h in e.args[1]:
1266
# some explanation or hints
1267
log_error(' ' + h)
1268
return 1
1269
except AssertionError, e:
1270
msg = 'assertion failed'
1271
if str(e):
1272
msg += ': ' + str(e)
1273
_report_exception(msg)
1274
return 2
1275
except KeyboardInterrupt, e:
1276
_report_exception('interrupted', quiet=True)
1277
return 2
1278
except Exception, e:
1279
quiet = False
1280
if (isinstance(e, IOError)
1281
and hasattr(e, 'errno')
1282
and e.errno == errno.EPIPE):
1283
quiet = True
1284
msg = 'broken pipe'
1285
else:
1286
msg = str(e).rstrip('\n')
1287
_report_exception(msg, quiet)
1288
return 2
1289
finally:
1290
bzrlib.trace.close_trace()
767
1291
768
1292
769
1293
if __name__ == '__main__':
770
1294
sys.exit(main(sys.argv))
771
##import profile
772
##profile.run('main(sys.argv)')
773
Loggerhead is a web-based interface for Breezy
Version: 2.0.1