/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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.
281 by Martin Pool
- List rename and move in help
45
  bzr rename FROM TO
46
      Rename one file.
47
  bzr move FROM... DESTDIR
48
      Move one or more files to a different directory.
196 by mbp at sourcefrog
selected-file diff
49
  bzr diff [FILE...]
273 by Martin Pool
- New 'bzr help commands'
50
      Show changes from last revision to working copy.
1 by mbp at sourcefrog
import from baz patch-364
51
  bzr commit -m 'MESSAGE'
273 by Martin Pool
- New 'bzr help commands'
52
      Store current state as new revision.
1 by mbp at sourcefrog
import from baz patch-364
53
  bzr export REVNO DESTINATION
273 by Martin Pool
- New 'bzr help commands'
54
      Export the branch state at a previous version.
1 by mbp at sourcefrog
import from baz patch-364
55
  bzr status
273 by Martin Pool
- New 'bzr help commands'
56
      Show summary of pending changes.
1 by mbp at sourcefrog
import from baz patch-364
57
  bzr remove FILE...
273 by Martin Pool
- New 'bzr help commands'
58
      Make a file not versioned.
76 by mbp at sourcefrog
mention "info" in top-level help
59
  bzr info
273 by Martin Pool
- New 'bzr help commands'
60
      Show statistics about this branch.
61
  bzr check
62
      Verify history is stored safely. 
63
  (for more type 'bzr help commands')
1 by mbp at sourcefrog
import from baz patch-364
64
"""
65
66
67
68
263 by Martin Pool
factor out code to log exceptions
69
import sys, os, time, types, shutil, tempfile, fnmatch, difflib, os.path
1 by mbp at sourcefrog
import from baz patch-364
70
from sets import Set
71
from pprint import pprint
72
from stat import *
73
from glob import glob
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
74
from inspect import getdoc
1 by mbp at sourcefrog
import from baz patch-364
75
76
import bzrlib
77
from bzrlib.store import ImmutableStore
78
from bzrlib.trace import mutter, note, log_error
184 by mbp at sourcefrog
pychecker fixups
79
from bzrlib.errors import bailout, BzrError, BzrCheckError
1 by mbp at sourcefrog
import from baz patch-364
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
34 by mbp at sourcefrog
doc
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
46 by Martin Pool
todo
112
1 by mbp at sourcefrog
import from baz patch-364
113
272 by Martin Pool
- Add command aliases
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):
274 by Martin Pool
- Fix 'bzr help COMMAND' for Unicode changes
125
    cmd = str(cmd)
272 by Martin Pool
- Add command aliases
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
1 by mbp at sourcefrog
import from baz patch-364
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
    """
233 by mbp at sourcefrog
- more output from test.sh
145
    #import bzrlib.status
146
    #bzrlib.status.tree_status(Branch('.'))
1 by mbp at sourcefrog
import from baz patch-364
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
70 by mbp at sourcefrog
Prepare for smart recursive add.
173
    
1 by mbp at sourcefrog
import from baz patch-364
174
def cmd_add(file_list, verbose=False):
70 by mbp at sourcefrog
Prepare for smart recursive add.
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.
279 by Martin Pool
todo
191
192
    TODO: Perhaps adding a file whose directly is not versioned should
193
    recursively add that parent, rather than giving an error?
70 by mbp at sourcefrog
Prepare for smart recursive add.
194
    """
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
195
    bzrlib.add.smart_add(file_list, verbose)
1 by mbp at sourcefrog
import from baz patch-364
196
    
197
68 by mbp at sourcefrog
- new relpath command and function
198
def cmd_relpath(filename):
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
199
    """Show path of file relative to root"""
68 by mbp at sourcefrog
- new relpath command and function
200
    print Branch(filename).relpath(filename)
201
202
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
203
1 by mbp at sourcefrog
import from baz patch-364
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
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
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):
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
223
    b = Branch('.')
224
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
225
    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
226
227
228
168 by mbp at sourcefrog
new "rename" command
229
def cmd_rename(from_name, to_name):
230
    """Change the name of an entry.
231
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
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?"""
168 by mbp at sourcefrog
new "rename" command
245
    b = Branch('.')
246
    b.rename_one(b.relpath(from_name), b.relpath(to_name))
247
    
248
249
250
164 by mbp at sourcefrog
new 'renames' command
251
def cmd_renames(dir='.'):
252
    """Show list of renamed files.
