/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
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
23
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
592 by Martin Pool
- trim imports more
24
from bzrlib.osutils import quotefn
25
from bzrlib import Branch, Inventory, InventoryEntry, BZRDIR, \
1 by mbp at sourcefrog
import from baz patch-364
26
     format_date
27
28
731 by Martin Pool
- merge plugin patch from john
29
plugin_cmds = {}
30
31
32
def register_plugin_command(cmd):
33
    "Utility function to help register a command"
34
    global plugin_cmds
35
    k = cmd.__name__
36
    if k.startswith("cmd_"):
37
        k_unsquished = _unsquish_command_name(k)
38
    else:
39
        k_unsquished = k
40
    if not plugin_cmds.has_key(k_unsquished):
41
        plugin_cmds[k_unsquished] = cmd
42
    else:
43
        log_error('Two plugins defined the same command: %r' % k)
44
        log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
45
46
350 by Martin Pool
- refactor command aliases into command classes
47
def _squish_command_name(cmd):
48
    return 'cmd_' + cmd.replace('-', '_')
49
50
51
def _unsquish_command_name(cmd):
52
    assert cmd.startswith("cmd_")
53
    return cmd[4:].replace('_','-')
54
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
55
def _parse_revision_str(revstr):
56
    """This handles a revision string -> revno. 
57
58
    There are several possibilities:
59
60
        '234'       -> 234
61
        '234:345'   -> [234, 345]
62
        ':234'      -> [None, 234]
63
        '234:'      -> [234, None]
64
65
    In the future we will also support:
66
        'uuid:blah-blah-blah'   -> ?
67
        'hash:blahblahblah'     -> ?
68
        potentially:
69
        'tag:mytag'             -> ?
70
    """
71
    if revstr.find(':') != -1:
72
        revs = revstr.split(':')
73
        if len(revs) > 2:
74
            raise ValueError('More than 2 pieces not supported for --revision: %r' % revstr)
75
76
        if not revs[0]:
77
            revs[0] = None
78
        else:
79
            revs[0] = int(revs[0])
80
81
        if not revs[1]:
82
            revs[1] = None
83
        else:
84
            revs[1] = int(revs[1])
85
    else:
86
        revs = int(revstr)
87
    return revs
88
731 by Martin Pool
- merge plugin patch from john
89
90
91
def _get_cmd_dict(plugins_override=True):
641 by Martin Pool
- improved external-command patch from john
92
    d = {}
350 by Martin Pool
- refactor command aliases into command classes
93
    for k, v in globals().iteritems():
94
        if k.startswith("cmd_"):
641 by Martin Pool
- improved external-command patch from john
95
            d[_unsquish_command_name(k)] = v
731 by Martin Pool
- merge plugin patch from john
96
    # If we didn't load plugins, the plugin_cmds dict will be empty
97
    if plugins_override:
98
        d.update(plugin_cmds)
99
    else:
100
        d2 = plugin_cmds.copy()
101
        d2.update(d)
102
        d = d2
641 by Martin Pool
- improved external-command patch from john
103
    return d
731 by Martin Pool
- merge plugin patch from john
104
641 by Martin Pool
- improved external-command patch from john
105
    
731 by Martin Pool
- merge plugin patch from john
106
def get_all_cmds(plugins_override=True):
641 by Martin Pool
- improved external-command patch from john
107
    """Return canonical name and class for all registered commands."""
731 by Martin Pool
- merge plugin patch from john
108
    for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
641 by Martin Pool
- improved external-command patch from john
109
        yield k,v
110
111
731 by Martin Pool
- merge plugin patch from john
112
def get_cmd_class(cmd, plugins_override=True):
350 by Martin Pool
- refactor command aliases into command classes
113
    """Return the canonical name and command class for a command.
114
    """
115
    cmd = str(cmd)                      # not unicode
116
117
    # first look up this command under the specified name
731 by Martin Pool
- merge plugin patch from john
118
    cmds = _get_cmd_dict(plugins_override=plugins_override)
272 by Martin Pool
- Add command aliases
119
    try:
641 by Martin Pool
- improved external-command patch from john
120
        return cmd, cmds[cmd]
272 by Martin Pool
- Add command aliases
121
    except KeyError:
350 by Martin Pool
- refactor command aliases into command classes
122
        pass
123
124
    # look for any command which claims this as an alias
641 by Martin Pool
- improved external-command patch from john
125
    for cmdname, cmdclass in cmds.iteritems():
350 by Martin Pool
- refactor command aliases into command classes
126
        if cmd in cmdclass.aliases:
127
            return cmdname, cmdclass
422 by Martin Pool
- External-command patch from mpe
128
129
    cmdclass = ExternalCommand.find_command(cmd)
130
    if cmdclass:
131
        return cmd, cmdclass
132
133
    raise BzrCommandError("unknown command %r" % cmd)
272 by Martin Pool
- Add command aliases
134
329 by Martin Pool
- refactor command functions into command classes
135
558 by Martin Pool
- All top-level classes inherit from object
136
class Command(object):
329 by Martin Pool
- refactor command functions into command classes
137
    """Base class for commands.
138
139
    The docstring for an actual command should give a single-line
140
    summary, then a complete description of the command.  A grammar
141
    description will be inserted.
142
143
    takes_args
144
        List of argument forms, marked with whether they are optional,
145
        repeated, etc.
146
147
    takes_options
148
        List of options that may be given for this command.
149
150
    hidden
151
        If true, this command isn't advertised.
152
    """
153
    aliases = []
154
    
155
    takes_args = []
156
    takes_options = []
157
158
    hidden = False
159
    
160
    def __init__(self, options, arguments):
161
        """Construct and run the command.
162
163
        Sets self.status to the return value of run()."""
164
        assert isinstance(options, dict)
165
        assert isinstance(arguments, dict)
166
        cmdargs = options.copy()
167
        cmdargs.update(arguments)
168
        assert self.__doc__ != Command.__doc__, \
169
               ("No help message set for %r" % self)
170
        self.status = self.run(**cmdargs)
171
172
    
173
    def run(self):
174
        """Override this in sub-classes.
175
176
        This is invoked with the options and arguments bound to
177
        keyword parameters.
178
337 by Martin Pool
- Clarify return codes from command objects
179
        Return 0 or None if the command was successful, or a shell
180
        error code if not.
329 by Martin Pool
- refactor command functions into command classes
181
        """
337 by Martin Pool
- Clarify return codes from command objects
182
        return 0
329 by Martin Pool
- refactor command functions into command classes
183
184
422 by Martin Pool
- External-command patch from mpe
185
class ExternalCommand(Command):
186
    """Class to wrap external commands.
187
188
    We cheat a little here, when get_cmd_class() calls us we actually give it back
189
    an object we construct that has the appropriate path, help, options etc for the
190
    specified command.
191
192
    When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
193
    method, which we override to call the Command.__init__ method. That then calls
194
    our run method which is pretty straight forward.
195
196
    The only wrinkle is that we have to map bzr's dictionary of options and arguments
197
    back into command line options and arguments for the script.
198
    """
199
200
    def find_command(cls, cmd):
572 by Martin Pool
- trim imports
201
        import os.path
422 by Martin Pool
- External-command patch from mpe
202
        bzrpath = os.environ.get('BZRPATH', '')
203
641 by Martin Pool
- improved external-command patch from john
204
        for dir in bzrpath.split(os.pathsep):
422 by Martin Pool
- External-command patch from mpe
205
            path = os.path.join(dir, cmd)
206
            if os.path.isfile(path):
207
                return ExternalCommand(path)
208
209
        return None
210
211
    find_command = classmethod(find_command)
212
213
    def __init__(self, path):
214
        self.path = path
215
216
        pipe = os.popen('%s --bzr-usage' % path, 'r')
217
        self.takes_options = pipe.readline().split()
687 by Martin Pool
- trap more errors from external commands
218
219
        for opt in self.takes_options:
220
            if not opt in OPTIONS:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
221
                raise BzrError("Unknown option '%s' returned by external command %s"
222
                               % (opt, path))
687 by Martin Pool
- trap more errors from external commands
223
224
        # TODO: Is there any way to check takes_args is valid here?
422 by Martin Pool
- External-command patch from mpe
225
        self.takes_args = pipe.readline().split()
687 by Martin Pool
- trap more errors from external commands
226
227
        if pipe.close() is not None:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
228
            raise BzrError("Failed funning '%s --bzr-usage'" % path)
422 by Martin Pool
- External-command patch from mpe
229
230
        pipe = os.popen('%s --bzr-help' % path, 'r')
231
        self.__doc__ = pipe.read()
687 by Martin Pool
- trap more errors from external commands
232
        if pipe.close() is not None:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
233
            raise BzrError("Failed funning '%s --bzr-help'" % path)
422 by Martin Pool
- External-command patch from mpe
234
235
    def __call__(self, options, arguments):
236
        Command.__init__(self, options, arguments)
237
        return self
238
239
    def run(self, **kargs):
240
        opts = []
241
        args = []
242
243
        keys = kargs.keys()
244
        keys.sort()
245
        for name in keys:
689 by Martin Pool
- make options with - work with external commands
246
            optname = name.replace('_','-')
422 by Martin Pool
- External-command patch from mpe
247
            value = kargs[name]
