~bzr-pqm/bzr/bzr.dev

1 by mbp at sourcefrog
import from baz patch-364
1
#! /usr/bin/python
2
3
4
# Copyright (C) 2004, 2005 by Martin Pool
5
# Copyright (C) 2005 by Canonical Ltd
6
7
8
# This program is free software; you can redistribute it and/or modify
9
# it under the terms of the GNU General Public License as published by
10
# the Free Software Foundation; either version 2 of the License, or
11
# (at your option) any later version.
12
13
# This program is distributed in the hope that it will be useful,
14
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
# GNU General Public License for more details.
17
18
# You should have received a copy of the GNU General Public License
19
# along with this program; if not, write to the Free Software
20
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
21
22
"""Bazaar-NG -- a free distributed version-control tool
23
24
**WARNING: THIS IS AN UNSTABLE DEVELOPMENT VERSION**
25
26
Current limitation include:
27
28
* Metadata format is not stable yet -- you may need to
29
  discard history in the future.
30
31
* No handling of subdirectories, symlinks or any non-text files.
32
33
* Insufficient error handling.
34
35
* Many commands unimplemented or partially implemented.
36
37
* Space-inefficient storage.
38
39
* No merge operators yet.
40
41
Interesting commands::
42
43
  bzr help
44
       Show summary help screen
45
  bzr version
46
       Show software version/licence/non-warranty.
47
  bzr init
48
       Start versioning the current directory
49
  bzr add FILE...
50
       Make files versioned.
51
  bzr log
52
       Show revision history.
53
  bzr diff
54
       Show changes from last revision to working copy.
55
  bzr commit -m 'MESSAGE'
56
       Store current state as new revision.
57
  bzr export REVNO DESTINATION
58
       Export the branch state at a previous version.
59
  bzr status
60
       Show summary of pending changes.
61
  bzr remove FILE...
62
       Make a file not versioned.
63
"""
64
65
# not currently working:
66
#  bzr check
67
#       Run internal consistency checks.
68
#  bzr info
69
#       Show some information about this branch.
70
71
72
73
__copyright__ = "Copyright 2005 Canonical Development Ltd."
74
__author__ = "Martin Pool <mbp@canonical.com>"
75
__docformat__ = "restructuredtext en"
76
__version__ = '0.0.0'
77
78
79
import sys, os, random, time, sha, sets, types, re, shutil, tempfile
80
import traceback, socket, fnmatch, difflib
81
from os import path
82
from sets import Set
83
from pprint import pprint
84
from stat import *
85
from glob import glob
86
87
import bzrlib
88
from bzrlib.store import ImmutableStore
89
from bzrlib.trace import mutter, note, log_error
90
from bzrlib.errors import bailout, BzrError
91
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
92
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
93
from bzrlib.revision import Revision
94
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
95
     format_date
96
97
BZR_DIFF_FORMAT = "## Bazaar-NG diff, format 0 ##\n"
98
BZR_PATCHNAME_FORMAT = 'cset:sha1:%s'
99
100
## standard representation
101
NONE_STRING = '(none)'
102
EMPTY = 'empty'
103
104
105
## TODO: Perhaps a different version of inventory commands that
106
## returns iterators...
107
108
## TODO: Perhaps an AtomicFile class that writes to a temporary file and then renames.
109
110
## TODO: Some kind of locking on branches.  Perhaps there should be a
111
## parameter to the branch object saying whether we want a read or
112
## write lock; release it from destructor.  Perhaps don't even need a
113
## read lock to look at immutable objects?
114
115
## TODO: Perhaps make UUIDs predictable in test mode to make it easier
116
## to compare output?
117
118
119
120
121
######################################################################
122
# check status
123
124
125
def cmd_status(all=False):
126
    """Display status summary.
127
128
    For each file there is a single line giving its file state and name.
129
    The name is that in the current revision unless it is deleted or
130
    missing, in which case the old name is shown.
131
132
    :todo: Don't show unchanged files unless ``--all`` is given?
133
    """
134
    Branch('.').show_status(show_all=all)
135
136
137
138
######################################################################
139
# examining history
140
def cmd_get_revision(revision_id):
141
    Branch('.').get_revision(revision_id).write_xml(sys.stdout)
142
143
144
def cmd_get_inventory(inventory_id):
145
    """Return inventory in XML by hash"""
146
    Branch('.').get_inventory(inventory_hash).write_xml(sys.stdout)
147
148
149
def cmd_get_revision_inventory(revision_id):
150
    """Output inventory for a revision."""