253
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
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
    """
164 by mbp at sourcefrog
new 'renames' command
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
1 by mbp at sourcefrog
import from baz patch-364
271
def cmd_info():
112 by mbp at sourcefrog
help for info command
272
    """info: Show statistical information for this branch
273
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
274
    usage: bzr info"""
77 by mbp at sourcefrog
- split info command out into separate file
275
    import info
276
    info.show_info(Branch('.'))        
21 by mbp at sourcefrog
- bzr info: show summary information on branch history
277
    
1 by mbp at sourcefrog
import from baz patch-364
278
279
280
def cmd_remove(file_list, verbose=False):
69 by Martin Pool
handle add, remove, file-id being given filenames that are
281
    b = Branch(file_list[0])
282
    b.remove([b.relpath(f) for f in file_list], verbose=verbose)
1 by mbp at sourcefrog
import from baz patch-364
283
284
285
286
def cmd_file_id(filename):
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
287
    """Print file_id of a particular file or directory.
288
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
289
    usage: bzr file-id FILE
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
290
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
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
    """
69 by Martin Pool
handle add, remove, file-id being given filenames that are
295
    b = Branch(filename)
296
    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
297
    if i == None:
298
        bailout("%r is not a versioned file" % filename)
1 by mbp at sourcefrog
import from baz patch-364
299
    else:
300
        print i
301
302
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
303
def cmd_file_id_path(filename):
304
    """Print path of file_ids to a file or directory.
305
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
306
    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
307
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
308
    This prints one line for each directory down to the target,
309
    starting at the branch root."""
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
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
1 by mbp at sourcefrog
import from baz patch-364
319
def cmd_revision_history():
320
    for patchid in Branch('.').revision_history():
321
        print patchid
322
323
156 by mbp at sourcefrog
new "directories" command
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
1 by mbp at sourcefrog
import from baz patch-364
331
157 by mbp at sourcefrog
fix test case breakage
332
def cmd_missing():
333
    for name, ie in Branch('.').working_tree().missing():
334
        print name
335
336
1 by mbp at sourcefrog
import from baz patch-364
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
196 by mbp at sourcefrog
selected-file diff
350
def cmd_diff(revision=None, file_list=None):
109 by mbp at sourcefrog
more help for diff command
351
    """bzr diff: Show differences in working tree.
352
    
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
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
276 by Martin Pool
Doc
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
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
371
    TODO: If a directory is given, diff everything under that.
372
276 by Martin Pool
Doc
373
    TODO: Selected-file diff is inefficient and doesn't show you
374
          deleted files.
278 by Martin Pool
- Better workaround for trailing newlines in diffs
375
376
    TODO: This probably handles non-Unix newlines poorly.
109 by mbp at sourcefrog
more help for diff command
377
"""
378
379
    ## TODO: Shouldn't be in the cmd function.
1 by mbp at sourcefrog
import from baz patch-364
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.
196 by mbp at sourcefrog
selected-file diff
403
271 by Martin Pool
- Windows path fixes
404
    if file_list:
405
        file_list = [b.relpath(f) for f in file_list]
406
196 by mbp at sourcefrog
selected-file diff
407
    # FIXME: If given a file list, compare only those files rather
408
    # than comparing everything and then throwing stuff away.
1 by mbp at sourcefrog
import from baz patch-364
409
    
410
    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
411
271 by Martin Pool
- Windows path fixes
412
        if file_list and (new_name not in file_list):
196 by mbp at sourcefrog
selected-file diff
413
            continue
414
        
1 by mbp at sourcefrog
import from baz patch-364
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
162 by mbp at sourcefrog
workaround for python2.3 difflib bug
422
        def diffit(oldlines, newlines, **kw):
278 by Martin Pool
- Better workaround for trailing newlines in diffs
423
            
162 by mbp at sourcefrog
workaround for python2.3 difflib bug
424
            # FIXME: difflib is wrong if there is no trailing newline.
278 by Martin Pool
- Better workaround for trailing newlines in diffs
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
            
162 by mbp at sourcefrog
workaround for python2.3 difflib bug
434
435
            # Special workaround for Python2.3, where difflib fails if
436
            # both sequences are empty.
278 by Martin Pool
- Better workaround for trailing newlines in diffs
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')
1 by mbp at sourcefrog
import from baz patch-364
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
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
489
def cmd_deleted(show_ids=False):
135 by mbp at sourcefrog
Simple new 'deleted' command
490
    """List files deleted in the working tree.
