/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
#! /usr/bin/python
2
3
4
# Copyright (C) 2004, 2005 by Martin Pool
5
# Copyright (C) 2005 by Canonical Ltd
6
7
8
# This program is free software; you can redistribute it and/or modify
9
# it under the terms of the GNU General Public License as published by
10
# the Free Software Foundation; either version 2 of the License, or
11
# (at your option) any later version.
12
13
# This program is distributed in the hope that it will be useful,
14
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
# GNU General Public License for more details.
17
18
# You should have received a copy of the GNU General Public License
19
# along with this program; if not, write to the Free Software
20
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
21
22
"""Bazaar-NG -- a free distributed version-control tool
23
24
**WARNING: THIS IS AN UNSTABLE DEVELOPMENT VERSION**
25
26
Current limitation include:
27
28
* Metadata format is not stable yet -- you may need to
29
  discard history in the future.
30
31
* No handling of subdirectories, symlinks or any non-text files.
32
33
* Insufficient error handling.
34
35
* Many commands unimplemented or partially implemented.
36
37
* Space-inefficient storage.
38
39
* No merge operators yet.
40
41
Interesting commands::
42
43
  bzr help
44
       Show summary help screen
45
  bzr version
46
       Show software version/licence/non-warranty.
47
  bzr init
48
       Start versioning the current directory
49
  bzr add FILE...
50
       Make files versioned.
51
  bzr log
52
       Show revision history.
53
  bzr diff
54
       Show changes from last revision to working copy.
55
  bzr commit -m 'MESSAGE'
56
       Store current state as new revision.
57
  bzr export REVNO DESTINATION
58
       Export the branch state at a previous version.
59
  bzr status
60
       Show summary of pending changes.
61
  bzr remove FILE...
62
       Make a file not versioned.
63
"""
64
65
# not currently working:
66
#  bzr info
67
#       Show some information about this branch.
68
69
70
71
__copyright__ = "Copyright 2005 Canonical Development Ltd."
72
__author__ = "Martin Pool <mbp@canonical.com>"
73
__docformat__ = "restructuredtext en"
74
__version__ = '0.0.0'
75
76
77
import sys, os, random, time, sha, sets, types, re, shutil, tempfile
78
import traceback, socket, fnmatch, difflib
79
from os import path
80
from sets import Set
81
from pprint import pprint
82
from stat import *
83
from glob import glob
84
85
import bzrlib
86
from bzrlib.store import ImmutableStore
87
from bzrlib.trace import mutter, note, log_error
88
from bzrlib.errors import bailout, BzrError
89
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
90
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
91
from bzrlib.revision import Revision
92
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
93
     format_date
94
95
BZR_DIFF_FORMAT = "## Bazaar-NG diff, format 0 ##\n"
96
BZR_PATCHNAME_FORMAT = 'cset:sha1:%s'
97
98
## standard representation
99
NONE_STRING = '(none)'
100
EMPTY = 'empty'
101
102
103
## TODO: Perhaps a different version of inventory commands that
104
## returns iterators...
105
106
## TODO: Perhaps an AtomicFile class that writes to a temporary file and then renames.
107
108
## TODO: Some kind of locking on branches.  Perhaps there should be a
109
## parameter to the branch object saying whether we want a read or
110
## write lock; release it from destructor.  Perhaps don't even need a
111
## read lock to look at immutable objects?
112
113
## TODO: Perhaps make UUIDs predictable in test mode to make it easier
114
## to compare output?
115
34 by mbp at sourcefrog
doc
116
## TODO: Some kind of global code to generate the right Branch object
117
## to work on.  Almost, but not quite all, commands need one, and it
118
## can be taken either from their parameters or their working
119
## directory.
120
46 by Martin Pool
todo
121
## TODO: rename command, needed soon: check destination doesn't exist
122
## either in working copy or tree; move working copy; update
123
## inventory; write out
124
125
## TODO: move command; check destination is a directory and will not
126
## clash; move it.
127
128
## TODO: command to show renames, one per line, as to->from
129
130
1 by mbp at sourcefrog
import from baz patch-364
131
132
133
def cmd_status(all=False):
134
    """Display status summary.
135
136
    For each file there is a single line giving its file state and name.
137
    The name is that in the current revision unless it is deleted or
138
    missing, in which case the old name is shown.
139
140
    :todo: Don't show unchanged files unless ``--all`` is given?
141
    """