689 by Martin Pool
- make options with - work with external commands
248
            if OPTIONS.has_key(optname):
422 by Martin Pool
- External-command patch from mpe
249
                # it's an option
689 by Martin Pool
- make options with - work with external commands
250
                opts.append('--%s' % optname)
422 by Martin Pool
- External-command patch from mpe
251
                if value is not None and value is not True:
252
                    opts.append(str(value))
253
            else:
254
                # it's an arg, or arg list
255
                if type(value) is not list:
256
                    value = [value]
257
                for v in value:
258
                    if v is not None:
259
                        args.append(str(v))
260
261
        self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
262
        return self.status
263
329 by Martin Pool
- refactor command functions into command classes
264
265
class cmd_status(Command):
1 by mbp at sourcefrog
import from baz patch-364
266
    """Display status summary.
267
466 by Martin Pool
- doc for status command
268
    This reports on versioned and unknown files, reporting them
269
    grouped by state.  Possible states are:
270
271
    added
272
        Versioned in the working copy but not in the previous revision.
273
274
    removed
467 by Martin Pool
- doc for status command
275
        Versioned in the previous revision but removed or deleted
466 by Martin Pool
- doc for status command
276
        in the working copy.
277
278
    renamed
279
        Path of this file changed from the previous revision;
280
        the text may also have changed.  This includes files whose
467 by Martin Pool
- doc for status command
281
        parent directory was renamed.
466 by Martin Pool
- doc for status command
282
283
    modified
284
        Text has changed since the previous revision.
285
286
    unchanged
467 by Martin Pool
- doc for status command
287
        Nothing about this file has changed since the previous revision.
288
        Only shown with --all.
466 by Martin Pool
- doc for status command
289
290
    unknown
291
        Not versioned and not matching an ignore pattern.
292
293
    To see ignored files use 'bzr ignored'.  For details in the
294
    changes to file texts, use 'bzr diff'.
468 by Martin Pool
- Interpret arguments to bzr status
295
296
    If no arguments are specified, the status of the entire working
297
    directory is shown.  Otherwise, only the status of the specified
298
    files or directories is reported.  If a directory is given, status
299
    is reported for everything inside that directory.
1 by mbp at sourcefrog
import from baz patch-364
300
    """
404 by Martin Pool
- bzr status now optionally takes filenames to check
301
    takes_args = ['file*']
465 by Martin Pool
- Move show_status() out of Branch into a new function in
302
    takes_options = ['all', 'show-ids']
350 by Martin Pool
- refactor command aliases into command classes
303
    aliases = ['st', 'stat']
329 by Martin Pool
- refactor command functions into command classes
304
    
465 by Martin Pool
- Move show_status() out of Branch into a new function in
305
    def run(self, all=False, show_ids=False, file_list=None):
468 by Martin Pool
- Interpret arguments to bzr status
306
        if file_list:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
307
            b = Branch(file_list[0])
468 by Martin Pool
- Interpret arguments to bzr status
308
            file_list = [b.relpath(x) for x in file_list]
309
            # special case: only one path was given and it's the root
310
            # of the branch
311
            if file_list == ['']:
312
                file_list = None
313
        else:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
314
            b = Branch('.')
465 by Martin Pool
- Move show_status() out of Branch into a new function in
315
        import status
316
        status.show_status(b, show_unchanged=all, show_ids=show_ids,
483 by Martin Pool
- change 'file_list' to more explanatory 'specific_files'
317
                           specific_files=file_list)
329 by Martin Pool
- refactor command functions into command classes
318
319
320
class cmd_cat_revision(Command):
321
    """Write out metadata for a revision."""
322
323
    hidden = True
324
    takes_args = ['revision_id']
325
    
326
    def run(self, revision_id):
327
        Branch('.').get_revision(revision_id).write_xml(sys.stdout)
328
329
330
class cmd_revno(Command):
331
    """Show current revision number.
332
333
    This is equal to the number of revisions on this branch."""
334
    def run(self):
335
        print Branch('.').revno()
336
337
    
338
class cmd_add(Command):
70 by mbp at sourcefrog
Prepare for smart recursive add.
339
    """Add specified files or directories.
340
341
    In non-recursive mode, all the named items are added, regardless
342
    of whether they were previously ignored.  A warning is given if
343
    any of the named files are already versioned.
344
345
    In recursive mode (the default), files are treated the same way
346
    but the behaviour for directories is different.  Directories that
347
    are already versioned do not give a warning.  All directories,
348
    whether already versioned or not, are searched for files or
349
    subdirectories that are neither versioned or ignored, and these
350
    are added.  This search proceeds recursively into versioned
351
    directories.
352
353
    Therefore simply saying 'bzr add .' will version all files that
354
    are currently unknown.
279 by Martin Pool
todo
355
356
    TODO: Perhaps adding a file whose directly is not versioned should
357
    recursively add that parent, rather than giving an error?
70 by mbp at sourcefrog
Prepare for smart recursive add.
358
    """
329 by Martin Pool
- refactor command functions into command classes
359
    takes_args = ['file+']
594 by Martin Pool
- add --no-recurse option for add command
360
    takes_options = ['verbose', 'no-recurse']
329 by Martin Pool
- refactor command functions into command classes
361
    
594 by Martin Pool
- add --no-recurse option for add command
362
    def run(self, file_list, verbose=False, no_recurse=False):
363
        bzrlib.add.smart_add(file_list, verbose, not no_recurse)
329 by Martin Pool
- refactor command functions into command classes
364
365
386 by Martin Pool
- Typo (reported by uws)
366
class cmd_relpath(Command):
329 by Martin Pool
- refactor command functions into command classes
367
    """Show path of a file relative to root"""
392 by Martin Pool
- fix relpath and add tests
368
    takes_args = ['filename']
584 by Martin Pool
- make relpath and revision-history hidden commands
369
    hidden = True
329 by Martin Pool
- refactor command functions into command classes
370
    
392 by Martin Pool
- fix relpath and add tests
371
    def run(self, filename):
372
        print Branch(filename).relpath(filename)
329 by Martin Pool
- refactor command functions into command classes
373
374
375
376
class cmd_inventory(Command):
377
    """Show inventory of the current working copy or a revision."""
588 by Martin Pool
- change inventory command to not show ids by default
378
    takes_options = ['revision', 'show-ids']
329 by Martin Pool
- refactor command functions into command classes
379
    
588 by Martin Pool
- change inventory command to not show ids by default
380
    def run(self, revision=None, show_ids=False):
329 by Martin Pool
- refactor command functions into command classes
381
        b = Branch('.')
382
        if revision == None:
383
            inv = b.read_working_inventory()
384
        else:
385
            inv = b.get_revision_inventory(b.lookup_revision(revision))
386
556 by Martin Pool
- fix up Inventory.entries()
387
        for path, entry in inv.entries():
588 by Martin Pool
- change inventory command to not show ids by default
388
            if show_ids:
389
                print '%-50s %s' % (path, entry.file_id)
390
            else:
391
                print path
329 by Martin Pool
- refactor command functions into command classes
392
393
394
class cmd_move(Command):
395
    """Move files to a different directory.
396
397
    examples:
398
        bzr move *.txt doc
399
400
    The destination must be a versioned directory in the same branch.
401
    """
402
    takes_args = ['source$', 'dest']
403
    def run(self, source_list, dest):
404
        b = Branch('.')
405
406
        b.move([b.relpath(s) for s in source_list], b.relpath(dest))
407
408
409
class cmd_rename(Command):
168 by mbp at sourcefrog
new "rename" command
410
    """Change the name of an entry.
411
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
412
    examples:
413
      bzr rename frob.c frobber.c
414
      bzr rename src/frob.c lib/frob.c
415
416
    It is an error if the destination name exists.
417
418
    See also the 'move' command, which moves files into a different
419
    directory without changing their name.
420
421
    TODO: Some way to rename multiple files without invoking bzr for each
422
    one?"""
329 by Martin Pool
- refactor command functions into command classes
423
    takes_args = ['from_name', 'to_name']
168 by mbp at sourcefrog
new "rename" command
424
    
329 by Martin Pool
- refactor command functions into command classes
425
    def run(self, from_name, to_name):
426
        b = Branch('.')
427
        b.rename_one(b.relpath(from_name), b.relpath(to_name))
428
429
430
628 by Martin Pool
- merge aaron's updated merge/pull code
431
432
433
class cmd_pull(Command):
434
    """Pull any changes from another branch into the current one.
435
436
    If the location is omitted, the last-used location will be used.
437
    Both the revision history and the working directory will be
438
    updated.
439
440
    This command only works on branches that have not diverged.  Branches are
441
    considered diverged if both branches have had commits without first
442
    pulling from the other.
443
444
    If branches have diverged, you can use 'bzr merge' to pull the text changes
445
    from one into the other.
446
    """
447
    takes_args = ['location?']
448
449
    def run(self, location=None):
450
        from bzrlib.merge import merge
451
        import errno
452
        
453
        br_to = Branch('.')
454
        stored_loc = None
455
        try:
456
            stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
457
        except IOError, e:
458
            if errno == errno.ENOENT:
459
                raise
460
        if location is None:
729 by Martin Pool
- pull shows location being used
461
            if stored_loc is None:
462
                raise BzrCommandError("No pull location known or specified.")
463
            else:
464
                print "Using last location: %s" % stored_loc
465
                location = stored_loc
628 by Martin Pool
- merge aaron's updated merge/pull code
466
        from branch import find_branch, DivergedBranches
467
        br_from = find_branch(location)
468
        location = pull_loc(br_from)
469
        old_revno = br_to.revno()
470
        try:
471
            br_to.update_revisions(br_from)
472
        except DivergedBranches:
473
            raise BzrCommandError("These branches have diverged.  Try merge.")
474
            
640 by Martin Pool
- bzr pull should not check that the tree is clean
475
        merge(('.', -1), ('.', old_revno), check_clean=False)
628 by Martin Pool
- merge aaron's updated merge/pull code
476
        if location != stored_loc:
477
            br_to.controlfile("x-pull", "wb").write(location + "\n")
478
479
480
481
class cmd_branch(Command):
482
    """Create a new copy of a branch.
483
685 by Martin Pool
- add -r option to the branch command
484
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
485
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
486
487
    To retrieve the branch as of a particular revision, supply the --revision
488
    parameter, as in "branch foo/bar -r 5".
628 by Martin Pool
- merge aaron's updated merge/pull code
489
    """
490
    takes_args = ['from_location', 'to_location?']
685 by Martin Pool
- add -r option to the branch command
491
    takes_options = ['revision']
628 by Martin Pool
- merge aaron's updated merge/pull code
492
685 by Martin Pool
- add -r option to the branch command
493
    def run(self, from_location, to_location=None, revision=None):
628 by Martin Pool
- merge aaron's updated merge/pull code
494
        import errno
495
        from bzrlib.merge import merge
685 by Martin Pool
- add -r option to the branch command
496
        from branch import find_branch, DivergedBranches, NoSuchRevision
497
        from shutil import rmtree
671 by Martin Pool
- Don't create an empty destination directory when
498
        try:
499
            br_from = find_branch(from_location)
500
        except OSError, e:
501
            if e.errno == errno.ENOENT:
502
                raise BzrCommandError('Source location "%s" does not exist.' %
503
                                      to_location)
504
            else:
505
                raise
506
628 by Martin Pool
- merge aaron's updated merge/pull code
507
        if to_location is None:
684 by Martin Pool
- Strip any number of trailing slashes and backslashes from the path name
508
            to_location = os.path.basename(from_location.rstrip("/\\"))
628 by Martin Pool
- merge aaron's updated merge/pull code
509
510
        try:
511
            os.mkdir(to_location)
512
        except OSError, e:
513
            if e.errno == errno.EEXIST:
514
                raise BzrCommandError('Target directory "%s" already exists.' %
515
                                      to_location)
516
            if e.errno == errno.ENOENT:
517
                raise BzrCommandError('Parent of "%s" does not exist.' %
518
                                      to_location)
519
            else:
520
                raise
521
        br_to = Branch(to_location, init=True)
522
685 by Martin Pool
- add -r option to the branch command
523
        try:
524
            br_to.update_revisions(br_from, stop_revision=revision)
525
        except NoSuchRevision:
526
            rmtree(to_location)
527
            msg = "The branch %s has no revision %d." % (from_location,
528
                                                         revision)
529
            raise BzrCommandError(msg)
628 by Martin Pool
- merge aaron's updated merge/pull code
530
        merge((to_location, -1), (to_location, 0), this_dir=to_location,
698 by Martin Pool
- bzr branch shouldn't say "0 conflicts"
531
              check_clean=False, ignore_zero=True)
685 by Martin Pool
- add -r option to the branch command
532
        from_location = pull_loc(br_from)
628 by Martin Pool
- merge aaron's updated merge/pull code
533
        br_to.controlfile("x-pull", "wb").write(from_location + "\n")
534
535
536
def pull_loc(branch):
537
    # TODO: Should perhaps just make attribute be 'base' in
538
    # RemoteBranch and Branch?
539
    if hasattr(branch, "baseurl"):
540
        return branch.baseurl
541
    else:
542
        return branch.base
543
544
545
329 by Martin Pool
- refactor command functions into command classes
546
class cmd_renames(Command):
164 by mbp at sourcefrog
new 'renames' command
547
    """Show list of renamed files.
548
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
549
    TODO: Option to show renames between two historical versions.
550
551
    TODO: Only show renames under dir, rather than in the whole branch.
552
    """
329 by Martin Pool
- refactor command functions into command classes
553
    takes_args = ['dir?']
554
555
    def run(self, dir='.'):
556
        b = Branch(dir)
557
        old_inv = b.basis_tree().inventory
558
        new_inv = b.read_working_inventory()
559
560
        renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
561
        renames.sort()
562
        for old_name, new_name in renames:
563
            print "%s => %s" % (old_name, new_name)        
564
565
566
class cmd_info(Command):
472 by Martin Pool
- Optional branch parameter to info command
567
    """Show statistical information about a branch."""
568
    takes_args = ['branch?']
569
    
570
    def run(self, branch=None):
329 by Martin Pool
- refactor command functions into command classes
571
        import info
472 by Martin Pool
- Optional branch parameter to info command
572
573
        from branch import find_branch
574
        b = find_branch(branch)
575
        info.show_info(b)
329 by Martin Pool
- refactor command functions into command classes
576
577
578
class cmd_remove(Command):
579
    """Make a file unversioned.
580
581
    This makes bzr stop tracking changes to a versioned file.  It does
582
    not delete the working copy.
583
    """
584
    takes_args = ['file+']
585
    takes_options = ['verbose']
586
    
587
    def run(self, file_list, verbose=False):
588
        b = Branch(file_list[0])
589
        b.remove([b.relpath(f) for f in file_list], verbose=verbose)
590
591
592
class cmd_file_id(Command):
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
593
    """Print file_id of a particular file or directory.
594
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
595
    The file_id is assigned when the file is first added and remains the
596
    same through all revisions where the file exists, even when it is
597
    moved or renamed.
598
    """
329 by Martin Pool
- refactor command functions into command classes
599
    hidden = True
600
    takes_args = ['filename']
601
    def run(self, filename):
602
        b = Branch(filename)
603
        i = b.inventory.path2id(b.relpath(filename))
604
        if i == None:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
605
            raise BzrError("%r is not a versioned file" % filename)
329 by Martin Pool
- refactor command functions into command classes
606
        else:
607
            print i
608
609
610
class cmd_file_path(Command):
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
611
    """Print path of file_ids to a file or directory.
612
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
613
    This prints one line for each directory down to the target,
614
    starting at the branch root."""
329 by Martin Pool
- refactor command functions into command classes
615
    hidden = True
616
    takes_args = ['filename']
617
    def run(self, filename):
618
        b = Branch(filename)
619
        inv = b.inventory
620
        fid = inv.path2id(b.relpath(filename))
621
        if fid == None:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
622
            raise BzrError("%r is not a versioned file" % filename)
329 by Martin Pool
- refactor command functions into command classes
623
        for fip in inv.get_idpath(fid):
624
            print fip
625
626
627
class cmd_revision_history(Command):
628
    """Display list of revision ids on this branch."""
584 by Martin Pool
- make relpath and revision-history hidden commands
629
    hidden = True
329 by Martin Pool
- refactor command functions into command classes
630
    def run(self):
631
        for patchid in Branch('.').revision_history():
632
            print patchid
633
634
635
class cmd_directories(Command):
636
    """Display list of versioned directories in this branch."""
637
    def run(self):
638
        for name, ie in Branch('.').read_working_inventory().directories():
639
            if name == '':
640
                print '.'
641
            else:
642
                print name
643
644
645
class cmd_init(Command):
646
    """Make a directory into a versioned branch.
647
648
    Use this to create an empty branch, or before importing an
649
    existing project.
650
651
    Recipe for importing a tree of files:
652
        cd ~/project
653
        bzr init
654
        bzr add -v .
655
        bzr status
656
        bzr commit -m 'imported project'
657
    """
658
    def run(self):
659
        Branch('.', init=True)
660
661
662
class cmd_diff(Command):
663
    """Show differences in working tree.
664
    
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
665
    If files are listed, only the changes in those files are listed.
666
    Otherwise, all changes for the tree are listed.
667
668
    TODO: Given two revision arguments, show the difference between them.
669
670
    TODO: Allow diff across branches.
671
672
    TODO: Option to use external diff command; could be GNU diff, wdiff,
673
          or a graphical diff.
674
276 by Martin Pool
Doc
675
    TODO: Python difflib is not exactly the same as unidiff; should
676
          either fix it up or prefer to use an external diff.
677
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
678
    TODO: If a directory is given, diff everything under that.
679
276 by Martin Pool
Doc
680
    TODO: Selected-file diff is inefficient and doesn't show you
681
          deleted files.
278 by Martin Pool
- Better workaround for trailing newlines in diffs
682
683
    TODO: This probably handles non-Unix newlines poorly.
329 by Martin Pool
- refactor command functions into command classes
684
    """
685
    
686
    takes_args = ['file*']
571 by Martin Pool
- new --diff-options to pass options through to external
687
    takes_options = ['revision', 'diff-options']