491
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
492
    TODO: Show files deleted since a previous revision, or between two revisions.
135 by mbp at sourcefrog
Simple new 'deleted' command
493
    """
494
    b = Branch('.')
495
    old = b.basis_tree()
496
    new = b.working_tree()
497
147 by mbp at sourcefrog
todo
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
135 by mbp at sourcefrog
Simple new 'deleted' command
503
    for path, ie in old.inventory.iter_entries():
504
        if not new.has_id(ie.file_id):
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
505
            if show_ids:
506
                print '%-50s %s' % (path, ie.file_id)
507
            else:
508
                print path
148 by mbp at sourcefrog
performance notes and measurements
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():
184 by mbp at sourcefrog
pychecker fixups
520
    """Load inventory for timing purposes"""
521
    Branch('.').basis_tree().inventory
149 by mbp at sourcefrog
experiment with new nested inventory file format
522
523
191 by mbp at sourcefrog
more XML performance tests
524
def cmd_dump_inventory():
525
    Branch('.').read_working_inventory().write_xml(sys.stdout)
526
149 by mbp at sourcefrog
experiment with new nested inventory file format
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)
151 by mbp at sourcefrog
experimental nested-inventory load support
532
533
534
def cmd_load_new_inventory():
535
    import bzrlib.newinventory
536
    bzrlib.newinventory.read_new_inventory(sys.stdin)
149 by mbp at sourcefrog
experiment with new nested inventory file format
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)
236 by mbp at sourcefrog
- Experiments in inventory performance
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
    
149 by mbp at sourcefrog
experiment with new nested inventory file format
557
    
135 by mbp at sourcefrog
Simple new 'deleted' command
558
65 by mbp at sourcefrog
rename 'find-branch-root' command to just 'root'
559
def cmd_root(filename=None):
560
    """Print the branch root."""
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
561
    print bzrlib.branch.find_branch_root(filename)
562
    
563
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
564
def cmd_log(timezone='original', verbose=False):
1 by mbp at sourcefrog
import from baz patch-364
565
    """Show log of this branch.
566
254 by Martin Pool
- Doc cleanups from Magnus Therning
567
    TODO: Options for utc; to show ids; to limit range; etc.
1 by mbp at sourcefrog
import from baz patch-364
568
    """
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
569
    Branch('.').write_log(show_timezone=timezone, verbose=verbose)
1 by mbp at sourcefrog
import from baz patch-364
570
571
572
def cmd_ls(revision=None, verbose=False):
573
    """List files in a tree.
574
254 by Martin Pool
- Doc cleanups from Magnus Therning
575
    TODO: Take a revision or remote path and list that tree instead.
1 by mbp at sourcefrog
import from baz patch-364
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
133 by mbp at sourcefrog
- new 'ignored' command
604
184 by mbp at sourcefrog
pychecker fixups
605
def cmd_ignored():
133 by mbp at sourcefrog
- new 'ignored' command
606
    """List ignored files and the patterns that matched them.
607
      """
608
    tree = Branch('.').working_tree()
184 by mbp at sourcefrog
pychecker fixups
609
    for path, file_class, kind, file_id in tree.list_files():
133 by mbp at sourcefrog
- new 'ignored' command
610
        if file_class != 'I':
611
            continue
612
        ## XXX: Slightly inefficient since this was already calculated
613
        pat = tree.is_ignored(path)
614
        print '%-50s %s' % (path, pat)
615
616
1 by mbp at sourcefrog
import from baz patch-364
617
def cmd_lookup_revision(revno):
618
    try:
619
        revno = int(revno)
620
    except ValueError:
621
        bailout("usage: lookup-revision REVNO",
622
                ["REVNO is a non-negative revision number for this branch"])
623
624
    print Branch('.').lookup_revision(revno) or NONE_STRING
625
626
627
628
def cmd_export(revno, dest):
629
    """Export past revision to destination directory."""
630
    b = Branch('.')
631
    rh = b.lookup_revision(int(revno))
632
    t = b.revision_tree(rh)
633
    t.export(dest)
634
176 by mbp at sourcefrog
New cat command contributed by janmar.
635
def cmd_cat(revision, filename):
636
    """Print file to stdout."""
637
    b = Branch('.')
638
    b.print_file(b.relpath(filename), int(revision))
1 by mbp at sourcefrog
import from baz patch-364
639
640
641
######################################################################
642
# internal/test commands
643
644
645
def cmd_uuid():
646
    """Print a newly-generated UUID."""
