/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
572 by Martin Pool
- trim imports
19
import sys, os
1 by mbp at sourcefrog
import from baz patch-364
20
21
import bzrlib
22
from bzrlib.trace import mutter, note, log_error
329 by Martin Pool
- refactor command functions into command classes
23
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
1 by mbp at sourcefrog
import from baz patch-364
24
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
453 by Martin Pool
- Split WorkingTree into its own file
25
from bzrlib.tree import RevisionTree, EmptyTree, Tree
1 by mbp at sourcefrog
import from baz patch-364
26
from bzrlib.revision import Revision
27
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
28
     format_date
29
30
350 by Martin Pool
- refactor command aliases into command classes
31
def _squish_command_name(cmd):
32
    return 'cmd_' + cmd.replace('-', '_')
33
34
35
def _unsquish_command_name(cmd):
36
    assert cmd.startswith("cmd_")
37
    return cmd[4:].replace('_','-')
38
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
39
def _parse_revision_str(revstr):
40
    """This handles a revision string -> revno. 
41
42
    There are several possibilities:
43
44
        '234'       -> 234
45
        '234:345'   -> [234, 345]
46
        ':234'      -> [None, 234]
47
        '234:'      -> [234, None]
48
49
    In the future we will also support:
50
        'uuid:blah-blah-blah'   -> ?
51
        'hash:blahblahblah'     -> ?
52
        potentially:
53
        'tag:mytag'             -> ?
54
    """
55
    if revstr.find(':') != -1:
56
        revs = revstr.split(':')
57
        if len(revs) > 2:
58
            raise ValueError('More than 2 pieces not supported for --revision: %r' % revstr)
59
60
        if not revs[0]:
61
            revs[0] = None
62
        else:
63
            revs[0] = int(revs[0])
64
65
        if not revs[1]:
66
            revs[1] = None
67
        else:
68
            revs[1] = int(revs[1])
69
    else:
70
        revs = int(revstr)
71
    return revs
72
351 by Martin Pool
- Split out help functions into bzrlib.help
73
def get_all_cmds():
350 by Martin Pool
- refactor command aliases into command classes
74
    """Return canonical name and class for all registered commands."""
75
    for k, v in globals().iteritems():
76
        if k.startswith("cmd_"):
77
            yield _unsquish_command_name(k), v
78
351 by Martin Pool
- Split out help functions into bzrlib.help
79
def get_cmd_class(cmd):
350 by Martin Pool
- refactor command aliases into command classes
80
    """Return the canonical name and command class for a command.
81
    """
82
    cmd = str(cmd)                      # not unicode
83
84
    # first look up this command under the specified name
272 by Martin Pool
- Add command aliases
85
    try:
350 by Martin Pool
- refactor command aliases into command classes
86
        return cmd, globals()[_squish_command_name(cmd)]
272 by Martin Pool
- Add command aliases
87
    except KeyError:
350 by Martin Pool
- refactor command aliases into command classes
88
        pass
89
90
    # look for any command which claims this as an alias
351 by Martin Pool
- Split out help functions into bzrlib.help
91
    for cmdname, cmdclass in get_all_cmds():
350 by Martin Pool
- refactor command aliases into command classes
92
        if cmd in cmdclass.aliases:
93
            return cmdname, cmdclass
422 by Martin Pool
- External-command patch from mpe
94
95
    cmdclass = ExternalCommand.find_command(cmd)
96
    if cmdclass:
97
        return cmd, cmdclass
98
99
    raise BzrCommandError("unknown command %r" % cmd)
272 by Martin Pool
- Add command aliases
100
329 by Martin Pool
- refactor command functions into command classes
101
558 by Martin Pool
- All top-level classes inherit from object
102
class Command(object):
329 by Martin Pool
- refactor command functions into command classes
103
    """Base class for commands.
104
105
    The docstring for an actual command should give a single-line
106
    summary, then a complete description of the command.  A grammar
107
    description will be inserted.
108
109
    takes_args
110
        List of argument forms, marked with whether they are optional,
111
        repeated, etc.
112
113
    takes_options
114
        List of options that may be given for this command.
115
116
    hidden
117
        If true, this command isn't advertised.
118
    """
119
    aliases = []
120
    
121
    takes_args = []
122
    takes_options = []
123
124
    hidden = False
125
    
126
    def __init__(self, options, arguments):
127
        """Construct and run the command.
128
129
        Sets self.status to the return value of run()."""
130
        assert isinstance(options, dict)
131
        assert isinstance(arguments, dict)
132
        cmdargs = options.copy()
133
        cmdargs.update(arguments)
134
        assert self.__doc__ != Command.__doc__, \
135
               ("No help message set for %r" % self)
136
        self.status = self.run(**cmdargs)
137
138
    
139
    def run(self):
140
        """Override this in sub-classes.
141
142
        This is invoked with the options and arguments bound to
143
        keyword parameters.
144
337 by Martin Pool
- Clarify return codes from command objects
145
        Return 0 or None if the command was successful, or a shell
146
        error code if not.
329 by Martin Pool
- refactor command functions into command classes
147
        """
337 by Martin Pool
- Clarify return codes from command objects
148
        return 0
329 by Martin Pool
- refactor command functions into command classes
149
150
422 by Martin Pool
- External-command patch from mpe
151
class ExternalCommand(Command):
152
    """Class to wrap external commands.
153
154
    We cheat a little here, when get_cmd_class() calls us we actually give it back
155
    an object we construct that has the appropriate path, help, options etc for the
156
    specified command.
157
158
    When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
159
    method, which we override to call the Command.__init__ method. That then calls
160
    our run method which is pretty straight forward.
161
162
    The only wrinkle is that we have to map bzr's dictionary of options and arguments
163
    back into command line options and arguments for the script.
164
    """
165
166
    def find_command(cls, cmd):
572 by Martin Pool
- trim imports
167
        import os.path
422 by Martin Pool
- External-command patch from mpe
168
        bzrpath = os.environ.get('BZRPATH', '')
169
170
        for dir in bzrpath.split(':'):
171
            path = os.path.join(dir, cmd)
172
            if os.path.isfile(path):
173
                return ExternalCommand(path)
174
175
        return None
176
177
    find_command = classmethod(find_command)
178
179
    def __init__(self, path):
180
        self.path = path
181
424 by Martin Pool
todo
182
        # TODO: If either of these fail, we should detect that and
183
        # assume that path is not really a bzr plugin after all.
184
422 by Martin Pool
- External-command patch from mpe
185
        pipe = os.popen('%s --bzr-usage' % path, 'r')
186
        self.takes_options = pipe.readline().split()
187
        self.takes_args = pipe.readline().split()
188
        pipe.close()
189
190
        pipe = os.popen('%s --bzr-help' % path, 'r')
191
        self.__doc__ = pipe.read()
192
        pipe.close()
193
194
    def __call__(self, options, arguments):
195
        Command.__init__(self, options, arguments)
196
        return self
197
198
    def run(self, **kargs):
199
        opts = []
200
        args = []
201
202
        keys = kargs.keys()
