~bzr-pqm/bzr/bzr.dev

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.
196 by mbp at sourcefrog
selected-file diff
48
  bzr diff [FILE...]
1 by mbp at sourcefrog
import from baz patch-364
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
184 by mbp at sourcefrog
pychecker fixups
65
import sys, os, time, types, shutil, tempfile, traceback, fnmatch, difflib, os.path
1 by mbp at sourcefrog
import from baz patch-364
66
from sets import Set
67
from pprint import pprint
68
from stat import *
69
from glob import glob
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
70
from inspect import getdoc
1 by mbp at sourcefrog
import from baz patch-364
71
72
import bzrlib
73
from bzrlib.store import ImmutableStore
74
from bzrlib.trace import mutter, note, log_error
184 by mbp at sourcefrog
pychecker fixups
75
from bzrlib.errors import bailout, BzrError, BzrCheckError
1 by mbp at sourcefrog
import from baz patch-364
76
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
77
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
78
from bzrlib.revision import Revision
79
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
80
     format_date
81
82
BZR_DIFF_FORMAT = "## Bazaar-NG diff, format 0 ##\n"
83
BZR_PATCHNAME_FORMAT = 'cset:sha1:%s'
84
85
## standard representation
86
NONE_STRING = '(none)'
87
EMPTY = 'empty'
88
89
90
## TODO: Perhaps a different version of inventory commands that
91
## returns iterators...
92
93
## TODO: Perhaps an AtomicFile class that writes to a temporary file and then renames.
94
95
## TODO: Some kind of locking on branches.  Perhaps there should be a
96
## parameter to the branch object saying whether we want a read or
97
## write lock; release it from destructor.  Perhaps don't even need a
98
## read lock to look at immutable objects?
99
100
## TODO: Perhaps make UUIDs predictable in test mode to make it easier
101
## to compare output?
102
34 by mbp at sourcefrog
doc
103
## TODO: Some kind of global code to generate the right Branch object
104
## to work on.  Almost, but not quite all, commands need one, and it
105
## can be taken either from their parameters or their working
106
## directory.
107
46 by Martin Pool
todo
108
## TODO: rename command, needed soon: check destination doesn't exist
109
## either in working copy or tree; move working copy; update
110
## inventory; write out
111
112
## TODO: move command; check destination is a directory and will not
113
## clash; move it.
114
115
## TODO: command to show renames, one per line, as to->from
116
117
1 by mbp at sourcefrog
import from baz patch-364
118
119
120
def cmd_status(all=False):
121
    """Display status summary.
122
123
    For each file there is a single line giving its file state and name.
124
    The name is that in the current revision unless it is deleted or
125
    missing, in which case the old name is shown.
126
127
    :todo: Don't show unchanged files unless ``--all`` is given?
128
    """
233 by mbp at sourcefrog
- more output from test.sh
129
    #import bzrlib.status
130
    #bzrlib.status.tree_status(Branch('.'))
1 by mbp at sourcefrog
import from baz patch-364
131
    Branch('.').show_status(show_all=all)
132
133
134
135
######################################################################
136
# examining history
137
def cmd_get_revision(revision_id):
138
    Branch('.').get_revision(revision_id).write_xml(sys.stdout)
139
140
141
def cmd_get_file_text(text_id):
142
    """Get contents of a file by hash."""
143
    sf = Branch('.').text_store[text_id]
144
    pumpfile(sf, sys.stdout)
145
146
147
148
######################################################################
149
# commands
150
    
151
152
def cmd_revno():
153
    """Show number of revisions on this branch"""
154
    print Branch('.').revno()
155
    
156
70 by mbp at sourcefrog
Prepare for smart recursive add.
157
    
1 by mbp at sourcefrog
import from baz patch-364
158
def cmd_add(file_list, verbose=False):
70 by mbp at sourcefrog
Prepare for smart recursive add.
159
    """Add specified files or directories.
160
161
    In non-recursive mode, all the named items are added, regardless
162
    of whether they were previously ignored.  A warning is given if
163
    any of the named files are already versioned.
164
165
    In recursive mode (the default), files are treated the same way
166
    but the behaviour for directories is different.  Directories that
167
    are already versioned do not give a warning.  All directories,
168
    whether already versioned or not, are searched for files or
169
    subdirectories that are neither versioned or ignored, and these
170
    are added.  This search proceeds recursively into versioned
171
    directories.
172
173
    Therefore simply saying 'bzr add .' will version all files that
174
    are currently unknown.
175
    """
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
176
    bzrlib.add.smart_add(file_list, verbose)
1 by mbp at sourcefrog
import from baz patch-364
177
    
178
68 by mbp at sourcefrog
- new relpath command and function
179
def cmd_relpath(filename):
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
180
    """Show path of file relative to root"""
68 by mbp at sourcefrog
- new relpath command and function
181
    print Branch(filename).relpath(filename)
182
183
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
184
1 by mbp at sourcefrog
import from baz patch-364
185
def cmd_inventory(revision=None):
186
    """Show inventory of the current working copy."""
