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