203
        keys.sort()
204
        for name in keys:
205
            value = kargs[name]
206
            if OPTIONS.has_key(name):
207
                # it's an option
208
                opts.append('--%s' % name)
209
                if value is not None and value is not True:
210
                    opts.append(str(value))
211
            else:
212
                # it's an arg, or arg list
213
                if type(value) is not list:
214
                    value = [value]
215
                for v in value:
216
                    if v is not None:
217
                        args.append(str(v))
218
219
        self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
220
        return self.status
221
329 by Martin Pool
- refactor command functions into command classes
222
223
class cmd_status(Command):
1 by mbp at sourcefrog
import from baz patch-364
224
    """Display status summary.
225
466 by Martin Pool
- doc for status command
226
    This reports on versioned and unknown files, reporting them
227
    grouped by state.  Possible states are:
228
229
    added
230
        Versioned in the working copy but not in the previous revision.
231
232
    removed
467 by Martin Pool
- doc for status command
233
        Versioned in the previous revision but removed or deleted
466 by Martin Pool
- doc for status command
234
        in the working copy.
235
236
    renamed
237
        Path of this file changed from the previous revision;
238
        the text may also have changed.  This includes files whose
467 by Martin Pool
- doc for status command
239
        parent directory was renamed.
466 by Martin Pool
- doc for status command
240
241
    modified
242
        Text has changed since the previous revision.
243
244
    unchanged
467 by Martin Pool
- doc for status command
245
        Nothing about this file has changed since the previous revision.
246
        Only shown with --all.
466 by Martin Pool
- doc for status command
247
248
    unknown
249
        Not versioned and not matching an ignore pattern.
250
251
    To see ignored files use 'bzr ignored'.  For details in the
252
    changes to file texts, use 'bzr diff'.
468 by Martin Pool
- Interpret arguments to bzr status
253
254
    If no arguments are specified, the status of the entire working
255
    directory is shown.  Otherwise, only the status of the specified
256
    files or directories is reported.  If a directory is given, status
257
    is reported for everything inside that directory.
1 by mbp at sourcefrog
import from baz patch-364
258
    """
404 by Martin Pool
- bzr status now optionally takes filenames to check
259
    takes_args = ['file*']
465 by Martin Pool
- Move show_status() out of Branch into a new function in
260
    takes_options = ['all', 'show-ids']
350 by Martin Pool
- refactor command aliases into command classes
261
    aliases = ['st', 'stat']
329 by Martin Pool
- refactor command functions into command classes
262
    
465 by Martin Pool
- Move show_status() out of Branch into a new function in
263
    def run(self, all=False, show_ids=False, file_list=None):
468 by Martin Pool
- Interpret arguments to bzr status
264
        if file_list:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
265
            b = Branch(file_list[0])
468 by Martin Pool
- Interpret arguments to bzr status
266
            file_list = [b.relpath(x) for x in file_list]
267
            # special case: only one path was given and it's the root
268
            # of the branch
269
            if file_list == ['']:
270
                file_list = None
271
        else:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
272
            b = Branch('.')
465 by Martin Pool
- Move show_status() out of Branch into a new function in
273
        import status
274
        status.show_status(b, show_unchanged=all, show_ids=show_ids,
483 by Martin Pool
- change 'file_list' to more explanatory 'specific_files'
275
                           specific_files=file_list)
329 by Martin Pool
- refactor command functions into command classes
276
277
278
class cmd_cat_revision(Command):
279
    """Write out metadata for a revision."""
280
281
    hidden = True
282
    takes_args = ['revision_id']
283
    
284
    def run(self, revision_id):
285
        Branch('.').get_revision(revision_id).write_xml(sys.stdout)
286
287
288
class cmd_revno(Command):
289
    """Show current revision number.
290
291
    This is equal to the number of revisions on this branch."""
292
    def run(self):
293
        print Branch('.').revno()
294
295
    
296
class cmd_add(Command):
70 by mbp at sourcefrog
Prepare for smart recursive add.
297
    """Add specified files or directories.
298
299
    In non-recursive mode, all the named items are added, regardless
300
    of whether they were previously ignored.  A warning is given if
301
    any of the named files are already versioned.
302
303
    In recursive mode (the default), files are treated the same way
304
    but the behaviour for directories is different.  Directories that
305
    are already versioned do not give a warning.  All directories,
306
    whether already versioned or not, are searched for files or
307
    subdirectories that are neither versioned or ignored, and these
308
    are added.  This search proceeds recursively into versioned
309
    directories.
310
311
    Therefore simply saying 'bzr add .' will version all files that
312
    are currently unknown.
279 by Martin Pool
todo
313
314
    TODO: Perhaps adding a file whose directly is not versioned should
315
    recursively add that parent, rather than giving an error?
70 by mbp at sourcefrog
Prepare for smart recursive add.
316
    """
329 by Martin Pool
- refactor command functions into command classes
317
    takes_args = ['file+']
318
    takes_options = ['verbose']
319
    
320
    def run(self, file_list, verbose=False):
321
        bzrlib.add.smart_add(file_list, verbose)
322
323
386 by Martin Pool
- Typo (reported by uws)
324
class cmd_relpath(Command):
329 by Martin Pool
- refactor command functions into command classes
325
    """Show path of a file relative to root"""
392 by Martin Pool
- fix relpath and add tests
326
    takes_args = ['filename']
584 by Martin Pool
- make relpath and revision-history hidden commands
327
    hidden = True
329 by Martin Pool
- refactor command functions into command classes
328
    
392 by Martin Pool
- fix relpath and add tests
329
    def run(self, filename):
330
        print Branch(filename).relpath(filename)
329 by Martin Pool
- refactor command functions into command classes
331
332
333
334
class cmd_inventory(Command):
335
    """Show inventory of the current working copy or a revision."""
588 by Martin Pool
- change inventory command to not show ids by default
336
    takes_options = ['revision', 'show-ids']
329 by Martin Pool
- refactor command functions into command classes
337
    
588 by Martin Pool
- change inventory command to not show ids by default
338
    def run(self, revision=None, show_ids=False):
329 by Martin Pool
- refactor command functions into command classes
339
        b = Branch('.')
340
        if revision == None:
341
            inv = b.read_working_inventory()
342
        else:
343
            inv = b.get_revision_inventory(b.lookup_revision(revision))
344
556 by Martin Pool
- fix up Inventory.entries()
345
        for path, entry in inv.entries():
588 by Martin Pool
- change inventory command to not show ids by default
346
            if show_ids:
347
                print '%-50s %s' % (path, entry.file_id)
348
            else:
349
                print path
329 by Martin Pool
- refactor command functions into command classes
350
351
352
class cmd_move(Command):
353
    """Move files to a different directory.
354
355
    examples:
356
        bzr move *.txt doc
357
358
    The destination must be a versioned directory in the same branch.
359
    """
360
    takes_args = ['source$', 'dest']
361
    def run(self, source_list, dest):
362
        b = Branch('.')
363
364
        b.move([b.relpath(s) for s in source_list], b.relpath(dest))
