/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
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
342
def cmd_deleted(show_ids=False):
135 by mbp at sourcefrog
Simple new 'deleted' command
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
147 by mbp at sourcefrog
todo
351
    ## TODO: Much more efficient way to do this: read in new
352
    ## directories with readdir, rather than stating each one.  Same
353
    ## level of effort but possibly much less IO.  (Or possibly not,
354
    ## if the directories are very large...)
355
135 by mbp at sourcefrog
Simple new 'deleted' command
356
    for path, ie in old.inventory.iter_entries():
357
        if not new.has_id(ie.file_id):
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
358
            if show_ids:
359
                print '%-50s %s' % (path, ie.file_id)
360
            else:
361
                print path
362
                
135 by mbp at sourcefrog
Simple new 'deleted' command
363
    
364
365
65 by mbp at sourcefrog
rename 'find-branch-root' command to just 'root'
366
def cmd_root(filename=None):
367
    """Print the branch root."""
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
368
    print bzrlib.branch.find_branch_root(filename)
369
    
370
13 by mbp at sourcefrog
fix up cmd_log args
371
def cmd_log(timezone='original'):
1 by mbp at sourcefrog
import from baz patch-364
372
    """Show log of this branch.
373
374
    :todo: Options for utc; to show ids; to limit range; etc.
375
    """
12 by mbp at sourcefrog
new --timezone option for bzr log
376
    Branch('.').write_log(show_timezone=timezone)
1 by mbp at sourcefrog
import from baz patch-364
377
378
379
def cmd_ls(revision=None, verbose=False):
380
    """List files in a tree.
381
382
    :todo: Take a revision or remote path and list that tree instead.
383
    """
384
    b = Branch('.')
385
    if revision == None:
386
        tree = b.working_tree()
387
    else:
388
        tree = b.revision_tree(b.lookup_revision(revision))
389
        
390
    for fp, fc, kind, fid in tree.list_files():
391
        if verbose:
392
            if kind == 'directory':
393
                kindch = '/'
394
            elif kind == 'file':
395
                kindch = ''
396
            else:
397
                kindch = '???'
398
                
399
            print '%-8s %s%s' % (fc, fp, kindch)
400
        else:
401
            print fp
402
    
403
    
404
405
def cmd_unknowns():
406
    """List unknown files"""
407
    for f in Branch('.').unknowns():
408
        print quotefn(f)
409
410
133 by mbp at sourcefrog
- new 'ignored' command
411
412
def cmd_ignored(verbose=True):
413
    """List ignored files and the patterns that matched them.
414
      """
415
    tree = Branch('.').working_tree()
416
    for path, file_class, kind, id in tree.list_files():
417
        if file_class != 'I':
418
            continue
419
        ## XXX: Slightly inefficient since this was already calculated
420
        pat = tree.is_ignored(path)
421
        print '%-50s %s' % (path, pat)
422
423
1 by mbp at sourcefrog
import from baz patch-364
424
def cmd_lookup_revision(revno):
425
    try:
426
        revno = int(revno)
427
    except ValueError:
428
        bailout("usage: lookup-revision REVNO",
429
                ["REVNO is a non-negative revision number for this branch"])
430
431
    print Branch('.').lookup_revision(revno) or NONE_STRING
432
433
434
435
def cmd_export(revno, dest):
436
    """Export past revision to destination directory."""
437
    b = Branch('.')
438
    rh = b.lookup_revision(int(revno))
439
    t = b.revision_tree(rh)
440
    t.export(dest)
441
442
443
444
######################################################################
445
# internal/test commands
446
447
448
def cmd_uuid():
449
    """Print a newly-generated UUID."""
63 by mbp at sourcefrog
fix up uuid command
450
    print bzrlib.osutils.uuid()
1 by mbp at sourcefrog
import from baz patch-364
451
452
453
8 by mbp at sourcefrog
store committer's timezone in revision and show
454
def cmd_local_time_offset():
455
    print bzrlib.osutils.local_time_offset()
