~bzr-pqm/bzr/bzr.dev

329 by Martin Pool
- refactor command functions into command classes
1
# Copyright (C) 2004, 2005 by Canonical Ltd
1 by mbp at sourcefrog
import from baz patch-364
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
18
338 by Martin Pool
- cleanup of some imports
19
import sys, os, time, os.path
1 by mbp at sourcefrog
import from baz patch-364
20
from sets import Set
21
22
import bzrlib
23
from bzrlib.trace import mutter, note, log_error
329 by Martin Pool
- refactor command functions into command classes
24
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
1 by mbp at sourcefrog
import from baz patch-364
25
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
26
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
27
from bzrlib.revision import Revision
28
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
29
     format_date
30
31
350 by Martin Pool
- refactor command aliases into command classes
32
def _squish_command_name(cmd):
33
    return 'cmd_' + cmd.replace('-', '_')
34
35
36
def _unsquish_command_name(cmd):
37
    assert cmd.startswith("cmd_")
38
    return cmd[4:].replace('_','-')
39
351 by Martin Pool
- Split out help functions into bzrlib.help
40
def get_all_cmds():
350 by Martin Pool
- refactor command aliases into command classes
41
    """Return canonical name and class for all registered commands."""
42
    for k, v in globals().iteritems():
43
        if k.startswith("cmd_"):
44
            yield _unsquish_command_name(k), v
45
351 by Martin Pool
- Split out help functions into bzrlib.help
46
def get_cmd_class(cmd):
350 by Martin Pool
- refactor command aliases into command classes
47
    """Return the canonical name and command class for a command.
48
    """
49
    cmd = str(cmd)                      # not unicode
50
51
    # first look up this command under the specified name
272 by Martin Pool
- Add command aliases
52
    try:
350 by Martin Pool
- refactor command aliases into command classes
53
        return cmd, globals()[_squish_command_name(cmd)]
272 by Martin Pool
- Add command aliases
54
    except KeyError:
350 by Martin Pool
- refactor command aliases into command classes
55
        pass
56
57
    # look for any command which claims this as an alias
351 by Martin Pool
- Split out help functions into bzrlib.help
58
    for cmdname, cmdclass in get_all_cmds():
350 by Martin Pool
- refactor command aliases into command classes
59
        if cmd in cmdclass.aliases:
60
            return cmdname, cmdclass
61
    else:
349 by Martin Pool
Better error for incorrect commands
62
        raise BzrCommandError("unknown command %r" % cmd)
272 by Martin Pool
- Add command aliases
63
329 by Martin Pool
- refactor command functions into command classes
64
65
class Command:
66
    """Base class for commands.
67
68
    The docstring for an actual command should give a single-line
69
    summary, then a complete description of the command.  A grammar
70
    description will be inserted.
71
72
    takes_args
73
        List of argument forms, marked with whether they are optional,
74
        repeated, etc.
75
76
    takes_options
77
        List of options that may be given for this command.
78
79
    hidden
80
        If true, this command isn't advertised.
81
    """
82
    aliases = []
83
    
84
    takes_args = []
85
    takes_options = []
86
87
    hidden = False
88
    
89
    def __init__(self, options, arguments):
90
        """Construct and run the command.
91
92
        Sets self.status to the return value of run()."""
93
        assert isinstance(options, dict)
94
        assert isinstance(arguments, dict)
95
        cmdargs = options.copy()
96
        cmdargs.update(arguments)
97
        assert self.__doc__ != Command.__doc__, \
98
               ("No help message set for %r" % self)
99
        self.status = self.run(**cmdargs)
100
101
    
102
    def run(self):
103
        """Override this in sub-classes.
104
105
        This is invoked with the options and arguments bound to
106
        keyword parameters.
107
337 by Martin Pool
- Clarify return codes from command objects
108
        Return 0 or None if the command was successful, or a shell
109
        error code if not.
329 by Martin Pool
- refactor command functions into command classes
110
        """
337 by Martin Pool
- Clarify return codes from command objects
111
        return 0
329 by Martin Pool
- refactor command functions into command classes
112
113
114
115
class cmd_status(Command):
1 by mbp at sourcefrog
import from baz patch-364
116
    """Display status summary.
117
118
    For each file there is a single line giving its file state and name.
119
    The name is that in the current revision unless it is deleted or
120
    missing, in which case the old name is shown.
121
    """
329 by Martin Pool
- refactor command functions into command classes
122
    takes_options = ['all']
350 by Martin Pool
- refactor command aliases into command classes
123
    aliases = ['st', 'stat']
329 by Martin Pool
- refactor command functions into command classes
124
    
125
    def run(self, all=False):
126
        #import bzrlib.status
127
        #bzrlib.status.tree_status(Branch('.'))
128
        Branch('.').show_status(show_all=all)
129
130
131
class cmd_cat_revision(Command):
132
    """Write out metadata for a revision."""
133
134
    hidden = True