365
366
367
class cmd_rename(Command):
168 by mbp at sourcefrog
new "rename" command
368
    """Change the name of an entry.
369
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
370
    examples:
371
      bzr rename frob.c frobber.c
372
      bzr rename src/frob.c lib/frob.c
373
374
    It is an error if the destination name exists.
375
376
    See also the 'move' command, which moves files into a different
377
    directory without changing their name.
378
379
    TODO: Some way to rename multiple files without invoking bzr for each
380
    one?"""
329 by Martin Pool
- refactor command functions into command classes
381
    takes_args = ['from_name', 'to_name']
168 by mbp at sourcefrog
new "rename" command
382
    
329 by Martin Pool
- refactor command functions into command classes
383
    def run(self, from_name, to_name):
384
        b = Branch('.')
385
        b.rename_one(b.relpath(from_name), b.relpath(to_name))
386
387
388
389
class cmd_renames(Command):
164 by mbp at sourcefrog
new 'renames' command
390
    """Show list of renamed files.
391
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
392
    TODO: Option to show renames between two historical versions.
393
394
    TODO: Only show renames under dir, rather than in the whole branch.
395
    """
329 by Martin Pool
- refactor command functions into command classes
396
    takes_args = ['dir?']
397
398
    def run(self, dir='.'):
399
        b = Branch(dir)
400
        old_inv = b.basis_tree().inventory
401
        new_inv = b.read_working_inventory()
402
403
        renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
404
        renames.sort()
405
        for old_name, new_name in renames:
406
            print "%s => %s" % (old_name, new_name)        
407
408
409
class cmd_info(Command):
472 by Martin Pool
- Optional branch parameter to info command
410
    """Show statistical information about a branch."""
411
    takes_args = ['branch?']
412
    
413
    def run(self, branch=None):
329 by Martin Pool
- refactor command functions into command classes
414
        import info
472 by Martin Pool
- Optional branch parameter to info command
415
416
        from branch import find_branch
417
        b = find_branch(branch)
418
        info.show_info(b)
329 by Martin Pool
- refactor command functions into command classes
419
420
421
class cmd_remove(Command):
422
    """Make a file unversioned.
423
424
    This makes bzr stop tracking changes to a versioned file.  It does
425
    not delete the working copy.
426
    """
427
    takes_args = ['file+']
428
    takes_options = ['verbose']
429
    
430
    def run(self, file_list, verbose=False):
431
        b = Branch(file_list[0])
432
        b.remove([b.relpath(f) for f in file_list], verbose=verbose)
433
434
435
class cmd_file_id(Command):
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
436
    """Print file_id of a particular file or directory.
437
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
438
    The file_id is assigned when the file is first added and remains the
439
    same through all revisions where the file exists, even when it is
440
    moved or renamed.
441
    """
329 by Martin Pool
- refactor command functions into command classes
442
    hidden = True
443
    takes_args = ['filename']
444
    def run(self, filename):
445
        b = Branch(filename)
446
        i = b.inventory.path2id(b.relpath(filename))
447
        if i == None:
448
            bailout("%r is not a versioned file" % filename)
449
        else:
450
            print i
451
452
453
class cmd_file_path(Command):
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
454
    """Print path of file_ids to a file or directory.
455
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
456
    This prints one line for each directory down to the target,
457
    starting at the branch root."""
329 by Martin Pool
- refactor command functions into command classes
458
    hidden = True
459
    takes_args = ['filename']
460
    def run(self, filename):
461
        b = Branch(filename)
462
        inv = b.inventory
463
        fid = inv.path2id(b.relpath(filename))
464
        if fid == None:
465
            bailout("%r is not a versioned file" % filename)
466
        for fip in inv.get_idpath(fid):
467
            print fip
468
469
470
class cmd_revision_history(Command):
471
    """Display list of revision ids on this branch."""
584 by Martin Pool
- make relpath and revision-history hidden commands
472
    hidden = True
329 by Martin Pool
- refactor command functions into command classes
473
    def run(self):
474
        for patchid in Branch('.').revision_history():
475
            print patchid
476
477
478
class cmd_directories(Command):
479
    """Display list of versioned directories in this branch."""
480
    def run(self):
481
        for name, ie in Branch('.').read_working_inventory().directories():
482
            if name == '':
483
                print '.'
484
            else:
485
                print name
486
487
488
class cmd_init(Command):
489
    """Make a directory into a versioned branch.
490
491
    Use this to create an empty branch, or before importing an
492
    existing project.
493
494
    Recipe for importing a tree of files:
495
        cd ~/project
496
        bzr init
497
        bzr add -v .
498
        bzr status
499
        bzr commit -m 'imported project'
500
    """
501
    def run(self):
502
        Branch('.', init=True)
503
504
505
class cmd_diff(Command):
506
    """Show differences in working tree.
507
    
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
508
    If files are listed, only the changes in those files are listed.
509
    Otherwise, all changes for the tree are listed.
510
511
    TODO: Given two revision arguments, show the difference between them.
512
513
    TODO: Allow diff across branches.
514
515
    TODO: Option to use external diff command; could be GNU diff, wdiff,
516
          or a graphical diff.
517
276 by Martin Pool
Doc
518
    TODO: Python difflib is not exactly the same as unidiff; should
519
          either fix it up or prefer to use an external diff.
520
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
521
    TODO: If a directory is given, diff everything under that.
522
276 by Martin Pool
Doc
523
    TODO: Selected-file diff is inefficient and doesn't show you
524
          deleted files.
278 by Martin Pool
- Better workaround for trailing newlines in diffs
525
526
    TODO: This probably handles non-Unix newlines poorly.
329 by Martin Pool
- refactor command functions into command classes
527
    """
528
    
529
    takes_args = ['file*']
571 by Martin Pool
- new --diff-options to pass options through to external
530
    takes_options = ['revision', 'diff-options']
350 by Martin Pool
- refactor command aliases into command classes
531
    aliases = ['di']
329 by Martin Pool
- refactor command functions into command classes
532
571 by Martin Pool
- new --diff-options to pass options through to external
533
    def run(self, revision=None, file_list=None, diff_options=None):
329 by Martin Pool
- refactor command functions into command classes
534
        from bzrlib.diff import show_diff
547 by Martin Pool
- bzr diff finds a branch from the first parameter,
535
        from bzrlib import find_branch
536
537
        if file_list:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
538
            b = find_branch(file_list[0])
547 by Martin Pool
- bzr diff finds a branch from the first parameter,
539
            file_list = [b.relpath(f) for f in file_list]
540
            if file_list == ['']:
541
                # just pointing to top-of-tree
542
                file_list = None
543
        else:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
544
            b = Branch('.')
329 by Martin Pool
- refactor command functions into command classes
545
    
571 by Martin Pool
- new --diff-options to pass options through to external
546
        show_diff(b, revision, specific_files=file_list,
547
                  external_diff_options=diff_options)
329 by Martin Pool
- refactor command functions into command classes
548
549
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
550
        
