/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
    """
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
175
    bzrlib.add.smart_add(file_list, verbose)
1 by mbp at sourcefrog
import from baz patch-364
176
    
177
68 by mbp at sourcefrog
- new relpath command and function
178
def cmd_relpath(filename):
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
179
    """Show path of file relative to root"""
68 by mbp at sourcefrog
- new relpath command and function
180
    print Branch(filename).relpath(filename)
181
182
1 by mbp at sourcefrog
import from baz patch-364
183
def cmd_inventory(revision=None):
184
    """Show inventory of the current working copy."""
185
    ## TODO: Also optionally show a previous inventory
186
    ## TODO: Format options
187
    b = Branch('.')
188
    if revision == None:
189
        inv = b.read_working_inventory()
190
    else:
191
        inv = b.get_revision_inventory(b.lookup_revision(revision))
192
        
193
    for path, entry in inv.iter_entries():
194
        print '%-50s %s' % (entry.file_id, path)
195
196
197
198
def cmd_info():
112 by mbp at sourcefrog
help for info command
199
    """info: Show statistical information for this branch
200
201
usage: bzr info"""
77 by mbp at sourcefrog
- split info command out into separate file
202
    import info
203
    info.show_info(Branch('.'))        
21 by mbp at sourcefrog
- bzr info: show summary information on branch history
204
    
1 by mbp at sourcefrog
import from baz patch-364
205
206
207
def cmd_remove(file_list, verbose=False):
69 by Martin Pool
handle add, remove, file-id being given filenames that are
208
    b = Branch(file_list[0])
209
    b.remove([b.relpath(f) for f in file_list], verbose=verbose)
1 by mbp at sourcefrog
import from baz patch-364
210
211
212
213
def cmd_file_id(filename):
69 by Martin Pool
handle add, remove, file-id being given filenames that are
214
    b = Branch(filename)
215
    i = b.inventory.path2id(b.relpath(filename))
1 by mbp at sourcefrog
import from baz patch-364
216
    if i is None:
217
        bailout("%s is not a versioned file" % filename)
218
    else:
219
        print i
220
221
222
def cmd_find_filename(fileid):
223
    n = find_filename(fileid)
224
    if n is None:
225
        bailout("%s is not a live file id" % fileid)
226
    else:
227
        print n
228
229
230
def cmd_revision_history():
231
    for patchid in Branch('.').revision_history():
232
        print patchid
233
234
235
236
def cmd_init():
237
    # TODO: Check we're not already in a working directory?  At the
238
    # moment you'll get an ugly error.
239
    
240
    # TODO: What if we're in a subdirectory of a branch?  Would like
241
    # to allow that, but then the parent may need to understand that
242
    # the children have disappeared, or should they be versioned in
243
    # both?
244
245
    # TODO: Take an argument/option for branch name.
246
    Branch('.', init=True)
247
248
249
def cmd_diff(revision=None):
109 by mbp at sourcefrog
more help for diff command
250
    """bzr diff: Show differences in working tree.
251
    
252
usage: bzr diff [-r REV]
253
254
--revision REV
255
    Show changes since REV, rather than predecessor.