456
457
458
57 by mbp at sourcefrog
error if --message is not given for commit
459
def cmd_commit(message=None, verbose=False):
97 by mbp at sourcefrog
- more commit help
460
    """Commit changes to a new revision.
461
462
--message MESSAGE
463
    Description of changes in this revision; free form text.
464
    It is recommended that the first line be a single-sentence
465
    summary.
466
--verbose
467
    Show status of changed files,
468
469
TODO: Commit only selected files.
470
471
TODO: Run hooks on tree to-be-committed, and after commit.
472
473
TODO: Strict commit that fails if there are unknown or deleted files.
474
"""
475
57 by mbp at sourcefrog
error if --message is not given for commit
476
    if not message:
477
        bailout("please specify a commit message")
1 by mbp at sourcefrog
import from baz patch-364
478
    Branch('.').commit(message, verbose=verbose)
479
480
113 by mbp at sourcefrog
More help for check command
481
def cmd_check(dir='.'):
482
    """check: Consistency check of branch history.
483
484
usage: bzr check [-v] [BRANCH]
485
486
options:
487
  --verbose, -v         Show progress of checking.
488
489
This command checks various invariants about the branch storage to
490
detect data corruption or bzr bugs.
491
"""
492
    import bzrlib.check
493
    bzrlib.check.check(Branch(dir, find_root=False))
1 by mbp at sourcefrog
import from baz patch-364
494
495
496
def cmd_is(pred, *rest):
497
    """Test whether PREDICATE is true."""
498
    try:
499
        cmd_handler = globals()['assert_' + pred.replace('-', '_')]
500
    except KeyError:
501
        bailout("unknown predicate: %s" % quotefn(pred))
502
        
503
    try:
504
        cmd_handler(*rest)
505
    except BzrCheckError:
506
        # by default we don't print the message so that this can
507
        # be used from shell scripts without producing noise
508
        sys.exit(1)
509
510
511
def cmd_username():
512
    print bzrlib.osutils.username()
513
514
515
def cmd_user_email():
516
    print bzrlib.osutils.user_email()
517
518
519
def cmd_gen_revision_id():
520
    import time
521
    print bzrlib.branch._gen_revision_id(time.time())
522
523
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
524
def cmd_selftest(verbose=False):
525
    """Run internal test suite"""
1 by mbp at sourcefrog
import from baz patch-364
526
    ## -v, if present, is seen by doctest; the argument is just here
527
    ## so our parser doesn't complain
528
529
    ## TODO: --verbose option
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
530
531
    failures, tests = 0, 0
1 by mbp at sourcefrog
import from baz patch-364
532
    
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
533
    import doctest, bzrlib.store, bzrlib.tests
1 by mbp at sourcefrog
import from baz patch-364
534
    bzrlib.trace.verbose = False
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
535
536
    for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
70 by mbp at sourcefrog
Prepare for smart recursive add.
537
        bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
538
        mf, mt = doctest.testmod(m)
539
        failures += mf
540
        tests += mt
541
        print '%-40s %3d tests' % (m.__name__, mt),
542
        if mf:
543
            print '%3d FAILED!' % mf
544
        else:
545
            print
546
547
    print '%-40s %3d tests' % ('total', tests),
548
    if failures:
549
        print '%3d FAILED!' % failures
550
    else:
551
        print
552
553
554
555
# deprecated
556
cmd_doctest = cmd_selftest
53 by mbp at sourcefrog
'selftest' command instead of 'doctest'
557
558
1 by mbp at sourcefrog
import from baz patch-364
559
######################################################################
560
# help
561
562
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
563
def cmd_help(topic=None):
564
    if topic == None:
565
        print __doc__
566
        return
567
568
    # otherwise, maybe the name of a command?
569
    try:
570
        cmdfn = globals()['cmd_' + topic.replace('-', '_')]