151
    b = Branch('.')
152
    b.get_revision_inventory(revision_id).write_xml(sys.stdout)
153
154
155
def cmd_get_file_text(text_id):
156
    """Get contents of a file by hash."""
157
    sf = Branch('.').text_store[text_id]
158
    pumpfile(sf, sys.stdout)
159
160
161
162
######################################################################
163
# commands
164
    
165
166
def cmd_revno():
167
    """Show number of revisions on this branch"""
168
    print Branch('.').revno()
169
    
170
171
def cmd_add(file_list, verbose=False):
172
    """Add specified files.
173
    
174
    Fails if the files are already added.
175
    """
176
    Branch('.').add(file_list, verbose=verbose)
177
178
179
def cmd_inventory(revision=None):
180
    """Show inventory of the current working copy."""
181
    ## TODO: Also optionally show a previous inventory
182
    ## TODO: Format options
183
    b = Branch('.')
184
    if revision == None:
185
        inv = b.read_working_inventory()
186
    else:
187
        inv = b.get_revision_inventory(b.lookup_revision(revision))
188
        
189
    for path, entry in inv.iter_entries():
190
        print '%-50s %s' % (entry.file_id, path)
191
192
193
194
def cmd_info():
195
    b = Branch('.')
196
    print 'branch format:', b.controlfile('branch-format', 'r').readline().rstrip('\n')
197
    print 'revision number:', b.revno()
198
    print 'number of versioned files:', len(b.read_working_inventory())
199
200
201
def cmd_remove(file_list, verbose=False):
202
    Branch('.').remove(file_list, verbose=verbose)
203
204
205
206
def cmd_file_id(filename):
207
    i = Branch('.').read_working_inventory().path2id(filename)
208
    if i is None:
209
        bailout("%s is not a versioned file" % filename)
210
    else:
211
        print i
212
213
214
def cmd_find_filename(fileid):
215
    n = find_filename(fileid)
216
    if n is None:
217
        bailout("%s is not a live file id" % fileid)
218
    else:
219
        print n
220
221
222
def cmd_revision_history():
223
    for patchid in Branch('.').revision_history():
224
        print patchid
225
226
227
228
def cmd_init():
229
    # TODO: Check we're not already in a working directory?  At the
230
    # moment you'll get an ugly error.
231
    
232
    # TODO: What if we're in a subdirectory of a branch?  Would like
233
    # to allow that, but then the parent may need to understand that
234
    # the children have disappeared, or should they be versioned in
235
    # both?
236
237
    # TODO: Take an argument/option for branch name.
238
    Branch('.', init=True)
239
240
241
def cmd_diff(revision=None):
242
    """Show diff from basis to working copy.
243
244
    :todo: Take one or two revision arguments, look up those trees,
245
           and diff them.
246
247
    :todo: Allow diff across branches.
248
249
    :todo: Mangle filenames in diff to be more relevant.
250
251
    :todo: Shouldn't be in the cmd function.
252
    """
253
254
    b = Branch('.')
255
256
    if revision == None:
257
        old_tree = b.basis_tree()
258
    else:
259
        old_tree = b.revision_tree(b.lookup_revision(revision))
260
        
261
    new_tree = b.working_tree()
262
    old_inv = old_tree.inventory
263
    new_inv = new_tree.inventory
264
265
    # TODO: Options to control putting on a prefix or suffix, perhaps as a format string
266
    old_label = ''
267
    new_label = ''
268
269
    DEVNULL = '/dev/null'
270
    # Windows users, don't panic about this filename -- it is a
271
    # special signal to GNU patch that the file should be created or
272
    # deleted respectively.
273
274
    # TODO: Generation of pseudo-diffs for added/deleted files could
275
    # be usefully made into a much faster special case.
276
277
    # TODO: Better to return them in sorted order I think.
278
    
279
    for file_state, fid, old_name, new_name, kind in bzrlib.diff_trees(old_tree, new_tree):
280
        d = None
281
282
        # Don't show this by default; maybe do it if an option is passed
283
        # idlabel = '      {%s}' % fid
284
        idlabel = ''
285
286
        # FIXME: Something about the diff format makes patch unhappy
287
        # with newly-added files.
288
289
        def diffit(*a, **kw):
290
            sys.stdout.writelines(difflib.unified_diff(*a, **kw))
291
            print
292
        
293
        if file_state in ['.', '?', 'I']:
294
            continue
295
        elif file_state == 'A':