256
257
TODO: Given two revision arguments, show the difference between them.
258
259
TODO: Allow diff across branches.
260
261
TODO: Option to use external diff command; could be GNU diff, wdiff,
262
or a graphical diff.
263
264
TODO: Diff selected files.
265
"""
266
267
    ## TODO: Shouldn't be in the cmd function.
1 by mbp at sourcefrog
import from baz patch-364
268
269
    b = Branch('.')
270
271
    if revision == None:
272
        old_tree = b.basis_tree()
273
    else:
274
        old_tree = b.revision_tree(b.lookup_revision(revision))
275
        
276
    new_tree = b.working_tree()
277
    old_inv = old_tree.inventory
278
    new_inv = new_tree.inventory
279
280
    # TODO: Options to control putting on a prefix or suffix, perhaps as a format string
281
    old_label = ''
282
    new_label = ''
283
284
    DEVNULL = '/dev/null'
285
    # Windows users, don't panic about this filename -- it is a
286
    # special signal to GNU patch that the file should be created or
287
    # deleted respectively.
288
289
    # TODO: Generation of pseudo-diffs for added/deleted files could
290
    # be usefully made into a much faster special case.
291
292
    # TODO: Better to return them in sorted order I think.
293
    
294
    for file_state, fid, old_name, new_name, kind in bzrlib.diff_trees(old_tree, new_tree):
295
        d = None
296
297
        # Don't show this by default; maybe do it if an option is passed
298
        # idlabel = '      {%s}' % fid
299
        idlabel = ''
300
301
        # FIXME: Something about the diff format makes patch unhappy
302
        # with newly-added files.
303
304
        def diffit(*a, **kw):
305
            sys.stdout.writelines(difflib.unified_diff(*a, **kw))
306
            print
307
        
308
        if file_state in ['.', '?', 'I']:
309
            continue
310
        elif file_state == 'A':
311
            print '*** added %s %r' % (kind, new_name)
312
            if kind == 'file':
313
                diffit([],
314
                       new_tree.get_file(fid).readlines(),
315
                       fromfile=DEVNULL,
316
                       tofile=new_label + new_name + idlabel)
317
        elif file_state == 'D':
318
            assert isinstance(old_name, types.StringTypes)
319
            print '*** deleted %s %r' % (kind, old_name)
320
            if kind == 'file':
321
                diffit(old_tree.get_file(fid).readlines(), [],
322
                       fromfile=old_label + old_name + idlabel,
323
                       tofile=DEVNULL)
324
        elif file_state in ['M', 'R']:
325
            if file_state == 'M':
326
                assert kind == 'file'
327
                assert old_name == new_name
328
                print '*** modified %s %r' % (kind, new_name)
329
            elif file_state == 'R':
330
                print '*** renamed %s %r => %r' % (kind, old_name, new_name)
331
332
            if kind == 'file':
333
                diffit(old_tree.get_file(fid).readlines(),
334
                       new_tree.get_file(fid).readlines(),
335
                       fromfile=old_label + old_name + idlabel,
336
                       tofile=new_label + new_name)
337
        else:
338
            bailout("can't represent state %s {%s}" % (file_state, fid))
339
340
341
135 by mbp at sourcefrog
Simple new 'deleted' command
342
def cmd_deleted():
343
    """List files deleted in the working tree.
344
345
TODO: Show files deleted since a previous revision, or between two revisions.
346
    """
347
    b = Branch('.')
348
    old = b.basis_tree()
349
    new = b.working_tree()
350
351
    for path, ie in old.inventory.iter_entries():
352
        if not new.has_id(ie.file_id):
353
            print path
354
    
355
356
65 by mbp at sourcefrog
rename 'find-branch-root' command to just 'root'
357
def cmd_root(filename=None):
358
    """Print the branch root."""
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
359
    print bzrlib.branch.find_branch_root(filename)
360
    
361
13 by mbp at sourcefrog
fix up cmd_log args
362
def cmd_log(timezone='original'):
1 by mbp at sourcefrog
import from baz patch-364
363
    """Show log of this branch.
364
365
    :todo: Options for utc; to show ids; to limit range; etc.
366
    """
12 by mbp at sourcefrog
new --timezone option for bzr log
367
    Branch('.').write_log(show_timezone=timezone)
1 by mbp at sourcefrog
import from baz patch-364
368
369
370
def cmd_ls(revision=None, verbose=False):
371
    """List files in a tree.
372
373
    :todo: Take a revision or remote path and list that tree instead.
374
    """
375
    b = Branch('.')
376
    if revision == None:
377
        tree = b.working_tree()
378
    else:
379
        tree = b.revision_tree(b.lookup_revision(revision))
380
        
381
    for fp, fc, kind, fid in tree.list_files():
382
        if verbose:
383
            if kind == 'directory':
384
                kindch = '/'
385
            elif kind == 'file':
386
                kindch = ''
387
            else:
388
                kindch = '???'
389
                
390
            print '%-8s %s%s' % (fc, fp, kindch)
391
        else:
392
            print fp
393
    
394
    
395
396
def cmd_unknowns():
397
    """List unknown files"""
398
    for f in Branch('.').unknowns():
399
        print quotefn(f)
400
401
133 by mbp at sourcefrog
- new 'ignored' command
402
403
def cmd_ignored(verbose=True):
404
    """List ignored files and the patterns that matched them.
405
      """
406
    tree = Branch('.').working_tree()
407
    for path, file_class, kind, id in tree.list_files():
408
        if file_class != 'I':
409
            continue
410
        ## XXX: Slightly inefficient since this was already calculated
411
        pat = tree.is_ignored(path)
412
        print '%-50s %s' % (path, pat)
413
    
414
415
1 by mbp at sourcefrog
import from baz patch-364
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):
97 by mbp at sourcefrog
- more commit help
452
    """Commit changes to a new revision.
453
454
--message MESSAGE
455
    Description of changes in this revision; free form text.
456
    It is recommended that the first line be a single-sentence
457
    summary.
458
--verbose
459
    Show status of changed files,