638 by Martin Pool
- add 'dif' as alias for 'diff' command
688
    aliases = ['di', 'dif']
329 by Martin Pool
- refactor command functions into command classes
689
571 by Martin Pool
- new --diff-options to pass options through to external
690
    def run(self, revision=None, file_list=None, diff_options=None):
329 by Martin Pool
- refactor command functions into command classes
691
        from bzrlib.diff import show_diff
547 by Martin Pool
- bzr diff finds a branch from the first parameter,
692
        from bzrlib import find_branch
693
694
        if file_list:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
695
            b = find_branch(file_list[0])
547 by Martin Pool
- bzr diff finds a branch from the first parameter,
696
            file_list = [b.relpath(f) for f in file_list]
697
            if file_list == ['']:
698
                # just pointing to top-of-tree
699
                file_list = None
700
        else:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
701
            b = Branch('.')
329 by Martin Pool
- refactor command functions into command classes
702
    
571 by Martin Pool
- new --diff-options to pass options through to external
703
        show_diff(b, revision, specific_files=file_list,
704
                  external_diff_options=diff_options)
329 by Martin Pool
- refactor command functions into command classes
705
706
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
707
        
708
709
329 by Martin Pool
- refactor command functions into command classes
710
class cmd_deleted(Command):
135 by mbp at sourcefrog
Simple new 'deleted' command
711
    """List files deleted in the working tree.
712
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
713
    TODO: Show files deleted since a previous revision, or between two revisions.
135 by mbp at sourcefrog
Simple new 'deleted' command
714
    """
329 by Martin Pool
- refactor command functions into command classes
715
    def run(self, show_ids=False):
716
        b = Branch('.')
717
        old = b.basis_tree()
718
        new = b.working_tree()
719
720
        ## TODO: Much more efficient way to do this: read in new
721
        ## directories with readdir, rather than stating each one.  Same
722
        ## level of effort but possibly much less IO.  (Or possibly not,
723
        ## if the directories are very large...)
724
725
        for path, ie in old.inventory.iter_entries():
726
            if not new.has_id(ie.file_id):
727
                if show_ids:
728
                    print '%-50s %s' % (path, ie.file_id)
729
                else:
730
                    print path
731
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
732
733
class cmd_modified(Command):
734
    """List files modified in working tree."""
735
    hidden = True
736
    def run(self):
737
        import statcache
738
        b = Branch('.')
438 by Martin Pool
- Avoid calling Inventory.iter_entries() when finding modified
739
        inv = b.read_working_inventory()
740
        sc = statcache.update_cache(b, inv)
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
741
        basis = b.basis_tree()
742
        basis_inv = basis.inventory
438 by Martin Pool
- Avoid calling Inventory.iter_entries() when finding modified
743
        
744
        # We used to do this through iter_entries(), but that's slow
745
        # when most of the files are unmodified, as is usually the
746
        # case.  So instead we iterate by inventory entry, and only
747
        # calculate paths as necessary.
748
749
        for file_id in basis_inv:
750
            cacheentry = sc.get(file_id)
751
            if not cacheentry:                 # deleted
752
                continue
753
            ie = basis_inv[file_id]
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
754
            if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
438 by Martin Pool
- Avoid calling Inventory.iter_entries() when finding modified
755
                path = inv.id2path(file_id)
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
756
                print path
439 by Martin Pool
- new command 'bzr added'
757
758
759
760
class cmd_added(Command):
761
    """List files added in working tree."""
762
    hidden = True
763
    def run(self):
764
        b = Branch('.')
765
        wt = b.working_tree()
766
        basis_inv = b.basis_tree().inventory
767
        inv = wt.inventory
768
        for file_id in inv:
769
            if file_id in basis_inv:
770
                continue
771
            path = inv.id2path(file_id)
772
            if not os.access(b.abspath(path), os.F_OK):
773
                continue
774
            print path
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
775
                
776
        
777
329 by Martin Pool
- refactor command functions into command classes
778
class cmd_root(Command):
779
    """Show the tree root directory.
780
781
    The root is the nearest enclosing directory with a .bzr control
782
    directory."""
783
    takes_args = ['filename?']
784
    def run(self, filename=None):
785
        """Print the branch root."""
416 by Martin Pool
- bzr log and bzr root now accept an http URL
786
        from branch import find_branch
787
        b = find_branch(filename)
788
        print getattr(b, 'base', None) or getattr(b, 'baseurl')
329 by Martin Pool
- refactor command functions into command classes
789
790
791
class cmd_log(Command):
1 by mbp at sourcefrog
import from baz patch-364
792
    """Show log of this branch.
793
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
794
    To request a range of logs, you can use the command -r begin:end
795
    -r revision requests a specific revision, -r :end or -r begin: are
796
    also valid.
797
798
    TODO: Make --revision support uuid: and hash: [future tag:] notation.
799
  
545 by Martin Pool
- --forward option for log
800
    """
367 by Martin Pool
- New --show-ids option for bzr log
801
378 by Martin Pool
- New usage bzr log FILENAME
802
    takes_args = ['filename?']
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
803
    takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision']
545 by Martin Pool
- --forward option for log
804
    
805
    def run(self, filename=None, timezone='original',
806
            verbose=False,
807
            show_ids=False,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
808
            forward=False,
809
            revision=None):
527 by Martin Pool
- refactor log command
810
        from bzrlib import show_log, find_branch
562 by Martin Pool
- bug fix for printing logs containing unicode
811
        import codecs
545 by Martin Pool
- --forward option for log
812
813
        direction = (forward and 'forward') or 'reverse'
527 by Martin Pool
- refactor log command
814
        
378 by Martin Pool
- New usage bzr log FILENAME
815
        if filename:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
816
            b = find_branch(filename)
527 by Martin Pool
- refactor log command
817
            fp = b.relpath(filename)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
818
            if fp:
819
                file_id = b.read_working_inventory().path2id(fp)
820
            else:
821
                file_id = None  # points to branch root
527 by Martin Pool
- refactor log command
822
        else:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
823
            b = find_branch('.')
527 by Martin Pool
- refactor log command
824
            file_id = None
825
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
826
        if revision == None:
827
            revision = [None, None]
828
        elif isinstance(revision, int):
829
            revision = [revision, revision]
830
        else:
831
            # pair of revisions?
832
            pass
833
            
834
        assert len(revision) == 2
835
562 by Martin Pool
- bug fix for printing logs containing unicode
836
        mutter('encoding log as %r' % bzrlib.user_encoding)
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
837
838
        # use 'replace' so that we don't abort if trying to write out
839
        # in e.g. the default C locale.
840
        outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
562 by Martin Pool
- bug fix for printing logs containing unicode
841
527 by Martin Pool
- refactor log command
842
        show_log(b, file_id,
843
                 show_timezone=timezone,
844
                 verbose=verbose,
845
                 show_ids=show_ids,
562 by Martin Pool
- bug fix for printing logs containing unicode
846
                 to_file=outf,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
847
                 direction=direction,
848
                 start_revision=revision[0],
849
                 end_revision=revision[1])
329 by Martin Pool
- refactor command functions into command classes
850
851
375 by Martin Pool
- New command touching-revisions and function to trace
852
853
class cmd_touching_revisions(Command):
523 by Martin Pool
doc
854
    """Return revision-ids which affected a particular file.
855
856
    A more user-friendly interface is "bzr log FILE"."""
375 by Martin Pool
- New command touching-revisions and function to trace
857
    hidden = True
858
    takes_args = ["filename"]
859
    def run(self, filename):
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
860
        b = Branch(filename)
375 by Martin Pool
- New command touching-revisions and function to trace
861
        inv = b.read_working_inventory()
862
        file_id = inv.path2id(b.relpath(filename))
863
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
864
            print "%6d %s" % (revno, what)
865
866
329 by Martin Pool
- refactor command functions into command classes
867
class cmd_ls(Command):
1 by mbp at sourcefrog
import from baz patch-364
868
    """List files in a tree.
869
254 by Martin Pool
- Doc cleanups from Magnus Therning
870
    TODO: Take a revision or remote path and list that tree instead.
1 by mbp at sourcefrog
import from baz patch-364
871
    """
329 by Martin Pool
- refactor command functions into command classes
872
    hidden = True
873
    def run(self, revision=None, verbose=False):
874
        b = Branch('.')
875
        if revision == None:
876
            tree = b.working_tree()
877
        else:
878
            tree = b.revision_tree(b.lookup_revision(revision))
879
880
        for fp, fc, kind, fid in tree.list_files():
881
            if verbose:
882
                if kind == 'directory':
883
                    kindch = '/'
884
                elif kind == 'file':
885
                    kindch = ''
886
                else:
887
                    kindch = '???'
888
889
                print '%-8s %s%s' % (fc, fp, kindch)
1 by mbp at sourcefrog
import from baz patch-364
890
            else:
329 by Martin Pool
- refactor command functions into command classes
891
                print fp
892
893
894
895
class cmd_unknowns(Command):
634 by Martin Pool
- Tidy help messages
896
    """List unknown files."""
329 by Martin Pool
- refactor command functions into command classes
897
    def run(self):
898
        for f in Branch('.').unknowns():
899
            print quotefn(f)