571
    except KeyError:
572
        bailout("no help for %r" % topic)
573
574
    doc = cmdfn.__doc__
575
    if doc == None:
576
        bailout("sorry, no detailed help yet for %r" % topic)
577
578
    print doc
579
        
580
1 by mbp at sourcefrog
import from baz patch-364
581
582
583
def cmd_version():
84 by mbp at sourcefrog
- update version string
584
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
585
    print bzrlib.__copyright__
1 by mbp at sourcefrog
import from baz patch-364
586
    print "http://bazaar-ng.org/"
587
    print
588
    print \
589
"""bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and
590
you may use, modify and redistribute it under the terms of the GNU 
591
General Public License version 2 or later."""
592
593
594
def cmd_rocks():
595
    """Statement of optimism."""
596
    print "it sure does!"
597
598
599
600
######################################################################
601
# main routine
602
603
604
# list of all available options; the rhs can be either None for an
605
# option that takes no argument, or a constructor function that checks
606
# the type.
607
OPTIONS = {
608
    'all':                    None,
609
    'help':                   None,
610
    'message':                unicode,
137 by mbp at sourcefrog
new --profile option
611
    'profile':                None,
1 by mbp at sourcefrog
import from baz patch-364
612
    'revision':               int,
613
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
614
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
615
    'verbose':                None,
616
    'version':                None,
617
    }
618
619
SHORT_OPTIONS = {
620
    'm':                      'message',
621
    'r':                      'revision',
622
    'v':                      'verbose',
623
}
624
625
# List of options that apply to particular commands; commands not
626
# listed take none.
627
cmd_options = {
628
    'add':                    ['verbose'],
629
    'commit':                 ['message', 'verbose'],
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
630
    'deleted':                ['show-ids'],
1 by mbp at sourcefrog
import from baz patch-364
631
    'diff':                   ['revision'],
632
    'inventory':              ['revision'],
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
633
    'log':                    ['timezone'],
1 by mbp at sourcefrog
import from baz patch-364
634
    'ls':                     ['revision', 'verbose'],
12 by mbp at sourcefrog
new --timezone option for bzr log
635
    'remove':                 ['verbose'],
1 by mbp at sourcefrog
import from baz patch-364
636
    'status':                 ['all'],
637
    }
