~bzr-pqm/bzr/bzr.dev

1 by mbp at sourcefrog
import from baz patch-364
1
# Copyright (C) 2004, 2005 by Martin Pool
2
# Copyright (C) 2005 by Canonical Ltd
3
4
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
9
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
# GNU General Public License for more details.
14
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
19
"""Bazaar-NG -- a free distributed version-control tool
273 by Martin Pool
- New 'bzr help commands'
20
http://bazaar-ng.org/
1 by mbp at sourcefrog
import from baz patch-364
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
273 by Martin Pool
- New 'bzr help commands'
33
Interesting commands:
1 by mbp at sourcefrog
import from baz patch-364
34
85 by mbp at sourcefrog
improved help string
35
  bzr help [COMMAND]
273 by Martin Pool
- New 'bzr help commands'
36
      Show help screen
1 by mbp at sourcefrog
import from baz patch-364
37
  bzr version
273 by Martin Pool
- New 'bzr help commands'
38
      Show software version/licence/non-warranty.
1 by mbp at sourcefrog
import from baz patch-364
39
  bzr init
273 by Martin Pool
- New 'bzr help commands'
40
      Start versioning the current directory
1 by mbp at sourcefrog
import from baz patch-364
41
  bzr add FILE...
273 by Martin Pool
- New 'bzr help commands'
42
      Make files versioned.
1 by mbp at sourcefrog
import from baz patch-364
43
  bzr log
273 by Martin Pool
- New 'bzr help commands'
44
      Show revision history.
196 by mbp at sourcefrog
selected-file diff
45
  bzr diff [FILE...]
273 by Martin Pool
- New 'bzr help commands'
46
      Show changes from last revision to working copy.
1 by mbp at sourcefrog
import from baz patch-364
47
  bzr commit -m 'MESSAGE'
273 by Martin Pool
- New 'bzr help commands'
48
      Store current state as new revision.
1 by mbp at sourcefrog
import from baz patch-364
49
  bzr export REVNO DESTINATION
273 by Martin Pool
- New 'bzr help commands'
50
      Export the branch state at a previous version.
1 by mbp at sourcefrog
import from baz patch-364
51
  bzr status
273 by Martin Pool
- New 'bzr help commands'
52
      Show summary of pending changes.
1 by mbp at sourcefrog
import from baz patch-364
53
  bzr remove FILE...
273 by Martin Pool
- New 'bzr help commands'
54
      Make a file not versioned.
76 by mbp at sourcefrog
mention "info" in top-level help
55
  bzr info
273 by Martin Pool
- New 'bzr help commands'
56
      Show statistics about this branch.
57
  bzr check
58
      Verify history is stored safely. 
59
  (for more type 'bzr help commands')
1 by mbp at sourcefrog
import from baz patch-364
60
"""
61
62
63
64
263 by Martin Pool
factor out code to log exceptions
65
import sys, os, time, types, shutil, tempfile, fnmatch, difflib, os.path
1 by mbp at sourcefrog
import from baz patch-364
66
from sets import Set
67
from pprint import pprint
68
from stat import *
69
from glob import glob
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
70
from inspect import getdoc
1 by mbp at sourcefrog
import from baz patch-364
71
72
import bzrlib
73
from bzrlib.store import ImmutableStore
74
from bzrlib.trace import mutter, note, log_error
184 by mbp at sourcefrog
pychecker fixups
75
from bzrlib.errors import bailout, BzrError, BzrCheckError
1 by mbp at sourcefrog
import from baz patch-364
76
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
77
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
78
from bzrlib.revision import Revision
79
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
80
     format_date
81
82
BZR_DIFF_FORMAT = "## Bazaar-NG diff, format 0 ##\n"
83
BZR_PATCHNAME_FORMAT = 'cset:sha1:%s'
84
85
## standard representation
86
NONE_STRING = '(none)'
87
EMPTY = 'empty'
88
89
90
## TODO: Perhaps a different version of inventory commands that
91
## returns iterators...
92
93
## TODO: Perhaps an AtomicFile class that writes to a temporary file and then renames.
94
95
## TODO: Some kind of locking on branches.  Perhaps there should be a
96
## parameter to the branch object saying whether we want a read or
97
## write lock; release it from destructor.  Perhaps don't even need a
98
## read lock to look at immutable objects?
99
100
## TODO: Perhaps make UUIDs predictable in test mode to make it easier
101
## to compare output?
102
34 by mbp at sourcefrog
doc
103
## TODO: Some kind of global code to generate the right Branch object
104
## to work on.  Almost, but not quite all, commands need one, and it
105
## can be taken either from their parameters or their working
106
## directory.
107
46 by Martin Pool
todo
108
## TODO: rename command, needed soon: check destination doesn't exist
109
## either in working copy or tree; move working copy; update
110
## inventory; write out
111
112
## TODO: move command; check destination is a directory and will not
113
## clash; move it.
114
115
## TODO: command to show renames, one per line, as to->from
116
117
1 by mbp at sourcefrog
import from baz patch-364
118
272 by Martin Pool
- Add command aliases
119
cmd_aliases = {
120
    '?':         'help',
121
    'ci':        'commit',
122
    'checkin':   'commit',
123
    'di':        'diff',
124
    'st':        'status',
125
    'stat':      'status',
126
    }
127
128
129
def get_cmd_handler(cmd):
274 by Martin Pool
- Fix 'bzr help COMMAND' for Unicode changes
130
    cmd = str(cmd)
272 by Martin Pool
- Add command aliases
131
    
132
    cmd = cmd_aliases.get(cmd, cmd)
133
    
134
    try:
135
        cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
136
    except KeyError:
137
        raise BzrError("unknown command %r" % cmd)
138
139
    return cmd, cmd_handler