460
461
TODO: Commit only selected files.
462
463
TODO: Run hooks on tree to-be-committed, and after commit.
464
465
TODO: Strict commit that fails if there are unknown or deleted files.
466
"""
467
57 by mbp at sourcefrog
error if --message is not given for commit
468
    if not message:
469
        bailout("please specify a commit message")
1 by mbp at sourcefrog
import from baz patch-364
470
    Branch('.').commit(message, verbose=verbose)
471
472
113 by mbp at sourcefrog
More help for check command
473
def cmd_check(dir='.'):
474
    """check: Consistency check of branch history.
475
476
usage: bzr check [-v] [BRANCH]
477
478
options:
479
  --verbose, -v         Show progress of checking.
480
481
This command checks various invariants about the branch storage to
482
detect data corruption or bzr bugs.
483
"""
484
    import bzrlib.check
485
    bzrlib.check.check(Branch(dir, find_root=False))
1 by mbp at sourcefrog
import from baz patch-364
486
487
488
def cmd_is(pred, *rest):
489
    """Test whether PREDICATE is true."""
490
    try:
491
        cmd_handler = globals()['assert_' + pred.replace('-', '_')]
492
    except KeyError:
493
        bailout("unknown predicate: %s" % quotefn(pred))
494
        
495
    try:
496
        cmd_handler(*rest)
497
    except BzrCheckError:
498
        # by default we don't print the message so that this can
499
        # be used from shell scripts without producing noise
500
        sys.exit(1)
501
502
503
def cmd_username():
504
    print bzrlib.osutils.username()
505
506
507
def cmd_user_email():
508
    print bzrlib.osutils.user_email()
509
510
511
def cmd_gen_revision_id():
512
    import time
513
    print bzrlib.branch._gen_revision_id(time.time())
514
515
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
516
def cmd_selftest(verbose=False):
517
    """Run internal test suite"""
1 by mbp at sourcefrog
import from baz patch-364
518
    ## -v, if present, is seen by doctest; the argument is just here
519
    ## so our parser doesn't complain
520
521
    ## TODO: --verbose option
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
522
523
    failures, tests = 0, 0
1 by mbp at sourcefrog
import from baz patch-364
524
    
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
525
    import doctest, bzrlib.store, bzrlib.tests
1 by mbp at sourcefrog
import from baz patch-364
526
    bzrlib.trace.verbose = False
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
527
528
    for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
70 by mbp at sourcefrog
Prepare for smart recursive add.
529
        bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
530
        mf, mt = doctest.testmod(m)
531
        failures += mf
532
        tests += mt
533
        print '%-40s %3d tests' % (m.__name__, mt),
534
        if mf:
535
            print '%3d FAILED!' % mf
536
        else:
537
            print
538
539
    print '%-40s %3d tests' % ('total', tests),
540
    if failures:
541
        print '%3d FAILED!' % failures
542
    else:
543
        print
544
545
546
547
# deprecated
548
cmd_doctest = cmd_selftest
53 by mbp at sourcefrog
'selftest' command instead of 'doctest'
549
550
1 by mbp at sourcefrog
import from baz patch-364
551
######################################################################
552
# help
553
554
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
555
def cmd_help(topic=None):
556
    if topic == None:
557
        print __doc__
558
        return
559
560
    # otherwise, maybe the name of a command?
561
    try:
562
        cmdfn = globals()['cmd_' + topic.replace('-', '_')]
563
    except KeyError:
564
        bailout("no help for %r" % topic)
565
566
    doc = cmdfn.__doc__
567
    if doc == None:
568
        bailout("sorry, no detailed help yet for %r" % topic)
569
570
    print doc
571
        
572
1 by mbp at sourcefrog
import from baz patch-364
573
574
575
def cmd_version():
84 by mbp at sourcefrog
- update version string
576
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
577
    print bzrlib.__copyright__
1 by mbp at sourcefrog
import from baz patch-364
578
    print "http://bazaar-ng.org/"
579
    print
580
    print \
581
"""bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and
582
you may use, modify and redistribute it under the terms of the GNU 
583
General Public License version 2 or later."""
584
585
586
def cmd_rocks():
587
    """Statement of optimism."""
588
    print "it sure does!"
589
590
591
592
######################################################################
593
# main routine
594
595
596
# list of all available options; the rhs can be either None for an
597
# option that takes no argument, or a constructor function that checks
598
# the type.
599
OPTIONS = {
600
    'all':                    None,
601
    'help':                   None,
602
    'message':                unicode,
603
    'revision':               int,
604
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
605
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
606
    'verbose':                None,
607
    'version':                None,
608
    }
609
610
SHORT_OPTIONS = {
611
    'm':                      'message',
612
    'r':                      'revision',
613
    'v':                      'verbose',
614
}
615
616
# List of options that apply to particular commands; commands not
617
# listed take none.
618
cmd_options = {
619
    'add':                    ['verbose'],
620
    'commit':                 ['message', 'verbose'],
621
    'diff':                   ['revision'],
622
    'inventory':              ['revision'],
12 by mbp at sourcefrog
new --timezone option for bzr log
623
    'log':                    ['show-ids', 'timezone'],
1 by mbp at sourcefrog
import from baz patch-364
624
    'ls':                     ['revision', 'verbose'],
12 by mbp at sourcefrog
new --timezone option for bzr log
625
    'remove':                 ['verbose'],
1 by mbp at sourcefrog
import from baz patch-364
626
    'status':                 ['all'],
627
    }
628
629
630
cmd_args = {
631
    'add':                    ['file+'],
632
    'commit':                 [],
633
    'diff':                   [],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
634
    'export':                 ['revno', 'dest'],
1 by mbp at sourcefrog
import from baz patch-364
635
    'file-id':                ['filename'],
636
    'get-file-text':          ['text_id'],
637
    'get-inventory':          ['inventory_id'],
638
    'get-revision':           ['revision_id'],
639
    'get-revision-inventory': ['revision_id'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
640
    'help':                   ['topic?'],
641
    'init':                   [],
1 by mbp at sourcefrog
import from baz patch-364
642
    'log':                    [],
643
    'lookup-revision':        ['revno'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
644
    'relpath':                ['filename'],
1 by mbp at sourcefrog
import from baz patch-364
645
    'remove':                 ['file+'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
646
    'root':                   ['filename?'],
1 by mbp at sourcefrog
import from baz patch-364
647
    'status':                 [],
648
    }
649
650
651
def parse_args(argv):
652
    """Parse command line.