63 by mbp at sourcefrog
fix up uuid command
647
    print bzrlib.osutils.uuid()
1 by mbp at sourcefrog
import from baz patch-364
648
649
650
8 by mbp at sourcefrog
store committer's timezone in revision and show
651
def cmd_local_time_offset():
652
    print bzrlib.osutils.local_time_offset()
653
654
655
57 by mbp at sourcefrog
error if --message is not given for commit
656
def cmd_commit(message=None, verbose=False):
97 by mbp at sourcefrog
- more commit help
657
    """Commit changes to a new revision.
658
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
659
    --message MESSAGE
660
        Description of changes in this revision; free form text.
661
        It is recommended that the first line be a single-sentence
662
        summary.
663
    --verbose
664
        Show status of changed files,
665
666
    TODO: Commit only selected files.
667
668
    TODO: Run hooks on tree to-be-committed, and after commit.
669
670
    TODO: Strict commit that fails if there are unknown or deleted files.
671
    """
97 by mbp at sourcefrog
- more commit help
672
57 by mbp at sourcefrog
error if --message is not given for commit
673
    if not message:
674
        bailout("please specify a commit message")
1 by mbp at sourcefrog
import from baz patch-364
675
    Branch('.').commit(message, verbose=verbose)
676
677
113 by mbp at sourcefrog
More help for check command
678
def cmd_check(dir='.'):
679
    """check: Consistency check of branch history.
680
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
681
    usage: bzr check [-v] [BRANCH]
682
683
    options:
684
      --verbose, -v         Show progress of checking.
685
686
    This command checks various invariants about the branch storage to
687
    detect data corruption or bzr bugs.
688
    """
113 by mbp at sourcefrog
More help for check command
689
    import bzrlib.check
690
    bzrlib.check.check(Branch(dir, find_root=False))
1 by mbp at sourcefrog
import from baz patch-364
691
692
693
def cmd_is(pred, *rest):
694
    """Test whether PREDICATE is true."""
695
    try:
696
        cmd_handler = globals()['assert_' + pred.replace('-', '_')]
697
    except KeyError:
698
        bailout("unknown predicate: %s" % quotefn(pred))
699
        
700
    try:
701
        cmd_handler(*rest)
702
    except BzrCheckError:
703
        # by default we don't print the message so that this can
704
        # be used from shell scripts without producing noise
705
        sys.exit(1)
706
707
286 by Martin Pool
- New bzr whoami --email option
708
def cmd_whoami(email=False):
255 by Martin Pool
- New whoami command
709
    """Show bzr user id.
710
273 by Martin Pool
- New 'bzr help commands'
711
    usage: bzr whoami
712
286 by Martin Pool
- New bzr whoami --email option
713
    options:
714
        --email             Show only the email address.
715
    
255 by Martin Pool
- New whoami command
716
    """
286 by Martin Pool
- New bzr whoami --email option
717
    if email:
718
        print bzrlib.osutils.user_email()
719
    else:
720
        print bzrlib.osutils.username()
721
        
722
        
1 by mbp at sourcefrog
import from baz patch-364
723
def cmd_gen_revision_id():
724
    print bzrlib.branch._gen_revision_id(time.time())
725
726
184 by mbp at sourcefrog
pychecker fixups
727
def cmd_selftest():
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
728
    """Run internal test suite"""
1 by mbp at sourcefrog
import from baz patch-364
729
    ## -v, if present, is seen by doctest; the argument is just here
730
    ## so our parser doesn't complain
731
732
    ## TODO: --verbose option
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
733
734
    failures, tests = 0, 0
1 by mbp at sourcefrog
import from baz patch-364
735
    
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
736
    import doctest, bzrlib.store, bzrlib.tests
1 by mbp at sourcefrog
import from baz patch-364
737
    bzrlib.trace.verbose = False
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
738
739
    for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
70 by mbp at sourcefrog
Prepare for smart recursive add.
740
        bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
741
        mf, mt = doctest.testmod(m)
742
        failures += mf
743
        tests += mt
744
        print '%-40s %3d tests' % (m.__name__, mt),
745
        if mf:
746
            print '%3d FAILED!' % mf
747
        else:
748
            print
749
750
    print '%-40s %3d tests' % ('total', tests),
751
    if failures:
752
        print '%3d FAILED!' % failures
753
    else:
754
        print