551
552
329 by Martin Pool
- refactor command functions into command classes
553
class cmd_deleted(Command):
135 by mbp at sourcefrog
Simple new 'deleted' command
554
    """List files deleted in the working tree.
555
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
556
    TODO: Show files deleted since a previous revision, or between two revisions.
135 by mbp at sourcefrog
Simple new 'deleted' command
557
    """
329 by Martin Pool
- refactor command functions into command classes
558
    def run(self, show_ids=False):
559
        b = Branch('.')
560
        old = b.basis_tree()
561
        new = b.working_tree()
562
563
        ## TODO: Much more efficient way to do this: read in new
564
        ## directories with readdir, rather than stating each one.  Same
565
        ## level of effort but possibly much less IO.  (Or possibly not,
566
        ## if the directories are very large...)
567
568
        for path, ie in old.inventory.iter_entries():
569
            if not new.has_id(ie.file_id):
570
                if show_ids:
571
                    print '%-50s %s' % (path, ie.file_id)
572
                else:
573
                    print path
574
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
575
576
class cmd_modified(Command):
577
    """List files modified in working tree."""
578
    hidden = True
579
    def run(self):
580
        import statcache
581
        b = Branch('.')
438 by Martin Pool
- Avoid calling Inventory.iter_entries() when finding modified
582
        inv = b.read_working_inventory()
583
        sc = statcache.update_cache(b, inv)
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
584
        basis = b.basis_tree()
585
        basis_inv = basis.inventory
438 by Martin Pool
- Avoid calling Inventory.iter_entries() when finding modified
586
        
587
        # We used to do this through iter_entries(), but that's slow
588
        # when most of the files are unmodified, as is usually the
589
        # case.  So instead we iterate by inventory entry, and only
590
        # calculate paths as necessary.
591
592
        for file_id in basis_inv:
593
            cacheentry = sc.get(file_id)
594
            if not cacheentry:                 # deleted
595
                continue
596
            ie = basis_inv[file_id]
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
597
            if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
438 by Martin Pool
- Avoid calling Inventory.iter_entries() when finding modified
598
                path = inv.id2path(file_id)
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
599
                print path
439 by Martin Pool
- new command 'bzr added'
600
601
602
603
class cmd_added(Command):
604
    """List files added in working tree."""
605
    hidden = True
606
    def run(self):
607
        b = Branch('.')
608
        wt = b.working_tree()
609
        basis_inv = b.basis_tree().inventory
610
        inv = wt.inventory
611
        for file_id in inv:
612
            if file_id in basis_inv:
613
                continue
614
            path = inv.id2path(file_id)
615
            if not os.access(b.abspath(path), os.F_OK):
616
                continue
617
            print path
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
618
                
619
        
620
329 by Martin Pool
- refactor command functions into command classes
621
class cmd_root(Command):
622
    """Show the tree root directory.
623
624
    The root is the nearest enclosing directory with a .bzr control
625
    directory."""
626
    takes_args = ['filename?']
627
    def run(self, filename=None):
628
        """Print the branch root."""
416 by Martin Pool
- bzr log and bzr root now accept an http URL
629
        from branch import find_branch
630
        b = find_branch(filename)
631
        print getattr(b, 'base', None) or getattr(b, 'baseurl')
329 by Martin Pool
- refactor command functions into command classes
632
633
634
class cmd_log(Command):
1 by mbp at sourcefrog
import from baz patch-364
635
    """Show log of this branch.
636
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
637
    To request a range of logs, you can use the command -r begin:end
638
    -r revision requests a specific revision, -r :end or -r begin: are
639
    also valid.
640
641
    TODO: Make --revision support uuid: and hash: [future tag:] notation.
642
  
545 by Martin Pool
- --forward option for log
643
    """
367 by Martin Pool
- New --show-ids option for bzr log
644
378 by Martin Pool
- New usage bzr log FILENAME
645
    takes_args = ['filename?']
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
646
    takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision']
545 by Martin Pool
- --forward option for log
647
    
648
    def run(self, filename=None, timezone='original',
649
            verbose=False,
650
            show_ids=False,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
651
            forward=False,
652
            revision=None):
527 by Martin Pool
- refactor log command
653
        from bzrlib import show_log, find_branch
562 by Martin Pool
- bug fix for printing logs containing unicode
654
        import codecs
545 by Martin Pool
- --forward option for log
655
656
        direction = (forward and 'forward') or 'reverse'
527 by Martin Pool
- refactor log command
657
        
378 by Martin Pool
- New usage bzr log FILENAME
658
        if filename:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
659
            b = find_branch(filename)
527 by Martin Pool
- refactor log command
660
            fp = b.relpath(filename)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
661
            if fp:
662
                file_id = b.read_working_inventory().path2id(fp)
663
            else:
664
                file_id = None  # points to branch root
527 by Martin Pool
- refactor log command
665
        else:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
666
            b = find_branch('.')
527 by Martin Pool
- refactor log command
667
            file_id = None
668
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
669
        if revision == None:
670
            revision = [None, None]
671
        elif isinstance(revision, int):
672
            revision = [revision, revision]
673
        else:
674
            # pair of revisions?
675
            pass
676
            
677
        assert len(revision) == 2
678
562 by Martin Pool
- bug fix for printing logs containing unicode
679
        mutter('encoding log as %r' % bzrlib.user_encoding)
680
        outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout)
681
527 by Martin Pool
- refactor log command
682
        show_log(b, file_id,
683
                 show_timezone=timezone,
684
                 verbose=verbose,
685
                 show_ids=show_ids,
562 by Martin Pool
- bug fix for printing logs containing unicode
686
                 to_file=outf,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
687
                 direction=direction,
688
                 start_revision=revision[0],
689
                 end_revision=revision[1])
329 by Martin Pool
- refactor command functions into command classes
690
691
375 by Martin Pool
- New command touching-revisions and function to trace
692
693
class cmd_touching_revisions(Command):
523 by Martin Pool
doc
694
    """Return revision-ids which affected a particular file.
695
696
    A more user-friendly interface is "bzr log FILE"."""
375 by Martin Pool
- New command touching-revisions and function to trace
697
    hidden = True
698
    takes_args = ["filename"]
699
    def run(self, filename):
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
700
        b = Branch(filename)
375 by Martin Pool
- New command touching-revisions and function to trace
701
        inv = b.read_working_inventory()
702
        file_id = inv.path2id(b.relpath(filename))
703
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
704
            print "%6d %s" % (revno, what)
705
706
329 by Martin Pool
- refactor command functions into command classes
707
class cmd_ls(Command):
1 by mbp at sourcefrog
import from baz patch-364
708
    """List files in a tree.
709
254 by Martin Pool
- Doc cleanups from Magnus Therning
710
    TODO: Take a revision or remote path and list that tree instead.
1 by mbp at sourcefrog
import from baz patch-364
711
    """
329 by Martin Pool
- refactor command functions into command classes
712
    hidden = True
713
    def run(self, revision=None, verbose=False):
714
        b = Branch('.')
715
        if revision == None:
716
            tree = b.working_tree()
717
        else:
718
            tree = b.revision_tree(b.lookup_revision(revision))
719
720
        for fp, fc, kind, fid in tree.list_files():
721
            if verbose:
722
                if kind == 'directory':
723
                    kindch = '/'
724
                elif kind == 'file':
725
                    kindch = ''
726
                else:
727
                    kindch = '???'
728
729
                print '%-8s %s%s' % (fc, fp, kindch)
1 by mbp at sourcefrog
import from baz patch-364
730
            else:
329 by Martin Pool
- refactor command functions into command classes
731
                print fp
732
733
734
735
class cmd_unknowns(Command):
1 by mbp at sourcefrog
import from baz patch-364
736
    """List unknown files"""
329 by Martin Pool
- refactor command functions into command classes
737
    def run(self):
738
        for f in Branch('.').unknowns():
739
            print quotefn(f)
740
741
742
743
class cmd_ignore(Command):
420 by Martin Pool
Doc
744
    """Ignore a command or pattern
745
746
    To remove patterns from the ignore list, edit the .bzrignore file.
747
748
    If the pattern contains a slash, it is compared to the whole path
749
    from the branch root.  Otherwise, it is comapred to only the last
750
    component of the path.
751
752
    Ignore patterns are case-insensitive on case-insensitive systems.
753
754
    Note: wildcards must be quoted from the shell on Unix.
755
756
    examples:
757
        bzr ignore ./Makefile
758
        bzr ignore '*.class'
759
    """
329 by Martin Pool
- refactor command functions into command classes
760
    takes_args = ['name_pattern']
310 by Martin Pool
- new 'bzr ignored' command!
761
    
329 by Martin Pool
- refactor command functions into command classes
762
    def run(self, name_pattern):
409 by Martin Pool
- New AtomicFile class
763
        from bzrlib.atomicfile import AtomicFile
575 by Martin Pool
- cleanup imports
764
        import os.path
409 by Martin Pool
- New AtomicFile class
765
329 by Martin Pool
- refactor command functions into command classes
766
        b = Branch('.')
410 by Martin Pool
- Fix ignore command and add tests
767
        ifn = b.abspath('.bzrignore')
329 by Martin Pool
- refactor command functions into command classes
768
410 by Martin Pool
- Fix ignore command and add tests
769
        if os.path.exists(ifn):
498 by Martin Pool
bugfix for bzr ignore reported by ddaa:
770
            f = open(ifn, 'rt')
771
            try:
772
                igns = f.read().decode('utf-8')
773
            finally:
774
                f.close()
409 by Martin Pool
- New AtomicFile class
775
        else:
776
            igns = ''
777
575 by Martin Pool
- cleanup imports
778
        # TODO: If the file already uses crlf-style termination, maybe
779
        # we should use that for the newly added lines?
780
409 by Martin Pool
- New AtomicFile class
781
        if igns and igns[-1] != '\n':
782
            igns += '\n'
783
        igns += name_pattern + '\n'
784
498 by Martin Pool
bugfix for bzr ignore reported by ddaa:
785
        try:
786
            f = AtomicFile(ifn, 'wt')
787
            f.write(igns.encode('utf-8'))
788
            f.commit()
789
        finally:
790
            f.close()
329 by Martin Pool
- refactor command functions into command classes
791
792
        inv = b.working_tree().inventory
793
        if inv.path2id('.bzrignore'):
794
            mutter('.bzrignore is already versioned')
795
        else:
796
            mutter('need to make new .bzrignore file versioned')
797
            b.add(['.bzrignore'])
798
799
800
801
class cmd_ignored(Command):
421 by Martin Pool
doc
802
    """List ignored files and the patterns that matched them.
803
804
    See also: bzr ignore"""
329 by Martin Pool
- refactor command functions into command classes
805
    def run(self):
806
        tree = Branch('.').working_tree()
807
        for path, file_class, kind, file_id in tree.list_files():
808
            if file_class != 'I':
809
                continue
810
            ## XXX: Slightly inefficient since this was already calculated
811
            pat = tree.is_ignored(path)
812
            print '%-50s %s' % (path, pat)
813
814
815
class cmd_lookup_revision(Command):
816
    """Lookup the revision-id from a revision-number
817
818
    example:
819
        bzr lookup-revision 33
421 by Martin Pool
doc
820
    """
329 by Martin Pool
- refactor command functions into command classes
821
    hidden = True
338 by Martin Pool
- cleanup of some imports
822
    takes_args = ['revno']
823
    
329 by Martin Pool
- refactor command functions into command classes
824
    def run(self, revno):
825
        try:
826
            revno = int(revno)
827
        except ValueError:
338 by Martin Pool
- cleanup of some imports
828
            raise BzrCommandError("not a valid revision-number: %r" % revno)
829
830
        print Branch('.').lookup_revision(revno)
329 by Martin Pool
- refactor command functions into command classes
831
832
833
class cmd_export(Command):
834
    """Export past revision to destination directory.
835
836
    If no revision is specified this exports the last committed revision."""
837
    takes_args = ['dest']
838
    takes_options = ['revision']
394 by Martin Pool
- Fix argument handling in export command
839
    def run(self, dest, revision=None):
329 by Martin Pool
- refactor command functions into command classes
840
        b = Branch('.')
394 by Martin Pool
- Fix argument handling in export command
841
        if revision == None:
842
            rh = b.revision_history()[-1]
329 by Martin Pool
- refactor command functions into command classes
843
        else:
394 by Martin Pool
- Fix argument handling in export command
844
            rh = b.lookup_revision(int(revision))
329 by Martin Pool
- refactor command functions into command classes
845
        t = b.revision_tree(rh)
846
        t.export(dest)
847
848
849
class cmd_cat(Command):
850
    """Write a file's text from a previous revision."""
851
852
    takes_options = ['revision']
853
    takes_args = ['filename']
854
855
    def run(self, filename, revision=None):
856
        if revision == None:
857
            raise BzrCommandError("bzr cat requires a revision number")
858
        b = Branch('.')
859
        b.print_file(b.relpath(filename), int(revision))
860
861
862
class cmd_local_time_offset(Command):
863
    """Show the offset in seconds from GMT to local time."""
864
    hidden = True    
865
    def run(self):
866
        print bzrlib.osutils.local_time_offset()
867
868
869
870
class cmd_commit(Command):
871
    """Commit changes into a new revision.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
872
491 by Martin Pool
- Selective commit!
873
    If selected files are specified, only changes to those files are
874
    committed.  If a directory is specified then its contents are also
875
    committed.
876
877
    A selected-file commit may fail in some cases where the committed
878
    tree would be invalid, such as trying to commit a file in a
879
    newly-added directory that is not itself committed.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
880
881
    TODO: Run hooks on tree to-be-committed, and after commit.
882
883
    TODO: Strict commit that fails if there are unknown or deleted files.
884
    """
491 by Martin Pool
- Selective commit!
885
    takes_args = ['selected*']
389 by Martin Pool
- new commit --file option!
886
    takes_options = ['message', 'file', 'verbose']
350 by Martin Pool
- refactor command aliases into command classes
887
    aliases = ['ci', 'checkin']