135
    takes_args = ['revision_id']
136
    
137
    def run(self, revision_id):
138
        Branch('.').get_revision(revision_id).write_xml(sys.stdout)
139
140
141
class cmd_revno(Command):
142
    """Show current revision number.
143
144
    This is equal to the number of revisions on this branch."""
145
    def run(self):
146
        print Branch('.').revno()
147
148
    
149
class cmd_add(Command):
70 by mbp at sourcefrog
Prepare for smart recursive add.
150
    """Add specified files or directories.
151
152
    In non-recursive mode, all the named items are added, regardless
153
    of whether they were previously ignored.  A warning is given if
154
    any of the named files are already versioned.
155
156
    In recursive mode (the default), files are treated the same way
157
    but the behaviour for directories is different.  Directories that
158
    are already versioned do not give a warning.  All directories,
159
    whether already versioned or not, are searched for files or
160
    subdirectories that are neither versioned or ignored, and these
161
    are added.  This search proceeds recursively into versioned
162
    directories.
163
164
    Therefore simply saying 'bzr add .' will version all files that
165
    are currently unknown.
279 by Martin Pool
todo
166
167
    TODO: Perhaps adding a file whose directly is not versioned should
168
    recursively add that parent, rather than giving an error?
70 by mbp at sourcefrog
Prepare for smart recursive add.
169
    """
329 by Martin Pool
- refactor command functions into command classes
170
    takes_args = ['file+']
171
    takes_options = ['verbose']
172
    
173
    def run(self, file_list, verbose=False):
174
        bzrlib.add.smart_add(file_list, verbose)
175
176
386 by Martin Pool
- Typo (reported by uws)
177
class cmd_relpath(Command):
329 by Martin Pool
- refactor command functions into command classes
178
    """Show path of a file relative to root"""
179
    takes_args = ('filename')
180
    
181
    def run(self):
182
        print Branch(self.args['filename']).relpath(filename)
183
184
185
186
class cmd_inventory(Command):
187
    """Show inventory of the current working copy or a revision."""
188
    takes_options = ['revision']
189
    
190
    def run(self, revision=None):
191
        b = Branch('.')
192
        if revision == None:
193
            inv = b.read_working_inventory()
194
        else:
195
            inv = b.get_revision_inventory(b.lookup_revision(revision))
196
197
        for path, entry in inv.iter_entries():
198
            print '%-50s %s' % (entry.file_id, path)
199
200
201
class cmd_move(Command):
202
    """Move files to a different directory.
203
204
    examples:
205
        bzr move *.txt doc
206
207
    The destination must be a versioned directory in the same branch.
208
    """
209
    takes_args = ['source$', 'dest']
210
    def run(self, source_list, dest):
211
        b = Branch('.')
212
213
        b.move([b.relpath(s) for s in source_list], b.relpath(dest))
214
215
216
class cmd_rename(Command):
168 by mbp at sourcefrog
new "rename" command
217
    """Change the name of an entry.
218
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
219
    examples:
220
      bzr rename frob.c frobber.c
221
      bzr rename src/frob.c lib/frob.c
222
223
    It is an error if the destination name exists.
224
225
    See also the 'move' command, which moves files into a different
226
    directory without changing their name.
227
228
    TODO: Some way to rename multiple files without invoking bzr for each
229
    one?"""
329 by Martin Pool
- refactor command functions into command classes
230
    takes_args = ['from_name', 'to_name']
168 by mbp at sourcefrog
new "rename" command
231
    
329 by Martin Pool
- refactor command functions into command classes
232
    def run(self, from_name, to_name):
233
        b = Branch('.')
234
        b.rename_one(b.relpath(from_name), b.relpath(to_name))
235
236
237
238
class cmd_renames(Command):
164 by mbp at sourcefrog
new 'renames' command
239
    """Show list of renamed files.
240
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
241
    TODO: Option to show renames between two historical versions.
242
243
    TODO: Only show renames under dir, rather than in the whole branch.
244
    """
329 by Martin Pool
- refactor command functions into command classes
245
    takes_args = ['dir?']
246
247
    def run(self, dir='.'):
248
        b = Branch(dir)
249
        old_inv = b.basis_tree().inventory
250
        new_inv = b.read_working_inventory()
251
252
        renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
253
        renames.sort()
254
        for old_name, new_name in renames:
255
            print "%s => %s" % (old_name, new_name)        
256
257
258
class cmd_info(Command):
259
    """Show statistical information for this branch"""
260
    def run(self):
261
        import info
262
        info.show_info(Branch('.'))        
263
264
265
class cmd_remove(Command):
266
    """Make a file unversioned.
267
268
    This makes bzr stop tracking changes to a versioned file.  It does
269
    not delete the working copy.
270
    """
271
    takes_args = ['file+']
272
    takes_options = ['verbose']
273
    
274
    def run(self, file_list, verbose=False):