900
901
902
903
class cmd_ignore(Command):
634 by Martin Pool
- Tidy help messages
904
    """Ignore a command or pattern.
420 by Martin Pool
Doc
905
906
    To remove patterns from the ignore list, edit the .bzrignore file.
907
908
    If the pattern contains a slash, it is compared to the whole path
909
    from the branch root.  Otherwise, it is comapred to only the last
910
    component of the path.
911
912
    Ignore patterns are case-insensitive on case-insensitive systems.
913
914
    Note: wildcards must be quoted from the shell on Unix.
915
916
    examples:
917
        bzr ignore ./Makefile
918
        bzr ignore '*.class'
919
    """
329 by Martin Pool
- refactor command functions into command classes
920
    takes_args = ['name_pattern']
310 by Martin Pool
- new 'bzr ignored' command!
921
    
329 by Martin Pool
- refactor command functions into command classes
922
    def run(self, name_pattern):
409 by Martin Pool
- New AtomicFile class
923
        from bzrlib.atomicfile import AtomicFile
575 by Martin Pool
- cleanup imports
924
        import os.path
409 by Martin Pool
- New AtomicFile class
925
329 by Martin Pool
- refactor command functions into command classes
926
        b = Branch('.')
410 by Martin Pool
- Fix ignore command and add tests
927
        ifn = b.abspath('.bzrignore')
329 by Martin Pool
- refactor command functions into command classes
928
410 by Martin Pool
- Fix ignore command and add tests
929
        if os.path.exists(ifn):
498 by Martin Pool
bugfix for bzr ignore reported by ddaa:
930
            f = open(ifn, 'rt')
931
            try:
932
                igns = f.read().decode('utf-8')
933
            finally:
934
                f.close()
409 by Martin Pool
- New AtomicFile class
935
        else:
936
            igns = ''
937
575 by Martin Pool
- cleanup imports
938
        # TODO: If the file already uses crlf-style termination, maybe
939
        # we should use that for the newly added lines?
940
409 by Martin Pool
- New AtomicFile class
941
        if igns and igns[-1] != '\n':
942
            igns += '\n'
943
        igns += name_pattern + '\n'
944
498 by Martin Pool
bugfix for bzr ignore reported by ddaa:
945
        try:
946
            f = AtomicFile(ifn, 'wt')
947
            f.write(igns.encode('utf-8'))
948
            f.commit()
949
        finally:
950
            f.close()
329 by Martin Pool
- refactor command functions into command classes
951
952
        inv = b.working_tree().inventory
953
        if inv.path2id('.bzrignore'):
954
            mutter('.bzrignore is already versioned')
955
        else:
956
            mutter('need to make new .bzrignore file versioned')
957
            b.add(['.bzrignore'])
958
959
960
961
class cmd_ignored(Command):
421 by Martin Pool
doc
962
    """List ignored files and the patterns that matched them.
963
964
    See also: bzr ignore"""
329 by Martin Pool
- refactor command functions into command classes
965
    def run(self):
966
        tree = Branch('.').working_tree()
967
        for path, file_class, kind, file_id in tree.list_files():
968
            if file_class != 'I':
969
                continue
970
            ## XXX: Slightly inefficient since this was already calculated
971
            pat = tree.is_ignored(path)
972
            print '%-50s %s' % (path, pat)
973
974
975
class cmd_lookup_revision(Command):
976
    """Lookup the revision-id from a revision-number
977
978
    example:
979
        bzr lookup-revision 33
421 by Martin Pool
doc
980
    """
329 by Martin Pool
- refactor command functions into command classes
981
    hidden = True
338 by Martin Pool
- cleanup of some imports
982
    takes_args = ['revno']
983
    
329 by Martin Pool
- refactor command functions into command classes
984
    def run(self, revno):
985
        try:
986
            revno = int(revno)
987
        except ValueError:
338 by Martin Pool
- cleanup of some imports
988
            raise BzrCommandError("not a valid revision-number: %r" % revno)
989
990
        print Branch('.').lookup_revision(revno)
329 by Martin Pool
- refactor command functions into command classes
991
992
993
class cmd_export(Command):
994
    """Export past revision to destination directory.
995
678 by Martin Pool
- export to tarballs
996
    If no revision is specified this exports the last committed revision.
997
998
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
999
    given, exports to a directory (equivalent to --format=dir)."""
1000
    # TODO: list known exporters
329 by Martin Pool
- refactor command functions into command classes
1001
    takes_args = ['dest']
678 by Martin Pool
- export to tarballs
1002
    takes_options = ['revision', 'format']
1003
    def run(self, dest, revision=None, format='dir'):
329 by Martin Pool
- refactor command functions into command classes
1004
        b = Branch('.')
394 by Martin Pool
- Fix argument handling in export command
1005
        if revision == None:
1006
            rh = b.revision_history()[-1]
329 by Martin Pool
- refactor command functions into command classes
1007
        else:
394 by Martin Pool
- Fix argument handling in export command
1008
            rh = b.lookup_revision(int(revision))
329 by Martin Pool
- refactor command functions into command classes
1009
        t = b.revision_tree(rh)
678 by Martin Pool
- export to tarballs
1010
        t.export(dest, format)
329 by Martin Pool
- refactor command functions into command classes
1011
1012
1013
class cmd_cat(Command):
1014
    """Write a file's text from a previous revision."""
1015
1016
    takes_options = ['revision']
1017
    takes_args = ['filename']
1018
1019
    def run(self, filename, revision=None):
1020
        if revision == None:
1021
            raise BzrCommandError("bzr cat requires a revision number")
1022
        b = Branch('.')
1023
        b.print_file(b.relpath(filename), int(revision))
1024
1025
1026
class cmd_local_time_offset(Command):
1027
    """Show the offset in seconds from GMT to local time."""
1028
    hidden = True    
1029
    def run(self):
1030
        print bzrlib.osutils.local_time_offset()
1031
1032
1033
1034
class cmd_commit(Command):
1035
    """Commit changes into a new revision.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1036
491 by Martin Pool
- Selective commit!
1037
    If selected files are specified, only changes to those files are
1038
    committed.  If a directory is specified then its contents are also
1039
    committed.
1040
1041
    A selected-file commit may fail in some cases where the committed
1042
    tree would be invalid, such as trying to commit a file in a
1043
    newly-added directory that is not itself committed.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1044
1045
    TODO: Run hooks on tree to-be-committed, and after commit.
1046
1047
    TODO: Strict commit that fails if there are unknown or deleted files.
1048
    """
491 by Martin Pool
- Selective commit!
1049
    takes_args = ['selected*']
389 by Martin Pool
- new commit --file option!
1050
    takes_options = ['message', 'file', 'verbose']
350 by Martin Pool
- refactor command aliases into command classes
1051
    aliases = ['ci', 'checkin']
1052
505 by Martin Pool
- commit is verbose by default
1053
    def run(self, message=None, file=None, verbose=True, selected_list=None):
485 by Martin Pool
- move commit code into its own module
1054
        from bzrlib.commit import commit
1055
389 by Martin Pool
- new commit --file option!
1056
        ## Warning: shadows builtin file()
1057
        if not message and not file:
1058
            raise BzrCommandError("please specify a commit message",
1059
                                  ["use either --message or --file"])
1060
        elif message and file:
1061
            raise BzrCommandError("please specify either --message or --file")
1062
        
1063
        if file:
1064
            import codecs
1065
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1066
485 by Martin Pool
- move commit code into its own module
1067
        b = Branch('.')
491 by Martin Pool
- Selective commit!
1068
        commit(b, message, verbose=verbose, specific_files=selected_list)
329 by Martin Pool
- refactor command functions into command classes
1069
1070
1071
class cmd_check(Command):
1072
    """Validate consistency of branch history.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1073
1074
    This command checks various invariants about the branch storage to
1075
    detect data corruption or bzr bugs.
674 by Martin Pool
- check command now also checks new inventory_sha1 and
1076
1077
    If given the --update flag, it will update some optional fields
1078
    to help ensure data consistency.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1079
    """
329 by Martin Pool
- refactor command functions into command classes
1080
    takes_args = ['dir?']
674 by Martin Pool
- check command now also checks new inventory_sha1 and
1081
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
1082
    def run(self, dir='.'):
329 by Martin Pool
- refactor command functions into command classes
1083
        import bzrlib.check
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
1084
        bzrlib.check.check(Branch(dir))
1085
1086
1087
1088
class cmd_upgrade(Command):
1089
    """Upgrade branch storage to current format.
1090
1091
    This should normally be used only after the check command tells
1092
    you to run it.
1093
    """
1094
    takes_args = ['dir?']
1095
1096
    def run(self, dir='.'):
1097
        from bzrlib.upgrade import upgrade
1098
        upgrade(Branch(dir))
329 by Martin Pool
- refactor command functions into command classes
1099
1100
1101
1102
class cmd_whoami(Command):
1103
    """Show bzr user id."""
1104
    takes_options = ['email']
286 by Martin Pool
- New bzr whoami --email option
1105
    
329 by Martin Pool
- refactor command functions into command classes
1106
    def run(self, email=False):
1107
        if email:
1108
            print bzrlib.osutils.user_email()
1109
        else:
1110
            print bzrlib.osutils.username()
1111
1112
1113
class cmd_selftest(Command):
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
1114
    """Run internal test suite"""
