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