140
141
1 by mbp at sourcefrog
import from baz patch-364
142
143
def cmd_status(all=False):
144
    """Display status summary.
145
146
    For each file there is a single line giving its file state and name.
147
    The name is that in the current revision unless it is deleted or
148
    missing, in which case the old name is shown.
149
    """
233 by mbp at sourcefrog
- more output from test.sh
150
    #import bzrlib.status
151
    #bzrlib.status.tree_status(Branch('.'))
1 by mbp at sourcefrog
import from baz patch-364
152
    Branch('.').show_status(show_all=all)
153
154
155
156
######################################################################
157
# examining history
158
def cmd_get_revision(revision_id):
159
    Branch('.').get_revision(revision_id).write_xml(sys.stdout)
160
161
162
def cmd_get_file_text(text_id):
163
    """Get contents of a file by hash."""
164
    sf = Branch('.').text_store[text_id]
165
    pumpfile(sf, sys.stdout)
166
167
168
169
######################################################################
170
# commands
171
    
172
173
def cmd_revno():
174
    """Show number of revisions on this branch"""
175
    print Branch('.').revno()
176
    
177
70 by mbp at sourcefrog
Prepare for smart recursive add.
178
    
1 by mbp at sourcefrog
import from baz patch-364
179
def cmd_add(file_list, verbose=False):
70 by mbp at sourcefrog
Prepare for smart recursive add.
180
    """Add specified files or directories.
181
182
    In non-recursive mode, all the named items are added, regardless
183
    of whether they were previously ignored.  A warning is given if
184
    any of the named files are already versioned.
185
186
    In recursive mode (the default), files are treated the same way
187
    but the behaviour for directories is different.  Directories that
188
    are already versioned do not give a warning.  All directories,
189
    whether already versioned or not, are searched for files or
190
    subdirectories that are neither versioned or ignored, and these
191
    are added.  This search proceeds recursively into versioned
192
    directories.
193
194
    Therefore simply saying 'bzr add .' will version all files that
195
    are currently unknown.
196
    """
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
197
    bzrlib.add.smart_add(file_list, verbose)
1 by mbp at sourcefrog
import from baz patch-364
198
    
199
68 by mbp at sourcefrog
- new relpath command and function
200
def cmd_relpath(filename):
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
201
    """Show path of file relative to root"""
68 by mbp at sourcefrog
- new relpath command and function
202
    print Branch(filename).relpath(filename)
203
204
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
205
1 by mbp at sourcefrog
import from baz patch-364
206
def cmd_inventory(revision=None):
207
    """Show inventory of the current working copy."""
208
    ## TODO: Also optionally show a previous inventory
209
    ## TODO: Format options
210
    b = Branch('.')
211
    if revision == None:
212
        inv = b.read_working_inventory()
213
    else:
214
        inv = b.get_revision_inventory(b.lookup_revision(revision))
215
        
216
    for path, entry in inv.iter_entries():
217
        print '%-50s %s' % (entry.file_id, path)
218
219
220
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
221
# TODO: Maybe a 'mv' command that has the combined move/rename
222
# special behaviour of Unix?
223
224
def cmd_move(source_list, dest):
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
225
    b = Branch('.')
226
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
227
    b.move([b.relpath(s) for s in source_list], b.relpath(dest))
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
228
229
230
168 by mbp at sourcefrog
new "rename" command
231
def cmd_rename(from_name, to_name):
232
    """Change the name of an entry.
233
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
234
    usage: bzr rename FROM_NAME TO_NAME
235
236
    examples:
237
      bzr rename frob.c frobber.c
238
      bzr rename src/frob.c lib/frob.c
239
240
    It is an error if the destination name exists.
241
242
    See also the 'move' command, which moves files into a different
243
    directory without changing their name.
244
245
    TODO: Some way to rename multiple files without invoking bzr for each
246
    one?"""
168 by mbp at sourcefrog
new "rename" command
247
    b = Branch('.')
248
    b.rename_one(b.relpath(from_name), b.relpath(to_name))
249
    
250
251
252
164 by mbp at sourcefrog
new 'renames' command
253
def cmd_renames(dir='.'):
254
    """Show list of renamed files.
255
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
256
    usage: bzr renames [BRANCH]
257
258
    TODO: Option to show renames between two historical versions.
259
260
    TODO: Only show renames under dir, rather than in the whole branch.
261
    """
164 by mbp at sourcefrog
new 'renames' command
262
    b = Branch(dir)
263
    old_inv = b.basis_tree().inventory
264
    new_inv = b.read_working_inventory()
265
    
266
    renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
267
    renames.sort()
268
    for old_name, new_name in renames:
269
        print "%s => %s" % (old_name, new_name)        
270
271
272
1 by mbp at sourcefrog
import from baz patch-364
273
def cmd_info():
112 by mbp at sourcefrog
help for info command
274
    """info: Show statistical information for this branch
275
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
276
    usage: bzr info"""
77 by mbp at sourcefrog
- split info command out into separate file
277
    import info
278
    info.show_info(Branch('.'))        
21 by mbp at sourcefrog
- bzr info: show summary information on branch history
279
    
1 by mbp at sourcefrog
import from baz patch-364
280
281
282
def cmd_remove(file_list, verbose=False):
69 by Martin Pool
handle add, remove, file-id being given filenames that are
283
    b = Branch(file_list[0])
284
    b.remove([b.relpath(f) for f in file_list], verbose=verbose)
1 by mbp at sourcefrog
import from baz patch-364
285
286
287
288
def cmd_file_id(filename):
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
289
    """Print file_id of a particular file or directory.
290
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
291
    usage: bzr file-id FILE
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
292
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
293
    The file_id is assigned when the file is first added and remains the
294
    same through all revisions where the file exists, even when it is
295
    moved or renamed.
296
    """