296
            print '*** added %s %r' % (kind, new_name)
297
            if kind == 'file':
298
                diffit([],
299
                       new_tree.get_file(fid).readlines(),
300
                       fromfile=DEVNULL,
301
                       tofile=new_label + new_name + idlabel)
302
        elif file_state == 'D':
303
            assert isinstance(old_name, types.StringTypes)
304
            print '*** deleted %s %r' % (kind, old_name)
305
            if kind == 'file':
306
                diffit(old_tree.get_file(fid).readlines(), [],
307
                       fromfile=old_label + old_name + idlabel,
308
                       tofile=DEVNULL)
309
        elif file_state in ['M', 'R']:
310
            if file_state == 'M':
311
                assert kind == 'file'
312
                assert old_name == new_name
313
                print '*** modified %s %r' % (kind, new_name)
314
            elif file_state == 'R':
315
                print '*** renamed %s %r => %r' % (kind, old_name, new_name)
316
317
            if kind == 'file':
318
                diffit(old_tree.get_file(fid).readlines(),
319
                       new_tree.get_file(fid).readlines(),
320
                       fromfile=old_label + old_name + idlabel,
321
                       tofile=new_label + new_name)
322
        else:
323
            bailout("can't represent state %s {%s}" % (file_state, fid))
324
325
326
327
def cmd_log():
328
    """Show log of this branch.
329
330
    :todo: Options for utc; to show ids; to limit range; etc.
331
    """
332
    Branch('.').write_log()
333
334
335
def cmd_ls(revision=None, verbose=False):
336
    """List files in a tree.
337
338
    :todo: Take a revision or remote path and list that tree instead.
339
    """
340
    b = Branch('.')
341
    if revision == None:
342
        tree = b.working_tree()
343
    else:
344
        tree = b.revision_tree(b.lookup_revision(revision))
345
        
346
    for fp, fc, kind, fid in tree.list_files():
347
        if verbose:
348
            if kind == 'directory':
349
                kindch = '/'
350
            elif kind == 'file':
351
                kindch = ''
352
            else:
353
                kindch = '???'
354
                
355
            print '%-8s %s%s' % (fc, fp, kindch)
356
        else:
357
            print fp
358
    
359
    
360
361
def cmd_unknowns():
362
    """List unknown files"""
363
    for f in Branch('.').unknowns():
364
        print quotefn(f)
365
366
367
def cmd_lookup_revision(revno):
368
    try:
369
        revno = int(revno)
370
    except ValueError:
371
        bailout("usage: lookup-revision REVNO",
372
                ["REVNO is a non-negative revision number for this branch"])
373
374
    print Branch('.').lookup_revision(revno) or NONE_STRING
375
376
377
378
def cmd_export(revno, dest):
379
    """Export past revision to destination directory."""
380
    b = Branch('.')
381
    rh = b.lookup_revision(int(revno))
382
    t = b.revision_tree(rh)
383
    t.export(dest)
384
385
386
387
######################################################################
388
# internal/test commands
389
390
391
def cmd_uuid():
392
    """Print a newly-generated UUID."""
393
    print uuid()
394
395
396
397
def cmd_commit(message, verbose=False):
398
    Branch('.').commit(message, verbose=verbose)
399
400
401
def cmd_check():
402
    """Check consistency of the branch."""
403
    check()
404
405
406
def cmd_is(pred, *rest):
407
    """Test whether PREDICATE is true."""
408
    try:
409
        cmd_handler = globals()['assert_' + pred.replace('-', '_')]
410
    except KeyError:
411
        bailout("unknown predicate: %s" % quotefn(pred))
412
        
413
    try:
414
        cmd_handler(*rest)
415
    except BzrCheckError:
416
        # by default we don't print the message so that this can
417
        # be used from shell scripts without producing noise
418
        sys.exit(1)
419
420
421
def cmd_username():
422
    print bzrlib.osutils.username()
423
424
425
def cmd_user_email():
426
    print bzrlib.osutils.user_email()
427
428
429
def cmd_gen_revision_id():
430
    import time
431
    print bzrlib.branch._gen_revision_id(time.time())
432
433
434
def cmd_doctest():
435
    """Run internal doctest suite"""
436
    ## -v, if present, is seen by doctest; the argument is just here
437
    ## so our parser doesn't complain
438
439
    ## TODO: --verbose option
440
    
441
    import bzr, doctest, bzrlib.store
442
    bzrlib.trace.verbose = False
443
    doctest.testmod(bzr)