142
    Branch('.').show_status(show_all=all)
143
144
145
146
######################################################################
147
# examining history
148
def cmd_get_revision(revision_id):
149
    Branch('.').get_revision(revision_id).write_xml(sys.stdout)
150
151
152
def cmd_get_file_text(text_id):
153
    """Get contents of a file by hash."""
154
    sf = Branch('.').text_store[text_id]
155
    pumpfile(sf, sys.stdout)
156
157
158
159
######################################################################
160
# commands
161
    
162
163
def cmd_revno():
164
    """Show number of revisions on this branch"""
165
    print Branch('.').revno()
166
    
167
168
def cmd_add(file_list, verbose=False):
169
    """Add specified files.
170
    
171
    Fails if the files are already added.
172
    """
173
    Branch('.').add(file_list, verbose=verbose)
174
175
176
def cmd_inventory(revision=None):
177
    """Show inventory of the current working copy."""
178
    ## TODO: Also optionally show a previous inventory
179
    ## TODO: Format options
180
    b = Branch('.')
181
    if revision == None:
182
        inv = b.read_working_inventory()
183
    else:
184
        inv = b.get_revision_inventory(b.lookup_revision(revision))
185
        
186
    for path, entry in inv.iter_entries():
187
        print '%-50s %s' % (entry.file_id, path)
188
189
190
191
def cmd_info():
192
    b = Branch('.')
193
    print 'branch format:', b.controlfile('branch-format', 'r').readline().rstrip('\n')
21 by mbp at sourcefrog
- bzr info: show summary information on branch history
194
195
    def plural(n, base='', pl=None):
196
        if n == 1:
197
            return base
198
        elif pl is not None:
199
            return pl
200
        else:
201
            return 's'
18 by mbp at sourcefrog
show count of versioned/unknown/ignored files
202
203
    count_version_dirs = 0
19 by mbp at sourcefrog
more information in info command
204
205
    count_status = {'A': 0, 'D': 0, 'M': 0, 'R': 0, '?': 0, 'I': 0, '.': 0}
206
    for st_tup in bzrlib.diff_trees(b.basis_tree(), b.working_tree()):
207
        fs = st_tup[0]
208
        count_status[fs] += 1
209
        if fs not in ['I', '?'] and st_tup[4] == 'directory':
210
            count_version_dirs += 1
211
212
    print
213
    print 'in the working tree:'
214
    for name, fs in (('unchanged', '.'),
215
                     ('modified', 'M'), ('added', 'A'), ('removed', 'D'),
216
                     ('renamed', 'R'), ('unknown', '?'), ('ignored', 'I'),
217
                     ):
218
        print '  %5d %s' % (count_status[fs], name)
21 by mbp at sourcefrog
- bzr info: show summary information on branch history
219
    print '  %5d versioned subdirector%s' % (count_version_dirs,
220
                                             plural(count_version_dirs, 'y', 'ies'))
221
222
    print
223
    print 'branch history:'
224
    history = b.revision_history()
225
    revno = len(history)
226
    print '  %5d revision%s' % (revno, plural(revno))
227
    committers = Set()
228
    for rev in history:
229
        committers.add(b.get_revision(rev).committer)
230
    print '  %5d committer%s' % (len(committers), plural(len(committers)))
231
    if revno > 0:
232
        firstrev = b.get_revision(history[0])
233
        age = int((time.time() - firstrev.timestamp) / 3600 / 24)
234
        print '  %5d day%s old' % (age, plural(age))
22 by mbp at sourcefrog
bzr info: show date of first and latest commit
235
        print '  first revision: %s' % format_date(firstrev.timestamp,
236
                                                 firstrev.timezone)
