« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 324
- compare with another revision
- download diff
- download tarball
- view history from revision 324
- Committer: Martin Pool
- Date: 2005-05-02 07:29:28 UTC
- Revision ID: mbp@sourcefrog.net-20050502072928-4243b61c5272c9d9
- update doc build commands
- files added:
- bzrlib/tests.py
- files removed:
- HACKING
- bzrlib/plugins
- bzrlib/selftest
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib
- contrib/bash
- contrib/emacs
- contrib/zsh
- patches
- tools
- files renamed:
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/util/urlgrabber/ => urlgrabber/
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
1
# Copyright (C) 2004, 2005 by Canonical Ltd
1
# Copyright (C) 2004, 2005 by Martin Pool
2
# Copyright (C) 2005 by Canonical Ltd
3
2
4
3
5
# This program is free software; you can redistribute it and/or modify
4
6
# it under the terms of the GNU General Public License as published by
14
16
# along with this program; if not, write to the Free Software
15
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
18
17
18
# TODO: probably should say which arguments are candidates for glob
19
# expansion on windows and do that at the command level.
20
21
# TODO: Help messages for options.
22
23
# TODO: Define arguments by objects, rather than just using names.
24
# Those objects can specify the expected type of the argument, which
25
# would help with validation and shell completion.
26
27
28
29
import sys
30
import os
31
from warnings import warn
19
"""Bazaar-NG -- a free distributed version-control tool
20
http://bazaar-ng.org/
21
22
**WARNING: THIS IS AN UNSTABLE DEVELOPMENT VERSION**
23
24
* Metadata format is not stable yet -- you may need to
25
discard history in the future.
26
27
* Many commands unimplemented or partially implemented.
28
29
* Space-inefficient storage.
30
31
* No merge operators yet.
32
33
Interesting commands:
34
35
bzr help [COMMAND]
36
Show help screen
37
bzr version
38
Show software version/licence/non-warranty.
39
bzr init
40
Start versioning the current directory
41
bzr add FILE...
42
Make files versioned.
43
bzr log
44
Show revision history.
45
bzr rename FROM TO
46
Rename one file.
47
bzr move FROM... DESTDIR
48
Move one or more files to a different directory.
49
bzr diff [FILE...]
50
Show changes from last revision to working copy.
51
bzr commit -m 'MESSAGE'
52
Store current state as new revision.
53
bzr export REVNO DESTINATION
54
Export the branch state at a previous version.
55
bzr status
56
Show summary of pending changes.
57
bzr remove FILE...
58
Make a file not versioned.
59
bzr info
60
Show statistics about this branch.
61
bzr check
62
Verify history is stored safely.
63
(for more type 'bzr help commands')
64
"""
65
66
67
68
69
import sys, os, time, types, shutil, tempfile, fnmatch, difflib, os.path
70
from sets import Set
71
from pprint import pprint
72
from stat import *
73
from glob import glob
32
74
from inspect import getdoc
33
75
34
76
import bzrlib
35
import bzrlib.trace
36
from bzrlib.trace import mutter, note, log_error, warning
37
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError, NotBranchError
38
from bzrlib.branch import find_branch
39
from bzrlib import BZRDIR
40
41
plugin_cmds = {}
42
43
44
def register_command(cmd):
45
"Utility function to help register a command"
46
global plugin_cmds
47
k = cmd.__name__
48
if k.startswith("cmd_"):
49
k_unsquished = _unsquish_command_name(k)
50
else:
51
k_unsquished = k
52
if not plugin_cmds.has_key(k_unsquished):
53
plugin_cmds[k_unsquished] = cmd
54
mutter('registered plugin command %s', k_unsquished)
55
else:
56
log_error('Two plugins defined the same command: %r' % k)
57
log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
58
59
60
def _squish_command_name(cmd):
61
return 'cmd_' + cmd.replace('-', '_')
62
63
64
def _unsquish_command_name(cmd):
65
assert cmd.startswith("cmd_")
66
return cmd[4:].replace('_','-')
67
68
69
def _parse_revision_str(revstr):
70
"""This handles a revision string -> revno.
71
72
This always returns a list. The list will have one element for
73
74
It supports integers directly, but everything else it
75
defers for passing to Branch.get_revision_info()
76
77
>>> _parse_revision_str('234')
78
[234]
79
>>> _parse_revision_str('234..567')
80
[234, 567]
81
>>> _parse_revision_str('..')
82
[None, None]
83
>>> _parse_revision_str('..234')
84
[None, 234]
85
>>> _parse_revision_str('234..')
86
[234, None]
87
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
88
[234, 456, 789]
89
>>> _parse_revision_str('234....789') # Error?
90
[234, None, 789]
91
>>> _parse_revision_str('revid:test@other.com-234234')
92
['revid:test@other.com-234234']
93
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
94
['revid:test@other.com-234234', 'revid:test@other.com-234235']
95
>>> _parse_revision_str('revid:test@other.com-234234..23')
96
['revid:test@other.com-234234', 23]
97
>>> _parse_revision_str('date:2005-04-12')
98
['date:2005-04-12']
99
>>> _parse_revision_str('date:2005-04-12 12:24:33')
100
['date:2005-04-12 12:24:33']
101
>>> _parse_revision_str('date:2005-04-12T12:24:33')
102
['date:2005-04-12T12:24:33']
103
>>> _parse_revision_str('date:2005-04-12,12:24:33')
104
['date:2005-04-12,12:24:33']
105
>>> _parse_revision_str('-5..23')
106
[-5, 23]
107
>>> _parse_revision_str('-5')
108
[-5]
109
>>> _parse_revision_str('123a')
110
['123a']
111
>>> _parse_revision_str('abc')
112
['abc']
113
"""
114
import re
115
old_format_re = re.compile('\d*:\d*')
116
m = old_format_re.match(revstr)
117
if m:
118
warning('Colon separator for revision numbers is deprecated.'
119
' Use .. instead')
120
revs = []
121
for rev in revstr.split(':'):
122
if rev:
123
revs.append(int(rev))
124
else:
125
revs.append(None)
126
return revs
127
revs = []
128
for x in revstr.split('..'):
129
if not x:
130
revs.append(None)
131
else:
132
try:
133
revs.append(int(x))
134
except ValueError:
135
revs.append(x)
136
return revs
137
138
139
def get_merge_type(typestring):
140
"""Attempt to find the merge class/factory associated with a string."""
141
from merge import merge_types
142
try:
143
return merge_types[typestring][0]
144
except KeyError:
145
templ = '%s%%7s: %%s' % (' '*12)
146
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
147
type_list = '\n'.join(lines)
148
msg = "No known merge type %s. Supported types are:\n%s" %\
149
(typestring, type_list)
150
raise BzrCommandError(msg)
151
152
153
def get_merge_type(typestring):
154
"""Attempt to find the merge class/factory associated with a string."""
155
from merge import merge_types
156
try:
157
return merge_types[typestring][0]
158
except KeyError:
159
templ = '%s%%7s: %%s' % (' '*12)
160
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
161
type_list = '\n'.join(lines)
162
msg = "No known merge type %s. Supported types are:\n%s" %\
163
(typestring, type_list)
164
raise BzrCommandError(msg)
165
166
167
def _builtin_commands():
168
import bzrlib.builtins
169
r = {}
170
builtins = bzrlib.builtins.__dict__
171
for name in builtins:
172
if name.startswith("cmd_"):
173
real_name = _unsquish_command_name(name)
174
r[real_name] = builtins[name]
175
return r
176
177
178
179
def builtin_command_names():
180
"""Return list of builtin command names."""
181
return _builtin_commands().keys()
182
183
184
def plugin_command_names():
185
return plugin_cmds.keys()
186
187
188
def _get_cmd_dict(plugins_override=True):
189
"""Return name->class mapping for all commands."""
190
d = _builtin_commands()
191
if plugins_override:
192
d.update(plugin_cmds)
193
return d
194
195
196
def get_all_cmds(plugins_override=True):
197
"""Return canonical name and class for all registered commands."""
198
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
199
yield k,v
200
201
202
def get_cmd_object(cmd_name, plugins_override=True):
203
"""Return the canonical name and command class for a command.
204
205
plugins_override
206
If true, plugin commands can override builtins.
207
"""
208
from bzrlib.externalcommand import ExternalCommand
209
210
cmd_name = str(cmd_name) # not unicode
211
212
# first look up this command under the specified name
213
cmds = _get_cmd_dict(plugins_override=plugins_override)
214
try:
215
return cmds[cmd_name]()
216
except KeyError:
217
pass
218
219
# look for any command which claims this as an alias
220
for real_cmd_name, cmd_class in cmds.iteritems():
221
if cmd_name in cmd_class.aliases:
222
return cmd_class()
223
224
cmd_obj = ExternalCommand.find_command(cmd_name)
225
if cmd_obj:
226
return cmd_obj
227
228
raise BzrCommandError("unknown command %r" % cmd_name)
229
230
231
class Command(object):
232
"""Base class for commands.
233
234
Commands are the heart of the command-line bzr interface.
235
236
The command object mostly handles the mapping of command-line
237
parameters into one or more bzrlib operations, and of the results
238
into textual output.
239
240
Commands normally don't have any state. All their arguments are
241
passed in to the run method. (Subclasses may take a different
242
policy if the behaviour of the instance needs to depend on e.g. a
243
shell plugin and not just its Python class.)
244
245
The docstring for an actual command should give a single-line
246
summary, then a complete description of the command. A grammar
247
description will be inserted.
248
249
aliases
250
Other accepted names for this command.
251
252
takes_args
253
List of argument forms, marked with whether they are optional,
254
repeated, etc.
255
256
takes_options
257
List of options that may be given for this command.
258
259
hidden
260
If true, this command isn't advertised. This is typically
261
for commands intended for expert users.
262
"""
263
aliases = []
264
265
takes_args = []
266
takes_options = []
267
268
hidden = False
269
270
def __init__(self):
271
"""Construct an instance of this command."""
272
if self.__doc__ == Command.__doc__:
273
warn("No help message set for %r" % self)
274
275
276
def run_argv(self, argv):
277
"""Parse command line and run."""
278
args, opts = parse_args(argv)
279
280
if 'help' in opts: # e.g. bzr add --help
281
from bzrlib.help import help_on_command
282
help_on_command(self.name())
283
return 0
284
285
# check options are reasonable
286
allowed = self.takes_options
287
for oname in opts:
288
if oname not in allowed:
289
raise BzrCommandError("option '--%s' is not allowed for command %r"
290
% (oname, self.name()))
291
292
# mix arguments and options into one dictionary
293
cmdargs = _match_argform(self.name(), self.takes_args, args)
294
cmdopts = {}
295
for k, v in opts.items():
296
cmdopts[k.replace('-', '_')] = v
297
298
all_cmd_args = cmdargs.copy()
299
all_cmd_args.update(cmdopts)
300
301
return self.run(**all_cmd_args)
302
303
304
def run(self):
305
"""Actually run the command.
306
307
This is invoked with the options and arguments bound to
308
keyword parameters.
309
310
Return 0 or None if the command was successful, or a non-zero
311
shell error code if not. It's OK for this method to allow
312
an exception to raise up.
313
"""
314
raise NotImplementedError()
315
316
317
def help(self):
318
"""Return help message for this class."""
319
if self.__doc__ is Command.__doc__:
320
return None
321
return getdoc(self)
322
323
def name(self):
324
return _unsquish_command_name(self.__class__.__name__)
325
326
327
def parse_spec(spec):
328
"""
329
>>> parse_spec(None)
330
[None, None]
331
>>> parse_spec("./")
332
['./', None]
333
>>> parse_spec("../@")
334
['..', -1]
335
>>> parse_spec("../f/@35")
336
['../f', 35]
337
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
338
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
339
"""
340
if spec is None:
341
return [None, None]
342
if '/@' in spec:
343
parsed = spec.split('/@')
344
assert len(parsed) == 2
345
if parsed[1] == "":
346
parsed[1] = -1
347
else:
348
try:
349
parsed[1] = int(parsed[1])
350
except ValueError:
351
pass # We can allow stuff like ./@revid:blahblahblah
352
else:
353
assert parsed[1] >=0
354
else:
355
parsed = [spec, None]
356
return parsed
357
358
77
from bzrlib.store import ImmutableStore
78
from bzrlib.trace import mutter, note, log_error
79
from bzrlib.errors import bailout, BzrError, BzrCheckError
80
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
81
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
82
from bzrlib.revision import Revision
83
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
84
format_date
85
86
BZR_DIFF_FORMAT = "## Bazaar-NG diff, format 0 ##\n"
87
BZR_PATCHNAME_FORMAT = 'cset:sha1:%s'
88
89
## standard representation
90
NONE_STRING = '(none)'
91
EMPTY = 'empty'
92
93
94
## TODO: Perhaps a different version of inventory commands that
95
## returns iterators...
96
97
## TODO: Perhaps an AtomicFile class that writes to a temporary file and then renames.
98
99
## TODO: Some kind of locking on branches. Perhaps there should be a
100
## parameter to the branch object saying whether we want a read or
101
## write lock; release it from destructor. Perhaps don't even need a
102
## read lock to look at immutable objects?
103
104
## TODO: Perhaps make UUIDs predictable in test mode to make it easier
105
## to compare output?
106
107
## TODO: Some kind of global code to generate the right Branch object
108
## to work on. Almost, but not quite all, commands need one, and it
109
## can be taken either from their parameters or their working
110
## directory.
111
112
113
114
cmd_aliases = {
115
'?': 'help',
116
'ci': 'commit',
117
'checkin': 'commit',
118
'di': 'diff',
119
'st': 'status',
120
'stat': 'status',
121
}
122
123
124
def get_cmd_handler(cmd):
125
cmd = str(cmd)
126
127
cmd = cmd_aliases.get(cmd, cmd)
128
129
try:
130
cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
131
except KeyError:
132
raise BzrError("unknown command %r" % cmd)
133
134
return cmd, cmd_handler
135
136
137
138
def cmd_status(all=False):
139
"""Display status summary.
140
141
For each file there is a single line giving its file state and name.
142
The name is that in the current revision unless it is deleted or
143
missing, in which case the old name is shown.
144
"""
145
#import bzrlib.status
146
#bzrlib.status.tree_status(Branch('.'))
147
Branch('.').show_status(show_all=all)
148
149
150
151
######################################################################
152
# examining history
153
def cmd_get_revision(revision_id):
154
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
155
156
157
def cmd_get_file_text(text_id):
158
"""Get contents of a file by hash."""
159
sf = Branch('.').text_store[text_id]
160
pumpfile(sf, sys.stdout)
161
162
163
164
######################################################################
165
# commands
166
167
168
def cmd_revno():
169
"""Show number of revisions on this branch"""
170
print Branch('.').revno()
171
172
173
174
def cmd_add(file_list, verbose=False):
175
"""Add specified files or directories.
176
177
In non-recursive mode, all the named items are added, regardless
178
of whether they were previously ignored. A warning is given if
179
any of the named files are already versioned.
180
181
In recursive mode (the default), files are treated the same way
182
but the behaviour for directories is different. Directories that
183
are already versioned do not give a warning. All directories,
184
whether already versioned or not, are searched for files or
185
subdirectories that are neither versioned or ignored, and these
186
are added. This search proceeds recursively into versioned
187
directories.
188
189
Therefore simply saying 'bzr add .' will version all files that
190
are currently unknown.
191
192
TODO: Perhaps adding a file whose directly is not versioned should
193
recursively add that parent, rather than giving an error?
194
"""
195
bzrlib.add.smart_add(file_list, verbose)
196
197
198
def cmd_relpath(filename):
199
"""Show path of file relative to root"""
200
print Branch(filename).relpath(filename)
201
202
203
204
def cmd_inventory(revision=None):
205
"""Show inventory of the current working copy."""
206
## TODO: Also optionally show a previous inventory
207
## TODO: Format options
208
b = Branch('.')
209
if revision == None:
210
inv = b.read_working_inventory()
211
else:
212
inv = b.get_revision_inventory(b.lookup_revision(revision))
213
214
for path, entry in inv.iter_entries():
215
print '%-50s %s' % (entry.file_id, path)
216
217
218
219
# TODO: Maybe a 'mv' command that has the combined move/rename
220
# special behaviour of Unix?
221
222
def cmd_move(source_list, dest):
223
b = Branch('.')
224
225
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
226
227
228
229
def cmd_rename(from_name, to_name):
230
"""Change the name of an entry.
231
232
usage: bzr rename FROM_NAME TO_NAME
233
234
examples:
235
bzr rename frob.c frobber.c
236
bzr rename src/frob.c lib/frob.c
237
238
It is an error if the destination name exists.
239
240
See also the 'move' command, which moves files into a different
241
directory without changing their name.
242
243
TODO: Some way to rename multiple files without invoking bzr for each
244
one?"""
245
b = Branch('.')
246
b.rename_one(b.relpath(from_name), b.relpath(to_name))
247
248
249
250
251
def cmd_renames(dir='.'):
252
"""Show list of renamed files.
253
254
usage: bzr renames [BRANCH]
255
256
TODO: Option to show renames between two historical versions.
257
258
TODO: Only show renames under dir, rather than in the whole branch.
259
"""
260
b = Branch(dir)
261
old_inv = b.basis_tree().inventory
262
new_inv = b.read_working_inventory()
263
264
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
265
renames.sort()
266
for old_name, new_name in renames:
267
print "%s => %s" % (old_name, new_name)
268
269
270
271
def cmd_info():
272
"""info: Show statistical information for this branch
273
274
usage: bzr info"""
275
import info
276
info.show_info(Branch('.'))
277
278
279
280
def cmd_remove(file_list, verbose=False):
281
b = Branch(file_list[0])
282
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
283
284
285
286
def cmd_file_id(filename):
287
"""Print file_id of a particular file or directory.
288
289
usage: bzr file-id FILE
290
291
The file_id is assigned when the file is first added and remains the
292
same through all revisions where the file exists, even when it is
293
moved or renamed.
294
"""
295
b = Branch(filename)
296
i = b.inventory.path2id(b.relpath(filename))
297
if i == None:
298
bailout("%r is not a versioned file" % filename)
299
else:
300
print i
301
302
303
def cmd_file_id_path(filename):
304
"""Print path of file_ids to a file or directory.
305
306
usage: bzr file-id-path FILE
307
308
This prints one line for each directory down to the target,
309
starting at the branch root."""
310
b = Branch(filename)
311
inv = b.inventory
312
fid = inv.path2id(b.relpath(filename))
313
if fid == None:
314
bailout("%r is not a versioned file" % filename)
315
for fip in inv.get_idpath(fid):
316
print fip
317
318
319
def cmd_revision_history():
320
for patchid in Branch('.').revision_history():
321
print patchid
322
323
324
def cmd_directories():
325
for name, ie in Branch('.').read_working_inventory().directories():
326
if name == '':
327
print '.'
328
else:
329
print name
330
331
332
def cmd_missing():
333
for name, ie in Branch('.').working_tree().missing():
334
print name
335
336
337
def cmd_init():
338
# TODO: Check we're not already in a working directory? At the
339
# moment you'll get an ugly error.
340
341
# TODO: What if we're in a subdirectory of a branch? Would like
342
# to allow that, but then the parent may need to understand that
343
# the children have disappeared, or should they be versioned in
344
# both?
345
346
# TODO: Take an argument/option for branch name.
347
Branch('.', init=True)
348
349
350
def cmd_diff(revision=None, file_list=None):
351
"""bzr diff: Show differences in working tree.
352
353
usage: bzr diff [-r REV] [FILE...]
354
355
--revision REV
356
Show changes since REV, rather than predecessor.
357
358
If files are listed, only the changes in those files are listed.
359
Otherwise, all changes for the tree are listed.
360
361
TODO: Given two revision arguments, show the difference between them.
362
363
TODO: Allow diff across branches.
364
365
TODO: Option to use external diff command; could be GNU diff, wdiff,
366
or a graphical diff.
367
368
TODO: Python difflib is not exactly the same as unidiff; should
369
either fix it up or prefer to use an external diff.
370
371
TODO: If a directory is given, diff everything under that.
372
373
TODO: Selected-file diff is inefficient and doesn't show you
374
deleted files.
375
376
TODO: This probably handles non-Unix newlines poorly.
377
"""
378
379
## TODO: Shouldn't be in the cmd function.
380
381
b = Branch('.')
382
383
if revision == None:
384
old_tree = b.basis_tree()
385
else:
386
old_tree = b.revision_tree(b.lookup_revision(revision))
387
388
new_tree = b.working_tree()
389
390
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
391
old_label = ''
392
new_label = ''
393
394
DEVNULL = '/dev/null'
395
# Windows users, don't panic about this filename -- it is a
396
# special signal to GNU patch that the file should be created or
397
# deleted respectively.
398
399
# TODO: Generation of pseudo-diffs for added/deleted files could
400
# be usefully made into a much faster special case.
401
402
# TODO: Better to return them in sorted order I think.
403
404
if file_list:
405
file_list = [b.relpath(f) for f in file_list]
406
407
# FIXME: If given a file list, compare only those files rather
408
# than comparing everything and then throwing stuff away.
409
410
for file_state, fid, old_name, new_name, kind in bzrlib.diff_trees(old_tree, new_tree):
411
412
if file_list and (new_name not in file_list):
413
continue
414
415
# Don't show this by default; maybe do it if an option is passed
416
# idlabel = ' {%s}' % fid
417
idlabel = ''
418
419
# FIXME: Something about the diff format makes patch unhappy
420
# with newly-added files.
421
422
def diffit(oldlines, newlines, **kw):
423
424
# FIXME: difflib is wrong if there is no trailing newline.
425
# The syntax used by patch seems to be "\ No newline at
426
# end of file" following the last diff line from that
427
# file. This is not trivial to insert into the
428
# unified_diff output and it might be better to just fix
429
# or replace that function.
430
431
# In the meantime we at least make sure the patch isn't
432
# mangled.
433
434
435
# Special workaround for Python2.3, where difflib fails if
436
# both sequences are empty.
437
if not oldlines and not newlines:
438
return
439
440
nonl = False
441
442
if oldlines and (oldlines[-1][-1] != '\n'):
443
oldlines[-1] += '\n'
444
nonl = True
445
if newlines and (newlines[-1][-1] != '\n'):
446
newlines[-1] += '\n'
447
nonl = True
448
449
ud = difflib.unified_diff(oldlines, newlines, **kw)
450
sys.stdout.writelines(ud)
451
if nonl:
452
print "\\ No newline at end of file"
453
sys.stdout.write('\n')
454
455
if file_state in ['.', '?', 'I']:
456
continue
457
elif file_state == 'A':
458
print '*** added %s %r' % (kind, new_name)
459
if kind == 'file':
460
diffit([],
461
new_tree.get_file(fid).readlines(),
462
fromfile=DEVNULL,
463
tofile=new_label + new_name + idlabel)
464
elif file_state == 'D':
465
assert isinstance(old_name, types.StringTypes)
466
print '*** deleted %s %r' % (kind, old_name)
467
if kind == 'file':
468
diffit(old_tree.get_file(fid).readlines(), [],
469
fromfile=old_label + old_name + idlabel,
470
tofile=DEVNULL)
471
elif file_state in ['M', 'R']:
472
if file_state == 'M':
473
assert kind == 'file'
474
assert old_name == new_name
475
print '*** modified %s %r' % (kind, new_name)
476
elif file_state == 'R':
477
print '*** renamed %s %r => %r' % (kind, old_name, new_name)
478
479
if kind == 'file':
480
diffit(old_tree.get_file(fid).readlines(),
481
new_tree.get_file(fid).readlines(),
482
fromfile=old_label + old_name + idlabel,
483
tofile=new_label + new_name)
484
else:
485
bailout("can't represent state %s {%s}" % (file_state, fid))
486
487
488
489
def cmd_deleted(show_ids=False):
490
"""List files deleted in the working tree.
491
492
TODO: Show files deleted since a previous revision, or between two revisions.
493
"""
494
b = Branch('.')
495
old = b.basis_tree()
496
new = b.working_tree()
497
498
## TODO: Much more efficient way to do this: read in new
499
## directories with readdir, rather than stating each one. Same
500
## level of effort but possibly much less IO. (Or possibly not,
501
## if the directories are very large...)
502
503
for path, ie in old.inventory.iter_entries():
504
if not new.has_id(ie.file_id):
505
if show_ids:
506
print '%-50s %s' % (path, ie.file_id)
507
else:
508
print path
509
510
511
512
def cmd_parse_inventory():
513
import cElementTree
514
515
cElementTree.ElementTree().parse(file('.bzr/inventory'))
516
517
518
519
def cmd_load_inventory():
520
"""Load inventory for timing purposes"""
521
Branch('.').basis_tree().inventory
522
523
524
def cmd_dump_inventory():
525
Branch('.').read_working_inventory().write_xml(sys.stdout)
526
527
528
def cmd_dump_new_inventory():
529
import bzrlib.newinventory
530
inv = Branch('.').basis_tree().inventory
531
bzrlib.newinventory.write_inventory(inv, sys.stdout)
532
533
534
def cmd_load_new_inventory():
535
import bzrlib.newinventory
536
bzrlib.newinventory.read_new_inventory(sys.stdin)
537
538
539
def cmd_dump_slacker_inventory():
540
import bzrlib.newinventory
541
inv = Branch('.').basis_tree().inventory
542
bzrlib.newinventory.write_slacker_inventory(inv, sys.stdout)
543
544
545
546
def cmd_dump_text_inventory():
547
import bzrlib.textinv
548
inv = Branch('.').basis_tree().inventory
549
bzrlib.textinv.write_text_inventory(inv, sys.stdout)
550
551
552
def cmd_load_text_inventory():
553
import bzrlib.textinv
554
inv = bzrlib.textinv.read_text_inventory(sys.stdin)
555
print 'loaded %d entries' % len(inv)
556
557
558
559
def cmd_root(filename=None):
560
"""Print the branch root."""
561
print bzrlib.branch.find_branch_root(filename)
562
563
564
def cmd_log(timezone='original', verbose=False):
565
"""Show log of this branch.
566
567
TODO: Options for utc; to show ids; to limit range; etc.
568
"""
569
Branch('.').write_log(show_timezone=timezone, verbose=verbose)
570
571
572
def cmd_ls(revision=None, verbose=False):
573
"""List files in a tree.
574
575
TODO: Take a revision or remote path and list that tree instead.
576
"""
577
b = Branch('.')
578
if revision == None:
579
tree = b.working_tree()
580
else:
581
tree = b.revision_tree(b.lookup_revision(revision))
582
583
for fp, fc, kind, fid in tree.list_files():
584
if verbose:
585
if kind == 'directory':
586
kindch = '/'
587
elif kind == 'file':
588
kindch = ''
589
else:
590
kindch = '???'
591
592
print '%-8s %s%s' % (fc, fp, kindch)
593
else:
594
print fp
595
596
597
598
def cmd_unknowns():
599
"""List unknown files"""
600
for f in Branch('.').unknowns():
601
print quotefn(f)
602
603
604
605
def cmd_ignore(name_pattern):
606
"""Ignore a command or pattern"""
607
608
b = Branch('.')
609
610
# XXX: This will fail if it's a hardlink; should use an AtomicFile class.
611
f = open(b.abspath('.bzrignore'), 'at')
612
f.write(name_pattern + '\n')
613
f.close()
614
615
inv = b.working_tree().inventory
616
if inv.path2id('.bzrignore'):
617
mutter('.bzrignore is already versioned')
618
else:
619
mutter('need to make new .bzrignore file versioned')
620
b.add(['.bzrignore'])
621
622
623
624
def cmd_ignored():
625
"""List ignored files and the patterns that matched them.
626
"""
627
tree = Branch('.').working_tree()
628
for path, file_class, kind, file_id in tree.list_files():
629
if file_class != 'I':
630
continue
631
## XXX: Slightly inefficient since this was already calculated
632
pat = tree.is_ignored(path)
633
print '%-50s %s' % (path, pat)
634
635
636
def cmd_lookup_revision(revno):
637
try:
638
revno = int(revno)
639
except ValueError:
640
bailout("usage: lookup-revision REVNO",
641
["REVNO is a non-negative revision number for this branch"])
642
643
print Branch('.').lookup_revision(revno) or NONE_STRING
644
645
646
647
def cmd_export(revno, dest):
648
"""Export past revision to destination directory."""
649
b = Branch('.')
650
rh = b.lookup_revision(int(revno))
651
t = b.revision_tree(rh)
652
t.export(dest)
653
654
def cmd_cat(revision, filename):
655
"""Print file to stdout."""
656
b = Branch('.')
657
b.print_file(b.relpath(filename), int(revision))
658
659
660
######################################################################
661
# internal/test commands
662
663
664
def cmd_uuid():
665
"""Print a newly-generated UUID."""
666
print bzrlib.osutils.uuid()
667
668
669
670
def cmd_local_time_offset():
671
print bzrlib.osutils.local_time_offset()
672
673
674
675
def cmd_commit(message=None, verbose=False):
676
"""Commit changes to a new revision.
677
678
--message MESSAGE
679
Description of changes in this revision; free form text.
680
It is recommended that the first line be a single-sentence
681
summary.
682
--verbose
683
Show status of changed files,
684
685
TODO: Commit only selected files.
686
687
TODO: Run hooks on tree to-be-committed, and after commit.
688
689
TODO: Strict commit that fails if there are unknown or deleted files.
690
"""
691
692
if not message:
693
bailout("please specify a commit message")
694
Branch('.').commit(message, verbose=verbose)
695
696
697
def cmd_check(dir='.'):
698
"""check: Consistency check of branch history.
699
700
usage: bzr check [-v] [BRANCH]
701
702
options:
703
--verbose, -v Show progress of checking.
704
705
This command checks various invariants about the branch storage to
706
detect data corruption or bzr bugs.
707
"""
708
import bzrlib.check
709
bzrlib.check.check(Branch(dir, find_root=False))
710
711
712
def cmd_is(pred, *rest):
713
"""Test whether PREDICATE is true."""
714
try:
715
cmd_handler = globals()['assert_' + pred.replace('-', '_')]
716
except KeyError:
717
bailout("unknown predicate: %s" % quotefn(pred))
718
719
try:
720
cmd_handler(*rest)
721
except BzrCheckError:
722
# by default we don't print the message so that this can
723
# be used from shell scripts without producing noise
724
sys.exit(1)
725
726
727
def cmd_whoami(email=False):
728
"""Show bzr user id.
729
730
usage: bzr whoami
731
732
options:
733
--email Show only the email address.
734
735
"""
736
if email:
737
print bzrlib.osutils.user_email()
738
else:
739
print bzrlib.osutils.username()
740
741
742
def cmd_gen_revision_id():
743
print bzrlib.branch._gen_revision_id(time.time())
744
745
746
def cmd_selftest():
747
"""Run internal test suite"""
748
## -v, if present, is seen by doctest; the argument is just here
749
## so our parser doesn't complain
750
751
## TODO: --verbose option
752
753
failures, tests = 0, 0
754
755
import doctest, bzrlib.store, bzrlib.tests
756
bzrlib.trace.verbose = False
757
758
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
759
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
760
mf, mt = doctest.testmod(m)
761
failures += mf
762
tests += mt
763
print '%-40s %3d tests' % (m.__name__, mt),
764
if mf:
765
print '%3d FAILED!' % mf
766
else:
767
print
768
769
print '%-40s %3d tests' % ('total', tests),
770
if failures:
771
print '%3d FAILED!' % failures
772
else:
773
print
774
775
776
777
# deprecated
778
cmd_doctest = cmd_selftest
779
780
781
######################################################################
782
# help
783
784
785
def cmd_help(topic=None):
786
if topic == None:
787
print __doc__
788
elif topic == 'commands':
789
help_commands()
790
else:
791
# otherwise, maybe the name of a command?
792
topic, cmdfn = get_cmd_handler(topic)
793
794
doc = getdoc(cmdfn)
795
if doc == None:
796
bailout("sorry, no detailed help yet for %r" % topic)
797
798
print doc
799
800
801
def help_commands():
802
"""List all commands"""
803
accu = []
804
for k in globals().keys():
805
if k.startswith('cmd_'):
806
accu.append(k[4:].replace('_','-'))
807
accu.sort()
808
print "bzr commands: "
809
for x in accu:
810
print " " + x
811
print "note: some of these commands are internal-use or obsolete"
812
# TODO: Some kind of marker for internal-use commands?
813
# TODO: Show aliases?
814
815
816
817
818
def cmd_version():
819
print "bzr (bazaar-ng) %s" % bzrlib.__version__
820
print bzrlib.__copyright__
821
print "http://bazaar-ng.org/"
822
print
823
print \
824
"""bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
825
you may use, modify and redistribute it under the terms of the GNU
826
General Public License version 2 or later."""
827
828
829
def cmd_rocks():
830
"""Statement of optimism."""
831
print "it sure does!"
832
833
834
835
######################################################################
836
# main routine
359
837
360
838
361
839
# list of all available options; the rhs can be either None for an
363
841
# the type.
364
842
OPTIONS = {
365
843
'all': None,
366
'diff-options': str,
367
844
'help': None,
368
'file': unicode,
369
'force': None,
370
'format': unicode,
371
'forward': None,
372
845
'message': unicode,
373
'no-recurse': None,
374
846
'profile': None,
375
'revision': _parse_revision_str,
376
'short': None,
847
'revision': int,
377
848
'show-ids': None,
378
849
'timezone': str,
379
850
'verbose': None,
380
851
'version': None,
381
852
'email': None,
382
'unchanged': None,
383
'update': None,
384
'long': None,
385
'root': str,
386
'no-backup': None,
387
'merge-type': get_merge_type,
388
'pattern': str,
389
853
}
390
854
391
855
SHORT_OPTIONS = {
392
'F': 'file',
393
'h': 'help',
394
856
'm': 'message',
395
857
'r': 'revision',
396
858
'v': 'verbose',
397
'l': 'long',
398
859
}
399
860
861
# List of options that apply to particular commands; commands not
862
# listed take none.
863
cmd_options = {
864
'add': ['verbose'],
865
'cat': ['revision'],
866
'commit': ['message', 'verbose'],
867
'deleted': ['show-ids'],
868
'diff': ['revision'],
869
'inventory': ['revision'],
870
'log': ['timezone', 'verbose'],
871
'ls': ['revision', 'verbose'],
872
'remove': ['verbose'],
873
'status': ['all'],
874
'whoami': ['email'],
875
}
876
877
878
cmd_args = {
879
'add': ['file+'],
880
'cat': ['filename'],
881
'commit': [],
882
'diff': ['file*'],
883
'export': ['revno', 'dest'],
884
'file-id': ['filename'],
885
'file-id-path': ['filename'],
886
'get-file-text': ['text_id'],
887
'get-inventory': ['inventory_id'],
888
'get-revision': ['revision_id'],
889
'get-revision-inventory': ['revision_id'],
890
'help': ['topic?'],
891
'ignore': ['name_pattern'],
892
'init': [],
893
'log': [],
894
'lookup-revision': ['revno'],
895
'move': ['source$', 'dest'],
896
'relpath': ['filename'],
897
'remove': ['file+'],
898
'rename': ['from_name', 'to_name'],
899
'renames': ['dir?'],
900
'root': ['filename?'],
901
'status': [],
902
}
903
400
904
401
905
def parse_args(argv):
402
906
"""Parse command line.
408
912
409
913
>>> parse_args('--help'.split())
410
914
([], {'help': True})
411
>>> parse_args('help -- --invalidcmd'.split())
412
(['help', '--invalidcmd'], {})
413
915
>>> parse_args('--version'.split())
414
916
([], {'version': True})
415
917
>>> parse_args('status --all'.split())
416
918
(['status'], {'all': True})
417
919
>>> parse_args('commit --message=biter'.split())
418
920
(['commit'], {'message': u'biter'})
419
>>> parse_args('log -r 500'.split())
420
(['log'], {'revision': [500]})
421
>>> parse_args('log -r500..600'.split())
422
(['log'], {'revision': [500, 600]})
423
>>> parse_args('log -vr500..600'.split())
424
(['log'], {'verbose': True, 'revision': [500, 600]})
425
>>> parse_args('log -rv500..600'.split()) #the r takes an argument
426
(['log'], {'revision': ['v500', 600]})
427
921
"""
428
922
args = []
429
923
opts = {}
430
924
431
argsover = False
925
# TODO: Maybe handle '--' to end options?
926
432
927
while argv:
433
928
a = argv.pop(0)
434
if not argsover and a[0] == '-':
929
if a[0] == '-':
435
930
# option names must not be unicode
436
931
a = str(a)
437
932
optarg = None
438
933
if a[1] == '-':
439
if a == '--':
440
# We've received a standalone -- No more flags
441
argsover = True
442
continue
443
934
mutter(" got option %r" % a)
444
935
if '=' in a:
445
936
optname, optarg = a[2:].split('=', 1)
446
937
else:
447
938
optname = a[2:]
448
939
if optname not in OPTIONS:
449
raise BzrError('unknown long option %r' % a)
940
bailout('unknown long option %r' % a)
450
941
else:
451
942
shortopt = a[1:]
452
if shortopt in SHORT_OPTIONS:
453
# Multi-character options must have a space to delimit
454
# their value
455
optname = SHORT_OPTIONS[shortopt]
456
else:
457
# Single character short options, can be chained,
458
# and have their value appended to their name
459
shortopt = a[1:2]
460
if shortopt not in SHORT_OPTIONS:
461
# We didn't find the multi-character name, and we
462
# didn't find the single char name
463
raise BzrError('unknown short option %r' % a)
464
optname = SHORT_OPTIONS[shortopt]
465
466
if a[2:]:
467
# There are extra things on this option
468
# see if it is the value, or if it is another
469
# short option
470
optargfn = OPTIONS[optname]
471
if optargfn is None:
472
# This option does not take an argument, so the
473
# next entry is another short option, pack it back
474
# into the list
475
argv.insert(0, '-' + a[2:])
476
else:
477
# This option takes an argument, so pack it
478
# into the array
479
optarg = a[2:]
943
if shortopt not in SHORT_OPTIONS:
944
bailout('unknown short option %r' % a)
945
optname = SHORT_OPTIONS[shortopt]
480
946
481
947
if optname in opts:
482
948
# XXX: Do we ever want to support this, e.g. for -r?
483
raise BzrError('repeated option %r' % a)
949
bailout('repeated option %r' % a)
484
950
485
951
optargfn = OPTIONS[optname]
486
952
if optargfn:
487
953
if optarg == None:
488
954
if not argv:
489
raise BzrError('option %r needs an argument' % a)
955
bailout('option %r needs an argument' % a)
490
956
else:
491
957
optarg = argv.pop(0)
492
958
opts[optname] = optargfn(optarg)
493
959
else:
494
960
if optarg != None:
495
raise BzrError('option %r takes no argument' % optname)
961
bailout('option %r takes no argument' % optname)
496
962
opts[optname] = True
497
963
else:
498
964
args.append(a)
501
967
502
968
503
969
970
def _match_args(cmd, args):
971
"""Check non-option arguments match required pattern.
504
972
505
def _match_argform(cmd, takes_args, args):
973
>>> _match_args('status', ['asdasdsadasd'])
974
Traceback (most recent call last):
975
...
976
BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
977
>>> _match_args('add', ['asdasdsadasd'])
978
{'file_list': ['asdasdsadasd']}
979
>>> _match_args('add', 'abc def gj'.split())
980
{'file_list': ['abc', 'def', 'gj']}
981
"""
982
# match argument pattern
983
argform = cmd_args.get(cmd, [])
506
984
argdict = {}
985
# TODO: Need a way to express 'cp SRC... DEST', where it matches
986
# all but one.
507
987
508
# step through args and takes_args, allowing appropriate 0-many matches
509
for ap in takes_args:
988
# step through args and argform, allowing appropriate 0-many matches
989
for ap in argform:
510
990
argname = ap[:-1]
511
991
if ap[-1] == '?':
512
992
if args:
519
999
argdict[argname + '_list'] = None
520
1000
elif ap[-1] == '+':
521
1001
if not args:
522
raise BzrCommandError("command %r needs one or more %s"
1002
bailout("command %r needs one or more %s"
523
1003
% (cmd, argname.upper()))
524
1004
else:
525
1005
argdict[argname + '_list'] = args[:]
526
1006
args = []
527
1007
elif ap[-1] == '$': # all but one
528
1008
if len(args) < 2:
529
raise BzrCommandError("command %r needs one or more %s"
1009
bailout("command %r needs one or more %s"
530
1010
% (cmd, argname.upper()))
531
1011
argdict[argname + '_list'] = args[:-1]
532
1012
args[:-1] = []
534
1014
# just a plain arg
535
1015
argname = ap
536
1016
if not args:
537
raise BzrCommandError("command %r requires argument %s"
1017
bailout("command %r requires argument %s"
538
1018
% (cmd, argname.upper()))
539
1019
else:
540
1020
argdict[argname] = args.pop(0)
541
1021
542
1022
if args:
543
raise BzrCommandError("extra argument to command %s: %s"
544
% (cmd, args[0]))
1023
bailout("extra arguments to command %s: %r"
1024
% (cmd, args))
545
1025
546
1026
return argdict
547
1027
548
1028
549
1029
550
def apply_profiled(the_callable, *args, **kwargs):
551
import hotshot
552
import tempfile
553
pffileno, pfname = tempfile.mkstemp()
554
try:
555
prof = hotshot.Profile(pfname)
556
try:
557
ret = prof.runcall(the_callable, *args, **kwargs) or 0
558
finally:
559
prof.close()
560
561
import hotshot.stats
562
stats = hotshot.stats.load(pfname)
563
#stats.strip_dirs()
564
stats.sort_stats('time')
565
## XXX: Might like to write to stderr or the trace file instead but
566
## print_stats seems hardcoded to stdout
567
stats.print_stats(20)
568
569
return ret
570
finally:
571
os.close(pffileno)
572
os.remove(pfname)
573
574
575
1030
def run_bzr(argv):
576
1031
"""Execute a command.
577
1032
578
1033
This is similar to main(), but without all the trappings for
579
1034
logging and error handling.
580
581
argv
582
The command-line arguments, without the program name from argv[0]
583
584
Returns a command status or raises an exception.
585
586
Special master options: these must come before the command because
587
they control how the command is interpreted.
588
589
--no-plugins
590
Do not load plugin modules at all
591
592
--builtin
593
Only use builtin commands. (Plugins are still allowed to change
594
other behaviour.)
595
596
--profile
597
Run under the Python profiler.
598
1035
"""
599
1036
600
1037
argv = [a.decode(bzrlib.user_encoding) for a in argv]
601
602
opt_profile = opt_no_plugins = opt_builtin = False
603
604
# --no-plugins is handled specially at a very early stage. We need
605
# to load plugins before doing other command parsing so that they
606
# can override commands, but this needs to happen first.
607
608
for a in argv:
609
if a == '--profile':
610
opt_profile = True
611
elif a == '--no-plugins':
612
opt_no_plugins = True
613
elif a == '--builtin':
614
opt_builtin = True
615
else:
616
break
617
argv.remove(a)
618
619
if (not argv) or (argv[0] == '--help'):
620
from bzrlib.help import help
621
if len(argv) > 1:
622
help(argv[1])
623
else:
624
help()
625
return 0
626
627
if argv[0] == '--version':
628
from bzrlib.builtins import show_version
629
show_version()
630
return 0
631
632
if not opt_no_plugins:
633
from bzrlib.plugin import load_plugins
634
load_plugins()
635
636
cmd = str(argv.pop(0))
637
638
cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin)
639
640
if opt_profile:
641
ret = apply_profiled(cmd_obj.run_argv, argv)
642
else:
643
ret = cmd_obj.run_argv(argv)
644
return ret or 0
1038
1039
try:
1040
args, opts = parse_args(argv[1:])
1041
if 'help' in opts:
1042
# TODO: pass down other arguments in case they asked for
1043
# help on a command name?
1044
if args:
1045
cmd_help(args[0])
1046
else:
1047
cmd_help()
1048
return 0
1049
elif 'version' in opts:
1050
cmd_version()
1051
return 0
1052
cmd = str(args.pop(0))
1053
except IndexError:
1054
log_error('usage: bzr COMMAND')
1055
log_error(' try "bzr help"')
1056
return 1
1057
1058
canonical_cmd, cmd_handler = get_cmd_handler(cmd)
1059
1060
# global option
1061
if 'profile' in opts:
1062
profile = True
1063
del opts['profile']
1064
else:
1065
profile = False
1066
1067
# check options are reasonable
1068
allowed = cmd_options.get(canonical_cmd, [])
1069
for oname in opts:
1070
if oname not in allowed:
1071
bailout("option %r is not allowed for command %r"
1072
% (oname, cmd))
1073
1074
# TODO: give an error if there are any mandatory options which are
1075
# not specified? Or maybe there shouldn't be any "mandatory
1076
# options" (it is an oxymoron)
1077
1078
# mix arguments and options into one dictionary
1079
cmdargs = _match_args(canonical_cmd, args)
1080
for k, v in opts.items():
1081
cmdargs[k.replace('-', '_')] = v
1082
1083
if profile:
1084
import hotshot
1085
pffileno, pfname = tempfile.mkstemp()
1086
try:
1087
prof = hotshot.Profile(pfname)
1088
ret = prof.runcall(cmd_handler, **cmdargs) or 0
1089
prof.close()
1090
1091
import hotshot.stats
1092
stats = hotshot.stats.load(pfname)
1093
#stats.strip_dirs()
1094
stats.sort_stats('time')
1095
## XXX: Might like to write to stderr or the trace file instead but
1096
## print_stats seems hardcoded to stdout
1097
stats.print_stats(20)
1098
1099
return ret
1100
1101
finally:
1102
os.close(pffileno)
1103
os.remove(pfname)
1104
else:
1105
return cmd_handler(**cmdargs) or 0
1106
1107
1108
1109
def _report_exception(e, summary, quiet=False):
1110
import traceback
1111
log_error('bzr: ' + summary)
1112
bzrlib.trace.log_exception(e)
1113
1114
if not quiet:
1115
tb = sys.exc_info()[2]
1116
exinfo = traceback.extract_tb(tb)
1117
if exinfo:
1118
sys.stderr.write(' at %s:%d in %s()\n' % exinfo[-1][:3])
1119
sys.stderr.write(' see ~/.bzr.log for debug information\n')
1120
1121
1122
def cmd_assert_fail():
1123
assert False, "always fails"
645
1124
646
1125
647
1126
def main(argv):
648
import bzrlib.ui
649
bzrlib.trace.log_startup(argv)
650
bzrlib.ui.ui_factory = bzrlib.ui.TextUIFactory()
1127
import errno
1128
1129
bzrlib.trace.create_tracefile(argv)
651
1130
652
1131
try:
653
1132
try:
654
try:
655
return run_bzr(argv[1:])
656
finally:
657
# do this here inside the exception wrappers to catch EPIPE
658
sys.stdout.flush()
659
#wrap common errors as CommandErrors.
660
except (NotBranchError,), e:
661
raise BzrCommandError(str(e))
662
except BzrCommandError, e:
663
# command line syntax error, etc
664
log_error(str(e))
665
return 1
666
except BzrError, e:
667
bzrlib.trace.log_exception()
668
return 1
669
except AssertionError, e:
670
bzrlib.trace.log_exception('assertion failed: ' + str(e))
671
return 3
672
except KeyboardInterrupt, e:
673
bzrlib.trace.note('interrupted')
674
return 2
675
except Exception, e:
676
import errno
677
if (isinstance(e, IOError)
678
and hasattr(e, 'errno')
679
and e.errno == errno.EPIPE):
680
bzrlib.trace.note('broken pipe')
681
return 2
682
else:
683
bzrlib.trace.log_exception()
684
return 2
1133
ret = run_bzr(argv)
1134
# do this here to catch EPIPE
1135
sys.stdout.flush()
1136
return ret
1137
except BzrError, e:
1138
_report_exception(e, 'error: ' + e.args[0])
1139
if len(e.args) > 1:
1140
for h in e.args[1]:
1141
# some explanation or hints
1142
log_error(' ' + h)
1143
return 1
1144
except AssertionError, e:
1145
msg = 'assertion failed'
1146
if str(e):
1147
msg += ': ' + str(e)
1148
_report_exception(e, msg)
1149
return 2
1150
except KeyboardInterrupt, e:
1151
_report_exception(e, 'interrupted', quiet=True)
1152
return 2
1153
except Exception, e:
1154
quiet = False
1155
if isinstance(e, IOError) and e.errno == errno.EPIPE:
1156
quiet = True
1157
msg = 'broken pipe'
1158
else:
1159
msg = str(e).rstrip('\n')
1160
_report_exception(e, msg, quiet)
1161
return 2
1162
finally:
1163
bzrlib.trace.close_trace()
685
1164
686
1165
687
1166
if __name__ == '__main__':
Loggerhead is a web-based interface for Breezy
Version: 2.0.1