~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
12 by mbp at sourcefrog
new --timezone option for bzr log
327
def cmd_log(timezone):
1 by mbp at sourcefrog
import from baz patch-364
328
    """Show log of this branch.
329
330
    :todo: Options for utc; to show ids; to limit range; etc.
331
    """
12 by mbp at sourcefrog
new --timezone option for bzr log
332
    Branch('.').write_log(show_timezone=timezone)
1 by mbp at sourcefrog
import from baz patch-364
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
8 by mbp at sourcefrog
store committer's timezone in revision and show
397
def cmd_local_time_offset():
398
    print bzrlib.osutils.local_time_offset()
399
400
401
1 by mbp at sourcefrog
import from baz patch-364
402
def cmd_commit(message, verbose=False):
403
    Branch('.').commit(message, verbose=verbose)
404
405
406
def cmd_check():
407
    """Check consistency of the branch."""
408
    check()
409
410
411
def cmd_is(pred, *rest):
412
    """Test whether PREDICATE is true."""
413
    try:
414
        cmd_handler = globals()['assert_' + pred.replace('-', '_')]
415
    except KeyError:
416
        bailout("unknown predicate: %s" % quotefn(pred))
417
        
418
    try:
419
        cmd_handler(*rest)
420
    except BzrCheckError:
421
        # by default we don't print the message so that this can
422
        # be used from shell scripts without producing noise
423
        sys.exit(1)
424
425
426
def cmd_username():
427
    print bzrlib.osutils.username()
428
429
430
def cmd_user_email():
431
    print bzrlib.osutils.user_email()
432
433
434
def cmd_gen_revision_id():
435
    import time
436
    print bzrlib.branch._gen_revision_id(time.time())
437
438
439
def cmd_doctest():
440
    """Run internal doctest suite"""
441
    ## -v, if present, is seen by doctest; the argument is just here
442
    ## so our parser doesn't complain
443
444
    ## TODO: --verbose option
445
    
446
    import bzr, doctest, bzrlib.store
447
    bzrlib.trace.verbose = False
448
    doctest.testmod(bzr)
449
    doctest.testmod(bzrlib.store)
450
    doctest.testmod(bzrlib.inventory)
451
    doctest.testmod(bzrlib.branch)
452
    doctest.testmod(bzrlib.osutils)
453
    doctest.testmod(bzrlib.tree)
454
455
    # more strenuous tests;
456
    import bzrlib.tests
457
    doctest.testmod(bzrlib.tests)
458
459
460
######################################################################
461
# help
462
463
464
def cmd_help():
465
    # TODO: Specific help for particular commands
466
    print __doc__
467
468
469
def cmd_version():
470
    print "bzr (bazaar-ng) %s" % __version__
471
    print __copyright__
472
    print "http://bazaar-ng.org/"
473
    print
474
    print \
475
"""bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and
476
you may use, modify and redistribute it under the terms of the GNU 
477
General Public License version 2 or later."""
478
479
480
def cmd_rocks():
481
    """Statement of optimism."""
482
    print "it sure does!"
483
484
485
486
######################################################################
487
# main routine
488
489
490
# list of all available options; the rhs can be either None for an
491
# option that takes no argument, or a constructor function that checks
492
# the type.
493
OPTIONS = {
494
    'all':                    None,
495
    'help':                   None,
496
    'message':                unicode,
497
    'revision':               int,
498
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
499
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
500
    'verbose':                None,
501
    'version':                None,
502
    }
503
504
SHORT_OPTIONS = {
505
    'm':                      'message',
506
    'r':                      'revision',
507
    'v':                      'verbose',
508
}
509
510
# List of options that apply to particular commands; commands not
511
# listed take none.
512
cmd_options = {
513
    'add':                    ['verbose'],
514
    'commit':                 ['message', 'verbose'],
515
    'diff':                   ['revision'],
516
    'inventory':              ['revision'],
12 by mbp at sourcefrog
new --timezone option for bzr log
517
    'log':                    ['show-ids', 'timezone'],
1 by mbp at sourcefrog
import from baz patch-364
518
    'ls':                     ['revision', 'verbose'],
12 by mbp at sourcefrog
new --timezone option for bzr log
519
    'remove':                 ['verbose'],
1 by mbp at sourcefrog
import from baz patch-364
520
    'status':                 ['all'],
521
    }
522
523
524
cmd_args = {
525
    'init':                   [],
526
    'add':                    ['file+'],
527
    'commit':                 [],
528
    'diff':                   [],
529
    'file-id':                ['filename'],
530
    'get-file-text':          ['text_id'],
531
    'get-inventory':          ['inventory_id'],
532
    'get-revision':           ['revision_id'],
533
    'get-revision-inventory': ['revision_id'],
534
    'log':                    [],
535
    'lookup-revision':        ['revno'],
536
    'export':                 ['revno', 'dest'],
537
    'remove':                 ['file+'],
538
    'status':                 [],
539
    }
540
541
542
def parse_args(argv):
543
    """Parse command line.
544
    
545
    Arguments and options are parsed at this level before being passed
546
    down to specific command handlers.  This routine knows, from a
547
    lookup table, something about the available options, what optargs
548
    they take, and which commands will accept them.
549
550
    >>> parse_args('bzr --help'.split())
551
    ([], {'help': True})
552
    >>> parse_args('bzr --version'.split())
553
    ([], {'version': True})
554
    >>> parse_args('bzr status --all'.split())
555
    (['status'], {'all': True})
556
    """
557
    args = []
558
    opts = {}
559
560
    # TODO: Maybe handle '--' to end options?
561
562
    it = iter(argv[1:])
563
    while it:
564
        a = it.next()
565
        if a[0] == '-':
566
            if a[1] == '-':
567
                mutter("  got option %r" % a)
568
                optname = a[2:]
569
                if optname not in OPTIONS:
570
                    bailout('unknown long option %r' % a)
571
            else:
572
                shortopt = a[1:]
573
                if shortopt not in SHORT_OPTIONS:
574
                    bailout('unknown short option %r' % a)
575
                optname = SHORT_OPTIONS[shortopt]
576
            
577
            if optname in opts:
578
                # XXX: Do we ever want to support this, e.g. for -r?
579
                bailout('repeated option %r' % a)
580
            optargfn = OPTIONS[optname]
581
            if optargfn:
582
                if not it:
583
                    bailout('option %r needs an argument' % a)
584
                opts[optname] = optargfn(it.next())
585
                mutter("    option argument %r" % opts[optname])
586
            else:
587
                # takes no option argument
588
                opts[optname] = True
589
        elif a[:1] == '-':
590
            bailout('unknown short option %r' % a)
591
        else:
592
            args.append(a)
593
594
    return args, opts
595
596
597
598
def _match_args(cmd, args):
599
    """Check non-option arguments match required pattern.
600
601
    >>> _match_args('status', ['asdasdsadasd'])
602
    Traceback (most recent call last):
603
    ...
604
    BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
605
    >>> _match_args('add', ['asdasdsadasd'])
606
    {'file_list': ['asdasdsadasd']}
607
    >>> _match_args('add', 'abc def gj'.split())
608
    {'file_list': ['abc', 'def', 'gj']}
609
    """
610
    # match argument pattern
611
    argform = cmd_args.get(cmd, [])
612
    argdict = {}
613
    # TODO: Need a way to express 'cp SRC... DEST', where it matches
614
    # all but one.
615
    for ap in argform:
616
        argname = ap[:-1]
617
        if ap[-1] == '?':
618
            assert 0
619
        elif ap[-1] == '*':
620
            assert 0
621
        elif ap[-1] == '+':
622
            if not args:
623
                bailout("command %r needs one or more %s"
624
                        % (cmd, argname.upper()))
625
            else:
626
                argdict[argname + '_list'] = args[:]
627
                args = []
628
        else:
629
            # just a plain arg
630
            argname = ap
631
            if not args:
632
                bailout("command %r requires argument %s"
633
                        % (cmd, argname.upper()))
634
            else:
635
                argdict[argname] = args.pop(0)
636
            
637
    if args:
638
        bailout("extra arguments to command %s: %r"
639
                % (cmd, args))
640
641
    return argdict
642
643
644
645
def run_bzr(argv):
646
    """Execute a command.
647
648
    This is similar to main(), but without all the trappings for
649
    logging and error handling.
650
    """
651
    try:
652
        args, opts = parse_args(argv)
653
        if 'help' in opts:
654
            # TODO: pass down other arguments in case they asked for
655
            # help on a command name?
656
            cmd_help()
657
            return 0
658
        elif 'version' in opts:
659
            cmd_version()
660
            return 0
661
        cmd = args.pop(0)
662
    except IndexError:
663
        log_error('usage: bzr COMMAND\n')
664
        log_error('  try "bzr help"\n')
665
        return 1
666
            
667
    try:
668
        cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
669
    except KeyError:
670
        bailout("unknown command " + `cmd`)
671
672
    # TODO: special --profile option to turn on the Python profiler
673
674
    # check options are reasonable
675
    allowed = cmd_options.get(cmd, [])
676
    for oname in opts:
677
        if oname not in allowed:
678
            bailout("option %r is not allowed for command %r"
679
                    % (oname, cmd))
680
681
    cmdargs = _match_args(cmd, args)
682
    cmdargs.update(opts)
683
684
    ret = cmd_handler(**cmdargs) or 0
685
686
687
688
def main(argv):
689
    ## TODO: Handle command-line options; probably know what options are valid for
690
    ## each command
691
692
    ## TODO: If the arguments are wrong, give a usage message rather
693
    ## than just a backtrace.
694
695
    try:
696
        t = bzrlib.trace._tracefile
697
        t.write('-' * 60 + '\n')
698
        t.write('bzr invoked at %s\n' % format_date(time.time()))
699
        t.write('  by %s on %s\n' % (bzrlib.osutils.username(), socket.gethostname()))
700
        t.write('  arguments: %r\n' % argv)
701
702
        starttime = os.times()[4]
703
704
        import platform
705
        t.write('  platform: %s\n' % platform.platform())
706
        t.write('  python: %s\n' % platform.python_version())
707
708
        ret = run_bzr(argv)
709
        
710
        times = os.times()
711
        mutter("finished, %.3fu/%.3fs cpu, %.3fu/%.3fs cum"
712
               % times[:4])
713
        mutter("    %.3f elapsed" % (times[4] - starttime))
714
715
        return ret
716
    except BzrError, e:
717
        log_error('bzr: error: ' + e.args[0] + '\n')
718
        if len(e.args) > 1:
719
            for h in e.args[1]:
720
                log_error('  ' + h + '\n')
721
        return 1
722
    except Exception, e:
723
        log_error('bzr: exception: %s\n' % e)
724
        log_error('    see .bzr.log for details\n')
725
        traceback.print_exc(None, bzrlib.trace._tracefile)
726
        traceback.print_exc(None, sys.stderr)
727
        return 1
728
729
    # TODO: Maybe nicer handling of IOError?
730
731
732
733
if __name__ == '__main__':
734
    sys.exit(main(sys.argv))
735
    ##import profile
736
    ##profile.run('main(sys.argv)')
737