237
238
        lastrev = b.get_revision(history[-1])
239
        print '  latest revision: %s' % format_date(lastrev.timestamp,
240
                                                    lastrev.timezone)
241
        
21 by mbp at sourcefrog
- bzr info: show summary information on branch history
242
    
1 by mbp at sourcefrog
import from baz patch-364
243
244
245
def cmd_remove(file_list, verbose=False):
246
    Branch('.').remove(file_list, verbose=verbose)
247
248
249
250
def cmd_file_id(filename):
251
    i = Branch('.').read_working_inventory().path2id(filename)
252
    if i is None:
253
        bailout("%s is not a versioned file" % filename)
254
    else:
255
        print i
256
257
258
def cmd_find_filename(fileid):
259
    n = find_filename(fileid)
260
    if n is None:
261
        bailout("%s is not a live file id" % fileid)
262
    else:
263
        print n
264
265
266
def cmd_revision_history():
267
    for patchid in Branch('.').revision_history():
268
        print patchid
269
270
271
272
def cmd_init():
273
    # TODO: Check we're not already in a working directory?  At the
274
    # moment you'll get an ugly error.
275
    
276
    # TODO: What if we're in a subdirectory of a branch?  Would like
277
    # to allow that, but then the parent may need to understand that
278
    # the children have disappeared, or should they be versioned in
279
    # both?
280
281
    # TODO: Take an argument/option for branch name.
282
    Branch('.', init=True)
283
284
285
def cmd_diff(revision=None):
286
    """Show diff from basis to working copy.
287
288
    :todo: Take one or two revision arguments, look up those trees,
289
           and diff them.
290
291
    :todo: Allow diff across branches.
292
293
    :todo: Mangle filenames in diff to be more relevant.
294
295
    :todo: Shouldn't be in the cmd function.
296
    """
297
298
    b = Branch('.')
299
300
    if revision == None:
301
        old_tree = b.basis_tree()
302
    else:
303
        old_tree = b.revision_tree(b.lookup_revision(revision))
304
        
305
    new_tree = b.working_tree()
306
    old_inv = old_tree.inventory
307
    new_inv = new_tree.inventory
308
309
    # TODO: Options to control putting on a prefix or suffix, perhaps as a format string
310
    old_label = ''
311
    new_label = ''
312
313
    DEVNULL = '/dev/null'
314
    # Windows users, don't panic about this filename -- it is a
315
    # special signal to GNU patch that the file should be created or
316
    # deleted respectively.
317
318
    # TODO: Generation of pseudo-diffs for added/deleted files could
319
    # be usefully made into a much faster special case.
320
321
    # TODO: Better to return them in sorted order I think.
322
    
323
    for file_state, fid, old_name, new_name, kind in bzrlib.diff_trees(old_tree, new_tree):
324
        d = None
325
326
        # Don't show this by default; maybe do it if an option is passed
327
        # idlabel = '      {%s}' % fid
328
        idlabel = ''
329
330
        # FIXME: Something about the diff format makes patch unhappy
331
        # with newly-added files.
332
333
        def diffit(*a, **kw):
334
            sys.stdout.writelines(difflib.unified_diff(*a, **kw))
335
            print
336
        
337
        if file_state in ['.', '?', 'I']:
338
            continue
339
        elif file_state == 'A':
340
            print '*** added %s %r' % (kind, new_name)
341
            if kind == 'file':
342
                diffit([],
343
                       new_tree.get_file(fid).readlines(),
344
                       fromfile=DEVNULL,
345
                       tofile=new_label + new_name + idlabel)
346
        elif file_state == 'D':
347
            assert isinstance(old_name, types.StringTypes)
348
            print '*** deleted %s %r' % (kind, old_name)
349
            if kind == 'file':
350
                diffit(old_tree.get_file(fid).readlines(), [],
351
                       fromfile=old_label + old_name + idlabel,
352
                       tofile=DEVNULL)