187
    ## TODO: Also optionally show a previous inventory
188
    ## TODO: Format options
189
    b = Branch('.')
190
    if revision == None:
191
        inv = b.read_working_inventory()
192
    else:
193
        inv = b.get_revision_inventory(b.lookup_revision(revision))
194
        
195
    for path, entry in inv.iter_entries():
196
        print '%-50s %s' % (entry.file_id, path)
197
198
199
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
200
# TODO: Maybe a 'mv' command that has the combined move/rename
201
# special behaviour of Unix?
202
203
def cmd_move(source_list, dest):
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
204
    b = Branch('.')
205
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
206
    b.move([b.relpath(s) for s in source_list], b.relpath(dest))
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
207
208
209
168 by mbp at sourcefrog
new "rename" command
210
def cmd_rename(from_name, to_name):
211
    """Change the name of an entry.
212
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
213
    usage: bzr rename FROM_NAME TO_NAME
214
215
    examples:
216
      bzr rename frob.c frobber.c
217
      bzr rename src/frob.c lib/frob.c
218
219
    It is an error if the destination name exists.
220
221
    See also the 'move' command, which moves files into a different
222
    directory without changing their name.
223
224
    TODO: Some way to rename multiple files without invoking bzr for each
225
    one?"""
168 by mbp at sourcefrog
new "rename" command
226
    b = Branch('.')
227
    b.rename_one(b.relpath(from_name), b.relpath(to_name))
228
    
229
230
231
164 by mbp at sourcefrog
new 'renames' command
232
def cmd_renames(dir='.'):
233
    """Show list of renamed files.
234
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
235
    usage: bzr renames [BRANCH]
236
237
    TODO: Option to show renames between two historical versions.
238
239
    TODO: Only show renames under dir, rather than in the whole branch.
240
    """
164 by mbp at sourcefrog
new 'renames' command
241
    b = Branch(dir)
242
    old_inv = b.basis_tree().inventory
243
    new_inv = b.read_working_inventory()
244
    
245
    renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
246
    renames.sort()
247
    for old_name, new_name in renames:
248
        print "%s => %s" % (old_name, new_name)        
249
250
251
1 by mbp at sourcefrog
import from baz patch-364
252
def cmd_info():
112 by mbp at sourcefrog
help for info command
253
    """info: Show statistical information for this branch
254
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
255
    usage: bzr info"""
77 by mbp at sourcefrog
- split info command out into separate file
256
    import info
257
    info.show_info(Branch('.'))        
21 by mbp at sourcefrog
- bzr info: show summary information on branch history
258
    
1 by mbp at sourcefrog
import from baz patch-364
259
260
261
def cmd_remove(file_list, verbose=False):
69 by Martin Pool
handle add, remove, file-id being given filenames that are
262
    b = Branch(file_list[0])
263
    b.remove([b.relpath(f) for f in file_list], verbose=verbose)
1 by mbp at sourcefrog
import from baz patch-364
264
265
266
267
def cmd_file_id(filename):
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
268
    """Print file_id of a particular file or directory.
269
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
270
    usage: bzr file-id FILE
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
271
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
272
    The file_id is assigned when the file is first added and remains the
273
    same through all revisions where the file exists, even when it is
274
    moved or renamed.
275
    """
69 by Martin Pool
handle add, remove, file-id being given filenames that are
276
    b = Branch(filename)
277
    i = b.inventory.path2id(b.relpath(filename))
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
278
    if i == None:
279
        bailout("%r is not a versioned file" % filename)
1 by mbp at sourcefrog
import from baz patch-364
280
    else:
281
        print i
282
283
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
284
def cmd_file_id_path(filename):
285
    """Print path of file_ids to a file or directory.
286
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
287
    usage: bzr file-id-path FILE
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
288
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
289
    This prints one line for each directory down to the target,
290
    starting at the branch root."""
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
291
    b = Branch(filename)
292
    inv = b.inventory
293
    fid = inv.path2id(b.relpath(filename))
294
    if fid == None:
295
        bailout("%r is not a versioned file" % filename)
296
    for fip in inv.get_idpath(fid):
297
        print fip
298
299
1 by mbp at sourcefrog
import from baz patch-364
300
def cmd_revision_history():
301
    for patchid in Branch('.').revision_history():
302
        print patchid
303
304
156 by mbp at sourcefrog
new "directories" command
305
def cmd_directories():
306
    for name, ie in Branch('.').read_working_inventory().directories():
307
        if name == '':
308
            print '.'
309
        else:
310
            print name
311
1 by mbp at sourcefrog
import from baz patch-364
312
157 by mbp at sourcefrog
fix test case breakage
313
def cmd_missing():
314
    for name, ie in Branch('.').working_tree().missing():
315
        print name
316
317
1 by mbp at sourcefrog
import from baz patch-364
318
def cmd_init():
319
    # TODO: Check we're not already in a working directory?  At the
320
    # moment you'll get an ugly error.
321
    
322
    # TODO: What if we're in a subdirectory of a branch?  Would like