638
639
640
cmd_args = {
641
    'add':                    ['file+'],
642
    'commit':                 [],
643
    'diff':                   [],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
644
    'export':                 ['revno', 'dest'],
1 by mbp at sourcefrog
import from baz patch-364
645
    'file-id':                ['filename'],
646
    'get-file-text':          ['text_id'],
647
    'get-inventory':          ['inventory_id'],
648
    'get-revision':           ['revision_id'],
649
    'get-revision-inventory': ['revision_id'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
650
    'help':                   ['topic?'],
651
    'init':                   [],
1 by mbp at sourcefrog
import from baz patch-364
652
    'log':                    [],
653
    'lookup-revision':        ['revno'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
654
    'relpath':                ['filename'],
1 by mbp at sourcefrog
import from baz patch-364
655
    'remove':                 ['file+'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
656
    'root':                   ['filename?'],
1 by mbp at sourcefrog
import from baz patch-364
657
    'status':                 [],
658
    }
659
660
661
def parse_args(argv):
662
    """Parse command line.
663
    
664
    Arguments and options are parsed at this level before being passed
665
    down to specific command handlers.  This routine knows, from a
666
    lookup table, something about the available options, what optargs
667
    they take, and which commands will accept them.
668
31 by Martin Pool
fix up parse_args doctest
669
    >>> parse_args('--help'.split())
1 by mbp at sourcefrog
import from baz patch-364
670
    ([], {'help': True})
31 by Martin Pool
fix up parse_args doctest
671
    >>> parse_args('--version'.split())
1 by mbp at sourcefrog
import from baz patch-364
672
    ([], {'version': True})
31 by Martin Pool
fix up parse_args doctest
673
    >>> parse_args('status --all'.split())
1 by mbp at sourcefrog
import from baz patch-364
674
    (['status'], {'all': True})
31 by Martin Pool
fix up parse_args doctest
675
    >>> parse_args('commit --message=biter'.split())
17 by mbp at sourcefrog
allow --option=ARG syntax
676
    (['commit'], {'message': u'biter'})
1 by mbp at sourcefrog
import from baz patch-364
677
    """
678
    args = []
679
    opts = {}
680
681
    # TODO: Maybe handle '--' to end options?
682
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
683
    while argv:
684
        a = argv.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
685
        if a[0] == '-':
17 by mbp at sourcefrog
allow --option=ARG syntax
686
            optarg = None
1 by mbp at sourcefrog
import from baz patch-364
687
            if a[1] == '-':
688
                mutter("  got option %r" % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
689
                if '=' in a:
690
                    optname, optarg = a[2:].split('=', 1)
691
                else:
692
                    optname = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
693
                if optname not in OPTIONS:
694
                    bailout('unknown long option %r' % a)
695
            else:
696
                shortopt = a[1:]
697
                if shortopt not in SHORT_OPTIONS:
698
                    bailout('unknown short option %r' % a)
699
                optname = SHORT_OPTIONS[shortopt]
700
            
701
            if optname in opts:
702
                # XXX: Do we ever want to support this, e.g. for -r?
703
                bailout('repeated option %r' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
704
                
1 by mbp at sourcefrog
import from baz patch-364
705
            optargfn = OPTIONS[optname]
706
            if optargfn:
17 by mbp at sourcefrog
allow --option=ARG syntax
707
                if optarg == None:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
708
                    if not argv:
17 by mbp at sourcefrog
allow --option=ARG syntax
709
                        bailout('option %r needs an argument' % a)
710
                    else:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
711
                        optarg = argv.pop(0)
17 by mbp at sourcefrog
allow --option=ARG syntax
712
                opts[optname] = optargfn(optarg)
1 by mbp at sourcefrog
import from baz patch-364
713
            else:
17 by mbp at sourcefrog
allow --option=ARG syntax
714
                if optarg != None:
715
                    bailout('option %r takes no argument' % optname)
1 by mbp at sourcefrog
import from baz patch-364
716
                opts[optname] = True
717
        else:
718
            args.append(a)
719
720
    return args, opts
721
722
723
724
def _match_args(cmd, args):
725
    """Check non-option arguments match required pattern.
726
727
    >>> _match_args('status', ['asdasdsadasd'])
728
    Traceback (most recent call last):
729
    ...
730
    BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
731
    >>> _match_args('add', ['asdasdsadasd'])
732
    {'file_list': ['asdasdsadasd']}
733
    >>> _match_args('add', 'abc def gj'.split())
734
    {'file_list': ['abc', 'def', 'gj']}
735
    """
736
    # match argument pattern
737
    argform = cmd_args.get(cmd, [])
738
    argdict = {}
739
    # TODO: Need a way to express 'cp SRC... DEST', where it matches
740
    # all but one.
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
741
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
742
    # step through args and argform, allowing appropriate 0-many matches
1 by mbp at sourcefrog
import from baz patch-364
743
    for ap in argform:
744
        argname = ap[:-1]
745
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
746
            if args:
747
                argdict[argname] = args.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
748
        elif ap[-1] == '*':
749
            assert 0
750
        elif ap[-1] == '+':
751
            if not args:
752
                bailout("command %r needs one or more %s"
753
                        % (cmd, argname.upper()))
754
            else:
755
                argdict[argname + '_list'] = args[:]
756
                args = []
757
        else:
758
            # just a plain arg
759
            argname = ap
760
            if not args:
761
                bailout("command %r requires argument %s"
762
                        % (cmd, argname.upper()))
763
            else:
764
                argdict[argname] = args.pop(0)
765
            
766
    if args:
767
        bailout("extra arguments to command %s: %r"
768
                % (cmd, args))
769
770
    return argdict
771
772
773
774
def run_bzr(argv):
775
    """Execute a command.
776
777
    This is similar to main(), but without all the trappings for
778
    logging and error handling.
779
    """
780
    try:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
781
        args, opts = parse_args(argv[1:])
1 by mbp at sourcefrog
import from baz patch-364
782
        if 'help' in opts:
783
            # TODO: pass down other arguments in case they asked for
784
            # help on a command name?
785
            cmd_help()
786
            return 0
787
        elif 'version' in opts:
788
            cmd_version()
789
            return 0
790
        cmd = args.pop(0)
791
    except IndexError:
792
        log_error('usage: bzr COMMAND\n')
793
        log_error('  try "bzr help"\n')
794
        return 1
115 by mbp at sourcefrog
todo
795
1 by mbp at sourcefrog
import from baz patch-364
796
    try:
797
        cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
798
    except KeyError:
799
        bailout("unknown command " + `cmd`)
800
137 by mbp at sourcefrog
new --profile option
801
    # global option
802
    if 'profile' in opts:
803
        profile = True
804
        del opts['profile']
805
    else:
806
        profile = False
1 by mbp at sourcefrog
import from baz patch-364
807
808
    # check options are reasonable
809
    allowed = cmd_options.get(cmd, [])
810
    for oname in opts:
811
        if oname not in allowed:
812
            bailout("option %r is not allowed for command %r"
813
                    % (oname, cmd))
814
137 by mbp at sourcefrog
new --profile option
815
    # mix arguments and options into one dictionary
1 by mbp at sourcefrog
import from baz patch-364
816
    cmdargs = _match_args(cmd, args)
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
817
    for k, v in opts.items():
818
        cmdargs[k.replace('-', '_')] = v
1 by mbp at sourcefrog
import from baz patch-364
819
137 by mbp at sourcefrog
new --profile option
820
    if profile:
821
        import hotshot
822
        prof = hotshot.Profile('.bzr.profile')
823
        ret = prof.runcall(cmd_handler, **cmdargs) or 0
824
        prof.close()
825
826
        import hotshot.stats
827
        stats = hotshot.stats.load('.bzr.profile')
828
        #stats.strip_dirs()
829
        stats.sort_stats('cumulative', 'calls')
830
        stats.print_stats(20)
831
    else:
832
        return cmd_handler(**cmdargs) or 0
1 by mbp at sourcefrog
import from baz patch-364
833
834
835
836
def main(argv):
837
    ## TODO: Handle command-line options; probably know what options are valid for
838
    ## each command
839
840
    ## TODO: If the arguments are wrong, give a usage message rather
841
    ## than just a backtrace.
842
59 by mbp at sourcefrog
lift out tracefile creation code
843
    bzrlib.trace.create_tracefile(argv)
844
    
1 by mbp at sourcefrog
import from baz patch-364
845
    try:
846
        ret = run_bzr(argv)
847
        return ret
848
    except BzrError, e:
849
        log_error('bzr: error: ' + e.args[0] + '\n')
850
        if len(e.args) > 1:
851
            for h in e.args[1]:
852
                log_error('  ' + h + '\n')
853
        return 1
854
    except Exception, e:
855
        log_error('bzr: exception: %s\n' % e)
856
        log_error('    see .bzr.log for details\n')
857
        traceback.print_exc(None, bzrlib.trace._tracefile)
858
        traceback.print_exc(None, sys.stderr)
859
        return 1
860
861
    # TODO: Maybe nicer handling of IOError?
862
863
864
865
if __name__ == '__main__':
866
    sys.exit(main(sys.argv))
867
    ##import profile
868
    ##profile.run('main(sys.argv)')
869