69 by Martin Pool
handle add, remove, file-id being given filenames that are
297
    b = Branch(filename)
298
    i = b.inventory.path2id(b.relpath(filename))
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
299
    if i == None:
300
        bailout("%r is not a versioned file" % filename)
1 by mbp at sourcefrog
import from baz patch-364
301
    else:
302
        print i
303
304
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
305
def cmd_file_id_path(filename):
306
    """Print path of file_ids to a file or directory.
307
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
308
    usage: bzr file-id-path FILE
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
309
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
310
    This prints one line for each directory down to the target,
311
    starting at the branch root."""
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
312
    b = Branch(filename)
313
    inv = b.inventory
314
    fid = inv.path2id(b.relpath(filename))
315
    if fid == None:
316
        bailout("%r is not a versioned file" % filename)
317
    for fip in inv.get_idpath(fid):
318
        print fip
319
320
1 by mbp at sourcefrog
import from baz patch-364
321
def cmd_revision_history():
322
    for patchid in Branch('.').revision_history():
323
        print patchid
324
325
156 by mbp at sourcefrog
new "directories" command
326
def cmd_directories():
327
    for name, ie in Branch('.').read_working_inventory().directories():
328
        if name == '':
329
            print '.'
330
        else:
331
            print name
332
1 by mbp at sourcefrog
import from baz patch-364
333
157 by mbp at sourcefrog
fix test case breakage
334
def cmd_missing():
335
    for name, ie in Branch('.').working_tree().missing():
336
        print name
337
338
1 by mbp at sourcefrog
import from baz patch-364
339
def cmd_init():
340
    # TODO: Check we're not already in a working directory?  At the
341
    # moment you'll get an ugly error.
342
    
343
    # TODO: What if we're in a subdirectory of a branch?  Would like
344
    # to allow that, but then the parent may need to understand that
345
    # the children have disappeared, or should they be versioned in
346
    # both?
347
348
    # TODO: Take an argument/option for branch name.
349
    Branch('.', init=True)
350
351
196 by mbp at sourcefrog
selected-file diff
352
def cmd_diff(revision=None, file_list=None):
109 by mbp at sourcefrog
more help for diff command
353
    """bzr diff: Show differences in working tree.
354
    
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
355
    usage: bzr diff [-r REV] [FILE...]
356
357
    --revision REV
358
         Show changes since REV, rather than predecessor.
359
360
    If files are listed, only the changes in those files are listed.
361
    Otherwise, all changes for the tree are listed.
362
363
    TODO: Given two revision arguments, show the difference between them.
364
365
    TODO: Allow diff across branches.
366
367
    TODO: Option to use external diff command; could be GNU diff, wdiff,
368
          or a graphical diff.
369
370
    TODO: If a directory is given, diff everything under that.
371
372
    TODO: Selected-file diff is inefficient and doesn't show you deleted files.
109 by mbp at sourcefrog
more help for diff command
373
"""
374
375
    ## TODO: Shouldn't be in the cmd function.
1 by mbp at sourcefrog
import from baz patch-364
376
377
    b = Branch('.')
378
379
    if revision == None:
380
        old_tree = b.basis_tree()
381
    else:
382
        old_tree = b.revision_tree(b.lookup_revision(revision))
383
        
384
    new_tree = b.working_tree()
385
386
    # TODO: Options to control putting on a prefix or suffix, perhaps as a format string
387
    old_label = ''
388
    new_label = ''
389
390
    DEVNULL = '/dev/null'
391
    # Windows users, don't panic about this filename -- it is a
392
    # special signal to GNU patch that the file should be created or
393
    # deleted respectively.
394
395
    # TODO: Generation of pseudo-diffs for added/deleted files could
396
    # be usefully made into a much faster special case.
397
398
    # TODO: Better to return them in sorted order I think.
196 by mbp at sourcefrog
selected-file diff
399
271 by Martin Pool
- Windows path fixes
400
    if file_list:
401
        file_list = [b.relpath(f) for f in file_list]
402
196 by mbp at sourcefrog
selected-file diff
403
    # FIXME: If given a file list, compare only those files rather
404
    # than comparing everything and then throwing stuff away.
1 by mbp at sourcefrog
import from baz patch-364
405
    
406
    for file_state, fid, old_name, new_name, kind in bzrlib.diff_trees(old_tree, new_tree):
196 by mbp at sourcefrog
selected-file diff
407
271 by Martin Pool
- Windows path fixes
408
        if file_list and (new_name not in file_list):
196 by mbp at sourcefrog
selected-file diff
409
            continue
410
        
1 by mbp at sourcefrog
import from baz patch-364
411
        # Don't show this by default; maybe do it if an option is passed
412
        # idlabel = '      {%s}' % fid
413
        idlabel = ''
414
415
        # FIXME: Something about the diff format makes patch unhappy
416
        # with newly-added files.
417
162 by mbp at sourcefrog
workaround for python2.3 difflib bug
418
        def diffit(oldlines, newlines, **kw):
419
            # FIXME: difflib is wrong if there is no trailing newline.
420
421
            # Special workaround for Python2.3, where difflib fails if
422
            # both sequences are empty.
423
            if oldlines or newlines:
424
                sys.stdout.writelines(difflib.unified_diff(oldlines, newlines, **kw))
1 by mbp at sourcefrog
import from baz patch-364
425
            print
426
        
427
        if file_state in ['.', '?', 'I']:
428
            continue
429
        elif file_state == 'A':
430
            print '*** added %s %r' % (kind, new_name)
431
            if kind == 'file':
432
                diffit([],
433
                       new_tree.get_file(fid).readlines(),
434
                       fromfile=DEVNULL,
435
                       tofile=new_label + new_name + idlabel)
436
        elif file_state == 'D':
