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