653
    
654
    Arguments and options are parsed at this level before being passed
655
    down to specific command handlers.  This routine knows, from a
656
    lookup table, something about the available options, what optargs
657
    they take, and which commands will accept them.
658
31 by Martin Pool
fix up parse_args doctest
659
    >>> parse_args('--help'.split())
1 by mbp at sourcefrog
import from baz patch-364
660
    ([], {'help': True})
31 by Martin Pool
fix up parse_args doctest
661
    >>> parse_args('--version'.split())
1 by mbp at sourcefrog
import from baz patch-364
662
    ([], {'version': True})
31 by Martin Pool
fix up parse_args doctest
663
    >>> parse_args('status --all'.split())
1 by mbp at sourcefrog
import from baz patch-364
664
    (['status'], {'all': True})
31 by Martin Pool
fix up parse_args doctest
665
    >>> parse_args('commit --message=biter'.split())
17 by mbp at sourcefrog
allow --option=ARG syntax
666
    (['commit'], {'message': u'biter'})
1 by mbp at sourcefrog
import from baz patch-364
667
    """
668
    args = []
669
    opts = {}
670
671
    # TODO: Maybe handle '--' to end options?
672
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
673
    while argv:
674
        a = argv.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
675
        if a[0] == '-':
17 by mbp at sourcefrog
allow --option=ARG syntax
676
            optarg = None
1 by mbp at sourcefrog
import from baz patch-364
677
            if a[1] == '-':
678
                mutter("  got option %r" % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
679
                if '=' in a:
680
                    optname, optarg = a[2:].split('=', 1)
681
                else:
682
                    optname = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
683
                if optname not in OPTIONS:
684
                    bailout('unknown long option %r' % a)
685
            else:
686
                shortopt = a[1:]
687
                if shortopt not in SHORT_OPTIONS:
688
                    bailout('unknown short option %r' % a)
689
                optname = SHORT_OPTIONS[shortopt]
690
            
691
            if optname in opts:
692
                # XXX: Do we ever want to support this, e.g. for -r?
693
                bailout('repeated option %r' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
694
                
1 by mbp at sourcefrog
import from baz patch-364
695
            optargfn = OPTIONS[optname]
696
            if optargfn:
17 by mbp at sourcefrog
allow --option=ARG syntax
697
                if optarg == None:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
698
                    if not argv:
17 by mbp at sourcefrog
allow --option=ARG syntax
699
                        bailout('option %r needs an argument' % a)
700
                    else:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
701
                        optarg = argv.pop(0)
17 by mbp at sourcefrog
allow --option=ARG syntax
702
                opts[optname] = optargfn(optarg)
1 by mbp at sourcefrog
import from baz patch-364
703
                mutter("    option argument %r" % opts[optname])
704
            else:
17 by mbp at sourcefrog
allow --option=ARG syntax
705
                if optarg != None:
706
                    bailout('option %r takes no argument' % optname)
1 by mbp at sourcefrog
import from baz patch-364
707
                opts[optname] = True
708
        else:
709
            args.append(a)
710
711
    return args, opts
712
713
714
715
def _match_args(cmd, args):
716
    """Check non-option arguments match required pattern.