437
            assert isinstance(old_name, types.StringTypes)
438
            print '*** deleted %s %r' % (kind, old_name)
439
            if kind == 'file':
440
                diffit(old_tree.get_file(fid).readlines(), [],
441
                       fromfile=old_label + old_name + idlabel,
442
                       tofile=DEVNULL)
443
        elif file_state in ['M', 'R']:
444
            if file_state == 'M':
445
                assert kind == 'file'
446
                assert old_name == new_name
447
                print '*** modified %s %r' % (kind, new_name)
448
            elif file_state == 'R':
449
                print '*** renamed %s %r => %r' % (kind, old_name, new_name)
450
451
            if kind == 'file':
452
                diffit(old_tree.get_file(fid).readlines(),
453
                       new_tree.get_file(fid).readlines(),
454
                       fromfile=old_label + old_name + idlabel,
455
                       tofile=new_label + new_name)
456
        else:
457
            bailout("can't represent state %s {%s}" % (file_state, fid))
458
459
460
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
461
def cmd_deleted(show_ids=False):
135 by mbp at sourcefrog
Simple new 'deleted' command
462
    """List files deleted in the working tree.
463
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
464
    TODO: Show files deleted since a previous revision, or between two revisions.
135 by mbp at sourcefrog
Simple new 'deleted' command
465
    """
466
    b = Branch('.')
467
    old = b.basis_tree()
468
    new = b.working_tree()
469
147 by mbp at sourcefrog
todo
470
    ## TODO: Much more efficient way to do this: read in new
471
    ## directories with readdir, rather than stating each one.  Same
472
    ## level of effort but possibly much less IO.  (Or possibly not,
473
    ## if the directories are very large...)
474
135 by mbp at sourcefrog
Simple new 'deleted' command
475
    for path, ie in old.inventory.iter_entries():
476
        if not new.has_id(ie.file_id):
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
477
            if show_ids:
478
                print '%-50s %s' % (path, ie.file_id)
479
            else:
480
                print path
148 by mbp at sourcefrog
performance notes and measurements
481
482
483
484
def cmd_parse_inventory():
485
    import cElementTree
486
    
487
    cElementTree.ElementTree().parse(file('.bzr/inventory'))
488
489
490
491
def cmd_load_inventory():
184 by mbp at sourcefrog
pychecker fixups
492
    """Load inventory for timing purposes"""
493
    Branch('.').basis_tree().inventory
149 by mbp at sourcefrog
experiment with new nested inventory file format
494
495
191 by mbp at sourcefrog
more XML performance tests
496
def cmd_dump_inventory():
497
    Branch('.').read_working_inventory().write_xml(sys.stdout)
498
149 by mbp at sourcefrog
experiment with new nested inventory file format
499
500
def cmd_dump_new_inventory():
501
    import bzrlib.newinventory
502
    inv = Branch('.').basis_tree().inventory
503
    bzrlib.newinventory.write_inventory(inv, sys.stdout)
151 by mbp at sourcefrog
experimental nested-inventory load support
504
505
506
def cmd_load_new_inventory():
507
    import bzrlib.newinventory
508
    bzrlib.newinventory.read_new_inventory(sys.stdin)
149 by mbp at sourcefrog
experiment with new nested inventory file format
509
                
510
    
511
def cmd_dump_slacker_inventory():
512
    import bzrlib.newinventory
513
    inv = Branch('.').basis_tree().inventory
514
    bzrlib.newinventory.write_slacker_inventory(inv, sys.stdout)
236 by mbp at sourcefrog
- Experiments in inventory performance
515
516
517
518
def cmd_dump_text_inventory():
519
    import bzrlib.textinv
520
    inv = Branch('.').basis_tree().inventory
521
    bzrlib.textinv.write_text_inventory(inv, sys.stdout)
522
523
524
def cmd_load_text_inventory():
525
    import bzrlib.textinv
526
    inv = bzrlib.textinv.read_text_inventory(sys.stdin)
527
    print 'loaded %d entries' % len(inv)
528
    
149 by mbp at sourcefrog
experiment with new nested inventory file format
529
    
135 by mbp at sourcefrog
Simple new 'deleted' command
530
65 by mbp at sourcefrog
rename 'find-branch-root' command to just 'root'
531
def cmd_root(filename=None):
532
    """Print the branch root."""
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
533
    print bzrlib.branch.find_branch_root(filename)
534
    
535
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
536
def cmd_log(timezone='original', verbose=False):
1 by mbp at sourcefrog
import from baz patch-364
537
    """Show log of this branch.
538
254 by Martin Pool
- Doc cleanups from Magnus Therning
539
    TODO: Options for utc; to show ids; to limit range; etc.
1 by mbp at sourcefrog
import from baz patch-364
540
    """
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
541
    Branch('.').write_log(show_timezone=timezone, verbose=verbose)
1 by mbp at sourcefrog
import from baz patch-364
542
543
544
def cmd_ls(revision=None, verbose=False):
545
    """List files in a tree.
546
254 by Martin Pool
- Doc cleanups from Magnus Therning
547
    TODO: Take a revision or remote path and list that tree instead.
1 by mbp at sourcefrog
import from baz patch-364
548
    """
549
    b = Branch('.')
550
    if revision == None:
551
        tree = b.working_tree()
552
    else:
553
        tree = b.revision_tree(b.lookup_revision(revision))
554
        
555
    for fp, fc, kind, fid in tree.list_files():
556
        if verbose:
557
            if kind == 'directory':
558
                kindch = '/'
559
            elif kind == 'file':
560
                kindch = ''
561
            else:
562
                kindch = '???'
563
                
564
            print '%-8s %s%s' % (fc, fp, kindch)
565
        else:
566
            print fp
567
    
568
    