353
        elif file_state in ['M', 'R']:
354
            if file_state == 'M':
355
                assert kind == 'file'
356
                assert old_name == new_name
357
                print '*** modified %s %r' % (kind, new_name)
358
            elif file_state == 'R':
359
                print '*** renamed %s %r => %r' % (kind, old_name, new_name)
360
361
            if kind == 'file':
362
                diffit(old_tree.get_file(fid).readlines(),
363
                       new_tree.get_file(fid).readlines(),
364
                       fromfile=old_label + old_name + idlabel,
365
                       tofile=new_label + new_name)
366
        else:
367
            bailout("can't represent state %s {%s}" % (file_state, fid))
368
369
370
65 by mbp at sourcefrog
rename 'find-branch-root' command to just 'root'
371
def cmd_root(filename=None):
372
    """Print the branch root."""
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
373
    print bzrlib.branch.find_branch_root(filename)
374
    
375
13 by mbp at sourcefrog
fix up cmd_log args
376
def cmd_log(timezone='original'):
1 by mbp at sourcefrog
import from baz patch-364
377
    """Show log of this branch.
378
379
    :todo: Options for utc; to show ids; to limit range; etc.
380
    """
12 by mbp at sourcefrog
new --timezone option for bzr log
381
    Branch('.').write_log(show_timezone=timezone)
1 by mbp at sourcefrog
import from baz patch-364
382
383
384
def cmd_ls(revision=None, verbose=False):
385
    """List files in a tree.
386
387
    :todo: Take a revision or remote path and list that tree instead.
388
    """
389
    b = Branch('.')
390
    if revision == None:
391
        tree = b.working_tree()
392
    else:
393
        tree = b.revision_tree(b.lookup_revision(revision))
394
        
395
    for fp, fc, kind, fid in tree.list_files():
396
        if verbose:
397
            if kind == 'directory':
398
                kindch = '/'
399
            elif kind == 'file':
400
                kindch = ''
401
            else:
402
                kindch = '???'
403
                
404
            print '%-8s %s%s' % (fc, fp, kindch)
405
        else:
406
            print fp
407
    
408
    
409
410
def cmd_unknowns():
411
    """List unknown files"""
412
    for f in Branch('.').unknowns():
413
        print quotefn(f)
414
415
416
def cmd_lookup_revision(revno):
417
    try:
418
        revno = int(revno)
419
    except ValueError:
420
        bailout("usage: lookup-revision REVNO",
421
                ["REVNO is a non-negative revision number for this branch"])
422
423
    print Branch('.').lookup_revision(revno) or NONE_STRING
424
425
426
427
def cmd_export(revno, dest):
428
    """Export past revision to destination directory."""
429
    b = Branch('.')
430
    rh = b.lookup_revision(int(revno))
431
    t = b.revision_tree(rh)
432
    t.export(dest)
433
434
435
436
######################################################################
437
# internal/test commands
438
439
440
def cmd_uuid():
441
    """Print a newly-generated UUID."""
63 by mbp at sourcefrog
fix up uuid command
442
    print bzrlib.osutils.uuid()
1 by mbp at sourcefrog
import from baz patch-364
443
444
445
8 by mbp at sourcefrog
store committer's timezone in revision and show
446
def cmd_local_time_offset():
447
    print bzrlib.osutils.local_time_offset()
448
449
450
57 by mbp at sourcefrog
error if --message is not given for commit
451
def cmd_commit(message=None, verbose=False):
452
    if not message:
453
        bailout("please specify a commit message")
1 by mbp at sourcefrog
import from baz patch-364
454
    Branch('.').commit(message, verbose=verbose)
455
456
457
def cmd_check():
458
    """Check consistency of the branch."""
459
    check()
460
461
462
def cmd_is(pred, *rest):
463
    """Test whether PREDICATE is true."""
464
    try:
465
        cmd_handler = globals()['assert_' + pred.replace('-', '_')]
466
    except KeyError:
467
        bailout("unknown predicate: %s" % quotefn(pred))
468
        
469
    try:
470
        cmd_handler(*rest)
471
    except BzrCheckError:
472
        # by default we don't print the message so that this can
473
        # be used from shell scripts without producing noise
474
        sys.exit(1)
475
476
477
def cmd_username():
478
    print bzrlib.osutils.username()
479
480
481
def cmd_user_email():
482
    print bzrlib.osutils.user_email()
483
484
485
def cmd_gen_revision_id():
486
    import time
487
    print bzrlib.branch._gen_revision_id(time.time())
488
489
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
490
def cmd_selftest(verbose=False):
491
    """Run internal test suite"""
1 by mbp at sourcefrog
import from baz patch-364
492
    ## -v, if present, is seen by doctest; the argument is just here
493
    ## so our parser doesn't complain
494
495
    ## TODO: --verbose option
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
496
497
    failures, tests = 0, 0
1 by mbp at sourcefrog
import from baz patch-364
498
    
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
499
    import doctest, bzrlib.store, bzrlib.tests
1 by mbp at sourcefrog
import from baz patch-364
500
    bzrlib.trace.verbose = False
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
501
502
    for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
58 by mbp at sourcefrog
include bzrlib.commands in selftest
503
        bzrlib.tree, bzrlib.tests, bzrlib.commands:
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
504
        mf, mt = doctest.testmod(m)
505
        failures += mf
506
        tests += mt
507
        print '%-40s %3d tests' % (m.__name__, mt),
508
        if mf:
509
            print '%3d FAILED!' % mf
510
        else:
511
            print
512
513
    print '%-40s %3d tests' % ('total', tests),
514
    if failures:
515
        print '%3d FAILED!' % failures
516
    else:
517
        print
518
519
520
521
# deprecated
522
cmd_doctest = cmd_selftest
53 by mbp at sourcefrog
'selftest' command instead of 'doctest'
523
524
1 by mbp at sourcefrog
import from baz patch-364
525
######################################################################
526
# help
527
528
529
def cmd_help():
530
    # TODO: Specific help for particular commands
531
    print __doc__
532
533
534
def cmd_version():
535
    print "bzr (bazaar-ng) %s" % __version__
536
    print __copyright__
537
    print "http://bazaar-ng.org/"
538
    print
539
    print \
540
"""bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and
541
you may use, modify and redistribute it under the terms of the GNU 
542
General Public License version 2 or later."""
543
544
545
def cmd_rocks():
546
    """Statement of optimism."""
547
    print "it sure does!"
548
549
550
551
######################################################################
552
# main routine
553
554
555
# list of all available options; the rhs can be either None for an
556
# option that takes no argument, or a constructor function that checks
557
# the type.
558
OPTIONS = {
559
    'all':                    None,
560
    'help':                   None,
561
    'message':                unicode,
562
    'revision':               int,
563
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
564
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
565
    'verbose':                None,
566
    'version':                None,
567
    }
568
569
SHORT_OPTIONS = {
570
    'm':                      'message',
571
    'r':                      'revision',
572
    'v':                      'verbose',
573
}
574
575
# List of options that apply to particular commands; commands not
576
# listed take none.
577
cmd_options = {
578
    'add':                    ['verbose'],
579
    'commit':                 ['message', 'verbose'],
580
    'diff':                   ['revision'],
581
    'inventory':              ['revision'],
12 by mbp at sourcefrog
new --timezone option for bzr log
582
    'log':                    ['show-ids', 'timezone'],
1 by mbp at sourcefrog
import from baz patch-364
583
    'ls':                     ['revision', 'verbose'],
12 by mbp at sourcefrog
new --timezone option for bzr log
584
    'remove':                 ['verbose'],
1 by mbp at sourcefrog
import from baz patch-364
585
    'status':                 ['all'],
586
    }