444
    doctest.testmod(bzrlib.store)
445
    doctest.testmod(bzrlib.inventory)
446
    doctest.testmod(bzrlib.branch)
447
    doctest.testmod(bzrlib.osutils)
448
    doctest.testmod(bzrlib.tree)
449
450
    # more strenuous tests;
451
    import bzrlib.tests
452
    doctest.testmod(bzrlib.tests)
453
454
455
######################################################################
456
# help
457
458
459
def cmd_help():
460
    # TODO: Specific help for particular commands
461
    print __doc__
462
463
464
def cmd_version():
465
    print "bzr (bazaar-ng) %s" % __version__
466
    print __copyright__
467
    print "http://bazaar-ng.org/"
468
    print
469
    print \
470
"""bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and
471
you may use, modify and redistribute it under the terms of the GNU 
472
General Public License version 2 or later."""
473
474
475
def cmd_rocks():
476
    """Statement of optimism."""
477
    print "it sure does!"
478
479
480
481
######################################################################
482
# main routine
483
484
485
# list of all available options; the rhs can be either None for an
486
# option that takes no argument, or a constructor function that checks
487
# the type.
488
OPTIONS = {
489
    'all':                    None,
490
    'help':                   None,
491
    'message':                unicode,
492
    'revision':               int,
493
    'show-ids':               None,
494
    'verbose':                None,
495
    'version':                None,
496
    }
497
498
SHORT_OPTIONS = {
499
    'm':                      'message',
500
    'r':                      'revision',
501
    'v':                      'verbose',
502
}
503
504
# List of options that apply to particular commands; commands not
505
# listed take none.
506
cmd_options = {
507
    'add':                    ['verbose'],
508
    'commit':                 ['message', 'verbose'],
509
    'diff':                   ['revision'],
510
    'inventory':              ['revision'],
511
    'ls':                     ['revision', 'verbose'],
512
    'status':                 ['all'],
513
    'log':                    ['show-ids'],
514
    'remove':                 ['verbose'],
515
    }
516
517
518
cmd_args = {
519
    'init':                   [],
520
    'add':                    ['file+'],
521
    'commit':                 [],
522
    'diff':                   [],
523
    'file-id':                ['filename'],
524
    'get-file-text':          ['text_id'],
525
    'get-inventory':          ['inventory_id'],
526
    'get-revision':           ['revision_id'],
527
    'get-revision-inventory': ['revision_id'],
528
    'log':                    [],
529
    'lookup-revision':        ['revno'],
530
    'export':                 ['revno', 'dest'],
531
    'remove':                 ['file+'],
532
    'status':                 [],
533
    }
534
535
536
def parse_args(argv):
537
    """Parse command line.
538
    
539
    Arguments and options are parsed at this level before being passed
540
    down to specific command handlers.  This routine knows, from a
541
    lookup table, something about the available options, what optargs
542
    they take, and which commands will accept them.
543
544
    >>> parse_args('bzr --help'.split())
545
    ([], {'help': True})
546
    >>> parse_args('bzr --version'.split())
547
    ([], {'version': True})
548
    >>> parse_args('bzr status --all'.split())
549
    (['status'], {'all': True})
550
    """
551
    args = []
552
    opts = {}
553
554
    # TODO: Maybe handle '--' to end options?
555
556
    it = iter(argv[1:])
557
    while it:
558
        a = it.next()
559
        if a[0] == '-':
560
            if a[1] == '-':
561
                mutter("  got option %r" % a)
562
                optname = a[2:]
563
                if optname not in OPTIONS:
564
                    bailout('unknown long option %r' % a)
565
            else:
566
                shortopt = a[1:]
567
                if shortopt not in SHORT_OPTIONS:
568
                    bailout('unknown short option %r' % a)
569
                optname = SHORT_OPTIONS[shortopt]
570
            
571
            if optname in opts:
572
                # XXX: Do we ever want to support this, e.g. for -r?
573
                bailout('repeated option %r' % a)
574
            optargfn = OPTIONS[optname]
575
            if optargfn:
576
                if not it:
577
                    bailout('option %r needs an argument' % a)
578
                opts[optname] = optargfn(it.next())
579
                mutter("    option argument %r" % opts[optname])
580
            else:
581
                # takes no option argument
582
                opts[optname] = True
583
        elif a[:1] == '-':
584
            bailout('unknown short option %r' % a)
585
        else:
586
            args.append(a)
587
588
    return args, opts