323
    # to allow that, but then the parent may need to understand that
324
    # the children have disappeared, or should they be versioned in
325
    # both?
326
327
    # TODO: Take an argument/option for branch name.
328
    Branch('.', init=True)
329
330
196 by mbp at sourcefrog
selected-file diff
331
def cmd_diff(revision=None, file_list=None):
109 by mbp at sourcefrog
more help for diff command
332
    """bzr diff: Show differences in working tree.
333
    
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
334
    usage: bzr diff [-r REV] [FILE...]
335
336
    --revision REV
337
         Show changes since REV, rather than predecessor.
338
339
    If files are listed, only the changes in those files are listed.
340
    Otherwise, all changes for the tree are listed.
341
342
    TODO: Given two revision arguments, show the difference between them.
343
344
    TODO: Allow diff across branches.
345
346
    TODO: Option to use external diff command; could be GNU diff, wdiff,
347
          or a graphical diff.
348
349
    TODO: If a directory is given, diff everything under that.
350
351
    TODO: Selected-file diff is inefficient and doesn't show you deleted files.
109 by mbp at sourcefrog
more help for diff command
352
"""
353
354
    ## TODO: Shouldn't be in the cmd function.
1 by mbp at sourcefrog
import from baz patch-364
355
356
    b = Branch('.')
357
358
    if revision == None:
359
        old_tree = b.basis_tree()
360
    else:
361
        old_tree = b.revision_tree(b.lookup_revision(revision))
362
        
363
    new_tree = b.working_tree()
364
365
    # TODO: Options to control putting on a prefix or suffix, perhaps as a format string
366
    old_label = ''
367
    new_label = ''
368
369
    DEVNULL = '/dev/null'
370
    # Windows users, don't panic about this filename -- it is a
371
    # special signal to GNU patch that the file should be created or
372
    # deleted respectively.
373
374
    # TODO: Generation of pseudo-diffs for added/deleted files could
375
    # be usefully made into a much faster special case.
376
377
    # TODO: Better to return them in sorted order I think.
196 by mbp at sourcefrog
selected-file diff
378
379
    # FIXME: If given a file list, compare only those files rather
380
    # than comparing everything and then throwing stuff away.
1 by mbp at sourcefrog
import from baz patch-364
381
    
382
    for file_state, fid, old_name, new_name, kind in bzrlib.diff_trees(old_tree, new_tree):
196 by mbp at sourcefrog
selected-file diff
383
384
        if file_list and new_name not in file_list:
385
            continue
386
        
1 by mbp at sourcefrog
import from baz patch-364
387
        # Don't show this by default; maybe do it if an option is passed
388
        # idlabel = '      {%s}' % fid
389
        idlabel = ''
390
391
        # FIXME: Something about the diff format makes patch unhappy
392
        # with newly-added files.
393
162 by mbp at sourcefrog
workaround for python2.3 difflib bug
394
        def diffit(oldlines, newlines, **kw):
395
            # FIXME: difflib is wrong if there is no trailing newline.
396
397
            # Special workaround for Python2.3, where difflib fails if
398
            # both sequences are empty.
399
            if oldlines or newlines:
400
                sys.stdout.writelines(difflib.unified_diff(oldlines, newlines, **kw))
1 by mbp at sourcefrog
import from baz patch-364
401
            print
402
        
403
        if file_state in ['.', '?', 'I']:
404
            continue
405
        elif file_state == 'A':
406
            print '*** added %s %r' % (kind, new_name)
407
            if kind == 'file':
408
                diffit([],
409
                       new_tree.get_file(fid).readlines(),
410
                       fromfile=DEVNULL,
411
                       tofile=new_label + new_name + idlabel)
412
        elif file_state == 'D':
413
            assert isinstance(old_name, types.StringTypes)
414
            print '*** deleted %s %r' % (kind, old_name)
415
            if kind == 'file':
416
                diffit(old_tree.get_file(fid).readlines(), [],
417
                       fromfile=old_label + old_name + idlabel,
418
                       tofile=DEVNULL)
419
        elif file_state in ['M', 'R']:
420
            if file_state == 'M':
421
                assert kind == 'file'
422
                assert old_name == new_name
423
                print '*** modified %s %r' % (kind, new_name)
424
            elif file_state == 'R':
425
                print '*** renamed %s %r => %r' % (kind, old_name, new_name)
426
427
            if kind == 'file':
428
                diffit(old_tree.get_file(fid).readlines(),
429
                       new_tree.get_file(fid).readlines(),
430
                       fromfile=old_label + old_name + idlabel,
431
                       tofile=new_label + new_name)
432
        else:
433
            bailout("can't represent state %s {%s}" % (file_state, fid))
434
435
436
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
437
def cmd_deleted(show_ids=False):
135 by mbp at sourcefrog
Simple new 'deleted' command
438
    """List files deleted in the working tree.
439
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
440
    TODO: Show files deleted since a previous revision, or between two revisions.
135 by mbp at sourcefrog
Simple new 'deleted' command
441
    """