587
588
589
cmd_args = {
590
    'init':                   [],
591
    'add':                    ['file+'],
592
    'commit':                 [],
593
    'diff':                   [],
594
    'file-id':                ['filename'],
65 by mbp at sourcefrog
rename 'find-branch-root' command to just 'root'
595
    'root':                   ['filename?'],
1 by mbp at sourcefrog
import from baz patch-364
596
    'get-file-text':          ['text_id'],
597
    'get-inventory':          ['inventory_id'],
598
    'get-revision':           ['revision_id'],
599
    'get-revision-inventory': ['revision_id'],
600
    'log':                    [],
601
    'lookup-revision':        ['revno'],
602
    'export':                 ['revno', 'dest'],
603
    'remove':                 ['file+'],
604
    'status':                 [],
605
    }
606
607
608
def parse_args(argv):
609
    """Parse command line.
610
    
611
    Arguments and options are parsed at this level before being passed
612
    down to specific command handlers.  This routine knows, from a
613
    lookup table, something about the available options, what optargs
614
    they take, and which commands will accept them.
615
31 by Martin Pool
fix up parse_args doctest
616
    >>> parse_args('--help'.split())
1 by mbp at sourcefrog
import from baz patch-364
617
    ([], {'help': True})
31 by Martin Pool
fix up parse_args doctest
618
    >>> parse_args('--version'.split())
1 by mbp at sourcefrog
import from baz patch-364
619
    ([], {'version': True})
31 by Martin Pool
fix up parse_args doctest
620
    >>> parse_args('status --all'.split())
1 by mbp at sourcefrog
import from baz patch-364
621
    (['status'], {'all': True})
31 by Martin Pool
fix up parse_args doctest
622
    >>> parse_args('commit --message=biter'.split())
17 by mbp at sourcefrog
allow --option=ARG syntax
623
    (['commit'], {'message': u'biter'})
1 by mbp at sourcefrog
import from baz patch-364
624
    """
625
    args = []
626
    opts = {}
627
628
    # TODO: Maybe handle '--' to end options?
629
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
630
    while argv:
631
        a = argv.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
632
        if a[0] == '-':
17 by mbp at sourcefrog
allow --option=ARG syntax
633
            optarg = None
1 by mbp at sourcefrog
import from baz patch-364
634
            if a[1] == '-':