589
590
591
592
def _match_args(cmd, args):
593
    """Check non-option arguments match required pattern.
594
595
    >>> _match_args('status', ['asdasdsadasd'])
596
    Traceback (most recent call last):
597
    ...
598
    BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
599
    >>> _match_args('add', ['asdasdsadasd'])
600
    {'file_list': ['asdasdsadasd']}
601
    >>> _match_args('add', 'abc def gj'.split())
602
    {'file_list': ['abc', 'def', 'gj']}
603
    """
604
    # match argument pattern
605
    argform = cmd_args.get(cmd, [])
606
    argdict = {}
607
    # TODO: Need a way to express 'cp SRC... DEST', where it matches
608
    # all but one.
609
    for ap in argform:
610
        argname = ap[:-1]
611
        if ap[-1] == '?':
612
            assert 0
613
        elif ap[-1] == '*':
614
            assert 0
615
        elif ap[-1] == '+':
616
            if not args:
617
                bailout("command %r needs one or more %s"
618
                        % (cmd, argname.upper()))
619
            else:
620
                argdict[argname + '_list'] = args[:]
621
                args = []
622
        else:
623
            # just a plain arg
624
            argname = ap
625
            if not args:
626
                bailout("command %r requires argument %s"
627
                        % (cmd, argname.upper()))
628
            else:
629
                argdict[argname] = args.pop(0)
630
            
631
    if args:
632
        bailout("extra arguments to command %s: %r"
633
                % (cmd, args))
634
635
    return argdict
636
637
638
639
def run_bzr(argv):
640
    """Execute a command.
641
642
    This is similar to main(), but without all the trappings for
643
    logging and error handling.
644
    """
645
    try:
646
        args, opts = parse_args(argv)
647
        if 'help' in opts:
648
            # TODO: pass down other arguments in case they asked for
649
            # help on a command name?
650
            cmd_help()
651
            return 0
652
        elif 'version' in opts:
653
            cmd_version()
654
            return 0
655
        cmd = args.pop(0)
656
    except IndexError:
657
        log_error('usage: bzr COMMAND\n')
658
        log_error('  try "bzr help"\n')
659
        return 1
660
            
661
    try:
662
        cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
663
    except KeyError:
664
        bailout("unknown command " + `cmd`)
665
666
    # TODO: special --profile option to turn on the Python profiler
667
668
    # check options are reasonable
669
    allowed = cmd_options.get(cmd, [])
670
    for oname in opts:
671
        if oname not in allowed:
672
            bailout("option %r is not allowed for command %r"
673
                    % (oname, cmd))
674
675
    cmdargs = _match_args(cmd, args)
676
    cmdargs.update(opts)
677
678
    ret = cmd_handler(**cmdargs) or 0
679
680
681
682
def main(argv):
683
    ## TODO: Handle command-line options; probably know what options are valid for
684
    ## each command
685
686
    ## TODO: If the arguments are wrong, give a usage message rather
687
    ## than just a backtrace.
688
689
    try:
690
        t = bzrlib.trace._tracefile
691
        t.write('-' * 60 + '\n')
692
        t.write('bzr invoked at %s\n' % format_date(time.time()))
693
        t.write('  by %s on %s\n' % (bzrlib.osutils.username(), socket.gethostname()))
694
        t.write('  arguments: %r\n' % argv)
695
696
        starttime = os.times()[4]
697
698
        import platform
699
        t.write('  platform: %s\n' % platform.platform())
700
        t.write('  python: %s\n' % platform.python_version())
701
702
        ret = run_bzr(argv)
703
        
704
        times = os.times()
705
        mutter("finished, %.3fu/%.3fs cpu, %.3fu/%.3fs cum"
706
               % times[:4])
707
        mutter("    %.3f elapsed" % (times[4] - starttime))
708
709
        return ret
710
    except BzrError, e:
711
        log_error('bzr: error: ' + e.args[0] + '\n')
712
        if len(e.args) > 1:
713
            for h in e.args[1]:
714
                log_error('  ' + h + '\n')
715
        return 1
716
    except Exception, e:
717
        log_error('bzr: exception: %s\n' % e)
718
        log_error('    see .bzr.log for details\n')
719
        traceback.print_exc(None, bzrlib.trace._tracefile)
720
        traceback.print_exc(None, sys.stderr)
721
        return 1
722
723
    # TODO: Maybe nicer handling of IOError?
724
725
726
727
if __name__ == '__main__':
728
    sys.exit(main(sys.argv))
729
    ##import profile
730
    ##profile.run('main(sys.argv)')
731