442
    b = Branch('.')
443
    old = b.basis_tree()
444
    new = b.working_tree()
445
147 by mbp at sourcefrog
todo
446
    ## TODO: Much more efficient way to do this: read in new
447
    ## directories with readdir, rather than stating each one.  Same
448
    ## level of effort but possibly much less IO.  (Or possibly not,
449
    ## if the directories are very large...)
450
135 by mbp at sourcefrog
Simple new 'deleted' command
451
    for path, ie in old.inventory.iter_entries():
452
        if not new.has_id(ie.file_id):
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
453
            if show_ids:
454
                print '%-50s %s' % (path, ie.file_id)
455
            else:
456
                print path
148 by mbp at sourcefrog
performance notes and measurements
457
458
459
460
def cmd_parse_inventory():
461
    import cElementTree
462
    
463
    cElementTree.ElementTree().parse(file('.bzr/inventory'))
464
465
466
467
def cmd_load_inventory():
184 by mbp at sourcefrog
pychecker fixups
468
    """Load inventory for timing purposes"""
469
    Branch('.').basis_tree().inventory
149 by mbp at sourcefrog
experiment with new nested inventory file format
470
471
191 by mbp at sourcefrog
more XML performance tests
472
def cmd_dump_inventory():
473
    Branch('.').read_working_inventory().write_xml(sys.stdout)
474
149 by mbp at sourcefrog
experiment with new nested inventory file format
475
476
def cmd_dump_new_inventory():
477
    import bzrlib.newinventory
478
    inv = Branch('.').basis_tree().inventory
479
    bzrlib.newinventory.write_inventory(inv, sys.stdout)
151 by mbp at sourcefrog
experimental nested-inventory load support
480
481
482
def cmd_load_new_inventory():
483
    import bzrlib.newinventory
484
    bzrlib.newinventory.read_new_inventory(sys.stdin)
149 by mbp at sourcefrog
experiment with new nested inventory file format
485
                
486
    
487
def cmd_dump_slacker_inventory():
488
    import bzrlib.newinventory
489
    inv = Branch('.').basis_tree().inventory
490
    bzrlib.newinventory.write_slacker_inventory(inv, sys.stdout)
236 by mbp at sourcefrog
- Experiments in inventory performance
491
492
493
494
def cmd_dump_text_inventory():
495
    import bzrlib.textinv
496
    inv = Branch('.').basis_tree().inventory
497
    bzrlib.textinv.write_text_inventory(inv, sys.stdout)
498
499
500
def cmd_load_text_inventory():
501
    import bzrlib.textinv
502
    inv = bzrlib.textinv.read_text_inventory(sys.stdin)
503
    print 'loaded %d entries' % len(inv)
504
    
149 by mbp at sourcefrog
experiment with new nested inventory file format
505
    
135 by mbp at sourcefrog
Simple new 'deleted' command
506
65 by mbp at sourcefrog
rename 'find-branch-root' command to just 'root'
507
def cmd_root(filename=None):
508
    """Print the branch root."""
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
509
    print bzrlib.branch.find_branch_root(filename)
510
    
511
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
512
def cmd_log(timezone='original', verbose=False):
1 by mbp at sourcefrog
import from baz patch-364
513
    """Show log of this branch.
514
515
    :todo: Options for utc; to show ids; to limit range; etc.
516
    """
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
517
    Branch('.').write_log(show_timezone=timezone, verbose=verbose)
1 by mbp at sourcefrog
import from baz patch-364
518
519
520
def cmd_ls(revision=None, verbose=False):
521
    """List files in a tree.
522
523
    :todo: Take a revision or remote path and list that tree instead.
524
    """
525
    b = Branch('.')
526
    if revision == None:
527
        tree = b.working_tree()
528
    else:
529
        tree = b.revision_tree(b.lookup_revision(revision))
530
        
531
    for fp, fc, kind, fid in tree.list_files():
532
        if verbose:
533
            if kind == 'directory':
534
                kindch = '/'
535
            elif kind == 'file':
536
                kindch = ''
537
            else:
538
                kindch = '???'
539
                
540
            print '%-8s %s%s' % (fc, fp, kindch)
541
        else:
542
            print fp
543
    
544
    
545
546
def cmd_unknowns():
547
    """List unknown files"""
548
    for f in Branch('.').unknowns():
549
        print quotefn(f)
550
551
133 by mbp at sourcefrog
- new 'ignored' command
552
184 by mbp at sourcefrog
pychecker fixups
553
def cmd_ignored():
133 by mbp at sourcefrog
- new 'ignored' command
554
    """List ignored files and the patterns that matched them.
555
      """
556
    tree = Branch('.').working_tree()
184 by mbp at sourcefrog
pychecker fixups
557
    for path, file_class, kind, file_id in tree.list_files():
133 by mbp at sourcefrog
- new 'ignored' command
558
        if file_class != 'I':
559
            continue
560
        ## XXX: Slightly inefficient since this was already calculated