717
718
    >>> _match_args('status', ['asdasdsadasd'])
719
    Traceback (most recent call last):
720
    ...
721
    BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
722
    >>> _match_args('add', ['asdasdsadasd'])
723
    {'file_list': ['asdasdsadasd']}
724
    >>> _match_args('add', 'abc def gj'.split())
725
    {'file_list': ['abc', 'def', 'gj']}
726
    """
727
    # match argument pattern
728
    argform = cmd_args.get(cmd, [])
729
    argdict = {}
730
    # TODO: Need a way to express 'cp SRC... DEST', where it matches
731
    # all but one.
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
732
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
733
    # step through args and argform, allowing appropriate 0-many matches
1 by mbp at sourcefrog
import from baz patch-364
734
    for ap in argform:
735
        argname = ap[:-1]
736
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
737
            if args:
738
                argdict[argname] = args.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
739
        elif ap[-1] == '*':
740
            assert 0
741
        elif ap[-1] == '+':
742
            if not args:
743
                bailout("command %r needs one or more %s"
744
                        % (cmd, argname.upper()))
745
            else:
746
                argdict[argname + '_list'] = args[:]
747
                args = []
748
        else:
749
            # just a plain arg
750
            argname = ap
751
            if not args:
752
                bailout("command %r requires argument %s"
753
                        % (cmd, argname.upper()))
754
            else:
755
                argdict[argname] = args.pop(0)
756
            
757
    if args:
758
        bailout("extra arguments to command %s: %r"
759
                % (cmd, args))
760
761
    return argdict
762
763
764
765
def run_bzr(argv):
766
    """Execute a command.
767
768
    This is similar to main(), but without all the trappings for
769
    logging and error handling.
770
    """
771
    try:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
772
        args, opts = parse_args(argv[1:])
1 by mbp at sourcefrog
import from baz patch-364
773
        if 'help' in opts:
774
            # TODO: pass down other arguments in case they asked for
775
            # help on a command name?
776
            cmd_help()
777
            return 0
778
        elif 'version' in opts:
779
            cmd_version()
780
            return 0
781
        cmd = args.pop(0)
782
    except IndexError:
783
        log_error('usage: bzr COMMAND\n')
784
        log_error('  try "bzr help"\n')
785
        return 1
115 by mbp at sourcefrog
todo
786
1 by mbp at sourcefrog
import from baz patch-364
787
    try:
788
        cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
789
    except KeyError:
790
        bailout("unknown command " + `cmd`)
791
792
    # TODO: special --profile option to turn on the Python profiler
793
794
    # check options are reasonable
795
    allowed = cmd_options.get(cmd, [])
796
    for oname in opts:
797
        if oname not in allowed:
798
            bailout("option %r is not allowed for command %r"
799
                    % (oname, cmd))
800
801
    cmdargs = _match_args(cmd, args)
802
    cmdargs.update(opts)
803
804
    ret = cmd_handler(**cmdargs) or 0
805
806
807
808
def main(argv):
809
    ## TODO: Handle command-line options; probably know what options are valid for
810
    ## each command
811
812
    ## TODO: If the arguments are wrong, give a usage message rather
813
    ## than just a backtrace.
814
59 by mbp at sourcefrog
lift out tracefile creation code
815
    bzrlib.trace.create_tracefile(argv)
816
    
1 by mbp at sourcefrog
import from baz patch-364
817
    try:
818
        ret = run_bzr(argv)
819
        return ret
820
    except BzrError, e:
821
        log_error('bzr: error: ' + e.args[0] + '\n')
822
        if len(e.args) > 1:
823
            for h in e.args[1]:
824
                log_error('  ' + h + '\n')
825
        return 1
826
    except Exception, e:
827
        log_error('bzr: exception: %s\n' % e)
828
        log_error('    see .bzr.log for details\n')
829
        traceback.print_exc(None, bzrlib.trace._tracefile)
830
        traceback.print_exc(None, sys.stderr)
831
        return 1
832
833
    # TODO: Maybe nicer handling of IOError?
834
835
836
837
if __name__ == '__main__':
838
    sys.exit(main(sys.argv))
839
    ##import profile
840
    ##profile.run('main(sys.argv)')
841