275
        b = Branch(file_list[0])
276
        b.remove([b.relpath(f) for f in file_list], verbose=verbose)
277
278
279
class cmd_file_id(Command):
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
280
    """Print file_id of a particular file or directory.
281
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
282
    The file_id is assigned when the file is first added and remains the
283
    same through all revisions where the file exists, even when it is
284
    moved or renamed.
285
    """
329 by Martin Pool
- refactor command functions into command classes
286
    hidden = True
287
    takes_args = ['filename']
288
    def run(self, filename):
289
        b = Branch(filename)
290
        i = b.inventory.path2id(b.relpath(filename))
291
        if i == None:
292
            bailout("%r is not a versioned file" % filename)
293
        else:
294
            print i
295
296
297
class cmd_file_path(Command):
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
298
    """Print path of file_ids to a file or directory.
299
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
300
    This prints one line for each directory down to the target,
301
    starting at the branch root."""
329 by Martin Pool
- refactor command functions into command classes
302
    hidden = True
303
    takes_args = ['filename']
304
    def run(self, filename):
305
        b = Branch(filename)
306
        inv = b.inventory
307
        fid = inv.path2id(b.relpath(filename))
308
        if fid == None:
309
            bailout("%r is not a versioned file" % filename)
310
        for fip in inv.get_idpath(fid):
311
            print fip
312
313
314
class cmd_revision_history(Command):
315
    """Display list of revision ids on this branch."""
316
    def run(self):
317
        for patchid in Branch('.').revision_history():
318
            print patchid
319
320
321
class cmd_directories(Command):
322
    """Display list of versioned directories in this branch."""
323
    def run(self):
324
        for name, ie in Branch('.').read_working_inventory().directories():
325
            if name == '':
326
                print '.'
327
            else:
328
                print name
329
330
331
class cmd_init(Command):
332
    """Make a directory into a versioned branch.
333
334
    Use this to create an empty branch, or before importing an
335
    existing project.
336
337
    Recipe for importing a tree of files:
338
        cd ~/project
339
        bzr init
340
        bzr add -v .
341
        bzr status
342
        bzr commit -m 'imported project'
343
    """
344
    def run(self):
345
        Branch('.', init=True)
346
347
348
class cmd_diff(Command):
349
    """Show differences in working tree.
350
    
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
351
    If files are listed, only the changes in those files are listed.
352
    Otherwise, all changes for the tree are listed.
353
354
    TODO: Given two revision arguments, show the difference between them.
355
356
    TODO: Allow diff across branches.
357
358
    TODO: Option to use external diff command; could be GNU diff, wdiff,
359
          or a graphical diff.
360
276 by Martin Pool
Doc
361
    TODO: Python difflib is not exactly the same as unidiff; should
362
          either fix it up or prefer to use an external diff.
363
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
364
    TODO: If a directory is given, diff everything under that.
365
276 by Martin Pool
Doc
366
    TODO: Selected-file diff is inefficient and doesn't show you
367
          deleted files.
278 by Martin Pool
- Better workaround for trailing newlines in diffs
368
369
    TODO: This probably handles non-Unix newlines poorly.
329 by Martin Pool
- refactor command functions into command classes
370
    """
371
    
372
    takes_args = ['file*']
373
    takes_options = ['revision']
350 by Martin Pool
- refactor command aliases into command classes
374
    aliases = ['di']
329 by Martin Pool
- refactor command functions into command classes
375
376
    def run(self, revision=None, file_list=None):
377
        from bzrlib.diff import show_diff
378
    
379
        show_diff(Branch('.'), revision, file_list)
380
381
382
class cmd_deleted(Command):
135 by mbp at sourcefrog
Simple new 'deleted' command
383
    """List files deleted in the working tree.
384
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
385
    TODO: Show files deleted since a previous revision, or between two revisions.
135 by mbp at sourcefrog
Simple new 'deleted' command
386
    """
329 by Martin Pool
- refactor command functions into command classes
387
    def run(self, show_ids=False):
388
        b = Branch('.')
389
        old = b.basis_tree()
390
        new = b.working_tree()
391
392
        ## TODO: Much more efficient way to do this: read in new
393
        ## directories with readdir, rather than stating each one.  Same
394
        ## level of effort but possibly much less IO.  (Or possibly not,
395
        ## if the directories are very large...)
396
397
        for path, ie in old.inventory.iter_entries():
398
            if not new.has_id(ie.file_id):
399
                if show_ids:
400
                    print '%-50s %s' % (path, ie.file_id)
401
                else:
402
                    print path
403
404
class cmd_root(Command):
405
    """Show the tree root directory.
406
407
    The root is the nearest enclosing directory with a .bzr control
408
    directory."""
409
    takes_args = ['filename?']
410
    def run(self, filename=None):
411
        """Print the branch root."""
412
        print bzrlib.branch.find_branch_root(filename)