561
        pat = tree.is_ignored(path)
562
        print '%-50s %s' % (path, pat)
563
564
1 by mbp at sourcefrog
import from baz patch-364
565
def cmd_lookup_revision(revno):
566
    try:
567
        revno = int(revno)
568
    except ValueError:
569
        bailout("usage: lookup-revision REVNO",
570
                ["REVNO is a non-negative revision number for this branch"])
571
572
    print Branch('.').lookup_revision(revno) or NONE_STRING
573
574
575
576
def cmd_export(revno, dest):
577
    """Export past revision to destination directory."""
578
    b = Branch('.')
579
    rh = b.lookup_revision(int(revno))
580
    t = b.revision_tree(rh)
581
    t.export(dest)
582
176 by mbp at sourcefrog
New cat command contributed by janmar.
583
def cmd_cat(revision, filename):
584
    """Print file to stdout."""
585
    b = Branch('.')
586
    b.print_file(b.relpath(filename), int(revision))
1 by mbp at sourcefrog
import from baz patch-364
587
588
589
######################################################################
590
# internal/test commands
591
592
593
def cmd_uuid():
594
    """Print a newly-generated UUID."""
63 by mbp at sourcefrog
fix up uuid command
595
    print bzrlib.osutils.uuid()
1 by mbp at sourcefrog
import from baz patch-364
596
597
598
8 by mbp at sourcefrog
store committer's timezone in revision and show
599
def cmd_local_time_offset():
600
    print bzrlib.osutils.local_time_offset()
601
602
603
57 by mbp at sourcefrog
error if --message is not given for commit
604
def cmd_commit(message=None, verbose=False):
97 by mbp at sourcefrog
- more commit help
605
    """Commit changes to a new revision.
606
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
607
    --message MESSAGE
608
        Description of changes in this revision; free form text.
609
        It is recommended that the first line be a single-sentence
610
        summary.
611
    --verbose
612
        Show status of changed files,
613
614
    TODO: Commit only selected files.
615
616
    TODO: Run hooks on tree to-be-committed, and after commit.
617
618
    TODO: Strict commit that fails if there are unknown or deleted files.
619
    """
97 by mbp at sourcefrog
- more commit help
620
57 by mbp at sourcefrog
error if --message is not given for commit
621
    if not message:
622
        bailout("please specify a commit message")
1 by mbp at sourcefrog
import from baz patch-364
623
    Branch('.').commit(message, verbose=verbose)
624
625
113 by mbp at sourcefrog
More help for check command
626
def cmd_check(dir='.'):
627
    """check: Consistency check of branch history.
628
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
629
    usage: bzr check [-v] [BRANCH]
630
631
    options:
632
      --verbose, -v         Show progress of checking.
633
634
    This command checks various invariants about the branch storage to
635
    detect data corruption or bzr bugs.
636
    """
113 by mbp at sourcefrog
More help for check command
637
    import bzrlib.check
638
    bzrlib.check.check(Branch(dir, find_root=False))
1 by mbp at sourcefrog
import from baz patch-364
639
640
641
def cmd_is(pred, *rest):
642
    """Test whether PREDICATE is true."""
643
    try:
644
        cmd_handler = globals()['assert_' + pred.replace('-', '_')]
645
    except KeyError:
646
        bailout("unknown predicate: %s" % quotefn(pred))
647
        
648
    try:
649
        cmd_handler(*rest)
650
    except BzrCheckError:
651
        # by default we don't print the message so that this can
652
        # be used from shell scripts without producing noise
653
        sys.exit(1)
654
655
656
def cmd_username():
657
    print bzrlib.osutils.username()
658
659
660
def cmd_user_email():
661
    print bzrlib.osutils.user_email()
662
663
664
def cmd_gen_revision_id():
665
    print bzrlib.branch._gen_revision_id(time.time())
666
667
184 by mbp at sourcefrog
pychecker fixups
668
def cmd_selftest():
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
669
    """Run internal test suite"""
1 by mbp at sourcefrog
import from baz patch-364
670
    ## -v, if present, is seen by doctest; the argument is just here
671
    ## so our parser doesn't complain
672
673
    ## TODO: --verbose option
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
674
675
    failures, tests = 0, 0
1 by mbp at sourcefrog
import from baz patch-364
676
    
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
677
    import doctest, bzrlib.store, bzrlib.tests
1 by mbp at sourcefrog
import from baz patch-364
678
    bzrlib.trace.verbose = False
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
679
680
    for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
70 by mbp at sourcefrog
Prepare for smart recursive add.
681
        bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
682
        mf, mt = doctest.testmod(m)
683
        failures += mf
684
        tests += mt
685
        print '%-40s %3d tests' % (m.__name__, mt),
686
        if mf:
687
            print '%3d FAILED!' % mf
688
        else:
689
            print
690
691
    print '%-40s %3d tests' % ('total', tests),
692
    if failures:
693
        print '%3d FAILED!' % failures
694
    else:
695
        print