635
                mutter("  got option %r" % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
636
                if '=' in a:
637
                    optname, optarg = a[2:].split('=', 1)
638
                else:
639
                    optname = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
640
                if optname not in OPTIONS:
641
                    bailout('unknown long option %r' % a)
642
            else:
643
                shortopt = a[1:]
644
                if shortopt not in SHORT_OPTIONS:
645
                    bailout('unknown short option %r' % a)
646
                optname = SHORT_OPTIONS[shortopt]
647
            
648
            if optname in opts:
649
                # XXX: Do we ever want to support this, e.g. for -r?
650
                bailout('repeated option %r' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
651
                
1 by mbp at sourcefrog
import from baz patch-364
652
            optargfn = OPTIONS[optname]
653
            if optargfn:
17 by mbp at sourcefrog
allow --option=ARG syntax
654
                if optarg == None:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
655
                    if not argv:
17 by mbp at sourcefrog
allow --option=ARG syntax
656
                        bailout('option %r needs an argument' % a)
657
                    else:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
658
                        optarg = argv.pop(0)
17 by mbp at sourcefrog
allow --option=ARG syntax
659
                opts[optname] = optargfn(optarg)
1 by mbp at sourcefrog
import from baz patch-364
660
                mutter("    option argument %r" % opts[optname])
661
            else:
17 by mbp at sourcefrog
allow --option=ARG syntax
662
                if optarg != None:
663
                    bailout('option %r takes no argument' % optname)
1 by mbp at sourcefrog
import from baz patch-364
664
                opts[optname] = True
665
        else:
666
            args.append(a)
667
668
    return args, opts
669
670
671
672
def _match_args(cmd, args):
673
    """Check non-option arguments match required pattern.
674
675
    >>> _match_args('status', ['asdasdsadasd'])
676
    Traceback (most recent call last):
677
    ...
678
    BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
679
    >>> _match_args('add', ['asdasdsadasd'])
680
    {'file_list': ['asdasdsadasd']}
681
    >>> _match_args('add', 'abc def gj'.split())
682
    {'file_list': ['abc', 'def', 'gj']}
683
    """
684
    # match argument pattern
685
    argform = cmd_args.get(cmd, [])
686
    argdict = {}
687
    # TODO: Need a way to express 'cp SRC... DEST', where it matches
688
    # all but one.
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
689
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
690
    # step through args and argform, allowing appropriate 0-many matches
1 by mbp at sourcefrog
import from baz patch-364
691
    for ap in argform:
692
        argname = ap[:-1]
693
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
694
            if args:
695
                argdict[argname] = args.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
696
        elif ap[-1] == '*':
697
            assert 0
698
        elif ap[-1] == '+':
699
            if not args:
700
                bailout("command %r needs one or more %s"
701
                        % (cmd, argname.upper()))
702
            else:
703
                argdict[argname + '_list'] = args[:]
704
                args = []
705
        else:
706
            # just a plain arg
707
            argname = ap
708
            if not args:
709
                bailout("command %r requires argument %s"
710
                        % (cmd, argname.upper()))
711
            else:
712
                argdict[argname] = args.pop(0)
713
            
714
    if args:
715
        bailout("extra arguments to command %s: %r"
716
                % (cmd, args))
717
718
    return argdict
719
720
721
722
def run_bzr(argv):
723
    """Execute a command.
724
725
    This is similar to main(), but without all the trappings for
726
    logging and error handling.
727
    """
728
    try:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
729
        args, opts = parse_args(argv[1:])
1 by mbp at sourcefrog
import from baz patch-364
730
        if 'help' in opts:
731
            # TODO: pass down other arguments in case they asked for
732
            # help on a command name?
733
            cmd_help()
734
            return 0
735
        elif 'version' in opts:
736
            cmd_version()
737
            return 0
738
        cmd = args.pop(0)
739
    except IndexError:
740
        log_error('usage: bzr COMMAND\n')
741
        log_error('  try "bzr help"\n')
742
        return 1
743
            
744
    try:
745
        cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
746
    except KeyError:
747
        bailout("unknown command " + `cmd`)
748
749
    # TODO: special --profile option to turn on the Python profiler
750
751
    # check options are reasonable
752
    allowed = cmd_options.get(cmd, [])
753
    for oname in opts:
754
        if oname not in allowed:
755
            bailout("option %r is not allowed for command %r"
756
                    % (oname, cmd))
757
758
    cmdargs = _match_args(cmd, args)
759
    cmdargs.update(opts)
760
761
    ret = cmd_handler(**cmdargs) or 0
762
763
764
765
def main(argv):
766
    ## TODO: Handle command-line options; probably know what options are valid for
767
    ## each command
768
769
    ## TODO: If the arguments are wrong, give a usage message rather
770
    ## than just a backtrace.
771
59 by mbp at sourcefrog
lift out tracefile creation code
772
    bzrlib.trace.create_tracefile(argv)
773
    
1 by mbp at sourcefrog
import from baz patch-364
774
    try:
775
        ret = run_bzr(argv)
776
        return ret
777
    except BzrError, e:
778
        log_error('bzr: error: ' + e.args[0] + '\n')
779
        if len(e.args) > 1:
780
            for h in e.args[1]:
781
                log_error('  ' + h + '\n')
782
        return 1
783
    except Exception, e:
784
        log_error('bzr: exception: %s\n' % e)
785
        log_error('    see .bzr.log for details\n')
786
        traceback.print_exc(None, bzrlib.trace._tracefile)
787
        traceback.print_exc(None, sys.stderr)
788
        return 1
789
790
    # TODO: Maybe nicer handling of IOError?
791
792
793
794
if __name__ == '__main__':
795
    sys.exit(main(sys.argv))
796
    ##import profile
797
    ##profile.run('main(sys.argv)')
798