755
756
757
758
# deprecated
759
cmd_doctest = cmd_selftest
53 by mbp at sourcefrog
'selftest' command instead of 'doctest'
760
761
1 by mbp at sourcefrog
import from baz patch-364
762
######################################################################
763
# help
764
765
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
766
def cmd_help(topic=None):
767
    if topic == None:
768
        print __doc__
273 by Martin Pool
- New 'bzr help commands'
769
    elif topic == 'commands':
770
        help_commands()
771
    else:
772
        # otherwise, maybe the name of a command?
773
        topic, cmdfn = get_cmd_handler(topic)
774
775
        doc = getdoc(cmdfn)
776
        if doc == None:
777
            bailout("sorry, no detailed help yet for %r" % topic)
778
779
        print doc
780
781
782
def help_commands():
783
    """List all commands"""
784
    accu = []
785
    for k in globals().keys():
786
        if k.startswith('cmd_'):
787
            accu.append(k[4:].replace('_','-'))
788
    accu.sort()
789
    print "bzr commands: "
790
    for x in accu:
791
        print "   " + x
792
    print "note: some of these commands are internal-use or obsolete"
793
    # TODO: Some kind of marker for internal-use commands?
794
    # TODO: Show aliases?
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
795
        
796
1 by mbp at sourcefrog
import from baz patch-364
797
798
799
def cmd_version():
84 by mbp at sourcefrog
- update version string
800
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
801
    print bzrlib.__copyright__
1 by mbp at sourcefrog
import from baz patch-364
802
    print "http://bazaar-ng.org/"
803
    print
804
    print \
805
"""bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and
806
you may use, modify and redistribute it under the terms of the GNU 
807
General Public License version 2 or later."""
808
809
810
def cmd_rocks():
811
    """Statement of optimism."""
812
    print "it sure does!"
813
814
815
816
######################################################################
817
# main routine
818
819
820
# list of all available options; the rhs can be either None for an
821
# option that takes no argument, or a constructor function that checks
822
# the type.
823
OPTIONS = {
824
    'all':                    None,
825
    'help':                   None,
826
    'message':                unicode,
137 by mbp at sourcefrog
new --profile option
827
    'profile':                None,
1 by mbp at sourcefrog
import from baz patch-364
828
    'revision':               int,
829
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
830
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
831
    'verbose':                None,
832
    'version':                None,
286 by Martin Pool
- New bzr whoami --email option
833
    'email':                  None,
1 by mbp at sourcefrog
import from baz patch-364
834
    }
835
836
SHORT_OPTIONS = {
837
    'm':                      'message',
838
    'r':                      'revision',
839
    'v':                      'verbose',
840
}
841
842
# List of options that apply to particular commands; commands not
843
# listed take none.
844
cmd_options = {
845
    'add':                    ['verbose'],
176 by mbp at sourcefrog
New cat command contributed by janmar.
846
    'cat':                    ['revision'],
1 by mbp at sourcefrog
import from baz patch-364
847
    'commit':                 ['message', 'verbose'],
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
848
    'deleted':                ['show-ids'],
1 by mbp at sourcefrog
import from baz patch-364
849
    'diff':                   ['revision'],
850
    'inventory':              ['revision'],
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
851
    'log':                    ['timezone', 'verbose'],
1 by mbp at sourcefrog
import from baz patch-364
852
    'ls':                     ['revision', 'verbose'],
12 by mbp at sourcefrog
new --timezone option for bzr log
853
    'remove':                 ['verbose'],
1 by mbp at sourcefrog
import from baz patch-364
854
    'status':                 ['all'],
286 by Martin Pool
- New bzr whoami --email option
855
    'whoami':                 ['email'],
1 by mbp at sourcefrog
import from baz patch-364
856
    }