696
697
698
699
# deprecated
700
cmd_doctest = cmd_selftest
53 by mbp at sourcefrog
'selftest' command instead of 'doctest'
701
702
1 by mbp at sourcefrog
import from baz patch-364
703
######################################################################
704
# help
705
706
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
707
def cmd_help(topic=None):
708
    if topic == None:
709
        print __doc__
710
        return
711
712
    # otherwise, maybe the name of a command?
713
    try:
714
        cmdfn = globals()['cmd_' + topic.replace('-', '_')]
715
    except KeyError:
716
        bailout("no help for %r" % topic)
717
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
718
    doc = getdoc(cmdfn)
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
719
    if doc == None:
720
        bailout("sorry, no detailed help yet for %r" % topic)
721
722
    print doc
723
        
724
1 by mbp at sourcefrog
import from baz patch-364
725
726
727
def cmd_version():
84 by mbp at sourcefrog
- update version string
728
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
729
    print bzrlib.__copyright__
1 by mbp at sourcefrog
import from baz patch-364
730
    print "http://bazaar-ng.org/"
731
    print
732
    print \
733
"""bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and
734
you may use, modify and redistribute it under the terms of the GNU 
735
General Public License version 2 or later."""
736
737
738
def cmd_rocks():
739
    """Statement of optimism."""
740
    print "it sure does!"
741
742
743
744
######################################################################
745
# main routine
746
747
748
# list of all available options; the rhs can be either None for an
749
# option that takes no argument, or a constructor function that checks
750
# the type.
751
OPTIONS = {
752
    'all':                    None,
753
    'help':                   None,
754
    'message':                unicode,
137 by mbp at sourcefrog
new --profile option
755
    'profile':                None,
1 by mbp at sourcefrog
import from baz patch-364
756
    'revision':               int,
757
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
758
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
759
    'verbose':                None,
760
    'version':                None,
761
    }
762
763
SHORT_OPTIONS = {
764
    'm':                      'message',
765
    'r':                      'revision',
766
    'v':                      'verbose',
767
}
768
769
# List of options that apply to particular commands; commands not
770
# listed take none.
771
cmd_options = {
772
    'add':                    ['verbose'],
176 by mbp at sourcefrog
New cat command contributed by janmar.
773
    'cat':                    ['revision'],
1 by mbp at sourcefrog
import from baz patch-364
774
    'commit':                 ['message', 'verbose'],
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
775
    'deleted':                ['show-ids'],
1 by mbp at sourcefrog
import from baz patch-364
776
    'diff':                   ['revision'],
777
    'inventory':              ['revision'],
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
778
    'log':                    ['timezone', 'verbose'],
1 by mbp at sourcefrog
import from baz patch-364
779
    'ls':                     ['revision', 'verbose'],
12 by mbp at sourcefrog
new --timezone option for bzr log
780
    'remove':                 ['verbose'],
1 by mbp at sourcefrog
import from baz patch-364
781
    'status':                 ['all'],
782
    }