888
505 by Martin Pool
- commit is verbose by default
889
    def run(self, message=None, file=None, verbose=True, selected_list=None):
485 by Martin Pool
- move commit code into its own module
890
        from bzrlib.commit import commit
891
389 by Martin Pool
- new commit --file option!
892
        ## Warning: shadows builtin file()
893
        if not message and not file:
894
            raise BzrCommandError("please specify a commit message",
895
                                  ["use either --message or --file"])
896
        elif message and file:
897
            raise BzrCommandError("please specify either --message or --file")
898
        
899
        if file:
900
            import codecs
901
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
902
485 by Martin Pool
- move commit code into its own module
903
        b = Branch('.')
491 by Martin Pool
- Selective commit!
904
        commit(b, message, verbose=verbose, specific_files=selected_list)
329 by Martin Pool
- refactor command functions into command classes
905
906
907
class cmd_check(Command):
908
    """Validate consistency of branch history.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
909
910
    This command checks various invariants about the branch storage to
911
    detect data corruption or bzr bugs.
912
    """
329 by Martin Pool
- refactor command functions into command classes
913
    takes_args = ['dir?']
914
    def run(self, dir='.'):
915
        import bzrlib.check
512 by Martin Pool
- bzr check can be run from a branch subdirectory
916
        bzrlib.check.check(Branch(dir))
329 by Martin Pool
- refactor command functions into command classes
917
918
919
920
class cmd_whoami(Command):
921
    """Show bzr user id."""
922
    takes_options = ['email']
286 by Martin Pool
- New bzr whoami --email option
923
    
329 by Martin Pool
- refactor command functions into command classes
924
    def run(self, email=False):
925
        if email:
926
            print bzrlib.osutils.user_email()
927
        else:
928
            print bzrlib.osutils.username()
929
930
931
class cmd_selftest(Command):
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
932
    """Run internal test suite"""
329 by Martin Pool
- refactor command functions into command classes
933
    hidden = True
934
    def run(self):
935
        failures, tests = 0, 0
936
528 by Martin Pool
- fix bzr selftest trying to import non-existant module
937
        import doctest, bzrlib.store
329 by Martin Pool
- refactor command functions into command classes
938
        bzrlib.trace.verbose = False
939
940
        for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
514 by Martin Pool
- remove old internal tests in favour of blackbox tests
941
            bzrlib.tree, bzrlib.commands, bzrlib.add:
329 by Martin Pool
- refactor command functions into command classes
942
            mf, mt = doctest.testmod(m)
943
            failures += mf
944
            tests += mt
945
            print '%-40s %3d tests' % (m.__name__, mt),
946
            if mf:
947
                print '%3d FAILED!' % mf
948
            else:
949
                print
950
951
        print '%-40s %3d tests' % ('total', tests),
952
        if failures:
953
            print '%3d FAILED!' % failures
515 by Martin Pool
- bzr selftest: return shell false (1) if any tests fail
954
            return 1
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
955
        else:
956
            print
515 by Martin Pool
- bzr selftest: return shell false (1) if any tests fail
957
            return 0
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
958
329 by Martin Pool
- refactor command functions into command classes
959
960
961
class cmd_version(Command):
962
    """Show version of bzr"""
963
    def run(self):
964
        show_version()
965
966
def show_version():
967
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
968
    print bzrlib.__copyright__
969
    print "http://bazaar-ng.org/"
970
    print
971
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
972
    print "you may use, modify and redistribute it under the terms of the GNU"
973
    print "General Public License version 2 or later."
974
975
976
class cmd_rocks(Command):
977
    """Statement of optimism."""
978
    hidden = True
979
    def run(self):
980
        print "it sure does!"
981
493 by Martin Pool
- Merge aaron's merge command
982
def parse_spec(spec):
983
    if '/@' in spec:
984
        parsed = spec.split('/@')
985
        assert len(parsed) == 2
986
        if parsed[1] == "":
987
            parsed[1] = -1
988
        else:
989
            parsed[1] = int(parsed[1])
990
            assert parsed[1] >=0
991
    else:
992
        parsed = [spec, None]
993
    return parsed
994
995
class cmd_merge(Command):
996
    """Perform a three-way merge of trees."""
997
    takes_args = ['other_spec', 'base_spec']
998
999
    def run(self, other_spec, base_spec):
591 by Martin Pool
- trim imports
1000
        from bzrlib.merge import merge
1001
        merge(parse_spec(other_spec), parse_spec(base_spec))
329 by Martin Pool
- refactor command functions into command classes
1002
1003
class cmd_assert_fail(Command):
1004
    """Test reporting of assertion failures"""
1005
    hidden = True
1006
    def run(self):
1007
        assert False, "always fails"
1008
1009
1010
class cmd_help(Command):
1011
    """Show help on a command or other topic.
1012
1013
    For a list of all available commands, say 'bzr help commands'."""
1014
    takes_args = ['topic?']
350 by Martin Pool
- refactor command aliases into command classes
1015
    aliases = ['?']
329 by Martin Pool
- refactor command functions into command classes
1016
    
1017
    def run(self, topic=None):
351 by Martin Pool
- Split out help functions into bzrlib.help
1018
        import help
1019
        help.help(topic)
1020
1 by mbp at sourcefrog
import from baz patch-364
1021
429 by Martin Pool
- New command update-stat-cache for testing
1022
class cmd_update_stat_cache(Command):
1023
    """Update stat-cache mapping inodes to SHA-1 hashes.
1024
1025
    For testing only."""
1026
    hidden = True
1027
    def run(self):
1028
        import statcache
1029
        b = Branch('.')
454 by Martin Pool
- fix update-stat-cache command
1030
        statcache.update_cache(b.base, b.read_working_inventory())
429 by Martin Pool
- New command update-stat-cache for testing
1031
1032
1 by mbp at sourcefrog
import from baz patch-364
1033
1034
# list of all available options; the rhs can be either None for an
1035
# option that takes no argument, or a constructor function that checks
1036
# the type.
1037
OPTIONS = {
1038
    'all':                    None,
571 by Martin Pool
- new --diff-options to pass options through to external
1039
    'diff-options':           str,
1 by mbp at sourcefrog
import from baz patch-364
1040
    'help':                   None,
389 by Martin Pool
- new commit --file option!
1041
    'file':                   unicode,
545 by Martin Pool
- --forward option for log
1042
    'forward':                None,
1 by mbp at sourcefrog
import from baz patch-364
1043
    'message':                unicode,
137 by mbp at sourcefrog
new --profile option
1044
    'profile':                None,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
1045
    'revision':               _parse_revision_str,
1 by mbp at sourcefrog
import from baz patch-364
1046
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
1047
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
1048
    'verbose':                None,
1049
    'version':                None,
286 by Martin Pool
- New bzr whoami --email option
1050
    'email':                  None,
1 by mbp at sourcefrog
import from baz patch-364
1051
    }