569
570
def cmd_unknowns():
571
    """List unknown files"""
572
    for f in Branch('.').unknowns():
573
        print quotefn(f)
574
575
133 by mbp at sourcefrog
- new 'ignored' command
576
184 by mbp at sourcefrog
pychecker fixups
577
def cmd_ignored():
133 by mbp at sourcefrog
- new 'ignored' command
578
    """List ignored files and the patterns that matched them.
579
      """
580
    tree = Branch('.').working_tree()
184 by mbp at sourcefrog
pychecker fixups
581
    for path, file_class, kind, file_id in tree.list_files():
133 by mbp at sourcefrog
- new 'ignored' command
582
        if file_class != 'I':
583
            continue
584
        ## XXX: Slightly inefficient since this was already calculated
585
        pat = tree.is_ignored(path)
586
        print '%-50s %s' % (path, pat)
587
588
1 by mbp at sourcefrog
import from baz patch-364
589
def cmd_lookup_revision(revno):
590
    try:
591
        revno = int(revno)
592
    except ValueError:
593
        bailout("usage: lookup-revision REVNO",
594
                ["REVNO is a non-negative revision number for this branch"])
595
596
    print Branch('.').lookup_revision(revno) or NONE_STRING
597
598
599
600
def cmd_export(revno, dest):
601
    """Export past revision to destination directory."""
602
    b = Branch('.')
603
    rh = b.lookup_revision(int(revno))
604
    t = b.revision_tree(rh)
605
    t.export(dest)
606
176 by mbp at sourcefrog
New cat command contributed by janmar.
607
def cmd_cat(revision, filename):
608
    """Print file to stdout."""
609
    b = Branch('.')
610
    b.print_file(b.relpath(filename), int(revision))
1 by mbp at sourcefrog
import from baz patch-364
611
612
613
######################################################################
614
# internal/test commands
615
616
617
def cmd_uuid():
618
    """Print a newly-generated UUID."""
63 by mbp at sourcefrog
fix up uuid command
619
    print bzrlib.osutils.uuid()
1 by mbp at sourcefrog
import from baz patch-364
620
621
622
8 by mbp at sourcefrog
store committer's timezone in revision and show
623
def cmd_local_time_offset():
624
    print bzrlib.osutils.local_time_offset()
625
626
627
57 by mbp at sourcefrog
error if --message is not given for commit
628
def cmd_commit(message=None, verbose=False):
97 by mbp at sourcefrog
- more commit help
629
    """Commit changes to a new revision.
630
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
631
    --message MESSAGE
632
        Description of changes in this revision; free form text.
633
        It is recommended that the first line be a single-sentence
634
        summary.
635
    --verbose
636
        Show status of changed files,
637
638
    TODO: Commit only selected files.
639
640
    TODO: Run hooks on tree to-be-committed, and after commit.
641
642
    TODO: Strict commit that fails if there are unknown or deleted files.
643
    """
97 by mbp at sourcefrog
- more commit help
644
57 by mbp at sourcefrog
error if --message is not given for commit
645
    if not message:
646
        bailout("please specify a commit message")
1 by mbp at sourcefrog
import from baz patch-364
647
    Branch('.').commit(message, verbose=verbose)
648
649
113 by mbp at sourcefrog
More help for check command
650
def cmd_check(dir='.'):
651
    """check: Consistency check of branch history.
652
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
653
    usage: bzr check [-v] [BRANCH]
654
655
    options:
656
      --verbose, -v         Show progress of checking.
657
658
    This command checks various invariants about the branch storage to
659
    detect data corruption or bzr bugs.
660
    """
113 by mbp at sourcefrog
More help for check command
661
    import bzrlib.check
662
    bzrlib.check.check(Branch(dir, find_root=False))
1 by mbp at sourcefrog
import from baz patch-364
663
664
665
def cmd_is(pred, *rest):
666
    """Test whether PREDICATE is true."""
667
    try:
668
        cmd_handler = globals()['assert_' + pred.replace('-', '_')]
669
    except KeyError:
670
        bailout("unknown predicate: %s" % quotefn(pred))
671
        
672
    try:
673
        cmd_handler(*rest)
674
    except BzrCheckError:
675
        # by default we don't print the message so that this can
676
        # be used from shell scripts without producing noise
677
        sys.exit(1)
678
679
255 by Martin Pool
- New whoami command
680
def cmd_whoami():
681
    """Show bzr user id.
682
273 by Martin Pool
- New 'bzr help commands'
683
    usage: bzr whoami
684
255 by Martin Pool
- New whoami command
685
    TODO: Command to show only the email-address part as parsed out.
686
    """
1 by mbp at sourcefrog
import from baz patch-364
687
    print bzrlib.osutils.username()
688
689
690
def cmd_gen_revision_id():
691
    print bzrlib.branch._gen_revision_id(time.time())
692
693
184 by mbp at sourcefrog
pychecker fixups
694
def cmd_selftest():
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
695
    """Run internal test suite"""
1 by mbp at sourcefrog
import from baz patch-364
696
    ## -v, if present, is seen by doctest; the argument is just here
697
    ## so our parser doesn't complain
698
699
    ## TODO: --verbose option
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
700
701
    failures, tests = 0, 0
1 by mbp at sourcefrog
import from baz patch-364
702
    
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
703
    import doctest, bzrlib.store, bzrlib.tests
1 by mbp at sourcefrog
import from baz patch-364
704
    bzrlib.trace.verbose = False
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
705
706
    for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
70 by mbp at sourcefrog
Prepare for smart recursive add.
707
        bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
708
        mf, mt = doctest.testmod(m)
709
        failures += mf
710
        tests += mt
711
        print '%-40s %3d tests' % (m.__name__, mt),
712
        if mf:
713
            print '%3d FAILED!' % mf
