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