413
414
415
416
class cmd_log(Command):
1 by mbp at sourcefrog
import from baz patch-364
417
    """Show log of this branch.
418
367 by Martin Pool
- New --show-ids option for bzr log
419
    TODO: Option to limit range.
420
421
    TODO: Perhaps show most-recent first with an option for last.
1 by mbp at sourcefrog
import from baz patch-364
422
    """
378 by Martin Pool
- New usage bzr log FILENAME
423
    takes_args = ['filename?']
367 by Martin Pool
- New --show-ids option for bzr log
424
    takes_options = ['timezone', 'verbose', 'show-ids']
378 by Martin Pool
- New usage bzr log FILENAME
425
    def run(self, filename=None, timezone='original', verbose=False, show_ids=False):
426
        b = Branch((filename or '.'), lock_mode='r')
427
        if filename:
428
            filename = b.relpath(filename)
429
        bzrlib.show_log(b, filename,
371 by Martin Pool
- Fix up bzr log command
430
                        show_timezone=timezone,
431
                        verbose=verbose,
432
                        show_ids=show_ids)
329 by Martin Pool
- refactor command functions into command classes
433
434
375 by Martin Pool
- New command touching-revisions and function to trace
435
436
class cmd_touching_revisions(Command):
437
    """Return revision-ids which affected a particular file."""
438
    hidden = True
439
    takes_args = ["filename"]
440
    def run(self, filename):
441
        b = Branch(filename, lock_mode='r')
442
        inv = b.read_working_inventory()
443
        file_id = inv.path2id(b.relpath(filename))
444
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
445
            print "%6d %s" % (revno, what)
446
447
329 by Martin Pool
- refactor command functions into command classes
448
class cmd_ls(Command):
1 by mbp at sourcefrog
import from baz patch-364
449
    """List files in a tree.
450
254 by Martin Pool
- Doc cleanups from Magnus Therning
451
    TODO: Take a revision or remote path and list that tree instead.
1 by mbp at sourcefrog
import from baz patch-364
452
    """
329 by Martin Pool
- refactor command functions into command classes
453
    hidden = True
454
    def run(self, revision=None, verbose=False):
455
        b = Branch('.')
456
        if revision == None:
457
            tree = b.working_tree()
458
        else:
459
            tree = b.revision_tree(b.lookup_revision(revision))
460
461
        for fp, fc, kind, fid in tree.list_files():
462
            if verbose:
463
                if kind == 'directory':
464
                    kindch = '/'
465
                elif kind == 'file':
466
                    kindch = ''
467
                else:
468
                    kindch = '???'
469
470
                print '%-8s %s%s' % (fc, fp, kindch)
1 by mbp at sourcefrog
import from baz patch-364
471
            else:
329 by Martin Pool
- refactor command functions into command classes
472
                print fp
473
474
475
476
class cmd_unknowns(Command):
1 by mbp at sourcefrog
import from baz patch-364
477
    """List unknown files"""
329 by Martin Pool
- refactor command functions into command classes
478
    def run(self):
479
        for f in Branch('.').unknowns():
480
            print quotefn(f)
481
482
483
484
class cmd_ignore(Command):
310 by Martin Pool
- new 'bzr ignored' command!
485
    """Ignore a command or pattern"""
329 by Martin Pool
- refactor command functions into command classes
486
    takes_args = ['name_pattern']
310 by Martin Pool
- new 'bzr ignored' command!
487
    
329 by Martin Pool
- refactor command functions into command classes
488
    def run(self, name_pattern):
489
        b = Branch('.')
490
491
        # XXX: This will fail if it's a hardlink; should use an AtomicFile class.
492
        f = open(b.abspath('.bzrignore'), 'at')
493
        f.write(name_pattern + '\n')
494
        f.close()
495
496
        inv = b.working_tree().inventory
497
        if inv.path2id('.bzrignore'):
498
            mutter('.bzrignore is already versioned')
499
        else:
500
            mutter('need to make new .bzrignore file versioned')
501
            b.add(['.bzrignore'])
502
503
504
505
class cmd_ignored(Command):
506
    """List ignored files and the patterns that matched them."""
507
    def run(self):
508
        tree = Branch('.').working_tree()
509
        for path, file_class, kind, file_id in tree.list_files():
510
            if file_class != 'I':
511
                continue
512
            ## XXX: Slightly inefficient since this was already calculated
513
            pat = tree.is_ignored(path)
514
            print '%-50s %s' % (path, pat)
515
516
517
class cmd_lookup_revision(Command):
518
    """Lookup the revision-id from a revision-number
519
520
    example:
521
        bzr lookup-revision 33
522
        """
523
    hidden = True
338 by Martin Pool
- cleanup of some imports
524
    takes_args = ['revno']
525
    
329 by Martin Pool
- refactor command functions into command classes
526
    def run(self, revno):
527
        try:
528
            revno = int(revno)
529
        except ValueError:
338 by Martin Pool
- cleanup of some imports
530
            raise BzrCommandError("not a valid revision-number: %r" % revno)
531
532
        print Branch('.').lookup_revision(revno)
329 by Martin Pool
- refactor command functions into command classes
533
534
535
class cmd_export(Command):
536
    """Export past revision to destination directory.
537
538
    If no revision is specified this exports the last committed revision."""
539
    takes_args = ['dest']
540
    takes_options = ['revision']
541
    def run(self, dest, revno=None):
542
        b = Branch('.')
543
        if revno == None:
544
            rh = b.revision_history[-1]
545
        else:
546
            rh = b.lookup_revision(int(revno))
547
        t = b.revision_tree(rh)
548
        t.export(dest)
549
550
551
class cmd_cat(Command):
552
    """Write a file's text from a previous revision."""
553
554
    takes_options = ['revision']
555
    takes_args = ['filename']
556
557
    def run(self, filename, revision=None):
558
        if revision == None:
559
            raise BzrCommandError("bzr cat requires a revision number")
560
        b = Branch('.')
561
        b.print_file(b.relpath(filename), int(revision))
562
563
564
class cmd_local_time_offset(Command):
565
    """Show the offset in seconds from GMT to local time."""
566
    hidden = True    
567
    def run(self):
568
        print bzrlib.osutils.local_time_offset()
569
570
571
572
class cmd_commit(Command):
573
    """Commit changes into a new revision.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
574
575
    TODO: Commit only selected files.
576
577
    TODO: Run hooks on tree to-be-committed, and after commit.
578
579
    TODO: Strict commit that fails if there are unknown or deleted files.
580
    """
329 by Martin Pool
- refactor command functions into command classes
581
    takes_options = ['message', 'verbose']
350 by Martin Pool
- refactor command aliases into command classes
582
    aliases = ['ci', 'checkin']
583
329 by Martin Pool
- refactor command functions into command classes
584
    def run(self, message=None, verbose=False):
585
        if not message:
586
            raise BzrCommandError("please specify a commit message")
587
        Branch('.').commit(message, verbose=verbose)
588
589
590
class cmd_check(Command):
591
    """Validate consistency of branch history.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
592
593
    This command checks various invariants about the branch storage to
594
    detect data corruption or bzr bugs.
595
    """
329 by Martin Pool
- refactor command functions into command classes
596
    takes_args = ['dir?']
597
    def run(self, dir='.'):
598
        import bzrlib.check
599
        bzrlib.check.check(Branch(dir, find_root=False))
600
601
602
603
class cmd_whoami(Command):
604
    """Show bzr user id."""
605
    takes_options = ['email']
286 by Martin Pool
- New bzr whoami --email option
606
    
329 by Martin Pool
- refactor command functions into command classes
607
    def run(self, email=False):
608
        if email:
609
            print bzrlib.osutils.user_email()
610
        else:
611
            print bzrlib.osutils.username()
612
613
614
class cmd_selftest(Command):
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
615
    """Run internal test suite"""
329 by Martin Pool
- refactor command functions into command classes
616
    hidden = True
617
    def run(self):
618
        failures, tests = 0, 0
619
620
        import doctest, bzrlib.store, bzrlib.tests
621
        bzrlib.trace.verbose = False
622
623
        for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
624
            bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
625
            mf, mt = doctest.testmod(m)
626
            failures += mf
627
            tests += mt
628
            print '%-40s %3d tests' % (m.__name__, mt),
629
            if mf:
630
                print '%3d FAILED!' % mf
631
            else:
632
                print
633
634
        print '%-40s %3d tests' % ('total', tests),
635
        if failures:
636
            print '%3d FAILED!' % failures
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
637
        else:
638
            print
639
329 by Martin Pool
- refactor command functions into command classes
640
641
642
class cmd_version(Command):
643
    """Show version of bzr"""
644
    def run(self):
645
        show_version()
646
647
def show_version():
648
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
649
    print bzrlib.__copyright__
650
    print "http://bazaar-ng.org/"
651
    print
652
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
653
    print "you may use, modify and redistribute it under the terms of the GNU"
654
    print "General Public License version 2 or later."
655
656
657
class cmd_rocks(Command):
658
    """Statement of optimism."""
659
    hidden = True
660
    def run(self):
661
        print "it sure does!"
662
663
664
class cmd_assert_fail(Command):
665
    """Test reporting of assertion failures"""
666
    hidden = True
667
    def run(self):
668
        assert False, "always fails"
669
670
671
class cmd_help(Command):
672
    """Show help on a command or other topic.
673
674
    For a list of all available commands, say 'bzr help commands'."""
675
    takes_args = ['topic?']
350 by Martin Pool
- refactor command aliases into command classes
676
    aliases = ['?']
329 by Martin Pool
- refactor command functions into command classes
677
    
678
    def run(self, topic=None):
351 by Martin Pool
- Split out help functions into bzrlib.help
679
        import help