714
        else:
715
            print
716
717
    print '%-40s %3d tests' % ('total', tests),
718
    if failures:
719
        print '%3d FAILED!' % failures
720
    else:
721
        print
722
723
724
725
# deprecated
726
cmd_doctest = cmd_selftest
53 by mbp at sourcefrog
'selftest' command instead of 'doctest'
727
728
1 by mbp at sourcefrog
import from baz patch-364
729
######################################################################
730
# help
731
732
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
733
def cmd_help(topic=None):
734
    if topic == None:
735
        print __doc__
273 by Martin Pool
- New 'bzr help commands'
736
    elif topic == 'commands':
737
        help_commands()
738
    else:
739
        # otherwise, maybe the name of a command?
740
        topic, cmdfn = get_cmd_handler(topic)
741
742
        doc = getdoc(cmdfn)
743
        if doc == None:
744
            bailout("sorry, no detailed help yet for %r" % topic)
745
746
        print doc
747
748
749
def help_commands():
750
    """List all commands"""
751
    accu = []
752
    for k in globals().keys():
753
        if k.startswith('cmd_'):
754
            accu.append(k[4:].replace('_','-'))
755
    accu.sort()
756
    print "bzr commands: "
757
    for x in accu:
758
        print "   " + x
759
    print "note: some of these commands are internal-use or obsolete"
760
    # TODO: Some kind of marker for internal-use commands?
761
    # TODO: Show aliases?
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
762
        
763
1 by mbp at sourcefrog
import from baz patch-364
764
765
766
def cmd_version():
84 by mbp at sourcefrog
- update version string
767
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
768
    print bzrlib.__copyright__
1 by mbp at sourcefrog
import from baz patch-364
769
    print "http://bazaar-ng.org/"
770
    print
771
    print \
772
"""bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and
773
you may use, modify and redistribute it under the terms of the GNU 
774
General Public License version 2 or later."""
775
776
777
def cmd_rocks():
778
    """Statement of optimism."""
779
    print "it sure does!"
780
781
782
783
######################################################################
784
# main routine
785
786
787
# list of all available options; the rhs can be either None for an
788
# option that takes no argument, or a constructor function that checks
789
# the type.
790
OPTIONS = {
791
    'all':                    None,
792
    'help':                   None,
793
    'message':                unicode,
137 by mbp at sourcefrog
new --profile option
794
    'profile':                None,
1 by mbp at sourcefrog
import from baz patch-364
795
    'revision':               int,
796
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
797
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
798
    'verbose':                None,
799
    'version':                None,
800
    }
801
802
SHORT_OPTIONS = {
803
    'm':                      'message',
804
    'r':                      'revision',
805
    'v':                      'verbose',
806
}
807
808
# List of options that apply to particular commands; commands not
809
# listed take none.
810
cmd_options = {
811
    'add':                    ['verbose'],
176 by mbp at sourcefrog
New cat command contributed by janmar.
812
    'cat':                    ['revision'],
1 by mbp at sourcefrog
import from baz patch-364
813
    'commit':                 ['message', 'verbose'],
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
814
    'deleted':                ['show-ids'],
1 by mbp at sourcefrog
import from baz patch-364
815
    'diff':                   ['revision'],
816
    'inventory':              ['revision'],
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
817
    'log':                    ['timezone', 'verbose'],
1 by mbp at sourcefrog
import from baz patch-364
818
    'ls':                     ['revision', 'verbose'],
12 by mbp at sourcefrog
new --timezone option for bzr log
819
    'remove':                 ['verbose'],
1 by mbp at sourcefrog
import from baz patch-364
820
    'status':                 ['all'],
821
    }