1052
1053
SHORT_OPTIONS = {
583 by Martin Pool
- add -h as short name for --help
1054
    'F':                      'file', 
1055
    'h':                      'help',
1 by mbp at sourcefrog
import from baz patch-364
1056
    'm':                      'message',
1057
    'r':                      'revision',
1058
    'v':                      'verbose',
1059
}
1060
1061
1062
def parse_args(argv):
1063
    """Parse command line.
1064
    
1065
    Arguments and options are parsed at this level before being passed
1066
    down to specific command handlers.  This routine knows, from a
1067
    lookup table, something about the available options, what optargs
1068
    they take, and which commands will accept them.
1069
31 by Martin Pool
fix up parse_args doctest
1070
    >>> parse_args('--help'.split())
1 by mbp at sourcefrog
import from baz patch-364
1071
    ([], {'help': True})
31 by Martin Pool
fix up parse_args doctest
1072
    >>> parse_args('--version'.split())
1 by mbp at sourcefrog
import from baz patch-364
1073
    ([], {'version': True})
31 by Martin Pool
fix up parse_args doctest
1074
    >>> parse_args('status --all'.split())
1 by mbp at sourcefrog
import from baz patch-364
1075
    (['status'], {'all': True})
31 by Martin Pool
fix up parse_args doctest
1076
    >>> parse_args('commit --message=biter'.split())
17 by mbp at sourcefrog
allow --option=ARG syntax
1077
    (['commit'], {'message': u'biter'})
1 by mbp at sourcefrog
import from baz patch-364
1078
    """
1079
    args = []
1080
    opts = {}
1081
1082
    # TODO: Maybe handle '--' to end options?
1083
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1084
    while argv:
1085
        a = argv.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
1086
        if a[0] == '-':
264 by Martin Pool
parse_args: option names must be ascii
1087
            # option names must not be unicode