329 by Martin Pool
- refactor command functions into command classes
1115
    hidden = True
1116
    def run(self):
608 by Martin Pool
- Split selftests out into a new module and start changing them
1117
        from bzrlib.selftest import selftest
723 by Martin Pool
- move whitebox/blackbox modules into bzrlib.selftest subdirectory
1118
        return int(not selftest())
329 by Martin Pool
- refactor command functions into command classes
1119
1120
1121
class cmd_version(Command):
634 by Martin Pool
- Tidy help messages
1122
    """Show version of bzr."""
329 by Martin Pool
- refactor command functions into command classes
1123
    def run(self):
1124
        show_version()
1125
1126
def show_version():
1127
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
605 by Martin Pool
- patch from Lalo Martins to show version of bzr itself
1128
    # is bzrlib itself in a branch?
606 by Martin Pool
- new bzrlib.get_bzr_revision() tells about the history of
1129
    bzrrev = bzrlib.get_bzr_revision()
1130
    if bzrrev:
1131
        print "  (bzr checkout, revision %d {%s})" % bzrrev
329 by Martin Pool
- refactor command functions into command classes
1132
    print bzrlib.__copyright__
1133
    print "http://bazaar-ng.org/"
1134
    print
1135
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
1136
    print "you may use, modify and redistribute it under the terms of the GNU"
1137
    print "General Public License version 2 or later."
1138
1139
1140
class cmd_rocks(Command):
1141
    """Statement of optimism."""
1142
    hidden = True
1143
    def run(self):
1144
        print "it sure does!"
1145
493 by Martin Pool
- Merge aaron's merge command
1146
def parse_spec(spec):
622 by Martin Pool
Updated merge patch from Aaron
1147
    """
1148
    >>> parse_spec(None)
1149
    [None, None]
1150
    >>> parse_spec("./")
1151
    ['./', None]
1152
    >>> parse_spec("../@")
1153
    ['..', -1]
1154
    >>> parse_spec("../f/@35")
1155
    ['../f', 35]
1156
    """
1157
    if spec is None:
1158
        return [None, None]
493 by Martin Pool
- Merge aaron's merge command
1159
    if '/@' in spec:
1160
        parsed = spec.split('/@')
1161
        assert len(parsed) == 2
1162
        if parsed[1] == "":
1163
            parsed[1] = -1
1164
        else:
1165
            parsed[1] = int(parsed[1])
1166
            assert parsed[1] >=0
1167
    else:
1168
        parsed = [spec, None]
1169
    return parsed
1170
628 by Martin Pool
- merge aaron's updated merge/pull code
1171
1172
493 by Martin Pool
- Merge aaron's merge command
1173
class cmd_merge(Command):
622 by Martin Pool
Updated merge patch from Aaron
1174
    """Perform a three-way merge of trees.
1175
    
1176
    The SPEC parameters are working tree or revision specifiers.  Working trees
1177
    are specified using standard paths or urls.  No component of a directory
1178
    path may begin with '@'.
1179
    
1180
    Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1181
1182
    Revisions are specified using a dirname/@revno pair, where dirname is the
1183
    branch directory and revno is the revision within that branch.  If no revno
1184
    is specified, the latest revision is used.
1185
1186
    Revision examples: './@127', 'foo/@', '../@1'
1187
1188
    The OTHER_SPEC parameter is required.  If the BASE_SPEC parameter is
1189
    not supplied, the common ancestor of OTHER_SPEC the current branch is used
1190
    as the BASE.
628 by Martin Pool
- merge aaron's updated merge/pull code
1191
1192
    merge refuses to run if there are any uncommitted changes, unless
1193
    --force is given.
622 by Martin Pool
Updated merge patch from Aaron
1194
    """
1195
    takes_args = ['other_spec', 'base_spec?']
628 by Martin Pool
- merge aaron's updated merge/pull code
1196
    takes_options = ['force']
622 by Martin Pool
Updated merge patch from Aaron
1197
628 by Martin Pool
- merge aaron's updated merge/pull code
1198
    def run(self, other_spec, base_spec=None, force=False):
591 by Martin Pool
- trim imports
1199
        from bzrlib.merge import merge
628 by Martin Pool
- merge aaron's updated merge/pull code
1200
        merge(parse_spec(other_spec), parse_spec(base_spec),
1201
              check_clean=(not force))
329 by Martin Pool
- refactor command functions into command classes
1202
622 by Martin Pool
Updated merge patch from Aaron
1203
1204
class cmd_revert(Command):
628 by Martin Pool
- merge aaron's updated merge/pull code
1205
    """Reverse all changes since the last commit.
1206
1207
    Only versioned files are affected.
1208
1209
    TODO: Store backups of any files that will be reverted, so
1210
          that the revert can be undone.          
622 by Martin Pool
Updated merge patch from Aaron
1211
    """
1212
    takes_options = ['revision']
1213
1214
    def run(self, revision=-1):
636 by Martin Pool
- fix missing import in revert
1215
        from bzrlib.merge import merge
628 by Martin Pool
- merge aaron's updated merge/pull code
1216
        merge(('.', revision), parse_spec('.'),
1217
              check_clean=False,
1218
              ignore_zero=True)
622 by Martin Pool
Updated merge patch from Aaron
1219
1220
329 by Martin Pool
- refactor command functions into command classes
1221
class cmd_assert_fail(Command):
1222
    """Test reporting of assertion failures"""
1223
    hidden = True
1224
    def run(self):
1225
        assert False, "always fails"
1226
1227
1228
class cmd_help(Command):
1229
    """Show help on a command or other topic.
1230
1231
    For a list of all available commands, say 'bzr help commands'."""
1232
    takes_args = ['topic?']
350 by Martin Pool
- refactor command aliases into command classes
1233
    aliases = ['?']
329 by Martin Pool
- refactor command functions into command classes
1234
    
1235
    def run(self, topic=None):
351 by Martin Pool
- Split out help functions into bzrlib.help
1236
        import help
1237
        help.help(topic)
1238
1 by mbp at sourcefrog
import from baz patch-364
1239
429 by Martin Pool
- New command update-stat-cache for testing
1240
class cmd_update_stat_cache(Command):
1241
    """Update stat-cache mapping inodes to SHA-1 hashes.
1242
1243
    For testing only."""
1244
    hidden = True
1245
    def run(self):
1246
        import statcache
1247
        b = Branch('.')
454 by Martin Pool
- fix update-stat-cache command
1248
        statcache.update_cache(b.base, b.read_working_inventory())
429 by Martin Pool
- New command update-stat-cache for testing
1249
1250
1 by mbp at sourcefrog
import from baz patch-364
1251
1252
# list of all available options; the rhs can be either None for an
1253
# option that takes no argument, or a constructor function that checks
1254
# the type.
1255
OPTIONS = {
1256
    'all':                    None,
571 by Martin Pool
- new --diff-options to pass options through to external
1257
    'diff-options':           str,
1 by mbp at sourcefrog
import from baz patch-364
1258
    'help':                   None,
389 by Martin Pool
- new commit --file option!
1259
    'file':                   unicode,
628 by Martin Pool
- merge aaron's updated merge/pull code
1260
    'force':                  None,
678 by Martin Pool
- export to tarballs
1261
    'format':                 unicode,
545 by Martin Pool
- --forward option for log
1262
    'forward':                None,
1 by mbp at sourcefrog
import from baz patch-364
1263
    'message':                unicode,
594 by Martin Pool
- add --no-recurse option for add command
1264
    'no-recurse':             None,
137 by mbp at sourcefrog
new --profile option
1265
    'profile':                None,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
1266
    'revision':               _parse_revision_str,
1 by mbp at sourcefrog
import from baz patch-364
1267
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
1268
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
1269
    'verbose':                None,
1270
    'version':                None,
286 by Martin Pool
- New bzr whoami --email option
1271
    'email':                  None,
674 by Martin Pool
- check command now also checks new inventory_sha1 and
1272
    'update':                 None,
1 by mbp at sourcefrog
import from baz patch-364
1273
    }
1274
1275
SHORT_OPTIONS = {
583 by Martin Pool
- add -h as short name for --help
1276
    'F':                      'file', 
1277
    'h':                      'help',
1 by mbp at sourcefrog
import from baz patch-364
1278
    'm':                      'message',
1279
    'r':                      'revision',
1280
    'v':                      'verbose',
1281
}
1282
1283
1284
def parse_args(argv):
1285
    """Parse command line.
1286
    
1287
    Arguments and options are parsed at this level before being passed
1288
    down to specific command handlers.  This routine knows, from a
1289
    lookup table, something about the available options, what optargs
1290
    they take, and which commands will accept them.
1291
31 by Martin Pool
fix up parse_args doctest
1292
    >>> parse_args('--help'.split())
1 by mbp at sourcefrog
import from baz patch-364
1293
    ([], {'help': True})
31 by Martin Pool
fix up parse_args doctest
1294
    >>> parse_args('--version'.split())
1 by mbp at sourcefrog
import from baz patch-364
1295
    ([], {'version': True})
31 by Martin Pool
fix up parse_args doctest
1296
    >>> parse_args('status --all'.split())
1 by mbp at sourcefrog
import from baz patch-364
1297
    (['status'], {'all': True})
31 by Martin Pool
fix up parse_args doctest
1298
    >>> parse_args('commit --message=biter'.split())
17 by mbp at sourcefrog
allow --option=ARG syntax
1299
    (['commit'], {'message': u'biter'})
683 by Martin Pool
- short option stacking patch from John A Meinel
1300
    >>> parse_args('log -r 500'.split())
1301
    (['log'], {'revision': 500})
1302
    >>> parse_args('log -r500:600'.split())
1303
    (['log'], {'revision': [500, 600]})
1304
    >>> parse_args('log -vr500:600'.split())
1305
    (['log'], {'verbose': True, 'revision': [500, 600]})
1306
    >>> parse_args('log -rv500:600'.split()) #the r takes an argument
1307
    Traceback (most recent call last):
1308
    ...
1309
    ValueError: invalid literal for int(): v500
1 by mbp at sourcefrog
import from baz patch-364
1310
    """