680
        help.help(topic)
681
1 by mbp at sourcefrog
import from baz patch-364
682
683
######################################################################
684
# main routine
685
686
687
# list of all available options; the rhs can be either None for an
688
# option that takes no argument, or a constructor function that checks
689
# the type.
690
OPTIONS = {
691
    'all':                    None,
692
    'help':                   None,
693
    'message':                unicode,
137 by mbp at sourcefrog
new --profile option
694
    'profile':                None,
1 by mbp at sourcefrog
import from baz patch-364
695
    'revision':               int,
696
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
697
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
698
    'verbose':                None,
699
    'version':                None,
286 by Martin Pool
- New bzr whoami --email option
700
    'email':                  None,
1 by mbp at sourcefrog
import from baz patch-364
701
    }
702
703
SHORT_OPTIONS = {
704
    'm':                      'message',
705
    'r':                      'revision',
706
    'v':                      'verbose',
707
}
708
709
710
def parse_args(argv):
711
    """Parse command line.
712
    
713
    Arguments and options are parsed at this level before being passed
714
    down to specific command handlers.  This routine knows, from a
715
    lookup table, something about the available options, what optargs
716
    they take, and which commands will accept them.
717
31 by Martin Pool
fix up parse_args doctest
718
    >>> parse_args('--help'.split())
1 by mbp at sourcefrog
import from baz patch-364
719
    ([], {'help': True})
31 by Martin Pool
fix up parse_args doctest
720
    >>> parse_args('--version'.split())
1 by mbp at sourcefrog
import from baz patch-364
721
    ([], {'version': True})
31 by Martin Pool
fix up parse_args doctest
722
    >>> parse_args('status --all'.split())
1 by mbp at sourcefrog
import from baz patch-364
723
    (['status'], {'all': True})
31 by Martin Pool
fix up parse_args doctest
724
    >>> parse_args('commit --message=biter'.split())
17 by mbp at sourcefrog
allow --option=ARG syntax
725
    (['commit'], {'message': u'biter'})
1 by mbp at sourcefrog
import from baz patch-364
726
    """
727
    args = []
728
    opts = {}
729
730
    # TODO: Maybe handle '--' to end options?
731
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
732
    while argv:
733
        a = argv.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
734
        if a[0] == '-':
264 by Martin Pool
parse_args: option names must be ascii
735
            # option names must not be unicode
736
            a = str(a)
17 by mbp at sourcefrog
allow --option=ARG syntax
737
            optarg = None
1 by mbp at sourcefrog
import from baz patch-364
738
            if a[1] == '-':