1088
            a = str(a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1089
            optarg = None
1 by mbp at sourcefrog
import from baz patch-364
1090
            if a[1] == '-':
1091
                mutter("  got option %r" % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1092
                if '=' in a:
1093
                    optname, optarg = a[2:].split('=', 1)
1094
                else:
1095
                    optname = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
1096
                if optname not in OPTIONS:
1097
                    bailout('unknown long option %r' % a)
1098
            else:
1099
                shortopt = a[1:]
1100
                if shortopt not in SHORT_OPTIONS:
1101
                    bailout('unknown short option %r' % a)
1102
                optname = SHORT_OPTIONS[shortopt]
1103
            
1104
            if optname in opts:
1105
                # XXX: Do we ever want to support this, e.g. for -r?
1106
                bailout('repeated option %r' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1107
                
1 by mbp at sourcefrog
import from baz patch-364
1108
            optargfn = OPTIONS[optname]
1109
            if optargfn:
17 by mbp at sourcefrog
allow --option=ARG syntax
1110
                if optarg == None:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1111
                    if not argv:
17 by mbp at sourcefrog
allow --option=ARG syntax
1112
                        bailout('option %r needs an argument' % a)
1113
                    else:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1114
                        optarg = argv.pop(0)
17 by mbp at sourcefrog
allow --option=ARG syntax
1115
                opts[optname] = optargfn(optarg)
1 by mbp at sourcefrog
import from baz patch-364
1116
            else:
17 by mbp at sourcefrog
allow --option=ARG syntax
1117
                if optarg != None:
1118
                    bailout('option %r takes no argument' % optname)
1 by mbp at sourcefrog
import from baz patch-364
1119
                opts[optname] = True
1120
        else:
1121
            args.append(a)
1122
1123
    return args, opts
1124
1125
1126
1127
329 by Martin Pool
- refactor command functions into command classes
1128
def _match_argform(cmd, takes_args, args):
1 by mbp at sourcefrog
import from baz patch-364
1129
    argdict = {}
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1130
329 by Martin Pool
- refactor command functions into command classes
1131
    # step through args and takes_args, allowing appropriate 0-many matches
1132
    for ap in takes_args:
1 by mbp at sourcefrog
import from baz patch-364
1133
        argname = ap[:-1]
1134
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
1135
            if args:
1136
                argdict[argname] = args.pop(0)
196 by mbp at sourcefrog
selected-file diff
1137
        elif ap[-1] == '*': # all remaining arguments
1138
            if args:
1139
                argdict[argname + '_list'] = args[:]
1140
                args = []
1141
            else:
1142
                argdict[argname + '_list'] = None
1 by mbp at sourcefrog
import from baz patch-364
1143
        elif ap[-1] == '+':
1144
            if not args:
329 by Martin Pool
- refactor command functions into command classes
1145
                raise BzrCommandError("command %r needs one or more %s"
1 by mbp at sourcefrog
import from baz patch-364
1146
                        % (cmd, argname.upper()))
1147
            else:
1148
                argdict[argname + '_list'] = args[:]
1149
                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
1150
        elif ap[-1] == '$': # all but one
1151
            if len(args) < 2:
329 by Martin Pool
- refactor command functions into command classes
1152
                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
1153
                        % (cmd, argname.upper()))
1154
            argdict[argname + '_list'] = args[:-1]
1155
            args[:-1] = []                
1 by mbp at sourcefrog
import from baz patch-364
1156
        else:
1157
            # just a plain arg
1158
            argname = ap
1159
            if not args:
329 by Martin Pool
- refactor command functions into command classes
1160
                raise BzrCommandError("command %r requires argument %s"
1 by mbp at sourcefrog
import from baz patch-364
1161
                        % (cmd, argname.upper()))
1162
            else:
1163
                argdict[argname] = args.pop(0)
1164
            
1165
    if args:
329 by Martin Pool
- refactor command functions into command classes
1166
        raise BzrCommandError("extra argument to command %s: %s"
1167
                              % (cmd, args[0]))
1 by mbp at sourcefrog
import from baz patch-364
1168
1169
    return argdict
1170
1171
1172
1173
def run_bzr(argv):
1174
    """Execute a command.
1175
1176
    This is similar to main(), but without all the trappings for
245 by mbp at sourcefrog
- control files always in utf-8-unix format
1177
    logging and error handling.  
1 by mbp at sourcefrog
import from baz patch-364
1178
    """
251 by mbp at sourcefrog
- factor out locale.getpreferredencoding()
1179
    argv = [a.decode(bzrlib.user_encoding) for a in argv]
245 by mbp at sourcefrog
- control files always in utf-8-unix format
1180
    
1 by mbp at sourcefrog
import from baz patch-364
1181
    try:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1182
        args, opts = parse_args(argv[1:])
1 by mbp at sourcefrog
import from baz patch-364
1183
        if 'help' in opts:
351 by Martin Pool
- Split out help functions into bzrlib.help
1184
            import help
159 by mbp at sourcefrog
bzr commit --help now works
1185
            if args:
351 by Martin Pool
- Split out help functions into bzrlib.help
1186
                help.help(args[0])
159 by mbp at sourcefrog
bzr commit --help now works
1187
            else:
351 by Martin Pool
- Split out help functions into bzrlib.help
1188
                help.help()
1 by mbp at sourcefrog
import from baz patch-364
1189
            return 0
1190
        elif 'version' in opts:
336 by Martin Pool
- fix up 'bzr --version'
1191
            show_version()
1 by mbp at sourcefrog
import from baz patch-364
1192
            return 0
265 by Martin Pool
parse_args: command names must also be ascii
1193
        cmd = str(args.pop(0))
1 by mbp at sourcefrog
import from baz patch-364
1194
    except IndexError:
448 by Martin Pool
- bzr with no command now shows help, not just an error
1195
        import help
1196
        help.help()
1 by mbp at sourcefrog
import from baz patch-364
1197
        return 1
448 by Martin Pool
- bzr with no command now shows help, not just an error
1198
          
115 by mbp at sourcefrog
todo
1199
351 by Martin Pool
- Split out help functions into bzrlib.help
1200
    canonical_cmd, cmd_class = get_cmd_class(cmd)
1 by mbp at sourcefrog
import from baz patch-364
1201
137 by mbp at sourcefrog
new --profile option
1202
    # global option
1203
    if 'profile' in opts:
1204
        profile = True
1205
        del opts['profile']
1206
    else:
1207
        profile = False
1 by mbp at sourcefrog
import from baz patch-364
1208
1209
    # check options are reasonable
329 by Martin Pool
- refactor command functions into command classes
1210
    allowed = cmd_class.takes_options
1 by mbp at sourcefrog
import from baz patch-364
1211
    for oname in opts:
1212
        if oname not in allowed:
381 by Martin Pool
- Better message when a wrong argument is given
1213
            raise BzrCommandError("option '--%s' is not allowed for command %r"
329 by Martin Pool
- refactor command functions into command classes
1214
                                  % (oname, cmd))
176 by mbp at sourcefrog
New cat command contributed by janmar.
1215
137 by mbp at sourcefrog
new --profile option
1216
    # mix arguments and options into one dictionary
329 by Martin Pool
- refactor command functions into command classes
1217
    cmdargs = _match_argform(cmd, cmd_class.takes_args, args)
1218
    cmdopts = {}
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
1219
    for k, v in opts.items():
329 by Martin Pool
- refactor command functions into command classes
1220
        cmdopts[k.replace('-', '_')] = v
1 by mbp at sourcefrog
import from baz patch-364
1221
137 by mbp at sourcefrog
new --profile option
1222
    if profile:
338 by Martin Pool
- cleanup of some imports
1223
        import hotshot, tempfile
239 by mbp at sourcefrog
- remove profiler temporary file when done
1224
        pffileno, pfname = tempfile.mkstemp()
1225
        try:
1226
            prof = hotshot.Profile(pfname)
329 by Martin Pool
- refactor command functions into command classes
1227
            ret = prof.runcall(cmd_class, cmdopts, cmdargs) or 0
239 by mbp at sourcefrog
- remove profiler temporary file when done
1228
            prof.close()
1229
1230
            import hotshot.stats
1231
            stats = hotshot.stats.load(pfname)
1232
            #stats.strip_dirs()
1233
            stats.sort_stats('time')
1234
            ## XXX: Might like to write to stderr or the trace file instead but
1235
            ## print_stats seems hardcoded to stdout
1236
            stats.print_stats(20)
1237
            
337 by Martin Pool
- Clarify return codes from command objects
1238
            return ret.status
239 by mbp at sourcefrog
- remove profiler temporary file when done
1239
1240
        finally:
1241
            os.close(pffileno)
1242
            os.remove(pfname)
137 by mbp at sourcefrog
new --profile option
1243
    else:
500 by Martin Pool
- fix return value from run_bzr
1244
        return cmd_class(cmdopts, cmdargs).status 
1 by mbp at sourcefrog
import from baz patch-364
1245
1246
359 by Martin Pool
- pychecker fixups
1247
def _report_exception(summary, quiet=False):
267 by Martin Pool
- better reporting of errors
1248
    import traceback
1249
    log_error('bzr: ' + summary)
359 by Martin Pool
- pychecker fixups
1250
    bzrlib.trace.log_exception()
317 by Martin Pool
- better error message for broken pipe
1251
1252
    if not quiet:
1253
        tb = sys.exc_info()[2]
1254
        exinfo = traceback.extract_tb(tb)
1255
        if exinfo:
1256
            sys.stderr.write('  at %s:%d in %s()\n' % exinfo[-1][:3])
1257
        sys.stderr.write('  see ~/.bzr.log for debug information\n')
267 by Martin Pool
- better reporting of errors
1258
1259
1260
1 by mbp at sourcefrog
import from baz patch-364
1261
def main(argv):
317 by Martin Pool
- better error message for broken pipe
1262
    import errno
1263
    
344 by Martin Pool
- It's not an error to use the library without
1264
    bzrlib.open_tracefile(argv)
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1265
1 by mbp at sourcefrog
import from baz patch-364
1266
    try:
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1267
        try:
337 by Martin Pool
- Clarify return codes from command objects
1268
            try:
1269
                return run_bzr(argv)
1270
            finally:
1271
                # do this here inside the exception wrappers to catch EPIPE
1272
                sys.stdout.flush()
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1273
        except BzrError, e:
329 by Martin Pool
- refactor command functions into command classes
1274
            quiet = isinstance(e, (BzrCommandError))
359 by Martin Pool
- pychecker fixups
1275
            _report_exception('error: ' + e.args[0], quiet=quiet)
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1276
            if len(e.args) > 1:
1277
                for h in e.args[1]:
267 by Martin Pool
- better reporting of errors
1278
                    # some explanation or hints
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1279
                    log_error('  ' + h)
1280
            return 1
267 by Martin Pool
- better reporting of errors
1281
        except AssertionError, e:
1282
            msg = 'assertion failed'
1283
            if str(e):
1284
                msg += ': ' + str(e)
359 by Martin Pool
- pychecker fixups
1285
            _report_exception(msg)
318 by Martin Pool
- better error message for Ctrl-c
1286
            return 2
1287
        except KeyboardInterrupt, e:
359 by Martin Pool
- pychecker fixups
1288
            _report_exception('interrupted', quiet=True)
318 by Martin Pool
- better error message for Ctrl-c
1289
            return 2
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1290
        except Exception, e:
317 by Martin Pool
- better error message for broken pipe
1291
            quiet = False
419 by Martin Pool
- RemoteBranch.__str__ and repr
1292
            if (isinstance(e, IOError) 
1293
                and hasattr(e, 'errno')
1294
                and e.errno == errno.EPIPE):
317 by Martin Pool
- better error message for broken pipe
1295
                quiet = True
1296
                msg = 'broken pipe'
1297
            else:
1298
                msg = str(e).rstrip('\n')
359 by Martin Pool
- pychecker fixups
1299
            _report_exception(msg, quiet)
318 by Martin Pool
- better error message for Ctrl-c
1300
            return 2
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1301
    finally:
1302
        bzrlib.trace.close_trace()
1 by mbp at sourcefrog
import from baz patch-364
1303
1304
1305
if __name__ == '__main__':
1306
    sys.exit(main(sys.argv))