1311
    args = []
1312
    opts = {}
1313
1314
    # TODO: Maybe handle '--' to end options?
1315
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1316
    while argv:
1317
        a = argv.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
1318
        if a[0] == '-':
264 by Martin Pool
parse_args: option names must be ascii
1319
            # option names must not be unicode
1320
            a = str(a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1321
            optarg = None
1 by mbp at sourcefrog
import from baz patch-364
1322
            if a[1] == '-':
1323
                mutter("  got option %r" % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1324
                if '=' in a:
1325
                    optname, optarg = a[2:].split('=', 1)
1326
                else:
1327
                    optname = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
1328
                if optname not in OPTIONS:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1329
                    raise BzrError('unknown long option %r' % a)
1 by mbp at sourcefrog
import from baz patch-364
1330
            else:
1331
                shortopt = a[1:]
683 by Martin Pool
- short option stacking patch from John A Meinel
1332
                if shortopt in SHORT_OPTIONS:
1333
                    # Multi-character options must have a space to delimit
1334
                    # their value
1335
                    optname = SHORT_OPTIONS[shortopt]
1336
                else:
1337
                    # Single character short options, can be chained,
1338
                    # and have their value appended to their name
1339
                    shortopt = a[1:2]
1340
                    if shortopt not in SHORT_OPTIONS:
1341
                        # We didn't find the multi-character name, and we
1342
                        # didn't find the single char name
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1343
                        raise BzrError('unknown short option %r' % a)
683 by Martin Pool
- short option stacking patch from John A Meinel
1344
                    optname = SHORT_OPTIONS[shortopt]
1345
1346
                    if a[2:]:
1347
                        # There are extra things on this option
1348
                        # see if it is the value, or if it is another
1349
                        # short option
1350
                        optargfn = OPTIONS[optname]
1351
                        if optargfn is None:
1352
                            # This option does not take an argument, so the
1353
                            # next entry is another short option, pack it back
1354
                            # into the list
1355
                            argv.insert(0, '-' + a[2:])
1356
                        else:
1357
                            # This option takes an argument, so pack it
1358
                            # into the array
1359
                            optarg = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
1360
            
1361
            if optname in opts:
1362
                # XXX: Do we ever want to support this, e.g. for -r?
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1363
                raise BzrError('repeated option %r' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1364
                
1 by mbp at sourcefrog
import from baz patch-364
1365
            optargfn = OPTIONS[optname]
1366
            if optargfn:
17 by mbp at sourcefrog
allow --option=ARG syntax
1367
                if optarg == None:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1368
                    if not argv:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1369
                        raise BzrError('option %r needs an argument' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1370
                    else:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1371
                        optarg = argv.pop(0)
17 by mbp at sourcefrog
allow --option=ARG syntax
1372
                opts[optname] = optargfn(optarg)
1 by mbp at sourcefrog
import from baz patch-364
1373
            else:
17 by mbp at sourcefrog
allow --option=ARG syntax
1374
                if optarg != None:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1375
                    raise BzrError('option %r takes no argument' % optname)
1 by mbp at sourcefrog
import from baz patch-364
1376
                opts[optname] = True
1377
        else:
1378
            args.append(a)
1379
1380
    return args, opts
1381
1382
1383
1384
329 by Martin Pool
- refactor command functions into command classes
1385
def _match_argform(cmd, takes_args, args):
1 by mbp at sourcefrog
import from baz patch-364
1386
    argdict = {}
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1387
329 by Martin Pool
- refactor command functions into command classes
1388
    # step through args and takes_args, allowing appropriate 0-many matches
1389
    for ap in takes_args:
1 by mbp at sourcefrog
import from baz patch-364
1390
        argname = ap[:-1]
1391
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
1392
            if args:
1393
                argdict[argname] = args.pop(0)
196 by mbp at sourcefrog
selected-file diff
1394
        elif ap[-1] == '*': # all remaining arguments
1395
            if args:
1396
                argdict[argname + '_list'] = args[:]
1397
                args = []
1398
            else:
1399
                argdict[argname + '_list'] = None
1 by mbp at sourcefrog
import from baz patch-364
1400
        elif ap[-1] == '+':
1401
            if not args:
329 by Martin Pool
- refactor command functions into command classes
1402
                raise BzrCommandError("command %r needs one or more %s"
1 by mbp at sourcefrog
import from baz patch-364
1403
                        % (cmd, argname.upper()))
1404
            else:
1405
                argdict[argname + '_list'] = args[:]
1406
                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
1407
        elif ap[-1] == '$': # all but one
1408
            if len(args) < 2:
329 by Martin Pool
- refactor command functions into command classes
1409
                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
1410
                        % (cmd, argname.upper()))
1411
            argdict[argname + '_list'] = args[:-1]
1412
            args[:-1] = []                
1 by mbp at sourcefrog
import from baz patch-364
1413
        else:
1414
            # just a plain arg
1415
            argname = ap
1416
            if not args:
329 by Martin Pool
- refactor command functions into command classes
1417
                raise BzrCommandError("command %r requires argument %s"
1 by mbp at sourcefrog
import from baz patch-364
1418
                        % (cmd, argname.upper()))
1419
            else:
1420
                argdict[argname] = args.pop(0)
1421
            
1422
    if args:
329 by Martin Pool
- refactor command functions into command classes
1423
        raise BzrCommandError("extra argument to command %s: %s"
1424
                              % (cmd, args[0]))
1 by mbp at sourcefrog
import from baz patch-364
1425
1426
    return argdict
1427
1428
731 by Martin Pool
- merge plugin patch from john
1429
def _parse_master_args(argv):
1430
    """Parse the arguments that always go with the original command.
1431
    These are things like bzr --no-plugins, etc.
1432
1433
    There are now 2 types of option flags. Ones that come *before* the command,
1434
    and ones that come *after* the command.
1435
    Ones coming *before* the command are applied against all possible commands.
1436
    And are generally applied before plugins are loaded.
1437
1438
    The current list are:
1439
        --builtin   Allow plugins to load, but don't let them override builtin commands,
1440
                    they will still be allowed if they do not override a builtin.
1441
        --no-plugins    Don't load any plugins. This lets you get back to official source
1442
                        behavior.
1443
        --profile   Enable the hotspot profile before running the command.
1444
                    For backwards compatibility, this is also a non-master option.
1445
        --version   Spit out the version of bzr that is running and exit.
1446
                    This is also a non-master option.
1447
        --help      Run help and exit, also a non-master option (I think that should stay, though)
1448
1449
    >>> argv, opts = _parse_master_args(['bzr', '--test'])
1450
    Traceback (most recent call last):
1451
    ...
1452
    BzrCommandError: Invalid master option: 'test'
1453
    >>> argv, opts = _parse_master_args(['bzr', '--version', 'command'])
1454
    >>> print argv
1455
    ['command']
1456
    >>> print opts['version']
1457
    True
1458
    >>> argv, opts = _parse_master_args(['bzr', '--profile', 'command', '--more-options'])
1459
    >>> print argv
1460
    ['command', '--more-options']
1461
    >>> print opts['profile']
1462
    True
1463
    >>> argv, opts = _parse_master_args(['bzr', '--no-plugins', 'command'])
1464
    >>> print argv
1465
    ['command']
1466
    >>> print opts['no-plugins']
1467
    True
1468
    >>> print opts['profile']
1469
    False
1470
    >>> argv, opts = _parse_master_args(['bzr', 'command', '--profile'])
1471
    >>> print argv
1472
    ['command', '--profile']
1473
    >>> print opts['profile']
1474
    False
1475
    """
1476
    master_opts = {'builtin':False,
1477
        'no-plugins':False,
1478
        'version':False,
1479
        'profile':False,
1480
        'help':False
1481
    }
1482
1483
    # This is the point where we could hook into argv[0] to determine
1484
    # what front-end is supposed to be run
1485
    # For now, we are just ignoring it.
1486
    cmd_name = argv.pop(0)
1487
    for arg in argv[:]:
1488
        if arg[:2] != '--': # at the first non-option, we return the rest
1489
            break
1490
        arg = arg[2:] # Remove '--'
1491
        if arg not in master_opts:
1492
            # We could say that this is not an error, that we should
1493
            # just let it be handled by the main section instead
1494
            raise BzrCommandError('Invalid master option: %r' % arg)
1495
        argv.pop(0) # We are consuming this entry
1496
        master_opts[arg] = True
1497
    return argv, master_opts
1498
1499
1 by mbp at sourcefrog
import from baz patch-364
1500
1501
def run_bzr(argv):
1502
    """Execute a command.
1503
1504
    This is similar to main(), but without all the trappings for
245 by mbp at sourcefrog
- control files always in utf-8-unix format
1505
    logging and error handling.  
1 by mbp at sourcefrog
import from baz patch-364
1506
    """
251 by mbp at sourcefrog
- factor out locale.getpreferredencoding()
1507
    argv = [a.decode(bzrlib.user_encoding) for a in argv]
245 by mbp at sourcefrog
- control files always in utf-8-unix format
1508
    
1 by mbp at sourcefrog
import from baz patch-364
1509
    try:
731 by Martin Pool
- merge plugin patch from john
1510
        # some options like --builtin and --no-plugins have special effects
1511
        argv, master_opts = _parse_master_args(argv)
1512
        if 'no-plugins' not in master_opts:
1513
            bzrlib.load_plugins()
1514
1515
        args, opts = parse_args(argv)
1516
1517
        if master_opts['help']:
1518
            from bzrlib.help import help
1519
            if argv:
1520
                help(argv[0])
1521
            else:
1522
                help()
1523
            return 0            
1524
            
1 by mbp at sourcefrog
import from baz patch-364
1525
        if 'help' in opts:
731 by Martin Pool
- merge plugin patch from john
1526
            from bzrlib.help import help
159 by mbp at sourcefrog
bzr commit --help now works
1527
            if args:
731 by Martin Pool
- merge plugin patch from john
1528
                help(args[0])
159 by mbp at sourcefrog
bzr commit --help now works
1529
            else:
731 by Martin Pool
- merge plugin patch from john
1530
                help()
1 by mbp at sourcefrog
import from baz patch-364
1531
            return 0
1532
        elif 'version' in opts:
336 by Martin Pool
- fix up 'bzr --version'
1533
            show_version()
1 by mbp at sourcefrog
import from baz patch-364
1534
            return 0
641 by Martin Pool
- improved external-command patch from john
1535
        elif args and args[0] == 'builtin':
1536
            include_plugins=False
1537
            args = args[1:]
265 by Martin Pool
parse_args: command names must also be ascii
1538
        cmd = str(args.pop(0))
1 by mbp at sourcefrog
import from baz patch-364
1539
    except IndexError:
448 by Martin Pool
- bzr with no command now shows help, not just an error
1540
        import help
1541
        help.help()
1 by mbp at sourcefrog
import from baz patch-364
1542
        return 1
448 by Martin Pool
- bzr with no command now shows help, not just an error
1543
          
115 by mbp at sourcefrog
todo
1544
731 by Martin Pool
- merge plugin patch from john
1545
    plugins_override = not (master_opts['builtin'])
1546
    canonical_cmd, cmd_class = get_cmd_class(cmd, plugins_override=plugins_override)
1 by mbp at sourcefrog
import from baz patch-364
1547
731 by Martin Pool
- merge plugin patch from john
1548
    profile = master_opts['profile']
1549
    # For backwards compatibility, I would rather stick with --profile being a
1550
    # master/global option
137 by mbp at sourcefrog
new --profile option
1551
    if 'profile' in opts:
1552
        profile = True
1553
        del opts['profile']
1 by mbp at sourcefrog
import from baz patch-364
1554
1555
    # check options are reasonable
329 by Martin Pool
- refactor command functions into command classes
1556
    allowed = cmd_class.takes_options
1 by mbp at sourcefrog
import from baz patch-364
1557
    for oname in opts:
1558
        if oname not in allowed:
381 by Martin Pool
- Better message when a wrong argument is given
1559
            raise BzrCommandError("option '--%s' is not allowed for command %r"
329 by Martin Pool
- refactor command functions into command classes
1560
                                  % (oname, cmd))
176 by mbp at sourcefrog
New cat command contributed by janmar.
1561
137 by mbp at sourcefrog
new --profile option
1562
    # mix arguments and options into one dictionary
329 by Martin Pool
- refactor command functions into command classes
1563
    cmdargs = _match_argform(cmd, cmd_class.takes_args, args)
1564
    cmdopts = {}
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
1565
    for k, v in opts.items():
329 by Martin Pool
- refactor command functions into command classes
1566
        cmdopts[k.replace('-', '_')] = v
1 by mbp at sourcefrog
import from baz patch-364
1567
137 by mbp at sourcefrog
new --profile option
1568
    if profile:
338 by Martin Pool
- cleanup of some imports
1569
        import hotshot, tempfile
239 by mbp at sourcefrog
- remove profiler temporary file when done
1570
        pffileno, pfname = tempfile.mkstemp()
1571
        try:
1572
            prof = hotshot.Profile(pfname)
329 by Martin Pool
- refactor command functions into command classes
1573
            ret = prof.runcall(cmd_class, cmdopts, cmdargs) or 0
239 by mbp at sourcefrog
- remove profiler temporary file when done
1574
            prof.close()
1575
1576
            import hotshot.stats
1577
            stats = hotshot.stats.load(pfname)
1578
            #stats.strip_dirs()
1579
            stats.sort_stats('time')
1580
            ## XXX: Might like to write to stderr or the trace file instead but
1581
            ## print_stats seems hardcoded to stdout
1582
            stats.print_stats(20)
1583
            
337 by Martin Pool
- Clarify return codes from command objects
1584
            return ret.status
239 by mbp at sourcefrog
- remove profiler temporary file when done
1585
1586
        finally:
1587
            os.close(pffileno)
1588
            os.remove(pfname)
137 by mbp at sourcefrog
new --profile option
1589
    else:
500 by Martin Pool
- fix return value from run_bzr
1590
        return cmd_class(cmdopts, cmdargs).status 
1 by mbp at sourcefrog
import from baz patch-364
1591
1592
359 by Martin Pool
- pychecker fixups
1593
def _report_exception(summary, quiet=False):
267 by Martin Pool
- better reporting of errors
1594
    import traceback
1595
    log_error('bzr: ' + summary)
359 by Martin Pool
- pychecker fixups
1596
    bzrlib.trace.log_exception()
317 by Martin Pool
- better error message for broken pipe
1597
1598
    if not quiet:
1599
        tb = sys.exc_info()[2]
1600
        exinfo = traceback.extract_tb(tb)
1601
        if exinfo:
1602
            sys.stderr.write('  at %s:%d in %s()\n' % exinfo[-1][:3])
1603
        sys.stderr.write('  see ~/.bzr.log for debug information\n')
267 by Martin Pool
- better reporting of errors
1604
1605
1606
1 by mbp at sourcefrog
import from baz patch-364
1607
def main(argv):
317 by Martin Pool
- better error message for broken pipe
1608
    import errno
1609
    
344 by Martin Pool
- It's not an error to use the library without
1610
    bzrlib.open_tracefile(argv)
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1611
1 by mbp at sourcefrog
import from baz patch-364
1612
    try:
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1613
        try:
337 by Martin Pool
- Clarify return codes from command objects
1614
            try:
1615
                return run_bzr(argv)
1616
            finally:
1617
                # do this here inside the exception wrappers to catch EPIPE
1618
                sys.stdout.flush()
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1619
        except BzrError, e:
329 by Martin Pool
- refactor command functions into command classes
1620
            quiet = isinstance(e, (BzrCommandError))
359 by Martin Pool
- pychecker fixups
1621
            _report_exception('error: ' + e.args[0], quiet=quiet)
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1622
            if len(e.args) > 1:
1623
                for h in e.args[1]:
267 by Martin Pool
- better reporting of errors
1624
                    # some explanation or hints
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1625
                    log_error('  ' + h)
1626
            return 1
267 by Martin Pool
- better reporting of errors
1627
        except AssertionError, e:
1628
            msg = 'assertion failed'
1629
            if str(e):
1630
                msg += ': ' + str(e)
359 by Martin Pool
- pychecker fixups
1631
            _report_exception(msg)
318 by Martin Pool
- better error message for Ctrl-c
1632
            return 2
1633
        except KeyboardInterrupt, e:
359 by Martin Pool
- pychecker fixups
1634
            _report_exception('interrupted', quiet=True)
318 by Martin Pool
- better error message for Ctrl-c
1635
            return 2
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1636
        except Exception, e:
317 by Martin Pool
- better error message for broken pipe
1637
            quiet = False
419 by Martin Pool
- RemoteBranch.__str__ and repr
1638
            if (isinstance(e, IOError) 
1639
                and hasattr(e, 'errno')
1640
                and e.errno == errno.EPIPE):
317 by Martin Pool
- better error message for broken pipe
1641
                quiet = True
1642
                msg = 'broken pipe'
1643
            else:
1644
                msg = str(e).rstrip('\n')
359 by Martin Pool
- pychecker fixups
1645
            _report_exception(msg, quiet)
318 by Martin Pool
- better error message for Ctrl-c
1646
            return 2
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1647
    finally:
1648
        bzrlib.trace.close_trace()
1 by mbp at sourcefrog
import from baz patch-364
1649
1650
1651
if __name__ == '__main__':
1652
    sys.exit(main(sys.argv))