739
                mutter("  got option %r" % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
740
                if '=' in a:
741
                    optname, optarg = a[2:].split('=', 1)
742
                else:
743
                    optname = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
744
                if optname not in OPTIONS:
745
                    bailout('unknown long option %r' % a)
746
            else:
747
                shortopt = a[1:]
748
                if shortopt not in SHORT_OPTIONS:
749
                    bailout('unknown short option %r' % a)
750
                optname = SHORT_OPTIONS[shortopt]
751
            
752
            if optname in opts:
753
                # XXX: Do we ever want to support this, e.g. for -r?
754
                bailout('repeated option %r' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
755
                
1 by mbp at sourcefrog
import from baz patch-364
756
            optargfn = OPTIONS[optname]
757
            if optargfn:
17 by mbp at sourcefrog
allow --option=ARG syntax
758
                if optarg == None:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
759
                    if not argv:
17 by mbp at sourcefrog
allow --option=ARG syntax
760
                        bailout('option %r needs an argument' % a)
761
                    else:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
762
                        optarg = argv.pop(0)
17 by mbp at sourcefrog
allow --option=ARG syntax
763
                opts[optname] = optargfn(optarg)
1 by mbp at sourcefrog
import from baz patch-364
764
            else:
17 by mbp at sourcefrog
allow --option=ARG syntax
765
                if optarg != None:
766
                    bailout('option %r takes no argument' % optname)
1 by mbp at sourcefrog
import from baz patch-364
767
                opts[optname] = True
768
        else:
769
            args.append(a)
770
771
    return args, opts
772
773
774
775
329 by Martin Pool
- refactor command functions into command classes
776
def _match_argform(cmd, takes_args, args):
1 by mbp at sourcefrog
import from baz patch-364
777
    argdict = {}
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
778
329 by Martin Pool
- refactor command functions into command classes
779
    # step through args and takes_args, allowing appropriate 0-many matches
780
    for ap in takes_args:
1 by mbp at sourcefrog
import from baz patch-364
781
        argname = ap[:-1]
782
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
783
            if args:
784
                argdict[argname] = args.pop(0)
196 by mbp at sourcefrog
selected-file diff
785
        elif ap[-1] == '*': # all remaining arguments
786
            if args:
787
                argdict[argname + '_list'] = args[:]
788
                args = []
789
            else:
790
                argdict[argname + '_list'] = None
1 by mbp at sourcefrog
import from baz patch-364
791
        elif ap[-1] == '+':
792
            if not args:
329 by Martin Pool
- refactor command functions into command classes
793
                raise BzrCommandError("command %r needs one or more %s"
1 by mbp at sourcefrog
import from baz patch-364
794
                        % (cmd, argname.upper()))
795
            else:
796
                argdict[argname + '_list'] = args[:]
797
                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
798
        elif ap[-1] == '$': # all but one
799
            if len(args) < 2:
329 by Martin Pool
- refactor command functions into command classes
800
                raise BzrCommandError("command %r needs one or more %s"
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
801
                        % (cmd, argname.upper()))
802
            argdict[argname + '_list'] = args[:-1]
803
            args[:-1] = []                
1 by mbp at sourcefrog
import from baz patch-364
804
        else:
805
            # just a plain arg
806
            argname = ap
807
            if not args:
329 by Martin Pool
- refactor command functions into command classes
808
                raise BzrCommandError("command %r requires argument %s"
1 by mbp at sourcefrog
import from baz patch-364
809
                        % (cmd, argname.upper()))
810
            else:
811
                argdict[argname] = args.pop(0)
812
            
813
    if args:
329 by Martin Pool
- refactor command functions into command classes
814
        raise BzrCommandError("extra argument to command %s: %s"
815
                              % (cmd, args[0]))
1 by mbp at sourcefrog
import from baz patch-364
816
817
    return argdict
818
819
820
821
def run_bzr(argv):
822
    """Execute a command.
823
824
    This is similar to main(), but without all the trappings for
245 by mbp at sourcefrog
- control files always in utf-8-unix format
825
    logging and error handling.  
1 by mbp at sourcefrog
import from baz patch-364
826
    """
251 by mbp at sourcefrog
- factor out locale.getpreferredencoding()
827
    argv = [a.decode(bzrlib.user_encoding) for a in argv]
245 by mbp at sourcefrog
- control files always in utf-8-unix format
828
    
1 by mbp at sourcefrog
import from baz patch-364
829
    try:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
830
        args, opts = parse_args(argv[1:])
1 by mbp at sourcefrog
import from baz patch-364
831
        if 'help' in opts:
351 by Martin Pool
- Split out help functions into bzrlib.help
832
            import help
159 by mbp at sourcefrog
bzr commit --help now works
833
            if args:
351 by Martin Pool
- Split out help functions into bzrlib.help
834
                help.help(args[0])
159 by mbp at sourcefrog
bzr commit --help now works
835
            else:
351 by Martin Pool
- Split out help functions into bzrlib.help
836
                help.help()
1 by mbp at sourcefrog
import from baz patch-364
837
            return 0
838
        elif 'version' in opts:
336 by Martin Pool
- fix up 'bzr --version'
839
            show_version()
1 by mbp at sourcefrog
import from baz patch-364
840
            return 0
265 by Martin Pool
parse_args: command names must also be ascii
841
        cmd = str(args.pop(0))
1 by mbp at sourcefrog
import from baz patch-364
842
    except IndexError:
257 by Martin Pool
- Write less startup junk to .bzr.log
843
        log_error('usage: bzr COMMAND')
844
        log_error('  try "bzr help"')
1 by mbp at sourcefrog
import from baz patch-364
845
        return 1
115 by mbp at sourcefrog
todo
846
351 by Martin Pool
- Split out help functions into bzrlib.help
847
    canonical_cmd, cmd_class = get_cmd_class(cmd)
1 by mbp at sourcefrog
import from baz patch-364
848
137 by mbp at sourcefrog
new --profile option
849
    # global option
850
    if 'profile' in opts:
851
        profile = True
852
        del opts['profile']
853
    else:
854
        profile = False
1 by mbp at sourcefrog
import from baz patch-364
855
856
    # check options are reasonable
329 by Martin Pool
- refactor command functions into command classes
857
    allowed = cmd_class.takes_options
1 by mbp at sourcefrog
import from baz patch-364
858
    for oname in opts:
859
        if oname not in allowed:
381 by Martin Pool
- Better message when a wrong argument is given
860
            raise BzrCommandError("option '--%s' is not allowed for command %r"
329 by Martin Pool
- refactor command functions into command classes
861
                                  % (oname, cmd))
176 by mbp at sourcefrog
New cat command contributed by janmar.
862
137 by mbp at sourcefrog
new --profile option
863
    # mix arguments and options into one dictionary
329 by Martin Pool
- refactor command functions into command classes
864
    cmdargs = _match_argform(cmd, cmd_class.takes_args, args)
865
    cmdopts = {}
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
866
    for k, v in opts.items():
329 by Martin Pool
- refactor command functions into command classes
867
        cmdopts[k.replace('-', '_')] = v
1 by mbp at sourcefrog
import from baz patch-364
868
137 by mbp at sourcefrog
new --profile option
869
    if profile:
338 by Martin Pool
- cleanup of some imports
870
        import hotshot, tempfile
239 by mbp at sourcefrog
- remove profiler temporary file when done
871
        pffileno, pfname = tempfile.mkstemp()
872
        try:
873
            prof = hotshot.Profile(pfname)
329 by Martin Pool
- refactor command functions into command classes
874
            ret = prof.runcall(cmd_class, cmdopts, cmdargs) or 0
239 by mbp at sourcefrog
- remove profiler temporary file when done
875
            prof.close()
876
877
            import hotshot.stats
878
            stats = hotshot.stats.load(pfname)
879
            #stats.strip_dirs()
880
            stats.sort_stats('time')
881
            ## XXX: Might like to write to stderr or the trace file instead but
882
            ## print_stats seems hardcoded to stdout
883
            stats.print_stats(20)
884
            
337 by Martin Pool
- Clarify return codes from command objects
885
            return ret.status
239 by mbp at sourcefrog
- remove profiler temporary file when done
886
887
        finally:
888
            os.close(pffileno)
889
            os.remove(pfname)
137 by mbp at sourcefrog
new --profile option
890
    else:
337 by Martin Pool
- Clarify return codes from command objects
891
        cmdobj = cmd_class(cmdopts, cmdargs).status 
1 by mbp at sourcefrog
import from baz patch-364
892
893
359 by Martin Pool
- pychecker fixups
894
def _report_exception(summary, quiet=False):
267 by Martin Pool
- better reporting of errors
895
    import traceback
896
    log_error('bzr: ' + summary)
359 by Martin Pool
- pychecker fixups
897
    bzrlib.trace.log_exception()
317 by Martin Pool
- better error message for broken pipe
898
899
    if not quiet:
900
        tb = sys.exc_info()[2]
901
        exinfo = traceback.extract_tb(tb)
902
        if exinfo:
903
            sys.stderr.write('  at %s:%d in %s()\n' % exinfo[-1][:3])
904
        sys.stderr.write('  see ~/.bzr.log for debug information\n')
267 by Martin Pool
- better reporting of errors
905
906
907
1 by mbp at sourcefrog
import from baz patch-364
908
def main(argv):
317 by Martin Pool
- better error message for broken pipe
909
    import errno
910
    
344 by Martin Pool
- It's not an error to use the library without
911
    bzrlib.open_tracefile(argv)
260 by Martin Pool
- remove atexit() dependency for writing out execution times
912
1 by mbp at sourcefrog
import from baz patch-364
913
    try:
260 by Martin Pool
- remove atexit() dependency for writing out execution times
914
        try:
337 by Martin Pool
- Clarify return codes from command objects
915
            try:
916
                return run_bzr(argv)
917
            finally:
918
                # do this here inside the exception wrappers to catch EPIPE
919
                sys.stdout.flush()
260 by Martin Pool
- remove atexit() dependency for writing out execution times
920
        except BzrError, e:
329 by Martin Pool
- refactor command functions into command classes
921
            quiet = isinstance(e, (BzrCommandError))
359 by Martin Pool
- pychecker fixups
922
            _report_exception('error: ' + e.args[0], quiet=quiet)
260 by Martin Pool
- remove atexit() dependency for writing out execution times
923
            if len(e.args) > 1:
924
                for h in e.args[1]:
267 by Martin Pool
- better reporting of errors
925
                    # some explanation or hints
260 by Martin Pool
- remove atexit() dependency for writing out execution times
926
                    log_error('  ' + h)
927
            return 1
267 by Martin Pool
- better reporting of errors
928
        except AssertionError, e:
929
            msg = 'assertion failed'
930
            if str(e):
931
                msg += ': ' + str(e)
359 by Martin Pool
- pychecker fixups
932
            _report_exception(msg)
318 by Martin Pool
- better error message for Ctrl-c
933
            return 2
934
        except KeyboardInterrupt, e:
359 by Martin Pool
- pychecker fixups
935
            _report_exception('interrupted', quiet=True)
318 by Martin Pool
- better error message for Ctrl-c
936
            return 2
260 by Martin Pool
- remove atexit() dependency for writing out execution times
937
        except Exception, e:
317 by Martin Pool
- better error message for broken pipe
938
            quiet = False
939
            if isinstance(e, IOError) and e.errno == errno.EPIPE:
940
                quiet = True
941
                msg = 'broken pipe'
942
            else:
943
                msg = str(e).rstrip('\n')
359 by Martin Pool
- pychecker fixups
944
            _report_exception(msg, quiet)
318 by Martin Pool
- better error message for Ctrl-c
945
            return 2
260 by Martin Pool
- remove atexit() dependency for writing out execution times
946
    finally:
947
        bzrlib.trace.close_trace()
1 by mbp at sourcefrog
import from baz patch-364
948
949
950
if __name__ == '__main__':
951
    sys.exit(main(sys.argv))