822
823
824
cmd_args = {
825
    'add':                    ['file+'],
176 by mbp at sourcefrog
New cat command contributed by janmar.
826
    'cat':                    ['filename'],
1 by mbp at sourcefrog
import from baz patch-364
827
    'commit':                 [],
196 by mbp at sourcefrog
selected-file diff
828
    'diff':                   ['file*'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
829
    'export':                 ['revno', 'dest'],
1 by mbp at sourcefrog
import from baz patch-364
830
    'file-id':                ['filename'],
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
831
    'file-id-path':           ['filename'],
1 by mbp at sourcefrog
import from baz patch-364
832
    'get-file-text':          ['text_id'],
833
    'get-inventory':          ['inventory_id'],
834
    'get-revision':           ['revision_id'],
835
    'get-revision-inventory': ['revision_id'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
836
    'help':                   ['topic?'],
837
    'init':                   [],
1 by mbp at sourcefrog
import from baz patch-364
838
    'log':                    [],
839
    'lookup-revision':        ['revno'],
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
840
    'move':                   ['source$', 'dest'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
841
    'relpath':                ['filename'],
1 by mbp at sourcefrog
import from baz patch-364
842
    'remove':                 ['file+'],
168 by mbp at sourcefrog
new "rename" command
843
    'rename':                 ['from_name', 'to_name'],
164 by mbp at sourcefrog
new 'renames' command
844
    'renames':                ['dir?'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
845
    'root':                   ['filename?'],
1 by mbp at sourcefrog
import from baz patch-364
846
    'status':                 [],
847
    }
848
849
850
def parse_args(argv):
851
    """Parse command line.
852
    
853
    Arguments and options are parsed at this level before being passed
854
    down to specific command handlers.  This routine knows, from a
855
    lookup table, something about the available options, what optargs
856
    they take, and which commands will accept them.
857
31 by Martin Pool
fix up parse_args doctest
858
    >>> parse_args('--help'.split())
1 by mbp at sourcefrog
import from baz patch-364
859
    ([], {'help': True})
31 by Martin Pool
fix up parse_args doctest
860
    >>> parse_args('--version'.split())
1 by mbp at sourcefrog
import from baz patch-364
861
    ([], {'version': True})
31 by Martin Pool
fix up parse_args doctest
862
    >>> parse_args('status --all'.split())
1 by mbp at sourcefrog
import from baz patch-364
863
    (['status'], {'all': True})
31 by Martin Pool
fix up parse_args doctest
864
    >>> parse_args('commit --message=biter'.split())
17 by mbp at sourcefrog
allow --option=ARG syntax
865
    (['commit'], {'message': u'biter'})
1 by mbp at sourcefrog
import from baz patch-364
866
    """
867
    args = []
868
    opts = {}
869
870
    # TODO: Maybe handle '--' to end options?
871
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
872
    while argv:
873
        a = argv.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
874
        if a[0] == '-':
264 by Martin Pool
parse_args: option names must be ascii
875
            # option names must not be unicode
876
            a = str(a)
17 by mbp at sourcefrog
allow --option=ARG syntax
877
            optarg = None
1 by mbp at sourcefrog
import from baz patch-364
878
            if a[1] == '-':
879
                mutter("  got option %r" % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
880
                if '=' in a:
881
                    optname, optarg = a[2:].split('=', 1)
882
                else:
883
                    optname = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
884
                if optname not in OPTIONS:
885
                    bailout('unknown long option %r' % a)
886
            else:
887
                shortopt = a[1:]
888
                if shortopt not in SHORT_OPTIONS:
889
                    bailout('unknown short option %r' % a)
890
                optname = SHORT_OPTIONS[shortopt]
891
            
892
            if optname in opts:
893
                # XXX: Do we ever want to support this, e.g. for -r?
894
                bailout('repeated option %r' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
895
                
1 by mbp at sourcefrog
import from baz patch-364
896
            optargfn = OPTIONS[optname]
897
            if optargfn:
17 by mbp at sourcefrog
allow --option=ARG syntax
898
                if optarg == None:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
899
                    if not argv:
17 by mbp at sourcefrog
allow --option=ARG syntax
900
                        bailout('option %r needs an argument' % a)
901
                    else:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
902
                        optarg = argv.pop(0)
17 by mbp at sourcefrog
allow --option=ARG syntax
903
                opts[optname] = optargfn(optarg)
1 by mbp at sourcefrog
import from baz patch-364
904
            else:
17 by mbp at sourcefrog
allow --option=ARG syntax
905
                if optarg != None:
906
                    bailout('option %r takes no argument' % optname)
1 by mbp at sourcefrog
import from baz patch-364
907
                opts[optname] = True
908
        else:
909
            args.append(a)
910
911
    return args, opts
912
913
914
915
def _match_args(cmd, args):
916
    """Check non-option arguments match required pattern.
917
918
    >>> _match_args('status', ['asdasdsadasd'])
919
    Traceback (most recent call last):
920
    ...
921
    BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
922
    >>> _match_args('add', ['asdasdsadasd'])
923
    {'file_list': ['asdasdsadasd']}
924
    >>> _match_args('add', 'abc def gj'.split())
925
    {'file_list': ['abc', 'def', 'gj']}
926
    """
927
    # match argument pattern
928
    argform = cmd_args.get(cmd, [])
929
    argdict = {}
930
    # TODO: Need a way to express 'cp SRC... DEST', where it matches
931
    # all but one.
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
932
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
933
    # step through args and argform, allowing appropriate 0-many matches
1 by mbp at sourcefrog
import from baz patch-364
934
    for ap in argform:
935
        argname = ap[:-1]
936
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
937
            if args:
938
                argdict[argname] = args.pop(0)
196 by mbp at sourcefrog
selected-file diff
939
        elif ap[-1] == '*': # all remaining arguments
940
            if args:
941
                argdict[argname + '_list'] = args[:]
942
                args = []
943
            else:
944
                argdict[argname + '_list'] = None
1 by mbp at sourcefrog
import from baz patch-364
945
        elif ap[-1] == '+':
946
            if not args:
947
                bailout("command %r needs one or more %s"
948
                        % (cmd, argname.upper()))
949
            else:
950
                argdict[argname + '_list'] = args[:]
951
                args = []
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
952
        elif ap[-1] == '$': # all but one
953
            if len(args) < 2:
954
                bailout("command %r needs one or more %s"
955
                        % (cmd, argname.upper()))
956
            argdict[argname + '_list'] = args[:-1]
957
            args[:-1] = []                
1 by mbp at sourcefrog
import from baz patch-364
958
        else:
959
            # just a plain arg
960
            argname = ap
961
            if not args:
962
                bailout("command %r requires argument %s"
963
                        % (cmd, argname.upper()))
964
            else:
965
                argdict[argname] = args.pop(0)
966
            
967
    if args:
968
        bailout("extra arguments to command %s: %r"
969
                % (cmd, args))
970
971
    return argdict
972
973
974
975
def run_bzr(argv):
976
    """Execute a command.
977
978
    This is similar to main(), but without all the trappings for
245 by mbp at sourcefrog
- control files always in utf-8-unix format
979
    logging and error handling.  
1 by mbp at sourcefrog
import from baz patch-364
980
    """
245 by mbp at sourcefrog
- control files always in utf-8-unix format
981
251 by mbp at sourcefrog
- factor out locale.getpreferredencoding()
982
    argv = [a.decode(bzrlib.user_encoding) for a in argv]
245 by mbp at sourcefrog
- control files always in utf-8-unix format
983
    
1 by mbp at sourcefrog
import from baz patch-364
984
    try:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
985
        args, opts = parse_args(argv[1:])
1 by mbp at sourcefrog
import from baz patch-364
986
        if 'help' in opts:
987
            # TODO: pass down other arguments in case they asked for
988
            # help on a command name?
159 by mbp at sourcefrog
bzr commit --help now works
989
            if args:
990
                cmd_help(args[0])
991
            else:
992
                cmd_help()
1 by mbp at sourcefrog
import from baz patch-364
993
            return 0
994
        elif 'version' in opts:
995
            cmd_version()
996
            return 0
265 by Martin Pool
parse_args: command names must also be ascii
997
        cmd = str(args.pop(0))
1 by mbp at sourcefrog
import from baz patch-364
998
    except IndexError:
257 by Martin Pool
- Write less startup junk to .bzr.log
999
        log_error('usage: bzr COMMAND')
1000
        log_error('  try "bzr help"')
1 by mbp at sourcefrog
import from baz patch-364
1001
        return 1
115 by mbp at sourcefrog
todo
1002
272 by Martin Pool
- Add command aliases
1003
    canonical_cmd, cmd_handler = get_cmd_handler(cmd)
1 by mbp at sourcefrog
import from baz patch-364
1004
137 by mbp at sourcefrog
new --profile option
1005
    # global option
1006
    if 'profile' in opts:
1007
        profile = True
1008
        del opts['profile']
1009
    else:
1010
        profile = False
1 by mbp at sourcefrog
import from baz patch-364
1011
1012
    # check options are reasonable
272 by Martin Pool
- Add command aliases
1013
    allowed = cmd_options.get(canonical_cmd, [])
1 by mbp at sourcefrog
import from baz patch-364
1014
    for oname in opts:
1015
        if oname not in allowed:
1016
            bailout("option %r is not allowed for command %r"
1017
                    % (oname, cmd))
1018
176 by mbp at sourcefrog
New cat command contributed by janmar.
1019
    # TODO: give an error if there are any mandatory options which are
1020
    # not specified?  Or maybe there shouldn't be any "mandatory
1021
    # options" (it is an oxymoron)
1022
137 by mbp at sourcefrog
new --profile option
1023
    # mix arguments and options into one dictionary
272 by Martin Pool
- Add command aliases
1024
    cmdargs = _match_args(canonical_cmd, args)
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
1025
    for k, v in opts.items():
265 by Martin Pool
parse_args: command names must also be ascii
1026
        cmdargs[k.replace('-', '_')] = v
1 by mbp at sourcefrog
import from baz patch-364
1027
137 by mbp at sourcefrog
new --profile option
1028
    if profile:
1029
        import hotshot
239 by mbp at sourcefrog
- remove profiler temporary file when done
1030
        pffileno, pfname = tempfile.mkstemp()
1031
        try:
1032
            prof = hotshot.Profile(pfname)
1033
            ret = prof.runcall(cmd_handler, **cmdargs) or 0
1034
            prof.close()
1035
1036
            import hotshot.stats
1037
            stats = hotshot.stats.load(pfname)
1038
            #stats.strip_dirs()
1039
            stats.sort_stats('time')
1040
            ## XXX: Might like to write to stderr or the trace file instead but
1041
            ## print_stats seems hardcoded to stdout
1042
            stats.print_stats(20)
1043
            
1044
            return ret
1045
1046
        finally:
1047
            os.close(pffileno)
1048
            os.remove(pfname)
137 by mbp at sourcefrog
new --profile option
1049
    else:
1050
        return cmd_handler(**cmdargs) or 0
1 by mbp at sourcefrog
import from baz patch-364
1051
1052
1053
267 by Martin Pool
- better reporting of errors
1054
def _report_exception(e, summary):
1055
    import traceback
1056
    log_error('bzr: ' + summary)
1057
    bzrlib.trace.log_exception(e)
1058
    tb = sys.exc_info()[2]
1059
    exinfo = traceback.extract_tb(tb, 1)
1060
    if exinfo:
1061
        sys.stderr.write('  at %s:%d in %s()\n' % exinfo[0][:3])
1062
    sys.stderr.write('  see ~/.bzr.log for debug information\n')
1063
1064
1065
def cmd_assert_fail():
268 by Martin Pool
- more tests for assertion failures
1066
    assert False, "always fails"
267 by Martin Pool
- better reporting of errors
1067
1068
1 by mbp at sourcefrog
import from baz patch-364
1069
def main(argv):
59 by mbp at sourcefrog
lift out tracefile creation code
1070
    bzrlib.trace.create_tracefile(argv)
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1071
1 by mbp at sourcefrog
import from baz patch-364
1072
    try:
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1073
        try:
1074
            ret = run_bzr(argv)
1075
            return ret
1076
        except BzrError, e:
267 by Martin Pool
- better reporting of errors
1077
            _report_exception(e, 'error: ' + e.args[0])
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1078
            if len(e.args) > 1:
1079
                for h in e.args[1]:
267 by Martin Pool
- better reporting of errors
1080
                    # some explanation or hints
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1081
                    log_error('  ' + h)
1082
            return 1
267 by Martin Pool
- better reporting of errors
1083
        except AssertionError, e:
1084
            msg = 'assertion failed'
1085
            if str(e):
1086
                msg += ': ' + str(e)
1087
            _report_exception(e, msg)
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1088
        except Exception, e:
267 by Martin Pool
- better reporting of errors
1089
            _report_exception(e, 'exception: %s' % str(e).rstrip('\n'))
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1090
            return 1
1091
    finally:
1092
        bzrlib.trace.close_trace()
1 by mbp at sourcefrog
import from baz patch-364
1093
236 by mbp at sourcefrog
- Experiments in inventory performance
1094
    ## TODO: Trap AssertionError
1095
1096
    # TODO: Maybe nicer handling of IOError especially for broken pipe.
1 by mbp at sourcefrog
import from baz patch-364
1097
1098
1099
1100
if __name__ == '__main__':
1101
    sys.exit(main(sys.argv))