857
858
859
cmd_args = {
860
    'add':                    ['file+'],
176 by mbp at sourcefrog
New cat command contributed by janmar.
861
    'cat':                    ['filename'],
1 by mbp at sourcefrog
import from baz patch-364
862
    'commit':                 [],
196 by mbp at sourcefrog
selected-file diff
863
    'diff':                   ['file*'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
864
    'export':                 ['revno', 'dest'],
1 by mbp at sourcefrog
import from baz patch-364
865
    'file-id':                ['filename'],
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
866
    'file-id-path':           ['filename'],
1 by mbp at sourcefrog
import from baz patch-364
867
    'get-file-text':          ['text_id'],
868
    'get-inventory':          ['inventory_id'],
869
    'get-revision':           ['revision_id'],
870
    'get-revision-inventory': ['revision_id'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
871
    'help':                   ['topic?'],
872
    'init':                   [],
1 by mbp at sourcefrog
import from baz patch-364
873
    'log':                    [],
874
    'lookup-revision':        ['revno'],
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
875
    'move':                   ['source$', 'dest'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
876
    'relpath':                ['filename'],
1 by mbp at sourcefrog
import from baz patch-364
877
    'remove':                 ['file+'],
168 by mbp at sourcefrog
new "rename" command
878
    'rename':                 ['from_name', 'to_name'],
164 by mbp at sourcefrog
new 'renames' command
879
    'renames':                ['dir?'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
880
    'root':                   ['filename?'],
1 by mbp at sourcefrog
import from baz patch-364
881
    'status':                 [],
882
    }
883
884
885
def parse_args(argv):
886
    """Parse command line.
887
    
888
    Arguments and options are parsed at this level before being passed
889
    down to specific command handlers.  This routine knows, from a
890
    lookup table, something about the available options, what optargs
891
    they take, and which commands will accept them.
892
31 by Martin Pool
fix up parse_args doctest
893
    >>> parse_args('--help'.split())
1 by mbp at sourcefrog
import from baz patch-364
894
    ([], {'help': True})
31 by Martin Pool
fix up parse_args doctest
895
    >>> parse_args('--version'.split())
1 by mbp at sourcefrog
import from baz patch-364
896
    ([], {'version': True})
31 by Martin Pool
fix up parse_args doctest
897
    >>> parse_args('status --all'.split())
1 by mbp at sourcefrog
import from baz patch-364
898
    (['status'], {'all': True})
31 by Martin Pool
fix up parse_args doctest
899
    >>> parse_args('commit --message=biter'.split())
17 by mbp at sourcefrog
allow --option=ARG syntax
900
    (['commit'], {'message': u'biter'})
1 by mbp at sourcefrog
import from baz patch-364
901
    """
902
    args = []
903
    opts = {}
904
905
    # TODO: Maybe handle '--' to end options?
906
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
907
    while argv:
908
        a = argv.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
909
        if a[0] == '-':
264 by Martin Pool
parse_args: option names must be ascii
910
            # option names must not be unicode
911
            a = str(a)
17 by mbp at sourcefrog
allow --option=ARG syntax
912
            optarg = None
1 by mbp at sourcefrog
import from baz patch-364
913
            if a[1] == '-':
914
                mutter("  got option %r" % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
915
                if '=' in a:
916
                    optname, optarg = a[2:].split('=', 1)
917
                else:
918
                    optname = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
919
                if optname not in OPTIONS:
920
                    bailout('unknown long option %r' % a)
921
            else:
922
                shortopt = a[1:]
923
                if shortopt not in SHORT_OPTIONS:
924
                    bailout('unknown short option %r' % a)
925
                optname = SHORT_OPTIONS[shortopt]
926
            
927
            if optname in opts:
928
                # XXX: Do we ever want to support this, e.g. for -r?
929
                bailout('repeated option %r' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
930
                
1 by mbp at sourcefrog
import from baz patch-364
931
            optargfn = OPTIONS[optname]
932
            if optargfn:
17 by mbp at sourcefrog
allow --option=ARG syntax
933
                if optarg == None:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
934
                    if not argv:
17 by mbp at sourcefrog
allow --option=ARG syntax
935
                        bailout('option %r needs an argument' % a)
936
                    else:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
937
                        optarg = argv.pop(0)
17 by mbp at sourcefrog
allow --option=ARG syntax
938
                opts[optname] = optargfn(optarg)
1 by mbp at sourcefrog
import from baz patch-364
939
            else:
17 by mbp at sourcefrog
allow --option=ARG syntax
940
                if optarg != None:
941
                    bailout('option %r takes no argument' % optname)
1 by mbp at sourcefrog
import from baz patch-364
942
                opts[optname] = True
943
        else:
944
            args.append(a)
945
946
    return args, opts
947
948
949
950
def _match_args(cmd, args):
951
    """Check non-option arguments match required pattern.
952
953
    >>> _match_args('status', ['asdasdsadasd'])
954
    Traceback (most recent call last):
955
    ...
956
    BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
957
    >>> _match_args('add', ['asdasdsadasd'])
958
    {'file_list': ['asdasdsadasd']}
959
    >>> _match_args('add', 'abc def gj'.split())
960
    {'file_list': ['abc', 'def', 'gj']}
961
    """
962
    # match argument pattern
963
    argform = cmd_args.get(cmd, [])
964
    argdict = {}
965
    # TODO: Need a way to express 'cp SRC... DEST', where it matches
966
    # all but one.
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
967
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
968
    # step through args and argform, allowing appropriate 0-many matches
1 by mbp at sourcefrog
import from baz patch-364
969
    for ap in argform:
970
        argname = ap[:-1]
971
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
972
            if args:
973
                argdict[argname] = args.pop(0)
196 by mbp at sourcefrog
selected-file diff
974
        elif ap[-1] == '*': # all remaining arguments
975
            if args:
976
                argdict[argname + '_list'] = args[:]
977
                args = []
978
            else:
979
                argdict[argname + '_list'] = None
1 by mbp at sourcefrog
import from baz patch-364
980
        elif ap[-1] == '+':
981
            if not args:
982
                bailout("command %r needs one or more %s"
983
                        % (cmd, argname.upper()))
984
            else:
985
                argdict[argname + '_list'] = args[:]
986
                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
987
        elif ap[-1] == '$': # all but one
988
            if len(args) < 2:
989
                bailout("command %r needs one or more %s"
990
                        % (cmd, argname.upper()))
991
            argdict[argname + '_list'] = args[:-1]
992
            args[:-1] = []                
1 by mbp at sourcefrog
import from baz patch-364
993
        else:
994
            # just a plain arg
995
            argname = ap
996
            if not args:
997
                bailout("command %r requires argument %s"
998
                        % (cmd, argname.upper()))
999
            else:
1000
                argdict[argname] = args.pop(0)
1001
            
1002
    if args:
1003
        bailout("extra arguments to command %s: %r"
1004
                % (cmd, args))
1005
1006
    return argdict
1007
1008
1009
1010
def run_bzr(argv):
1011
    """Execute a command.
1012
1013
    This is similar to main(), but without all the trappings for
245 by mbp at sourcefrog
- control files always in utf-8-unix format
1014
    logging and error handling.  
1 by mbp at sourcefrog
import from baz patch-364
1015
    """
245 by mbp at sourcefrog
- control files always in utf-8-unix format
1016
251 by mbp at sourcefrog
- factor out locale.getpreferredencoding()
1017
    argv = [a.decode(bzrlib.user_encoding) for a in argv]
245 by mbp at sourcefrog
- control files always in utf-8-unix format
1018
    
1 by mbp at sourcefrog
import from baz patch-364
1019
    try:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1020
        args, opts = parse_args(argv[1:])
1 by mbp at sourcefrog
import from baz patch-364
1021
        if 'help' in opts:
1022
            # TODO: pass down other arguments in case they asked for
1023
            # help on a command name?
159 by mbp at sourcefrog
bzr commit --help now works
1024
            if args:
1025
                cmd_help(args[0])
1026
            else:
1027
                cmd_help()
1 by mbp at sourcefrog
import from baz patch-364
1028
            return 0
1029
        elif 'version' in opts:
1030
            cmd_version()
1031
            return 0
265 by Martin Pool
parse_args: command names must also be ascii
1032
        cmd = str(args.pop(0))
1 by mbp at sourcefrog
import from baz patch-364
1033
    except IndexError:
257 by Martin Pool
- Write less startup junk to .bzr.log
1034
        log_error('usage: bzr COMMAND')
1035
        log_error('  try "bzr help"')
1 by mbp at sourcefrog
import from baz patch-364
1036
        return 1
115 by mbp at sourcefrog
todo
1037
272 by Martin Pool
- Add command aliases
1038
    canonical_cmd, cmd_handler = get_cmd_handler(cmd)
1 by mbp at sourcefrog
import from baz patch-364
1039
137 by mbp at sourcefrog
new --profile option
1040
    # global option
1041
    if 'profile' in opts:
1042
        profile = True
1043
        del opts['profile']
1044
    else:
1045
        profile = False
1 by mbp at sourcefrog
import from baz patch-364
1046
1047
    # check options are reasonable
272 by Martin Pool
- Add command aliases
1048
    allowed = cmd_options.get(canonical_cmd, [])
1 by mbp at sourcefrog
import from baz patch-364
1049
    for oname in opts:
1050
        if oname not in allowed:
1051
            bailout("option %r is not allowed for command %r"
1052
                    % (oname, cmd))
1053
176 by mbp at sourcefrog
New cat command contributed by janmar.
1054
    # TODO: give an error if there are any mandatory options which are
1055
    # not specified?  Or maybe there shouldn't be any "mandatory
1056
    # options" (it is an oxymoron)
1057
137 by mbp at sourcefrog
new --profile option
1058
    # mix arguments and options into one dictionary
272 by Martin Pool
- Add command aliases
1059
    cmdargs = _match_args(canonical_cmd, args)
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
1060
    for k, v in opts.items():
265 by Martin Pool
parse_args: command names must also be ascii
1061
        cmdargs[k.replace('-', '_')] = v
1 by mbp at sourcefrog
import from baz patch-364
1062
137 by mbp at sourcefrog
new --profile option
1063
    if profile:
1064
        import hotshot
239 by mbp at sourcefrog
- remove profiler temporary file when done
1065
        pffileno, pfname = tempfile.mkstemp()
1066
        try:
1067
            prof = hotshot.Profile(pfname)
1068
            ret = prof.runcall(cmd_handler, **cmdargs) or 0
1069
            prof.close()
1070
1071
            import hotshot.stats
1072
            stats = hotshot.stats.load(pfname)
1073
            #stats.strip_dirs()
1074
            stats.sort_stats('time')
1075
            ## XXX: Might like to write to stderr or the trace file instead but
1076
            ## print_stats seems hardcoded to stdout
1077
            stats.print_stats(20)
1078
            
1079
            return ret
1080
1081
        finally:
1082
            os.close(pffileno)
1083
            os.remove(pfname)
137 by mbp at sourcefrog
new --profile option
1084
    else:
1085
        return cmd_handler(**cmdargs) or 0
1 by mbp at sourcefrog
import from baz patch-364
1086
1087
1088
267 by Martin Pool
- better reporting of errors
1089
def _report_exception(e, summary):
1090
    import traceback
1091
    log_error('bzr: ' + summary)
1092
    bzrlib.trace.log_exception(e)
1093
    tb = sys.exc_info()[2]
275 by Martin Pool
- Show innermost not outermost frame location when reporting
1094
    exinfo = traceback.extract_tb(tb)
267 by Martin Pool
- better reporting of errors
1095
    if exinfo:
275 by Martin Pool
- Show innermost not outermost frame location when reporting
1096
        sys.stderr.write('  at %s:%d in %s()\n' % exinfo[-1][:3])
267 by Martin Pool
- better reporting of errors
1097
    sys.stderr.write('  see ~/.bzr.log for debug information\n')
1098
1099
1100
def cmd_assert_fail():
268 by Martin Pool
- more tests for assertion failures
1101
    assert False, "always fails"
267 by Martin Pool
- better reporting of errors
1102
1103
1 by mbp at sourcefrog
import from baz patch-364
1104
def main(argv):
59 by mbp at sourcefrog
lift out tracefile creation code
1105
    bzrlib.trace.create_tracefile(argv)
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1106
1 by mbp at sourcefrog
import from baz patch-364
1107
    try:
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1108
        try:
1109
            ret = run_bzr(argv)
1110
            return ret
1111
        except BzrError, e:
267 by Martin Pool
- better reporting of errors
1112
            _report_exception(e, 'error: ' + e.args[0])
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1113
            if len(e.args) > 1:
1114
                for h in e.args[1]:
267 by Martin Pool
- better reporting of errors
1115
                    # some explanation or hints
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1116
                    log_error('  ' + h)
1117
            return 1
267 by Martin Pool
- better reporting of errors
1118
        except AssertionError, e:
1119
            msg = 'assertion failed'
1120
            if str(e):
1121
                msg += ': ' + str(e)
1122
            _report_exception(e, msg)
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1123
        except Exception, e:
267 by Martin Pool
- better reporting of errors
1124
            _report_exception(e, 'exception: %s' % str(e).rstrip('\n'))
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1125
            return 1
1126
    finally:
1127
        bzrlib.trace.close_trace()
1 by mbp at sourcefrog
import from baz patch-364
1128
236 by mbp at sourcefrog
- Experiments in inventory performance
1129
    ## TODO: Trap AssertionError
1130
1131
    # TODO: Maybe nicer handling of IOError especially for broken pipe.
1 by mbp at sourcefrog
import from baz patch-364
1132
1133
1134
1135
if __name__ == '__main__':
1136
    sys.exit(main(sys.argv))