783
784
785
cmd_args = {
786
    'add':                    ['file+'],
176 by mbp at sourcefrog
New cat command contributed by janmar.
787
    'cat':                    ['filename'],
1 by mbp at sourcefrog
import from baz patch-364
788
    'commit':                 [],
196 by mbp at sourcefrog
selected-file diff
789
    'diff':                   ['file*'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
790
    'export':                 ['revno', 'dest'],
1 by mbp at sourcefrog
import from baz patch-364
791
    'file-id':                ['filename'],
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
792
    'file-id-path':           ['filename'],
1 by mbp at sourcefrog
import from baz patch-364
793
    'get-file-text':          ['text_id'],
794
    'get-inventory':          ['inventory_id'],
795
    'get-revision':           ['revision_id'],
796
    'get-revision-inventory': ['revision_id'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
797
    'help':                   ['topic?'],
798
    'init':                   [],
1 by mbp at sourcefrog
import from baz patch-364
799
    'log':                    [],
800
    'lookup-revision':        ['revno'],
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
801
    'move':                   ['source$', 'dest'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
802
    'relpath':                ['filename'],
1 by mbp at sourcefrog
import from baz patch-364
803
    'remove':                 ['file+'],
168 by mbp at sourcefrog
new "rename" command
804
    'rename':                 ['from_name', 'to_name'],
164 by mbp at sourcefrog
new 'renames' command
805
    'renames':                ['dir?'],
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
806
    'root':                   ['filename?'],
1 by mbp at sourcefrog
import from baz patch-364
807
    'status':                 [],
808
    }
809
810
811
def parse_args(argv):
812
    """Parse command line.
813
    
814
    Arguments and options are parsed at this level before being passed
815
    down to specific command handlers.  This routine knows, from a
816
    lookup table, something about the available options, what optargs
817
    they take, and which commands will accept them.
818
31 by Martin Pool
fix up parse_args doctest
819
    >>> parse_args('--help'.split())
1 by mbp at sourcefrog
import from baz patch-364
820
    ([], {'help': True})
31 by Martin Pool
fix up parse_args doctest
821
    >>> parse_args('--version'.split())
1 by mbp at sourcefrog
import from baz patch-364
822
    ([], {'version': True})
31 by Martin Pool
fix up parse_args doctest
823
    >>> parse_args('status --all'.split())
1 by mbp at sourcefrog
import from baz patch-364
824
    (['status'], {'all': True})
31 by Martin Pool
fix up parse_args doctest
825
    >>> parse_args('commit --message=biter'.split())
17 by mbp at sourcefrog
allow --option=ARG syntax
826
    (['commit'], {'message': u'biter'})
1 by mbp at sourcefrog
import from baz patch-364
827
    """
828
    args = []
829
    opts = {}
830
831
    # TODO: Maybe handle '--' to end options?
832
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
833
    while argv:
834
        a = argv.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
835
        if a[0] == '-':
17 by mbp at sourcefrog
allow --option=ARG syntax
836
            optarg = None
1 by mbp at sourcefrog
import from baz patch-364
837
            if a[1] == '-':
838
                mutter("  got option %r" % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
839
                if '=' in a:
840
                    optname, optarg = a[2:].split('=', 1)
841
                else:
842
                    optname = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
843
                if optname not in OPTIONS:
844
                    bailout('unknown long option %r' % a)
845
            else:
846
                shortopt = a[1:]
847
                if shortopt not in SHORT_OPTIONS:
848
                    bailout('unknown short option %r' % a)
849
                optname = SHORT_OPTIONS[shortopt]
850
            
851
            if optname in opts:
852
                # XXX: Do we ever want to support this, e.g. for -r?
853
                bailout('repeated option %r' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
854
                
1 by mbp at sourcefrog
import from baz patch-364
855
            optargfn = OPTIONS[optname]
856
            if optargfn:
17 by mbp at sourcefrog
allow --option=ARG syntax
857
                if optarg == None:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
858
                    if not argv:
17 by mbp at sourcefrog
allow --option=ARG syntax
859
                        bailout('option %r needs an argument' % a)
860
                    else:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
861
                        optarg = argv.pop(0)
17 by mbp at sourcefrog
allow --option=ARG syntax
862
                opts[optname] = optargfn(optarg)
1 by mbp at sourcefrog
import from baz patch-364
863
            else:
17 by mbp at sourcefrog
allow --option=ARG syntax
864
                if optarg != None:
865
                    bailout('option %r takes no argument' % optname)
1 by mbp at sourcefrog
import from baz patch-364
866
                opts[optname] = True
867
        else:
868
            args.append(a)
869
870
    return args, opts
871
872
873
874
def _match_args(cmd, args):
875
    """Check non-option arguments match required pattern.
876
877
    >>> _match_args('status', ['asdasdsadasd'])
878
    Traceback (most recent call last):
879
    ...
880
    BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
881
    >>> _match_args('add', ['asdasdsadasd'])
882
    {'file_list': ['asdasdsadasd']}
883
    >>> _match_args('add', 'abc def gj'.split())
884
    {'file_list': ['abc', 'def', 'gj']}
885
    """
886
    # match argument pattern
887
    argform = cmd_args.get(cmd, [])
888
    argdict = {}
889
    # TODO: Need a way to express 'cp SRC... DEST', where it matches
890
    # all but one.
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
891
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
892
    # step through args and argform, allowing appropriate 0-many matches
1 by mbp at sourcefrog
import from baz patch-364
893
    for ap in argform:
894
        argname = ap[:-1]
895
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
896
            if args:
897
                argdict[argname] = args.pop(0)
196 by mbp at sourcefrog
selected-file diff
898
        elif ap[-1] == '*': # all remaining arguments
899
            if args:
900
                argdict[argname + '_list'] = args[:]
901
                args = []
902
            else:
903
                argdict[argname + '_list'] = None
1 by mbp at sourcefrog
import from baz patch-364
904
        elif ap[-1] == '+':
905
            if not args:
906
                bailout("command %r needs one or more %s"
907
                        % (cmd, argname.upper()))
908
            else:
909
                argdict[argname + '_list'] = args[:]
910
                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
911
        elif ap[-1] == '$': # all but one
912
            if len(args) < 2:
913
                bailout("command %r needs one or more %s"
914
                        % (cmd, argname.upper()))
915
            argdict[argname + '_list'] = args[:-1]
916
            args[:-1] = []                
1 by mbp at sourcefrog
import from baz patch-364
917
        else:
918
            # just a plain arg
919
            argname = ap
920
            if not args:
921
                bailout("command %r requires argument %s"
922
                        % (cmd, argname.upper()))
923
            else:
924
                argdict[argname] = args.pop(0)
925
            
926
    if args:
927
        bailout("extra arguments to command %s: %r"
928
                % (cmd, args))
929
930
    return argdict
931
932
933
934
def run_bzr(argv):
935
    """Execute a command.
936
937
    This is similar to main(), but without all the trappings for
938
    logging and error handling.
939
    """
940
    try:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
941
        args, opts = parse_args(argv[1:])
1 by mbp at sourcefrog
import from baz patch-364
942
        if 'help' in opts:
943
            # TODO: pass down other arguments in case they asked for
944
            # help on a command name?
159 by mbp at sourcefrog
bzr commit --help now works
945
            if args:
946
                cmd_help(args[0])
947
            else:
948
                cmd_help()
1 by mbp at sourcefrog
import from baz patch-364
949
            return 0
950
        elif 'version' in opts:
951
            cmd_version()
952
            return 0
953
        cmd = args.pop(0)
954
    except IndexError:
955
        log_error('usage: bzr COMMAND\n')
956
        log_error('  try "bzr help"\n')
957
        return 1
115 by mbp at sourcefrog
todo
958
1 by mbp at sourcefrog
import from baz patch-364
959
    try:
960
        cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
961
    except KeyError:
962
        bailout("unknown command " + `cmd`)
963
137 by mbp at sourcefrog
new --profile option
964
    # global option
965
    if 'profile' in opts:
966
        profile = True
967
        del opts['profile']
968
    else:
969
        profile = False
1 by mbp at sourcefrog
import from baz patch-364
970
971
    # check options are reasonable
972
    allowed = cmd_options.get(cmd, [])
973
    for oname in opts:
974
        if oname not in allowed:
975
            bailout("option %r is not allowed for command %r"
976
                    % (oname, cmd))
977
176 by mbp at sourcefrog
New cat command contributed by janmar.
978
    # TODO: give an error if there are any mandatory options which are
979
    # not specified?  Or maybe there shouldn't be any "mandatory
980
    # options" (it is an oxymoron)
981
137 by mbp at sourcefrog
new --profile option
982
    # mix arguments and options into one dictionary
1 by mbp at sourcefrog
import from baz patch-364
983
    cmdargs = _match_args(cmd, args)
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
984
    for k, v in opts.items():
985
        cmdargs[k.replace('-', '_')] = v
1 by mbp at sourcefrog
import from baz patch-364
986
137 by mbp at sourcefrog
new --profile option
987
    if profile:
988
        import hotshot
239 by mbp at sourcefrog
- remove profiler temporary file when done
989
        pffileno, pfname = tempfile.mkstemp()
990
        try:
991
            prof = hotshot.Profile(pfname)
992
            ret = prof.runcall(cmd_handler, **cmdargs) or 0
993
            prof.close()
994
995
            import hotshot.stats
996
            stats = hotshot.stats.load(pfname)
997
            #stats.strip_dirs()
998
            stats.sort_stats('time')
999
            ## XXX: Might like to write to stderr or the trace file instead but
1000
            ## print_stats seems hardcoded to stdout
1001
            stats.print_stats(20)
1002
            
1003
            return ret
1004
1005
        finally:
1006
            os.close(pffileno)
1007
            os.remove(pfname)
137 by mbp at sourcefrog
new --profile option
1008
    else:
1009
        return cmd_handler(**cmdargs) or 0
1 by mbp at sourcefrog
import from baz patch-364
1010
1011
1012
1013
def main(argv):
1014
    ## TODO: Handle command-line options; probably know what options are valid for
1015
    ## each command
1016
1017
    ## TODO: If the arguments are wrong, give a usage message rather
1018
    ## than just a backtrace.
1019
59 by mbp at sourcefrog
lift out tracefile creation code
1020
    bzrlib.trace.create_tracefile(argv)
1021
    
1 by mbp at sourcefrog
import from baz patch-364
1022
    try:
1023
        ret = run_bzr(argv)
1024
        return ret
1025
    except BzrError, e:
1026
        log_error('bzr: error: ' + e.args[0] + '\n')
1027
        if len(e.args) > 1:
1028
            for h in e.args[1]:
1029
                log_error('  ' + h + '\n')
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1030
        traceback.print_exc(None, bzrlib.trace._tracefile)
179 by mbp at sourcefrog
better message on error
1031
        log_error('(see $HOME/.bzr.log for debug information)\n')
1 by mbp at sourcefrog
import from baz patch-364
1032
        return 1
1033
    except Exception, e:
1034
        log_error('bzr: exception: %s\n' % e)
179 by mbp at sourcefrog
better message on error
1035
        log_error('(see $HOME/.bzr.log for debug information)\n')
1 by mbp at sourcefrog
import from baz patch-364
1036
        traceback.print_exc(None, bzrlib.trace._tracefile)
179 by mbp at sourcefrog
better message on error
1037
        ## traceback.print_exc(None, sys.stderr)
1 by mbp at sourcefrog
import from baz patch-364
1038
        return 1
1039
236 by mbp at sourcefrog
- Experiments in inventory performance
1040
    ## TODO: Trap AssertionError
1041
1042
    # TODO: Maybe nicer handling of IOError especially for broken pipe.
1 by mbp at sourcefrog
import from baz patch-364
1043
1044
1045
1046
if __name__ == '__main__':
1047
    sys.exit(main(sys.argv))
1048
    ##import profile
1049
    ##profile.run('main(sys.argv)')