~bzr-pqm/bzr/bzr.dev

329 by Martin Pool
- refactor command functions into command classes
1
# Copyright (C) 2004, 2005 by Canonical Ltd
1 by mbp at sourcefrog
import from baz patch-364
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
1022 by Martin Pool
- bzr mv command that works like mv in unix -- either rename or delete depending
18
# TODO: Split the command framework away from the actual commands.
19
20
# TODO: probably should say which arguments are candidates for glob
21
# expansion on windows and do that at the command level.
1 by mbp at sourcefrog
import from baz patch-364
22
1092.1.18 by Robert Collins
merge from mpool
23
# TODO: Help messages for options.
24
25
# TODO: Define arguments by objects, rather than just using names.
26
# Those objects can specify the expected type of the argument, which
27
# would help with validation and shell completion.
28
29
1025 by Martin Pool
- if 1 is set, show tracebacks directly on stderr
30
import sys
31
import os
1 by mbp at sourcefrog
import from baz patch-364
32
33
import bzrlib
897 by Martin Pool
- merge john's revision-naming code
34
from bzrlib.trace import mutter, note, log_error, warning
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
35
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
800 by Martin Pool
Merge John's import-speedup branch:
36
from bzrlib.branch import find_branch
37
from bzrlib import BZRDIR
1 by mbp at sourcefrog
import from baz patch-364
38
39
731 by Martin Pool
- merge plugin patch from john
40
plugin_cmds = {}
41
42
759 by Martin Pool
- fix up register_command() names
43
def register_command(cmd):
731 by Martin Pool
- merge plugin patch from john
44
    "Utility function to help register a command"
45
    global plugin_cmds
46
    k = cmd.__name__
47
    if k.startswith("cmd_"):
48
        k_unsquished = _unsquish_command_name(k)
49
    else:
50
        k_unsquished = k
51
    if not plugin_cmds.has_key(k_unsquished):
52
        plugin_cmds[k_unsquished] = cmd
53
    else:
54
        log_error('Two plugins defined the same command: %r' % k)
55
        log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
56
57
350 by Martin Pool
- refactor command aliases into command classes
58
def _squish_command_name(cmd):
59
    return 'cmd_' + cmd.replace('-', '_')
60
61
62
def _unsquish_command_name(cmd):
63
    assert cmd.startswith("cmd_")
64
    return cmd[4:].replace('_','-')
65
914 by Martin Pool
- fix up breakage of 'bzr log -v' by root_id patch
66
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
67
def _parse_revision_str(revstr):
914 by Martin Pool
- fix up breakage of 'bzr log -v' by root_id patch
68
    """This handles a revision string -> revno.
69
70
    This always returns a list.  The list will have one element for 
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
71
897 by Martin Pool
- merge john's revision-naming code
72
    It supports integers directly, but everything else it
73
    defers for passing to Branch.get_revision_info()
74
75
    >>> _parse_revision_str('234')
76
    [234]
77
    >>> _parse_revision_str('234..567')
78
    [234, 567]
79
    >>> _parse_revision_str('..')
80
    [None, None]
81
    >>> _parse_revision_str('..234')
82
    [None, 234]
83
    >>> _parse_revision_str('234..')
84
    [234, None]
85
    >>> _parse_revision_str('234..456..789') # Maybe this should be an error
86
    [234, 456, 789]
87
    >>> _parse_revision_str('234....789') # Error?
88
    [234, None, 789]
89
    >>> _parse_revision_str('revid:test@other.com-234234')
90
    ['revid:test@other.com-234234']
91
    >>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
92
    ['revid:test@other.com-234234', 'revid:test@other.com-234235']
93
    >>> _parse_revision_str('revid:test@other.com-234234..23')
94
    ['revid:test@other.com-234234', 23]
95
    >>> _parse_revision_str('date:2005-04-12')
96
    ['date:2005-04-12']
97
    >>> _parse_revision_str('date:2005-04-12 12:24:33')
98
    ['date:2005-04-12 12:24:33']
99
    >>> _parse_revision_str('date:2005-04-12T12:24:33')
100
    ['date:2005-04-12T12:24:33']
101
    >>> _parse_revision_str('date:2005-04-12,12:24:33')
102
    ['date:2005-04-12,12:24:33']
103
    >>> _parse_revision_str('-5..23')
104
    [-5, 23]
105
    >>> _parse_revision_str('-5')
106
    [-5]
107
    >>> _parse_revision_str('123a')
108
    ['123a']
109
    >>> _parse_revision_str('abc')
110
    ['abc']
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
111
    """
897 by Martin Pool
- merge john's revision-naming code
112
    import re
113
    old_format_re = re.compile('\d*:\d*')
114
    m = old_format_re.match(revstr)
115
    if m:
116
        warning('Colon separator for revision numbers is deprecated.'
117
                ' Use .. instead')
118
        revs = []
119
        for rev in revstr.split(':'):
120
            if rev:
121
                revs.append(int(rev))
122
            else:
123
                revs.append(None)
124
        return revs
125
    revs = []
126
    for x in revstr.split('..'):
127
        if not x:
128
            revs.append(None)
129
        else:
130
            try:
131
                revs.append(int(x))
132
            except ValueError:
133
                revs.append(x)
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
134
    return revs
135
731 by Martin Pool
- merge plugin patch from john
136
974.1.9 by Aaron Bentley
Added merge-type parameter to merge.
137
def get_merge_type(typestring):
138
    """Attempt to find the merge class/factory associated with a string."""
139
    from merge import merge_types
140
    try:
141
        return merge_types[typestring][0]
142
    except KeyError:
143
        templ = '%s%%7s: %%s' % (' '*12)
144
        lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
145
        type_list = '\n'.join(lines)
146
        msg = "No known merge type %s. Supported types are:\n%s" %\
147
            (typestring, type_list)
148
        raise BzrCommandError(msg)
149
    
150
1051 by Martin Pool
- merge aaron's merge improvements up to
151
def get_merge_type(typestring):
152
    """Attempt to find the merge class/factory associated with a string."""
153
    from merge import merge_types
154
    try:
155
        return merge_types[typestring][0]
156
    except KeyError:
157
        templ = '%s%%7s: %%s' % (' '*12)
158
        lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
159
        type_list = '\n'.join(lines)
160
        msg = "No known merge type %s. Supported types are:\n%s" %\
161
            (typestring, type_list)
162
        raise BzrCommandError(msg)
163
    
164
731 by Martin Pool
- merge plugin patch from john
165
166
def _get_cmd_dict(plugins_override=True):
641 by Martin Pool
- improved external-command patch from john
167
    d = {}
350 by Martin Pool
- refactor command aliases into command classes
168
    for k, v in globals().iteritems():
169
        if k.startswith("cmd_"):
641 by Martin Pool
- improved external-command patch from john
170
            d[_unsquish_command_name(k)] = v
731 by Martin Pool
- merge plugin patch from john
171
    # If we didn't load plugins, the plugin_cmds dict will be empty
172
    if plugins_override:
173
        d.update(plugin_cmds)
174
    else:
175
        d2 = plugin_cmds.copy()
176
        d2.update(d)
177
        d = d2
641 by Martin Pool
- improved external-command patch from john
178
    return d
731 by Martin Pool
- merge plugin patch from john
179
641 by Martin Pool
- improved external-command patch from john
180
    
731 by Martin Pool
- merge plugin patch from john
181
def get_all_cmds(plugins_override=True):
641 by Martin Pool
- improved external-command patch from john
182
    """Return canonical name and class for all registered commands."""
731 by Martin Pool
- merge plugin patch from john
183
    for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
641 by Martin Pool
- improved external-command patch from john
184
        yield k,v
185
186
731 by Martin Pool
- merge plugin patch from john
187
def get_cmd_class(cmd, plugins_override=True):
350 by Martin Pool
- refactor command aliases into command classes
188
    """Return the canonical name and command class for a command.
189
    """
190
    cmd = str(cmd)                      # not unicode
191
192
    # first look up this command under the specified name
731 by Martin Pool
- merge plugin patch from john
193
    cmds = _get_cmd_dict(plugins_override=plugins_override)
272 by Martin Pool
- Add command aliases
194
    try:
641 by Martin Pool
- improved external-command patch from john
195
        return cmd, cmds[cmd]
272 by Martin Pool
- Add command aliases
196
    except KeyError:
350 by Martin Pool
- refactor command aliases into command classes
197
        pass
198
199
    # look for any command which claims this as an alias
641 by Martin Pool
- improved external-command patch from john
200
    for cmdname, cmdclass in cmds.iteritems():
350 by Martin Pool
- refactor command aliases into command classes
201
        if cmd in cmdclass.aliases:
202
            return cmdname, cmdclass
422 by Martin Pool
- External-command patch from mpe
203
204
    cmdclass = ExternalCommand.find_command(cmd)
205
    if cmdclass:
206
        return cmd, cmdclass
207
208
    raise BzrCommandError("unknown command %r" % cmd)
272 by Martin Pool
- Add command aliases
209
329 by Martin Pool
- refactor command functions into command classes
210
558 by Martin Pool
- All top-level classes inherit from object
211
class Command(object):
329 by Martin Pool
- refactor command functions into command classes
212
    """Base class for commands.
213
214
    The docstring for an actual command should give a single-line
215
    summary, then a complete description of the command.  A grammar
216
    description will be inserted.
217
218
    takes_args
219
        List of argument forms, marked with whether they are optional,
220
        repeated, etc.
221
222
    takes_options
223
        List of options that may be given for this command.
224
225
    hidden
226
        If true, this command isn't advertised.
227
    """
228
    aliases = []
229
    
230
    takes_args = []
231
    takes_options = []
232
233
    hidden = False
234
    
235
    def __init__(self, options, arguments):
236
        """Construct and run the command.
237
238
        Sets self.status to the return value of run()."""
239
        assert isinstance(options, dict)
240
        assert isinstance(arguments, dict)
241
        cmdargs = options.copy()
242
        cmdargs.update(arguments)
973 by Martin Pool
- various refactorings of command interpreter
243
        if self.__doc__ == Command.__doc__:
244
            from warnings import warn
245
            warn("No help message set for %r" % self)
329 by Martin Pool
- refactor command functions into command classes
246
        self.status = self.run(**cmdargs)
974 by Martin Pool
- start adding tests for commit in subdir
247
        if self.status is None:
248
            self.status = 0
329 by Martin Pool
- refactor command functions into command classes
249
250
    
251
    def run(self):
252
        """Override this in sub-classes.
253
254
        This is invoked with the options and arguments bound to
255
        keyword parameters.
256
337 by Martin Pool
- Clarify return codes from command objects
257
        Return 0 or None if the command was successful, or a shell
258
        error code if not.
329 by Martin Pool
- refactor command functions into command classes
259
        """
337 by Martin Pool
- Clarify return codes from command objects
260
        return 0
329 by Martin Pool
- refactor command functions into command classes
261
262
422 by Martin Pool
- External-command patch from mpe
263
class ExternalCommand(Command):
264
    """Class to wrap external commands.
265
984 by Martin Pool
- tidy up docstring
266
    We cheat a little here, when get_cmd_class() calls us we actually
267
    give it back an object we construct that has the appropriate path,
268
    help, options etc for the specified command.
269
270
    When run_bzr() tries to instantiate that 'class' it gets caught by
271
    the __call__ method, which we override to call the Command.__init__
272
    method. That then calls our run method which is pretty straight
273
    forward.
274
275
    The only wrinkle is that we have to map bzr's dictionary of options
276
    and arguments back into command line options and arguments for the
277
    script.
422 by Martin Pool
- External-command patch from mpe
278
    """
279
280
    def find_command(cls, cmd):
572 by Martin Pool
- trim imports
281
        import os.path
422 by Martin Pool
- External-command patch from mpe
282
        bzrpath = os.environ.get('BZRPATH', '')
283
641 by Martin Pool
- improved external-command patch from john
284
        for dir in bzrpath.split(os.pathsep):
422 by Martin Pool
- External-command patch from mpe
285
            path = os.path.join(dir, cmd)
286
            if os.path.isfile(path):
287
                return ExternalCommand(path)
288
289
        return None
290
291
    find_command = classmethod(find_command)
292
293
    def __init__(self, path):
294
        self.path = path
295
296
        pipe = os.popen('%s --bzr-usage' % path, 'r')
297
        self.takes_options = pipe.readline().split()
687 by Martin Pool
- trap more errors from external commands
298
299
        for opt in self.takes_options:
300
            if not opt in OPTIONS:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
301
                raise BzrError("Unknown option '%s' returned by external command %s"
302
                               % (opt, path))
687 by Martin Pool
- trap more errors from external commands
303
304
        # TODO: Is there any way to check takes_args is valid here?
422 by Martin Pool
- External-command patch from mpe
305
        self.takes_args = pipe.readline().split()
687 by Martin Pool
- trap more errors from external commands
306
307
        if pipe.close() is not None:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
308
            raise BzrError("Failed funning '%s --bzr-usage'" % path)
422 by Martin Pool
- External-command patch from mpe
309
310
        pipe = os.popen('%s --bzr-help' % path, 'r')
311
        self.__doc__ = pipe.read()
687 by Martin Pool
- trap more errors from external commands
312
        if pipe.close() is not None:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
313
            raise BzrError("Failed funning '%s --bzr-help'" % path)
422 by Martin Pool
- External-command patch from mpe
314
315
    def __call__(self, options, arguments):
316
        Command.__init__(self, options, arguments)
317
        return self
318
319
    def run(self, **kargs):
320
        opts = []
321
        args = []
322
323
        keys = kargs.keys()
324
        keys.sort()
325
        for name in keys:
689 by Martin Pool
- make options with - work with external commands
326
            optname = name.replace('_','-')
422 by Martin Pool
- External-command patch from mpe
327
            value = kargs[name]
689 by Martin Pool
- make options with - work with external commands
328
            if OPTIONS.has_key(optname):
422 by Martin Pool
- External-command patch from mpe
329
                # it's an option
689 by Martin Pool
- make options with - work with external commands
330
                opts.append('--%s' % optname)
422 by Martin Pool
- External-command patch from mpe
331
                if value is not None and value is not True:
332
                    opts.append(str(value))
333
            else:
334
                # it's an arg, or arg list
335
                if type(value) is not list:
336
                    value = [value]
337
                for v in value:
338
                    if v is not None:
339
                        args.append(str(v))
340
341
        self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
342
        return self.status
343
329 by Martin Pool
- refactor command functions into command classes
344
345
class cmd_status(Command):
1 by mbp at sourcefrog
import from baz patch-364
346
    """Display status summary.
347
466 by Martin Pool
- doc for status command
348
    This reports on versioned and unknown files, reporting them
349
    grouped by state.  Possible states are:
350
351
    added
352
        Versioned in the working copy but not in the previous revision.
353
354
    removed
467 by Martin Pool
- doc for status command
355
        Versioned in the previous revision but removed or deleted
466 by Martin Pool
- doc for status command
356
        in the working copy.
357
358
    renamed
359
        Path of this file changed from the previous revision;
360
        the text may also have changed.  This includes files whose
467 by Martin Pool
- doc for status command
361
        parent directory was renamed.
466 by Martin Pool
- doc for status command
362
363
    modified
364
        Text has changed since the previous revision.
365
366
    unchanged
467 by Martin Pool
- doc for status command
367
        Nothing about this file has changed since the previous revision.
368
        Only shown with --all.
466 by Martin Pool
- doc for status command
369
370
    unknown
371
        Not versioned and not matching an ignore pattern.
372
373
    To see ignored files use 'bzr ignored'.  For details in the
374
    changes to file texts, use 'bzr diff'.
468 by Martin Pool
- Interpret arguments to bzr status
375
376
    If no arguments are specified, the status of the entire working
377
    directory is shown.  Otherwise, only the status of the specified
378
    files or directories is reported.  If a directory is given, status
379
    is reported for everything inside that directory.
914 by Martin Pool
- fix up breakage of 'bzr log -v' by root_id patch
380
381
    If a revision is specified, the changes since that revision are shown.
1 by mbp at sourcefrog
import from baz patch-364
382
    """
404 by Martin Pool
- bzr status now optionally takes filenames to check
383
    takes_args = ['file*']
914 by Martin Pool
- fix up breakage of 'bzr log -v' by root_id patch
384
    takes_options = ['all', 'show-ids', 'revision']
350 by Martin Pool
- refactor command aliases into command classes
385
    aliases = ['st', 'stat']
329 by Martin Pool
- refactor command functions into command classes
386
    
465 by Martin Pool
- Move show_status() out of Branch into a new function in
387
    def run(self, all=False, show_ids=False, file_list=None):
468 by Martin Pool
- Interpret arguments to bzr status
388
        if file_list:
800 by Martin Pool
Merge John's import-speedup branch:
389
            b = find_branch(file_list[0])
468 by Martin Pool
- Interpret arguments to bzr status
390
            file_list = [b.relpath(x) for x in file_list]
391
            # special case: only one path was given and it's the root
392
            # of the branch
393
            if file_list == ['']:
394
                file_list = None
395
        else:
800 by Martin Pool
Merge John's import-speedup branch:
396
            b = find_branch('.')
914 by Martin Pool
- fix up breakage of 'bzr log -v' by root_id patch
397
            
398
        from bzrlib.status import show_status
399
        show_status(b, show_unchanged=all, show_ids=show_ids,
400
                    specific_files=file_list)
329 by Martin Pool
- refactor command functions into command classes
401
402
403
class cmd_cat_revision(Command):
404
    """Write out metadata for a revision."""
405
406
    hidden = True
407
    takes_args = ['revision_id']
408
    
409
    def run(self, revision_id):
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
410
        from bzrlib.xml import pack_xml
411
        pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
329 by Martin Pool
- refactor command functions into command classes
412
413
414
class cmd_revno(Command):
415
    """Show current revision number.
416
417
    This is equal to the number of revisions on this branch."""
418
    def run(self):
800 by Martin Pool
Merge John's import-speedup branch:
419
        print find_branch('.').revno()
329 by Martin Pool
- refactor command functions into command classes
420
897 by Martin Pool
- merge john's revision-naming code
421
class cmd_revision_info(Command):
422
    """Show revision number and revision id for a given revision identifier.
423
    """
424
    hidden = True
425
    takes_args = ['revision_info*']
426
    takes_options = ['revision']
427
    def run(self, revision=None, revision_info_list=None):
428
        from bzrlib.branch import find_branch
429
430
        revs = []
431
        if revision is not None:
432
            revs.extend(revision)
433
        if revision_info_list is not None:
434
            revs.extend(revision_info_list)
435
        if len(revs) == 0:
436
            raise BzrCommandError('You must supply a revision identifier')
437
438
        b = find_branch('.')
439
440
        for rev in revs:
441
            print '%4d %s' % b.get_revision_info(rev)
442
329 by Martin Pool
- refactor command functions into command classes
443
    
444
class cmd_add(Command):
70 by mbp at sourcefrog
Prepare for smart recursive add.
445
    """Add specified files or directories.
446
447
    In non-recursive mode, all the named items are added, regardless
448
    of whether they were previously ignored.  A warning is given if
449
    any of the named files are already versioned.
450
451
    In recursive mode (the default), files are treated the same way
452
    but the behaviour for directories is different.  Directories that
453
    are already versioned do not give a warning.  All directories,
454
    whether already versioned or not, are searched for files or
455
    subdirectories that are neither versioned or ignored, and these
456
    are added.  This search proceeds recursively into versioned
973 by Martin Pool
- various refactorings of command interpreter
457
    directories.  If no names are given '.' is assumed.
70 by mbp at sourcefrog
Prepare for smart recursive add.
458
973 by Martin Pool
- various refactorings of command interpreter
459
    Therefore simply saying 'bzr add' will version all files that
70 by mbp at sourcefrog
Prepare for smart recursive add.
460
    are currently unknown.
279 by Martin Pool
todo
461
462
    TODO: Perhaps adding a file whose directly is not versioned should
463
    recursively add that parent, rather than giving an error?
70 by mbp at sourcefrog
Prepare for smart recursive add.
464
    """
973 by Martin Pool
- various refactorings of command interpreter
465
    takes_args = ['file*']
594 by Martin Pool
- add --no-recurse option for add command
466
    takes_options = ['verbose', 'no-recurse']
329 by Martin Pool
- refactor command functions into command classes
467
    
594 by Martin Pool
- add --no-recurse option for add command
468
    def run(self, file_list, verbose=False, no_recurse=False):
800 by Martin Pool
Merge John's import-speedup branch:
469
        from bzrlib.add import smart_add
470
        smart_add(file_list, verbose, not no_recurse)
329 by Martin Pool
- refactor command functions into command classes
471
472
742 by Martin Pool
- new mkdir command
473
474
class cmd_mkdir(Command):
475
    """Create a new versioned directory.
476
477
    This is equivalent to creating the directory and then adding it.
478
    """
479
    takes_args = ['dir+']
480
481
    def run(self, dir_list):
482
        b = None
483
        
484
        for d in dir_list:
485
            os.mkdir(d)
486
            if not b:
800 by Martin Pool
Merge John's import-speedup branch:
487
                b = find_branch(d)
742 by Martin Pool
- new mkdir command
488
            b.add([d], verbose=True)
489
490
386 by Martin Pool
- Typo (reported by uws)
491
class cmd_relpath(Command):
329 by Martin Pool
- refactor command functions into command classes
492
    """Show path of a file relative to root"""
392 by Martin Pool
- fix relpath and add tests
493
    takes_args = ['filename']
584 by Martin Pool
- make relpath and revision-history hidden commands
494
    hidden = True
329 by Martin Pool
- refactor command functions into command classes
495
    
392 by Martin Pool
- fix relpath and add tests
496
    def run(self, filename):
800 by Martin Pool
Merge John's import-speedup branch:
497
        print find_branch(filename).relpath(filename)
329 by Martin Pool
- refactor command functions into command classes
498
499
500
501
class cmd_inventory(Command):
502
    """Show inventory of the current working copy or a revision."""
588 by Martin Pool
- change inventory command to not show ids by default
503
    takes_options = ['revision', 'show-ids']
329 by Martin Pool
- refactor command functions into command classes
504
    
588 by Martin Pool
- change inventory command to not show ids by default
505
    def run(self, revision=None, show_ids=False):
800 by Martin Pool
Merge John's import-speedup branch:
506
        b = find_branch('.')
329 by Martin Pool
- refactor command functions into command classes
507
        if revision == None:
508
            inv = b.read_working_inventory()
509
        else:
897 by Martin Pool
- merge john's revision-naming code
510
            if len(revision) > 1:
511
                raise BzrCommandError('bzr inventory --revision takes'
512
                    ' exactly one revision identifier')
513
            inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
329 by Martin Pool
- refactor command functions into command classes
514
556 by Martin Pool
- fix up Inventory.entries()
515
        for path, entry in inv.entries():
588 by Martin Pool
- change inventory command to not show ids by default
516
            if show_ids:
517
                print '%-50s %s' % (path, entry.file_id)
518
            else:
519
                print path
329 by Martin Pool
- refactor command functions into command classes
520
521
522
class cmd_move(Command):
523
    """Move files to a different directory.
524
525
    examples:
526
        bzr move *.txt doc
527
528
    The destination must be a versioned directory in the same branch.
529
    """
530
    takes_args = ['source$', 'dest']
531
    def run(self, source_list, dest):
800 by Martin Pool
Merge John's import-speedup branch:
532
        b = find_branch('.')
329 by Martin Pool
- refactor command functions into command classes
533
1022 by Martin Pool
- bzr mv command that works like mv in unix -- either rename or delete depending
534
        # TODO: glob expansion on windows?
329 by Martin Pool
- refactor command functions into command classes
535
        b.move([b.relpath(s) for s in source_list], b.relpath(dest))
536
537
538
class cmd_rename(Command):
168 by mbp at sourcefrog
new "rename" command
539
    """Change the name of an entry.
540
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
541
    examples:
542
      bzr rename frob.c frobber.c
543
      bzr rename src/frob.c lib/frob.c
544
545
    It is an error if the destination name exists.
546
547
    See also the 'move' command, which moves files into a different
548
    directory without changing their name.
549
550
    TODO: Some way to rename multiple files without invoking bzr for each
551
    one?"""
329 by Martin Pool
- refactor command functions into command classes
552
    takes_args = ['from_name', 'to_name']
168 by mbp at sourcefrog
new "rename" command
553
    
329 by Martin Pool
- refactor command functions into command classes
554
    def run(self, from_name, to_name):
800 by Martin Pool
Merge John's import-speedup branch:
555
        b = find_branch('.')
329 by Martin Pool
- refactor command functions into command classes
556
        b.rename_one(b.relpath(from_name), b.relpath(to_name))
557
558
559
1022 by Martin Pool
- bzr mv command that works like mv in unix -- either rename or delete depending
560
class cmd_mv(Command):
561
    """Move or rename a file.
562
563
    usage:
564
        bzr mv OLDNAME NEWNAME
565
        bzr mv SOURCE... DESTINATION
566
567
    If the last argument is a versioned directory, all the other names
568
    are moved into it.  Otherwise, there must be exactly two arguments
569
    and the file is changed to a new name, which must not already exist.
570
571
    Files cannot be moved between branches.
572
    """
573
    takes_args = ['names*']
574
    def run(self, names_list):
575
        if len(names_list) < 2:
576
            raise BzrCommandError("missing file argument")
577
        b = find_branch(names_list[0])
578
579
        rel_names = [b.relpath(x) for x in names_list]
580
        
581
        if os.path.isdir(names_list[-1]):
582
            # move into existing directory
583
            b.move(rel_names[:-1], rel_names[-1])
584
        else:
585
            if len(names_list) != 2:
586
                raise BzrCommandError('to mv multiple files the destination '
587
                                      'must be a versioned directory')
588
            b.move(rel_names[0], rel_names[1])
589
            
590
    
628 by Martin Pool
- merge aaron's updated merge/pull code
591
592
593
class cmd_pull(Command):
594
    """Pull any changes from another branch into the current one.
595
596
    If the location is omitted, the last-used location will be used.
597
    Both the revision history and the working directory will be
598
    updated.
599
600
    This command only works on branches that have not diverged.  Branches are
601
    considered diverged if both branches have had commits without first
602
    pulling from the other.
603
604
    If branches have diverged, you can use 'bzr merge' to pull the text changes
605
    from one into the other.
606
    """
607
    takes_args = ['location?']
608
609
    def run(self, location=None):
610
        from bzrlib.merge import merge
790 by Martin Pool
Merge from aaron:
611
        import tempfile
612
        from shutil import rmtree
628 by Martin Pool
- merge aaron's updated merge/pull code
613
        import errno
614
        
800 by Martin Pool
Merge John's import-speedup branch:
615
        br_to = find_branch('.')
628 by Martin Pool
- merge aaron's updated merge/pull code
616
        stored_loc = None
617
        try:
618
            stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
619
        except IOError, e:
789 by Martin Pool
- patch from john to cope with branches with missing x-pull file
620
            if e.errno != errno.ENOENT:
628 by Martin Pool
- merge aaron's updated merge/pull code
621
                raise
622
        if location is None:
729 by Martin Pool
- pull shows location being used
623
            if stored_loc is None:
624
                raise BzrCommandError("No pull location known or specified.")
625
            else:
626
                print "Using last location: %s" % stored_loc
627
                location = stored_loc
790 by Martin Pool
Merge from aaron:
628
        cache_root = tempfile.mkdtemp()
800 by Martin Pool
Merge John's import-speedup branch:
629
        from bzrlib.branch import DivergedBranches
630
        br_from = find_branch(location)
631
        location = pull_loc(br_from)
632
        old_revno = br_to.revno()
628 by Martin Pool
- merge aaron's updated merge/pull code
633
        try:
790 by Martin Pool
Merge from aaron:
634
            from branch import find_cached_branch, DivergedBranches
635
            br_from = find_cached_branch(location, cache_root)
636
            location = pull_loc(br_from)
637
            old_revno = br_to.revno()
638
            try:
639
                br_to.update_revisions(br_from)
640
            except DivergedBranches:
641
                raise BzrCommandError("These branches have diverged."
642
                    "  Try merge.")
643
                
644
            merge(('.', -1), ('.', old_revno), check_clean=False)
645
            if location != stored_loc:
646
                br_to.controlfile("x-pull", "wb").write(location + "\n")
647
        finally:
648
            rmtree(cache_root)
628 by Martin Pool
- merge aaron's updated merge/pull code
649
650
651
652
class cmd_branch(Command):
653
    """Create a new copy of a branch.
654
685 by Martin Pool
- add -r option to the branch command
655
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
656
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
657
658
    To retrieve the branch as of a particular revision, supply the --revision
659
    parameter, as in "branch foo/bar -r 5".
628 by Martin Pool
- merge aaron's updated merge/pull code
660
    """
661
    takes_args = ['from_location', 'to_location?']
685 by Martin Pool
- add -r option to the branch command
662
    takes_options = ['revision']
1019 by Martin Pool
- add get and clone as aliases for branch
663
    aliases = ['get', 'clone']
628 by Martin Pool
- merge aaron's updated merge/pull code
664
685 by Martin Pool
- add -r option to the branch command
665
    def run(self, from_location, to_location=None, revision=None):
628 by Martin Pool
- merge aaron's updated merge/pull code
666
        import errno
667
        from bzrlib.merge import merge
1035 by Martin Pool
- fix import
668
        from bzrlib.branch import DivergedBranches, \
800 by Martin Pool
Merge John's import-speedup branch:
669
             find_cached_branch, Branch
685 by Martin Pool
- add -r option to the branch command
670
        from shutil import rmtree
790 by Martin Pool
Merge from aaron:
671
        from meta_store import CachedStore
672
        import tempfile
673
        cache_root = tempfile.mkdtemp()
897 by Martin Pool
- merge john's revision-naming code
674
909.1.3 by aaron.bentley at utoronto
Fixed branch's --revision argument
675
        if revision is None:
676
            revision = [None]
923 by Martin Pool
- merge aaron's bugfix branch
677
        elif len(revision) > 1:
678
            raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
679
790 by Martin Pool
Merge from aaron:
680
        try:
681
            try:
682
                br_from = find_cached_branch(from_location, cache_root)
683
            except OSError, e:
684
                if e.errno == errno.ENOENT:
685
                    raise BzrCommandError('Source location "%s" does not'
686
                                          ' exist.' % to_location)
687
                else:
688
                    raise
689
690
            if to_location is None:
691
                to_location = os.path.basename(from_location.rstrip("/\\"))
692
693
            try:
694
                os.mkdir(to_location)
695
            except OSError, e:
696
                if e.errno == errno.EEXIST:
697
                    raise BzrCommandError('Target directory "%s" already'
698
                                          ' exists.' % to_location)
699
                if e.errno == errno.ENOENT:
700
                    raise BzrCommandError('Parent of "%s" does not exist.' %
701
                                          to_location)
702
                else:
703
                    raise
704
            br_to = Branch(to_location, init=True)
705
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
706
            br_to.set_root_id(br_from.get_root_id())
707
708
            if revision:
909.1.3 by aaron.bentley at utoronto
Fixed branch's --revision argument
709
                if revision[0] is None:
710
                    revno = br_from.revno()
711
                else:
712
                    revno, rev_id = br_from.get_revision_info(revision[0])
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
713
                try:
714
                    br_to.update_revisions(br_from, stop_revision=revno)
1035 by Martin Pool
- fix import
715
                except bzrlib.errors.NoSuchRevision:
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
716
                    rmtree(to_location)
717
                    msg = "The branch %s has no revision %d." % (from_location,
718
                                                                 revno)
719
                    raise BzrCommandError(msg)
1092.1.21 by Robert Collins
merge up with mpool
720
790 by Martin Pool
Merge from aaron:
721
            merge((to_location, -1), (to_location, 0), this_dir=to_location,
722
                  check_clean=False, ignore_zero=True)
723
            from_location = pull_loc(br_from)
724
            br_to.controlfile("x-pull", "wb").write(from_location + "\n")
725
        finally:
726
            rmtree(cache_root)
628 by Martin Pool
- merge aaron's updated merge/pull code
727
728
729
def pull_loc(branch):
730
    # TODO: Should perhaps just make attribute be 'base' in
731
    # RemoteBranch and Branch?
732
    if hasattr(branch, "baseurl"):
733
        return branch.baseurl
734
    else:
735
        return branch.base
736
737
738
329 by Martin Pool
- refactor command functions into command classes
739
class cmd_renames(Command):
164 by mbp at sourcefrog
new 'renames' command
740
    """Show list of renamed files.
741
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
742
    TODO: Option to show renames between two historical versions.
743
744
    TODO: Only show renames under dir, rather than in the whole branch.
745
    """
329 by Martin Pool
- refactor command functions into command classes
746
    takes_args = ['dir?']
747
748
    def run(self, dir='.'):
800 by Martin Pool
Merge John's import-speedup branch:
749
        b = find_branch(dir)
329 by Martin Pool
- refactor command functions into command classes
750
        old_inv = b.basis_tree().inventory
751
        new_inv = b.read_working_inventory()
752
753
        renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
754
        renames.sort()
755
        for old_name, new_name in renames:
756
            print "%s => %s" % (old_name, new_name)        
757
758
759
class cmd_info(Command):
472 by Martin Pool
- Optional branch parameter to info command
760
    """Show statistical information about a branch."""
761
    takes_args = ['branch?']
762
    
763
    def run(self, branch=None):
329 by Martin Pool
- refactor command functions into command classes
764
        import info
472 by Martin Pool
- Optional branch parameter to info command
765
766
        b = find_branch(branch)
767
        info.show_info(b)
329 by Martin Pool
- refactor command functions into command classes
768
769
770
class cmd_remove(Command):
771
    """Make a file unversioned.
772
773
    This makes bzr stop tracking changes to a versioned file.  It does
774
    not delete the working copy.
775
    """
776
    takes_args = ['file+']
777
    takes_options = ['verbose']
778
    
779
    def run(self, file_list, verbose=False):
800 by Martin Pool
Merge John's import-speedup branch:
780
        b = find_branch(file_list[0])
329 by Martin Pool
- refactor command functions into command classes
781
        b.remove([b.relpath(f) for f in file_list], verbose=verbose)
782
783
784
class cmd_file_id(Command):
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
785
    """Print file_id of a particular file or directory.
786
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
787
    The file_id is assigned when the file is first added and remains the
788
    same through all revisions where the file exists, even when it is
789
    moved or renamed.
790
    """
329 by Martin Pool
- refactor command functions into command classes
791
    hidden = True
792
    takes_args = ['filename']
793
    def run(self, filename):
800 by Martin Pool
Merge John's import-speedup branch:
794
        b = find_branch(filename)
329 by Martin Pool
- refactor command functions into command classes
795
        i = b.inventory.path2id(b.relpath(filename))
796
        if i == None:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
797
            raise BzrError("%r is not a versioned file" % filename)
329 by Martin Pool
- refactor command functions into command classes
798
        else:
799
            print i
800
801
802
class cmd_file_path(Command):
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
803
    """Print path of file_ids to a file or directory.
804
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
805
    This prints one line for each directory down to the target,
806
    starting at the branch root."""
329 by Martin Pool
- refactor command functions into command classes
807
    hidden = True
808
    takes_args = ['filename']
809
    def run(self, filename):
800 by Martin Pool
Merge John's import-speedup branch:
810
        b = find_branch(filename)
329 by Martin Pool
- refactor command functions into command classes
811
        inv = b.inventory
812
        fid = inv.path2id(b.relpath(filename))
813
        if fid == None:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
814
            raise BzrError("%r is not a versioned file" % filename)
329 by Martin Pool
- refactor command functions into command classes
815
        for fip in inv.get_idpath(fid):
816
            print fip
817
818
819
class cmd_revision_history(Command):
820
    """Display list of revision ids on this branch."""
584 by Martin Pool
- make relpath and revision-history hidden commands
821
    hidden = True
329 by Martin Pool
- refactor command functions into command classes
822
    def run(self):
800 by Martin Pool
Merge John's import-speedup branch:
823
        for patchid in find_branch('.').revision_history():
329 by Martin Pool
- refactor command functions into command classes
824
            print patchid
825
826
827
class cmd_directories(Command):
828
    """Display list of versioned directories in this branch."""
829
    def run(self):
800 by Martin Pool
Merge John's import-speedup branch:
830
        for name, ie in find_branch('.').read_working_inventory().directories():
329 by Martin Pool
- refactor command functions into command classes
831
            if name == '':
832
                print '.'
833
            else:
834
                print name
835
836
837
class cmd_init(Command):
838
    """Make a directory into a versioned branch.
839
840
    Use this to create an empty branch, or before importing an
841
    existing project.
842
843
    Recipe for importing a tree of files:
844
        cd ~/project
845
        bzr init
846
        bzr add -v .
847
        bzr status
848
        bzr commit -m 'imported project'
849
    """
850
    def run(self):
800 by Martin Pool
Merge John's import-speedup branch:
851
        from bzrlib.branch import Branch
329 by Martin Pool
- refactor command functions into command classes
852
        Branch('.', init=True)
853
854
855
class cmd_diff(Command):
856
    """Show differences in working tree.
857
    
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
858
    If files are listed, only the changes in those files are listed.
859
    Otherwise, all changes for the tree are listed.
860
861
    TODO: Allow diff across branches.
862
863
    TODO: Option to use external diff command; could be GNU diff, wdiff,
864
          or a graphical diff.
865
276 by Martin Pool
Doc
866
    TODO: Python difflib is not exactly the same as unidiff; should
867
          either fix it up or prefer to use an external diff.
868
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
869
    TODO: If a directory is given, diff everything under that.
870
276 by Martin Pool
Doc
871
    TODO: Selected-file diff is inefficient and doesn't show you
872
          deleted files.
278 by Martin Pool
- Better workaround for trailing newlines in diffs
873
874
    TODO: This probably handles non-Unix newlines poorly.
1040 by Martin Pool
- merge patch to take ranges to diff -r option
875
876
    examples:
877
        bzr diff
878
        bzr diff -r1
879
        bzr diff -r1:2
329 by Martin Pool
- refactor command functions into command classes
880
    """
881
    
882
    takes_args = ['file*']
571 by Martin Pool
- new --diff-options to pass options through to external
883
    takes_options = ['revision', 'diff-options']
638 by Martin Pool
- add 'dif' as alias for 'diff' command
884
    aliases = ['di', 'dif']
329 by Martin Pool
- refactor command functions into command classes
885
571 by Martin Pool
- new --diff-options to pass options through to external
886
    def run(self, revision=None, file_list=None, diff_options=None):
329 by Martin Pool
- refactor command functions into command classes
887
        from bzrlib.diff import show_diff
547 by Martin Pool
- bzr diff finds a branch from the first parameter,
888
889
        if file_list:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
890
            b = find_branch(file_list[0])
547 by Martin Pool
- bzr diff finds a branch from the first parameter,
891
            file_list = [b.relpath(f) for f in file_list]
892
            if file_list == ['']:
893
                # just pointing to top-of-tree
894
                file_list = None
895
        else:
800 by Martin Pool
Merge John's import-speedup branch:
896
            b = find_branch('.')
897 by Martin Pool
- merge john's revision-naming code
897
898
        if revision is not None:
1040 by Martin Pool
- merge patch to take ranges to diff -r option
899
            if len(revision) == 1:
900
                show_diff(b, revision[0], specific_files=file_list,
901
                          external_diff_options=diff_options)
902
            elif len(revision) == 2:
903
                show_diff(b, revision[0], specific_files=file_list,
904
                          external_diff_options=diff_options,
905
                          revision2=revision[1])
906
            else:
907
                raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
908
        else:
909
            show_diff(b, None, specific_files=file_list,
910
                      external_diff_options=diff_options)
329 by Martin Pool
- refactor command functions into command classes
911
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
912
        
913
914
329 by Martin Pool
- refactor command functions into command classes
915
class cmd_deleted(Command):
135 by mbp at sourcefrog
Simple new 'deleted' command
916
    """List files deleted in the working tree.
917
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
918
    TODO: Show files deleted since a previous revision, or between two revisions.
135 by mbp at sourcefrog
Simple new 'deleted' command
919
    """
329 by Martin Pool
- refactor command functions into command classes
920
    def run(self, show_ids=False):
800 by Martin Pool
Merge John's import-speedup branch:
921
        b = find_branch('.')
329 by Martin Pool
- refactor command functions into command classes
922
        old = b.basis_tree()
923
        new = b.working_tree()
924
925
        ## TODO: Much more efficient way to do this: read in new
926
        ## directories with readdir, rather than stating each one.  Same
927
        ## level of effort but possibly much less IO.  (Or possibly not,
928
        ## if the directories are very large...)
929
930
        for path, ie in old.inventory.iter_entries():
931
            if not new.has_id(ie.file_id):
932
                if show_ids:
933
                    print '%-50s %s' % (path, ie.file_id)
934
                else:
935
                    print path
936
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
937
938
class cmd_modified(Command):
939
    """List files modified in working tree."""
940
    hidden = True
941
    def run(self):
1005 by Martin Pool
- split TreeDelta and compare_trees out into new module bzrlib.delta
942
        from bzrlib.delta import compare_trees
865 by Martin Pool
- cleaner 'modified 'command
943
800 by Martin Pool
Merge John's import-speedup branch:
944
        b = find_branch('.')
865 by Martin Pool
- cleaner 'modified 'command
945
        td = compare_trees(b.basis_tree(), b.working_tree())
438 by Martin Pool
- Avoid calling Inventory.iter_entries() when finding modified
946
865 by Martin Pool
- cleaner 'modified 'command
947
        for path, id, kind in td.modified:
948
            print path
439 by Martin Pool
- new command 'bzr added'
949
950
951
952
class cmd_added(Command):
953
    """List files added in working tree."""
954
    hidden = True
955
    def run(self):
800 by Martin Pool
Merge John's import-speedup branch:
956
        b = find_branch('.')
439 by Martin Pool
- new command 'bzr added'
957
        wt = b.working_tree()
958
        basis_inv = b.basis_tree().inventory
959
        inv = wt.inventory
960
        for file_id in inv:
961
            if file_id in basis_inv:
962
                continue
963
            path = inv.id2path(file_id)
964
            if not os.access(b.abspath(path), os.F_OK):
965
                continue
966
            print path
437 by Martin Pool
- new command 'bzr modified' to exercise the statcache
967
                
968
        
969
329 by Martin Pool
- refactor command functions into command classes
970
class cmd_root(Command):
971
    """Show the tree root directory.
972
973
    The root is the nearest enclosing directory with a .bzr control
974
    directory."""
975
    takes_args = ['filename?']
976
    def run(self, filename=None):
977
        """Print the branch root."""
416 by Martin Pool
- bzr log and bzr root now accept an http URL
978
        b = find_branch(filename)
979
        print getattr(b, 'base', None) or getattr(b, 'baseurl')
329 by Martin Pool
- refactor command functions into command classes
980
981
982
class cmd_log(Command):
1 by mbp at sourcefrog
import from baz patch-364
983
    """Show log of this branch.
984
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
985
    To request a range of logs, you can use the command -r begin:end
986
    -r revision requests a specific revision, -r :end or -r begin: are
987
    also valid.
988
900 by Martin Pool
- patch from john to search for matching commits
989
    --message allows you to give a regular expression, which will be evaluated
990
    so that only matching entries will be displayed.
991
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
992
    TODO: Make --revision support uuid: and hash: [future tag:] notation.
993
  
545 by Martin Pool
- --forward option for log
994
    """
367 by Martin Pool
- New --show-ids option for bzr log
995
378 by Martin Pool
- New usage bzr log FILENAME
996
    takes_args = ['filename?']
1053 by Martin Pool
- change default log format back to long
997
    takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
998
                     'long', 'message', 'short',]
545 by Martin Pool
- --forward option for log
999
    
1000
    def run(self, filename=None, timezone='original',
1001
            verbose=False,
1002
            show_ids=False,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
1003
            forward=False,
807 by Martin Pool
- New log --long option
1004
            revision=None,
900 by Martin Pool
- patch from john to search for matching commits
1005
            message=None,
1053 by Martin Pool
- change default log format back to long
1006
            long=False,
1007
            short=False):
800 by Martin Pool
Merge John's import-speedup branch:
1008
        from bzrlib.branch import find_branch
1009
        from bzrlib.log import log_formatter, show_log
562 by Martin Pool
- bug fix for printing logs containing unicode
1010
        import codecs
545 by Martin Pool
- --forward option for log
1011
1012
        direction = (forward and 'forward') or 'reverse'
527 by Martin Pool
- refactor log command
1013
        
378 by Martin Pool
- New usage bzr log FILENAME
1014
        if filename:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
1015
            b = find_branch(filename)
527 by Martin Pool
- refactor log command
1016
            fp = b.relpath(filename)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
1017
            if fp:
1018
                file_id = b.read_working_inventory().path2id(fp)
1019
            else:
1020
                file_id = None  # points to branch root
527 by Martin Pool
- refactor log command
1021
        else:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
1022
            b = find_branch('.')
527 by Martin Pool
- refactor log command
1023
            file_id = None
1024
897 by Martin Pool
- merge john's revision-naming code
1025
        if revision is None:
1026
            rev1 = None
1027
            rev2 = None
1028
        elif len(revision) == 1:
1029
            rev1 = rev2 = b.get_revision_info(revision[0])[0]
1030
        elif len(revision) == 2:
1031
            rev1 = b.get_revision_info(revision[0])[0]
1032
            rev2 = b.get_revision_info(revision[1])[0]
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
1033
        else:
897 by Martin Pool
- merge john's revision-naming code
1034
            raise BzrCommandError('bzr log --revision takes one or two values.')
1035
1036
        if rev1 == 0:
1037
            rev1 = None
1038
        if rev2 == 0:
1039
            rev2 = None
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
1040
562 by Martin Pool
- bug fix for printing logs containing unicode
1041
        mutter('encoding log as %r' % bzrlib.user_encoding)
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
1042
1043
        # use 'replace' so that we don't abort if trying to write out
1044
        # in e.g. the default C locale.
1045
        outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
562 by Martin Pool
- bug fix for printing logs containing unicode
1046
1053 by Martin Pool
- change default log format back to long
1047
        if not short:
807 by Martin Pool
- New log --long option
1048
            log_format = 'long'
1049
        else:
1050
            log_format = 'short'
1051
        lf = log_formatter(log_format,
794 by Martin Pool
- Merge John's nice short-log format.
1052
                           show_ids=show_ids,
1053
                           to_file=outf,
1054
                           show_timezone=timezone)
1055
1056
        show_log(b,
1057
                 lf,
1058
                 file_id,
527 by Martin Pool
- refactor log command
1059
                 verbose=verbose,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
1060
                 direction=direction,
897 by Martin Pool
- merge john's revision-naming code
1061
                 start_revision=rev1,
900 by Martin Pool
- patch from john to search for matching commits
1062
                 end_revision=rev2,
1063
                 search=message)
329 by Martin Pool
- refactor command functions into command classes
1064
1065
375 by Martin Pool
- New command touching-revisions and function to trace
1066
1067
class cmd_touching_revisions(Command):
523 by Martin Pool
doc
1068
    """Return revision-ids which affected a particular file.
1069
1070
    A more user-friendly interface is "bzr log FILE"."""
375 by Martin Pool
- New command touching-revisions and function to trace
1071
    hidden = True
1072
    takes_args = ["filename"]
1073
    def run(self, filename):
800 by Martin Pool
Merge John's import-speedup branch:
1074
        b = find_branch(filename)
375 by Martin Pool
- New command touching-revisions and function to trace
1075
        inv = b.read_working_inventory()
1076
        file_id = inv.path2id(b.relpath(filename))
1077
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1078
            print "%6d %s" % (revno, what)
1079
1080
329 by Martin Pool
- refactor command functions into command classes
1081
class cmd_ls(Command):
1 by mbp at sourcefrog
import from baz patch-364
1082
    """List files in a tree.
1083
254 by Martin Pool
- Doc cleanups from Magnus Therning
1084
    TODO: Take a revision or remote path and list that tree instead.
1 by mbp at sourcefrog
import from baz patch-364
1085
    """
329 by Martin Pool
- refactor command functions into command classes
1086
    hidden = True
1087
    def run(self, revision=None, verbose=False):
800 by Martin Pool
Merge John's import-speedup branch:
1088
        b = find_branch('.')
329 by Martin Pool
- refactor command functions into command classes
1089
        if revision == None:
1090
            tree = b.working_tree()
1091
        else:
1092
            tree = b.revision_tree(b.lookup_revision(revision))
1093
1094
        for fp, fc, kind, fid in tree.list_files():
1095
            if verbose:
1096
                if kind == 'directory':
1097
                    kindch = '/'
1098
                elif kind == 'file':
1099
                    kindch = ''
1100
                else:
1101
                    kindch = '???'
1102
1103
                print '%-8s %s%s' % (fc, fp, kindch)
1 by mbp at sourcefrog
import from baz patch-364
1104
            else:
329 by Martin Pool
- refactor command functions into command classes
1105
                print fp
1106
1107
1108
1109
class cmd_unknowns(Command):
634 by Martin Pool
- Tidy help messages
1110
    """List unknown files."""
329 by Martin Pool
- refactor command functions into command classes
1111
    def run(self):
800 by Martin Pool
Merge John's import-speedup branch:
1112
        from bzrlib.osutils import quotefn
1113
        for f in find_branch('.').unknowns():
329 by Martin Pool
- refactor command functions into command classes
1114
            print quotefn(f)
1115
1116
1117
1118
class cmd_ignore(Command):
634 by Martin Pool
- Tidy help messages
1119
    """Ignore a command or pattern.
420 by Martin Pool
Doc
1120
1121
    To remove patterns from the ignore list, edit the .bzrignore file.
1122
1123
    If the pattern contains a slash, it is compared to the whole path
1124
    from the branch root.  Otherwise, it is comapred to only the last
1125
    component of the path.
1126
1127
    Ignore patterns are case-insensitive on case-insensitive systems.
1128
1129
    Note: wildcards must be quoted from the shell on Unix.
1130
1131
    examples:
1132
        bzr ignore ./Makefile
1133
        bzr ignore '*.class'
1134
    """
329 by Martin Pool
- refactor command functions into command classes
1135
    takes_args = ['name_pattern']
310 by Martin Pool
- new 'bzr ignored' command!
1136
    
329 by Martin Pool
- refactor command functions into command classes
1137
    def run(self, name_pattern):
409 by Martin Pool
- New AtomicFile class
1138
        from bzrlib.atomicfile import AtomicFile
575 by Martin Pool
- cleanup imports
1139
        import os.path
409 by Martin Pool
- New AtomicFile class
1140
800 by Martin Pool
Merge John's import-speedup branch:
1141
        b = find_branch('.')
410 by Martin Pool
- Fix ignore command and add tests
1142
        ifn = b.abspath('.bzrignore')
329 by Martin Pool
- refactor command functions into command classes
1143
410 by Martin Pool
- Fix ignore command and add tests
1144
        if os.path.exists(ifn):
498 by Martin Pool
bugfix for bzr ignore reported by ddaa:
1145
            f = open(ifn, 'rt')
1146
            try:
1147
                igns = f.read().decode('utf-8')
1148
            finally:
1149
                f.close()
409 by Martin Pool
- New AtomicFile class
1150
        else:
1151
            igns = ''
1152
575 by Martin Pool
- cleanup imports
1153
        # TODO: If the file already uses crlf-style termination, maybe
1154
        # we should use that for the newly added lines?
1155
409 by Martin Pool
- New AtomicFile class
1156
        if igns and igns[-1] != '\n':
1157
            igns += '\n'
1158
        igns += name_pattern + '\n'
1159
498 by Martin Pool
bugfix for bzr ignore reported by ddaa:
1160
        try:
1161
            f = AtomicFile(ifn, 'wt')
1162
            f.write(igns.encode('utf-8'))
1163
            f.commit()
1164
        finally:
1165
            f.close()
329 by Martin Pool
- refactor command functions into command classes
1166
1167
        inv = b.working_tree().inventory
1168
        if inv.path2id('.bzrignore'):
1169
            mutter('.bzrignore is already versioned')
1170
        else:
1171
            mutter('need to make new .bzrignore file versioned')
1172
            b.add(['.bzrignore'])
1173
1174
1175
1176
class cmd_ignored(Command):
421 by Martin Pool
doc
1177
    """List ignored files and the patterns that matched them.
1178
1179
    See also: bzr ignore"""
329 by Martin Pool
- refactor command functions into command classes
1180
    def run(self):
800 by Martin Pool
Merge John's import-speedup branch:
1181
        tree = find_branch('.').working_tree()
329 by Martin Pool
- refactor command functions into command classes
1182
        for path, file_class, kind, file_id in tree.list_files():
1183
            if file_class != 'I':
1184
                continue
1185
            ## XXX: Slightly inefficient since this was already calculated
1186
            pat = tree.is_ignored(path)
1187
            print '%-50s %s' % (path, pat)
1188
1189
1190
class cmd_lookup_revision(Command):
1191
    """Lookup the revision-id from a revision-number
1192
1193
    example:
1194
        bzr lookup-revision 33
421 by Martin Pool
doc
1195
    """
329 by Martin Pool
- refactor command functions into command classes
1196
    hidden = True
338 by Martin Pool
- cleanup of some imports
1197
    takes_args = ['revno']
1198
    
329 by Martin Pool
- refactor command functions into command classes
1199
    def run(self, revno):
1200
        try:
1201
            revno = int(revno)
1202
        except ValueError:
338 by Martin Pool
- cleanup of some imports
1203
            raise BzrCommandError("not a valid revision-number: %r" % revno)
1204
800 by Martin Pool
Merge John's import-speedup branch:
1205
        print find_branch('.').lookup_revision(revno)
329 by Martin Pool
- refactor command functions into command classes
1206
1207
1208
class cmd_export(Command):
1209
    """Export past revision to destination directory.
1210
678 by Martin Pool
- export to tarballs
1211
    If no revision is specified this exports the last committed revision.
1212
1213
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
857 by Martin Pool
- If export filename ends in .tar, etc, then make a tarball instead of a directory
1214
    given, try to find the format with the extension. If no extension
1215
    is found exports to a directory (equivalent to --format=dir).
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
1216
857 by Martin Pool
- If export filename ends in .tar, etc, then make a tarball instead of a directory
1217
    Root may be the top directory for tar, tgz and tbz2 formats. If none
1218
    is given, the top directory will be the root name of the file."""
678 by Martin Pool
- export to tarballs
1219
    # TODO: list known exporters
329 by Martin Pool
- refactor command functions into command classes
1220
    takes_args = ['dest']
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
1221
    takes_options = ['revision', 'format', 'root']
857 by Martin Pool
- If export filename ends in .tar, etc, then make a tarball instead of a directory
1222
    def run(self, dest, revision=None, format=None, root=None):
1223
        import os.path
800 by Martin Pool
Merge John's import-speedup branch:
1224
        b = find_branch('.')
897 by Martin Pool
- merge john's revision-naming code
1225
        if revision is None:
1226
            rev_id = b.last_patch()
329 by Martin Pool
- refactor command functions into command classes
1227
        else:
897 by Martin Pool
- merge john's revision-naming code
1228
            if len(revision) != 1:
1229
                raise BzrError('bzr export --revision takes exactly 1 argument')
1230
            revno, rev_id = b.get_revision_info(revision[0])
1231
        t = b.revision_tree(rev_id)
857 by Martin Pool
- If export filename ends in .tar, etc, then make a tarball instead of a directory
1232
        root, ext = os.path.splitext(dest)
1233
        if not format:
1234
            if ext in (".tar",):
1235
                format = "tar"
1236
            elif ext in (".gz", ".tgz"):
1237
                format = "tgz"
1238
            elif ext in (".bz2", ".tbz2"):
1239
                format = "tbz2"
1240
            else:
1241
                format = "dir"
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
1242
        t.export(dest, format, root)
329 by Martin Pool
- refactor command functions into command classes
1243
1244
1245
class cmd_cat(Command):
1246
    """Write a file's text from a previous revision."""
1247
1248
    takes_options = ['revision']
1249
    takes_args = ['filename']
1250
1251
    def run(self, filename, revision=None):
1252
        if revision == None:
1253
            raise BzrCommandError("bzr cat requires a revision number")
897 by Martin Pool
- merge john's revision-naming code
1254
        elif len(revision) != 1:
1255
            raise BzrCommandError("bzr cat --revision takes exactly one number")
800 by Martin Pool
Merge John's import-speedup branch:
1256
        b = find_branch('.')
897 by Martin Pool
- merge john's revision-naming code
1257
        b.print_file(b.relpath(filename), revision[0])
329 by Martin Pool
- refactor command functions into command classes
1258
1259
1260
class cmd_local_time_offset(Command):
1261
    """Show the offset in seconds from GMT to local time."""
1262
    hidden = True    
1263
    def run(self):
1264
        print bzrlib.osutils.local_time_offset()
1265
1266
1267
1268
class cmd_commit(Command):
1269
    """Commit changes into a new revision.
979 by Martin Pool
- fix bugs and add tests for doing commit of selected directories
1270
    
1271
    If no arguments are given, the entire tree is committed.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1272
491 by Martin Pool
- Selective commit!
1273
    If selected files are specified, only changes to those files are
979 by Martin Pool
- fix bugs and add tests for doing commit of selected directories
1274
    committed.  If a directory is specified then the directory and everything 
1275
    within it is committed.
491 by Martin Pool
- Selective commit!
1276
1277
    A selected-file commit may fail in some cases where the committed
1278
    tree would be invalid, such as trying to commit a file in a
1279
    newly-added directory that is not itself committed.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1280
1281
    TODO: Run hooks on tree to-be-committed, and after commit.
1282
1283
    TODO: Strict commit that fails if there are unknown or deleted files.
1284
    """
491 by Martin Pool
- Selective commit!
1285
    takes_args = ['selected*']
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
1286
    takes_options = ['message', 'file', 'verbose', 'unchanged']
350 by Martin Pool
- refactor command aliases into command classes
1287
    aliases = ['ci', 'checkin']
1288
979 by Martin Pool
- fix bugs and add tests for doing commit of selected directories
1289
    # TODO: Give better message for -s, --summary, used by tla people
1290
    
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
1291
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1292
            unchanged=False):
1293
        from bzrlib.errors import PointlessCommit
763 by Martin Pool
- Patch from Torsten Marek to take commit messages through an
1294
        from bzrlib.osutils import get_text_message
485 by Martin Pool
- move commit code into its own module
1295
389 by Martin Pool
- new commit --file option!
1296
        ## Warning: shadows builtin file()
1297
        if not message and not file:
979 by Martin Pool
- fix bugs and add tests for doing commit of selected directories
1298
            # FIXME: Ugly; change status code to send to a provided function?
1299
            
763 by Martin Pool
- Patch from Torsten Marek to take commit messages through an
1300
            import cStringIO
1301
            stdout = sys.stdout
1302
            catcher = cStringIO.StringIO()
1303
            sys.stdout = catcher
1304
            cmd_status({"file_list":selected_list}, {})
1305
            info = catcher.getvalue()
1306
            sys.stdout = stdout
1307
            message = get_text_message(info)
1308
            
1309
            if message is None:
1310
                raise BzrCommandError("please specify a commit message",
1311
                                      ["use either --message or --file"])
389 by Martin Pool
- new commit --file option!
1312
        elif message and file:
1313
            raise BzrCommandError("please specify either --message or --file")
1314
        
1315
        if file:
1316
            import codecs
1317
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1318
800 by Martin Pool
Merge John's import-speedup branch:
1319
        b = find_branch('.')
979 by Martin Pool
- fix bugs and add tests for doing commit of selected directories
1320
        if selected_list:
1321
            selected_list = [b.relpath(s) for s in selected_list]
980 by Martin Pool
- bzr commit from subdirectory should commit the whole tree
1322
            
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
1323
        try:
1324
            b.commit(message, verbose=verbose,
1325
                     specific_files=selected_list,
1326
                     allow_pointless=unchanged)
1327
        except PointlessCommit:
886 by Martin Pool
doc
1328
            # FIXME: This should really happen before the file is read in;
1329
            # perhaps prepare the commit; get the message; then actually commit
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
1330
            raise BzrCommandError("no changes to commit",
1331
                                  ["use --unchanged to commit anyhow"])
329 by Martin Pool
- refactor command functions into command classes
1332
1333
1334
class cmd_check(Command):
1335
    """Validate consistency of branch history.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1336
1337
    This command checks various invariants about the branch storage to
1338
    detect data corruption or bzr bugs.
674 by Martin Pool
- check command now also checks new inventory_sha1 and
1339
1340
    If given the --update flag, it will update some optional fields
1341
    to help ensure data consistency.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1342
    """
329 by Martin Pool
- refactor command functions into command classes
1343
    takes_args = ['dir?']
674 by Martin Pool
- check command now also checks new inventory_sha1 and
1344
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
1345
    def run(self, dir='.'):
800 by Martin Pool
Merge John's import-speedup branch:
1346
        from bzrlib.check import check
1092.1.21 by Robert Collins
merge up with mpool
1347
800 by Martin Pool
Merge John's import-speedup branch:
1348
        check(find_branch(dir))
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
1349
1350
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
1351
class cmd_scan_cache(Command):
949 by Martin Pool
- add back update-hashes command for testing/profiling
1352
    hidden = True
1353
    def run(self):
1354
        from bzrlib.hashcache import HashCache
952 by Martin Pool
- bzr update-hashes shows some stats on what it did
1355
        import os
949 by Martin Pool
- add back update-hashes command for testing/profiling
1356
1357
        c = HashCache('.')
1358
        c.read()
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
1359
        c.scan()
949 by Martin Pool
- add back update-hashes command for testing/profiling
1360
            
952 by Martin Pool
- bzr update-hashes shows some stats on what it did
1361
        print '%6d stats' % c.stat_count
1362
        print '%6d in hashcache' % len(c._cache)
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
1363
        print '%6d files removed from cache' % c.removed_count
1364
        print '%6d hashes updated' % c.update_count
952 by Martin Pool
- bzr update-hashes shows some stats on what it did
1365
        print '%6d files changed too recently to cache' % c.danger_count
949 by Martin Pool
- add back update-hashes command for testing/profiling
1366
952 by Martin Pool
- bzr update-hashes shows some stats on what it did
1367
        if c.needs_write:
1368
            c.write()
1369
            
949 by Martin Pool
- add back update-hashes command for testing/profiling
1370
1371
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
1372
class cmd_upgrade(Command):
1373
    """Upgrade branch storage to current format.
1374
1375
    This should normally be used only after the check command tells
1376
    you to run it.
1377
    """
1378
    takes_args = ['dir?']
1379
1380
    def run(self, dir='.'):
1381
        from bzrlib.upgrade import upgrade
800 by Martin Pool
Merge John's import-speedup branch:
1382
        upgrade(find_branch(dir))
329 by Martin Pool
- refactor command functions into command classes
1383
1384
1385
1386
class cmd_whoami(Command):
1387
    """Show bzr user id."""
1388
    takes_options = ['email']
286 by Martin Pool
- New bzr whoami --email option
1389
    
329 by Martin Pool
- refactor command functions into command classes
1390
    def run(self, email=False):
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
1391
        try:
1392
            b = bzrlib.branch.find_branch('.')
1393
        except:
1394
            b = None
1395
        
329 by Martin Pool
- refactor command functions into command classes
1396
        if email:
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
1397
            print bzrlib.osutils.user_email(b)
329 by Martin Pool
- refactor command functions into command classes
1398
        else:
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
1399
            print bzrlib.osutils.username(b)
329 by Martin Pool
- refactor command functions into command classes
1400
1401
1402
class cmd_selftest(Command):
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
1403
    """Run internal test suite"""
329 by Martin Pool
- refactor command functions into command classes
1404
    hidden = True
1092.1.20 by Robert Collins
import and use TestUtil to do regex based partial test runs
1405
    takes_options = ['verbose', 'pattern']
1406
    def run(self, verbose=False, pattern=".*"):
1092.1.21 by Robert Collins
merge up with mpool
1407
        import bzrlib.ui
608 by Martin Pool
- Split selftests out into a new module and start changing them
1408
        from bzrlib.selftest import selftest
1092.1.21 by Robert Collins
merge up with mpool
1409
        # we don't want progress meters from the tests to go to the
1410
        # real output.
1411
        save_ui = bzrlib.ui.ui_factory
1412
        try:
1413
            bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1414
            return int(not selftest(verbose=verbose, pattern=pattern))
1415
        finally:
1416
            bzrlib.ui.ui_factory = save_ui
329 by Martin Pool
- refactor command functions into command classes
1417
1418
1419
class cmd_version(Command):
634 by Martin Pool
- Tidy help messages
1420
    """Show version of bzr."""
329 by Martin Pool
- refactor command functions into command classes
1421
    def run(self):
1422
        show_version()
1423
1424
def show_version():
1425
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
605 by Martin Pool
- patch from Lalo Martins to show version of bzr itself
1426
    # is bzrlib itself in a branch?
606 by Martin Pool
- new bzrlib.get_bzr_revision() tells about the history of
1427
    bzrrev = bzrlib.get_bzr_revision()
1428
    if bzrrev:
1429
        print "  (bzr checkout, revision %d {%s})" % bzrrev
329 by Martin Pool
- refactor command functions into command classes
1430
    print bzrlib.__copyright__
1431
    print "http://bazaar-ng.org/"
1432
    print
1433
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
1434
    print "you may use, modify and redistribute it under the terms of the GNU"
1435
    print "General Public License version 2 or later."
1436
1437
1438
class cmd_rocks(Command):
1439
    """Statement of optimism."""
1440
    hidden = True
1441
    def run(self):
1442
        print "it sure does!"
1443
493 by Martin Pool
- Merge aaron's merge command
1444
def parse_spec(spec):
622 by Martin Pool
Updated merge patch from Aaron
1445
    """
1446
    >>> parse_spec(None)
1447
    [None, None]
1448
    >>> parse_spec("./")
1449
    ['./', None]
1450
    >>> parse_spec("../@")
1451
    ['..', -1]
1452
    >>> parse_spec("../f/@35")
1453
    ['../f', 35]
897 by Martin Pool
- merge john's revision-naming code
1454
    >>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1455
    ['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
622 by Martin Pool
Updated merge patch from Aaron
1456
    """
1457
    if spec is None:
1458
        return [None, None]
493 by Martin Pool
- Merge aaron's merge command
1459
    if '/@' in spec:
1460
        parsed = spec.split('/@')
1461
        assert len(parsed) == 2
1462
        if parsed[1] == "":
1463
            parsed[1] = -1
1464
        else:
897 by Martin Pool
- merge john's revision-naming code
1465
            try:
1466
                parsed[1] = int(parsed[1])
1467
            except ValueError:
1468
                pass # We can allow stuff like ./@revid:blahblahblah
1469
            else:
1470
                assert parsed[1] >=0
493 by Martin Pool
- Merge aaron's merge command
1471
    else:
1472
        parsed = [spec, None]
1473
    return parsed
1474
628 by Martin Pool
- merge aaron's updated merge/pull code
1475
1476
493 by Martin Pool
- Merge aaron's merge command
1477
class cmd_merge(Command):
1069 by Martin Pool
- merge merge improvements from aaron
1478
    """Perform a three-way merge.
1479
    
1480
    The branch is the branch you will merge from.  By default, it will merge
1481
    the latest revision.  If you specify a revision, that revision will be
1482
    merged.  If you specify two revisions, the first will be used as a BASE, 
1483
    and the second one as OTHER.  Revision numbers are always relative to the
1484
    specified branch.
1485
    
1486
    Examples:
1487
1488
    To merge the latest revision from bzr.dev
1489
    bzr merge ../bzr.dev
1490
1491
    To merge changes up to and including revision 82 from bzr.dev
1492
    bzr merge -r 82 ../bzr.dev
1493
1494
    To merge the changes introduced by 82, without previous changes:
1495
    bzr merge -r 81..82 ../bzr.dev
1496
    
628 by Martin Pool
- merge aaron's updated merge/pull code
1497
    merge refuses to run if there are any uncommitted changes, unless
1498
    --force is given.
622 by Martin Pool
Updated merge patch from Aaron
1499
    """
1069 by Martin Pool
- merge merge improvements from aaron
1500
    takes_args = ['branch?']
1501
    takes_options = ['revision', 'force', 'merge-type']
622 by Martin Pool
Updated merge patch from Aaron
1502
1069 by Martin Pool
- merge merge improvements from aaron
1503
    def run(self, branch='.', revision=None, force=False, 
1504
            merge_type=None):
591 by Martin Pool
- trim imports
1505
        from bzrlib.merge import merge
974.1.9 by Aaron Bentley
Added merge-type parameter to merge.
1506
        from bzrlib.merge_core import ApplyMerge3
1507
        if merge_type is None:
1508
            merge_type = ApplyMerge3
1069 by Martin Pool
- merge merge improvements from aaron
1509
1510
        if revision is None or len(revision) < 1:
1511
            base = (None, None)
1512
            other = (branch, -1)
1513
        else:
1514
            if len(revision) == 1:
1515
                other = (branch, revision[0])
1516
                base = (None, None)
1517
            else:
1518
                assert len(revision) == 2
1519
                if None in revision:
1520
                    raise BzrCommandError(
1521
                        "Merge doesn't permit that revision specifier.")
1522
                base = (branch, revision[0])
1523
                other = (branch, revision[1])
1524
            
1525
        merge(other, base, check_clean=(not force), merge_type=merge_type)
622 by Martin Pool
Updated merge patch from Aaron
1526
778 by Martin Pool
- simple revert of text files
1527
784 by Martin Pool
- rename merge-based revert command to 'merge-revert'
1528
class cmd_revert(Command):
628 by Martin Pool
- merge aaron's updated merge/pull code
1529
    """Reverse all changes since the last commit.
1530
974.1.10 by aaron.bentley at utoronto
Added file-selection to merge-revert
1531
    Only versioned files are affected.  Specify filenames to revert only 
1532
    those files.  By default, any files that are changed will be backed up
1533
    first.  Backup files have a '~' appended to their name.
622 by Martin Pool
Updated merge patch from Aaron
1534
    """
974.1.8 by Aaron Bentley
Added default backups for merge-revert
1535
    takes_options = ['revision', 'no-backup']
974.1.10 by aaron.bentley at utoronto
Added file-selection to merge-revert
1536
    takes_args = ['file*']
974.1.11 by aaron.bentley at utoronto
replaced revert with merge-revert
1537
    aliases = ['merge-revert']
622 by Martin Pool
Updated merge patch from Aaron
1538
974.1.10 by aaron.bentley at utoronto
Added file-selection to merge-revert
1539
    def run(self, revision=None, no_backup=False, file_list=None):
636 by Martin Pool
- fix missing import in revert
1540
        from bzrlib.merge import merge
974.1.10 by aaron.bentley at utoronto
Added file-selection to merge-revert
1541
        if file_list is not None:
1542
            if len(file_list) == 0:
1543
                raise BzrCommandError("No files specified")
897 by Martin Pool
- merge john's revision-naming code
1544
        if revision is None:
909.1.1 by aaron.bentley at utoronto
Fixed handling of merge-revert with no --revision
1545
            revision = [-1]
897 by Martin Pool
- merge john's revision-naming code
1546
        elif len(revision) != 1:
974.1.11 by aaron.bentley at utoronto
replaced revert with merge-revert
1547
            raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
897 by Martin Pool
- merge john's revision-naming code
1548
        merge(('.', revision[0]), parse_spec('.'),
628 by Martin Pool
- merge aaron's updated merge/pull code
1549
              check_clean=False,
974.1.8 by Aaron Bentley
Added default backups for merge-revert
1550
              ignore_zero=True,
974.1.10 by aaron.bentley at utoronto
Added file-selection to merge-revert
1551
              backup_files=not no_backup,
1552
              file_list=file_list)
622 by Martin Pool
Updated merge patch from Aaron
1553
1554
329 by Martin Pool
- refactor command functions into command classes
1555
class cmd_assert_fail(Command):
1556
    """Test reporting of assertion failures"""
1557
    hidden = True
1558
    def run(self):
1559
        assert False, "always fails"
1560
1561
1562
class cmd_help(Command):
1563
    """Show help on a command or other topic.
1564
1565
    For a list of all available commands, say 'bzr help commands'."""
1566
    takes_args = ['topic?']
350 by Martin Pool
- refactor command aliases into command classes
1567
    aliases = ['?']
329 by Martin Pool
- refactor command functions into command classes
1568
    
1569
    def run(self, topic=None):
351 by Martin Pool
- Split out help functions into bzrlib.help
1570
        import help
1571
        help.help(topic)
1572
1 by mbp at sourcefrog
import from baz patch-364
1573
1091 by Martin Pool
- new shell-complete command to help zsh completion
1574
class cmd_shell_complete(Command):
1575
    """Show appropriate completions for context.
1576
1577
    For a list of all available commands, say 'bzr shell-complete'."""
1578
    takes_args = ['context?']
1579
    aliases = ['s-c']
1580
    hidden = True
1581
    
1582
    def run(self, context=None):
1583
        import shellcomplete
1584
        shellcomplete.shellcomplete(context)
429 by Martin Pool
- New command update-stat-cache for testing
1585
1 by mbp at sourcefrog
import from baz patch-364
1586
1054 by Martin Pool
- merge john's "missing" command
1587
class cmd_missing(Command):
1588
    """What is missing in this branch relative to other branch.
1589
    """
1590
    takes_args = ['remote?']
1591
    aliases = ['mis', 'miss']
1592
    # We don't have to add quiet to the list, because 
1593
    # unknown options are parsed as booleans
1594
    takes_options = ['verbose', 'quiet']
1595
1596
    def run(self, remote=None, verbose=False, quiet=False):
1597
        from bzrlib.branch import find_branch, DivergedBranches
1598
        from bzrlib.errors import BzrCommandError
1599
        from bzrlib.missing import get_parent, show_missing
1600
1601
        if verbose and quiet:
1602
            raise BzrCommandError('Cannot pass both quiet and verbose')
1603
1604
        b = find_branch('.')
1605
        parent = get_parent(b)
1606
        if remote is None:
1607
            if parent is None:
1608
                raise BzrCommandError("No missing location known or specified.")
1609
            else:
1610
                if not quiet:
1611
                    print "Using last location: %s" % parent
1612
                remote = parent
1613
        elif parent is None:
1614
            # We only update x-pull if it did not exist, missing should not change the parent
1615
            b.controlfile('x-pull', 'wb').write(remote + '\n')
1616
        br_remote = find_branch(remote)
1617
1618
        return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1619
1620
1092.1.18 by Robert Collins
merge from mpool
1621
755 by Martin Pool
- new 'plugins' command
1622
class cmd_plugins(Command):
1623
    """List plugins"""
1624
    hidden = True
1625
    def run(self):
1626
        import bzrlib.plugin
908 by Martin Pool
- merge john's plugins-have-test_suite.patch:
1627
        from inspect import getdoc
756 by Martin Pool
- plugins documentation; better error reporting when failing to
1628
        from pprint import pprint
908 by Martin Pool
- merge john's plugins-have-test_suite.patch:
1629
        for plugin in bzrlib.plugin.all_plugins:
1630
            print plugin.__path__[0]
1631
            d = getdoc(plugin)
1632
            if d:
1633
                print '\t', d.split('\n')[0]
1634
1635
        #pprint(bzrlib.plugin.all_plugins)
755 by Martin Pool
- new 'plugins' command
1636
1637
1638
1 by mbp at sourcefrog
import from baz patch-364
1639
# list of all available options; the rhs can be either None for an
1640
# option that takes no argument, or a constructor function that checks
1641
# the type.
1642
OPTIONS = {
1643
    'all':                    None,
571 by Martin Pool
- new --diff-options to pass options through to external
1644
    'diff-options':           str,
1 by mbp at sourcefrog
import from baz patch-364
1645
    'help':                   None,
389 by Martin Pool
- new commit --file option!
1646
    'file':                   unicode,
628 by Martin Pool
- merge aaron's updated merge/pull code
1647
    'force':                  None,
678 by Martin Pool
- export to tarballs
1648
    'format':                 unicode,
545 by Martin Pool
- --forward option for log
1649
    'forward':                None,
1 by mbp at sourcefrog
import from baz patch-364
1650
    'message':                unicode,
594 by Martin Pool
- add --no-recurse option for add command
1651
    'no-recurse':             None,
137 by mbp at sourcefrog
new --profile option
1652
    'profile':                None,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
1653
    'revision':               _parse_revision_str,
1053 by Martin Pool
- change default log format back to long
1654
    'short':                  None,
1 by mbp at sourcefrog
import from baz patch-364
1655
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
1656
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
1657
    'verbose':                None,
1658
    'version':                None,
286 by Martin Pool
- New bzr whoami --email option
1659
    'email':                  None,
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
1660
    'unchanged':              None,
674 by Martin Pool
- check command now also checks new inventory_sha1 and
1661
    'update':                 None,
807 by Martin Pool
- New log --long option
1662
    'long':                   None,
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
1663
    'root':                   str,
974.1.8 by Aaron Bentley
Added default backups for merge-revert
1664
    'no-backup':              None,
974.1.9 by Aaron Bentley
Added merge-type parameter to merge.
1665
    'merge-type':             get_merge_type,
1092.1.20 by Robert Collins
import and use TestUtil to do regex based partial test runs
1666
    'pattern':                str,
1 by mbp at sourcefrog
import from baz patch-364
1667
    }
1668
1669
SHORT_OPTIONS = {
583 by Martin Pool
- add -h as short name for --help
1670
    'F':                      'file', 
1671
    'h':                      'help',
1 by mbp at sourcefrog
import from baz patch-364
1672
    'm':                      'message',
1673
    'r':                      'revision',
1674
    'v':                      'verbose',
807 by Martin Pool
- New log --long option
1675
    'l':                      'long',
1 by mbp at sourcefrog
import from baz patch-364
1676
}
1677
1678
1679
def parse_args(argv):
1680
    """Parse command line.
1681
    
1682
    Arguments and options are parsed at this level before being passed
1683
    down to specific command handlers.  This routine knows, from a
1684
    lookup table, something about the available options, what optargs
1685
    they take, and which commands will accept them.
1686
31 by Martin Pool
fix up parse_args doctest
1687
    >>> parse_args('--help'.split())
1 by mbp at sourcefrog
import from baz patch-364
1688
    ([], {'help': True})
31 by Martin Pool
fix up parse_args doctest
1689
    >>> parse_args('--version'.split())
1 by mbp at sourcefrog
import from baz patch-364
1690
    ([], {'version': True})
31 by Martin Pool
fix up parse_args doctest
1691
    >>> parse_args('status --all'.split())
1 by mbp at sourcefrog
import from baz patch-364
1692
    (['status'], {'all': True})
31 by Martin Pool
fix up parse_args doctest
1693
    >>> parse_args('commit --message=biter'.split())
17 by mbp at sourcefrog
allow --option=ARG syntax
1694
    (['commit'], {'message': u'biter'})
683 by Martin Pool
- short option stacking patch from John A Meinel
1695
    >>> parse_args('log -r 500'.split())
897 by Martin Pool
- merge john's revision-naming code
1696
    (['log'], {'revision': [500]})
1697
    >>> parse_args('log -r500..600'.split())
683 by Martin Pool
- short option stacking patch from John A Meinel
1698
    (['log'], {'revision': [500, 600]})
897 by Martin Pool
- merge john's revision-naming code
1699
    >>> parse_args('log -vr500..600'.split())
683 by Martin Pool
- short option stacking patch from John A Meinel
1700
    (['log'], {'verbose': True, 'revision': [500, 600]})
897 by Martin Pool
- merge john's revision-naming code
1701
    >>> parse_args('log -rv500..600'.split()) #the r takes an argument
1702
    (['log'], {'revision': ['v500', 600]})
1 by mbp at sourcefrog
import from baz patch-364
1703
    """
1704
    args = []
1705
    opts = {}
1706
1707
    # TODO: Maybe handle '--' to end options?
1708
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1709
    while argv:
1710
        a = argv.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
1711
        if a[0] == '-':
264 by Martin Pool
parse_args: option names must be ascii
1712
            # option names must not be unicode
1713
            a = str(a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1714
            optarg = None
1 by mbp at sourcefrog
import from baz patch-364
1715
            if a[1] == '-':
1716
                mutter("  got option %r" % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1717
                if '=' in a:
1718
                    optname, optarg = a[2:].split('=', 1)
1719
                else:
1720
                    optname = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
1721
                if optname not in OPTIONS:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1722
                    raise BzrError('unknown long option %r' % a)
1 by mbp at sourcefrog
import from baz patch-364
1723
            else:
1724
                shortopt = a[1:]
683 by Martin Pool
- short option stacking patch from John A Meinel
1725
                if shortopt in SHORT_OPTIONS:
1726
                    # Multi-character options must have a space to delimit
1727
                    # their value
1728
                    optname = SHORT_OPTIONS[shortopt]
1729
                else:
1730
                    # Single character short options, can be chained,
1731
                    # and have their value appended to their name
1732
                    shortopt = a[1:2]
1733
                    if shortopt not in SHORT_OPTIONS:
1734
                        # We didn't find the multi-character name, and we
1735
                        # didn't find the single char name
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1736
                        raise BzrError('unknown short option %r' % a)
683 by Martin Pool
- short option stacking patch from John A Meinel
1737
                    optname = SHORT_OPTIONS[shortopt]
1738
1739
                    if a[2:]:
1740
                        # There are extra things on this option
1741
                        # see if it is the value, or if it is another
1742
                        # short option
1743
                        optargfn = OPTIONS[optname]
1744
                        if optargfn is None:
1745
                            # This option does not take an argument, so the
1746
                            # next entry is another short option, pack it back
1747
                            # into the list
1748
                            argv.insert(0, '-' + a[2:])
1749
                        else:
1750
                            # This option takes an argument, so pack it
1751
                            # into the array
1752
                            optarg = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
1753
            
1754
            if optname in opts:
1755
                # 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
1756
                raise BzrError('repeated option %r' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1757
                
1 by mbp at sourcefrog
import from baz patch-364
1758
            optargfn = OPTIONS[optname]
1759
            if optargfn:
17 by mbp at sourcefrog
allow --option=ARG syntax
1760
                if optarg == None:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1761
                    if not argv:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1762
                        raise BzrError('option %r needs an argument' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1763
                    else:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1764
                        optarg = argv.pop(0)
17 by mbp at sourcefrog
allow --option=ARG syntax
1765
                opts[optname] = optargfn(optarg)
1 by mbp at sourcefrog
import from baz patch-364
1766
            else:
17 by mbp at sourcefrog
allow --option=ARG syntax
1767
                if optarg != None:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1768
                    raise BzrError('option %r takes no argument' % optname)
1 by mbp at sourcefrog
import from baz patch-364
1769
                opts[optname] = True
1770
        else:
1771
            args.append(a)
1772
1773
    return args, opts
1774
1775
1776
1777
329 by Martin Pool
- refactor command functions into command classes
1778
def _match_argform(cmd, takes_args, args):
1 by mbp at sourcefrog
import from baz patch-364
1779
    argdict = {}
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1780
329 by Martin Pool
- refactor command functions into command classes
1781
    # step through args and takes_args, allowing appropriate 0-many matches
1782
    for ap in takes_args:
1 by mbp at sourcefrog
import from baz patch-364
1783
        argname = ap[:-1]
1784
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
1785
            if args:
1786
                argdict[argname] = args.pop(0)
196 by mbp at sourcefrog
selected-file diff
1787
        elif ap[-1] == '*': # all remaining arguments
1788
            if args:
1789
                argdict[argname + '_list'] = args[:]
1790
                args = []
1791
            else:
1792
                argdict[argname + '_list'] = None
1 by mbp at sourcefrog
import from baz patch-364
1793
        elif ap[-1] == '+':
1794
            if not args:
329 by Martin Pool
- refactor command functions into command classes
1795
                raise BzrCommandError("command %r needs one or more %s"
1 by mbp at sourcefrog
import from baz patch-364
1796
                        % (cmd, argname.upper()))
1797
            else:
1798
                argdict[argname + '_list'] = args[:]
1799
                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
1800
        elif ap[-1] == '$': # all but one
1801
            if len(args) < 2:
329 by Martin Pool
- refactor command functions into command classes
1802
                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
1803
                        % (cmd, argname.upper()))
1804
            argdict[argname + '_list'] = args[:-1]
1805
            args[:-1] = []                
1 by mbp at sourcefrog
import from baz patch-364
1806
        else:
1807
            # just a plain arg
1808
            argname = ap
1809
            if not args:
329 by Martin Pool
- refactor command functions into command classes
1810
                raise BzrCommandError("command %r requires argument %s"
1 by mbp at sourcefrog
import from baz patch-364
1811
                        % (cmd, argname.upper()))
1812
            else:
1813
                argdict[argname] = args.pop(0)
1814
            
1815
    if args:
329 by Martin Pool
- refactor command functions into command classes
1816
        raise BzrCommandError("extra argument to command %s: %s"
1817
                              % (cmd, args[0]))
1 by mbp at sourcefrog
import from baz patch-364
1818
1819
    return argdict
1820
1821
1822
1823
def run_bzr(argv):
1824
    """Execute a command.
1825
1826
    This is similar to main(), but without all the trappings for
245 by mbp at sourcefrog
- control files always in utf-8-unix format
1827
    logging and error handling.  
973 by Martin Pool
- various refactorings of command interpreter
1828
    
1829
    argv
986 by Martin Pool
- Factor away _parse_master_args, which seems a bit overcomplicated.
1830
       The command-line arguments, without the program name from argv[0]
973 by Martin Pool
- various refactorings of command interpreter
1831
    
1832
    Returns a command status or raises an exception.
986 by Martin Pool
- Factor away _parse_master_args, which seems a bit overcomplicated.
1833
1834
    Special master options: these must come before the command because
1835
    they control how the command is interpreted.
1836
1837
    --no-plugins
1838
        Do not load plugin modules at all
1839
1840
    --builtin
1841
        Only use builtin commands.  (Plugins are still allowed to change
1842
        other behaviour.)
1843
1844
    --profile
1845
        Run under the Python profiler.
1 by mbp at sourcefrog
import from baz patch-364
1846
    """
986 by Martin Pool
- Factor away _parse_master_args, which seems a bit overcomplicated.
1847
    
251 by mbp at sourcefrog
- factor out locale.getpreferredencoding()
1848
    argv = [a.decode(bzrlib.user_encoding) for a in argv]
973 by Martin Pool
- various refactorings of command interpreter
1849
986 by Martin Pool
- Factor away _parse_master_args, which seems a bit overcomplicated.
1850
    opt_profile = opt_no_plugins = opt_builtin = False
1851
1852
    # --no-plugins is handled specially at a very early stage. We need
1853
    # to load plugins before doing other command parsing so that they
1854
    # can override commands, but this needs to happen first.
1855
1856
    for a in argv[:]:
1857
        if a == '--profile':
1858
            opt_profile = True
1859
        elif a == '--no-plugins':
1860
            opt_no_plugins = True
1861
        elif a == '--builtin':
1862
            opt_builtin = True
1863
        else:
1864
            break
1865
        argv.remove(a)
1866
1867
    if not opt_no_plugins:
973 by Martin Pool
- various refactorings of command interpreter
1868
        from bzrlib.plugin import load_plugins
1869
        load_plugins()
1870
1871
    args, opts = parse_args(argv)
1872
986 by Martin Pool
- Factor away _parse_master_args, which seems a bit overcomplicated.
1873
    if 'help' in opts:
973 by Martin Pool
- various refactorings of command interpreter
1874
        from bzrlib.help import help
986 by Martin Pool
- Factor away _parse_master_args, which seems a bit overcomplicated.
1875
        if args:
1876
            help(args[0])
973 by Martin Pool
- various refactorings of command interpreter
1877
        else:
1878
            help()
1879
        return 0            
1880
        
1881
    if 'version' in opts:
1882
        show_version()
1883
        return 0
1884
    
986 by Martin Pool
- Factor away _parse_master_args, which seems a bit overcomplicated.
1885
    if not args:
1092.1.18 by Robert Collins
merge from mpool
1886
        from bzrlib.help import help
1887
        help(None)
1888
        return 0
986 by Martin Pool
- Factor away _parse_master_args, which seems a bit overcomplicated.
1889
    
1890
    cmd = str(args.pop(0))
1891
1892
    canonical_cmd, cmd_class = \
1893
                   get_cmd_class(cmd, plugins_override=not opt_builtin)
1 by mbp at sourcefrog
import from baz patch-364
1894
1895
    # check options are reasonable
329 by Martin Pool
- refactor command functions into command classes
1896
    allowed = cmd_class.takes_options
1 by mbp at sourcefrog
import from baz patch-364
1897
    for oname in opts:
1898
        if oname not in allowed:
381 by Martin Pool
- Better message when a wrong argument is given
1899
            raise BzrCommandError("option '--%s' is not allowed for command %r"
329 by Martin Pool
- refactor command functions into command classes
1900
                                  % (oname, cmd))
176 by mbp at sourcefrog
New cat command contributed by janmar.
1901
137 by mbp at sourcefrog
new --profile option
1902
    # mix arguments and options into one dictionary
329 by Martin Pool
- refactor command functions into command classes
1903
    cmdargs = _match_argform(cmd, cmd_class.takes_args, args)
1904
    cmdopts = {}
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
1905
    for k, v in opts.items():
329 by Martin Pool
- refactor command functions into command classes
1906
        cmdopts[k.replace('-', '_')] = v
1 by mbp at sourcefrog
import from baz patch-364
1907
986 by Martin Pool
- Factor away _parse_master_args, which seems a bit overcomplicated.
1908
    if opt_profile:
338 by Martin Pool
- cleanup of some imports
1909
        import hotshot, tempfile
239 by mbp at sourcefrog
- remove profiler temporary file when done
1910
        pffileno, pfname = tempfile.mkstemp()
1911
        try:
1912
            prof = hotshot.Profile(pfname)
329 by Martin Pool
- refactor command functions into command classes
1913
            ret = prof.runcall(cmd_class, cmdopts, cmdargs) or 0
239 by mbp at sourcefrog
- remove profiler temporary file when done
1914
            prof.close()
1915
1916
            import hotshot.stats
1917
            stats = hotshot.stats.load(pfname)
1918
            #stats.strip_dirs()
1919
            stats.sort_stats('time')
1920
            ## XXX: Might like to write to stderr or the trace file instead but
1921
            ## print_stats seems hardcoded to stdout
1922
            stats.print_stats(20)
1923
            
337 by Martin Pool
- Clarify return codes from command objects
1924
            return ret.status
239 by mbp at sourcefrog
- remove profiler temporary file when done
1925
1926
        finally:
1927
            os.close(pffileno)
1928
            os.remove(pfname)
137 by mbp at sourcefrog
new --profile option
1929
    else:
500 by Martin Pool
- fix return value from run_bzr
1930
        return cmd_class(cmdopts, cmdargs).status 
1 by mbp at sourcefrog
import from baz patch-364
1931
1932
359 by Martin Pool
- pychecker fixups
1933
def _report_exception(summary, quiet=False):
267 by Martin Pool
- better reporting of errors
1934
    import traceback
1025 by Martin Pool
- if 1 is set, show tracebacks directly on stderr
1935
    
267 by Martin Pool
- better reporting of errors
1936
    log_error('bzr: ' + summary)
1025 by Martin Pool
- if 1 is set, show tracebacks directly on stderr
1937
317 by Martin Pool
- better error message for broken pipe
1938
    if not quiet:
1025 by Martin Pool
- if 1 is set, show tracebacks directly on stderr
1939
        sys.stderr.write('\n')
317 by Martin Pool
- better error message for broken pipe
1940
        tb = sys.exc_info()[2]
1941
        exinfo = traceback.extract_tb(tb)
1942
        if exinfo:
1943
            sys.stderr.write('  at %s:%d in %s()\n' % exinfo[-1][:3])
1944
        sys.stderr.write('  see ~/.bzr.log for debug information\n')
267 by Martin Pool
- better reporting of errors
1945
1946
1947
1 by mbp at sourcefrog
import from baz patch-364
1948
def main(argv):
1092.1.21 by Robert Collins
merge up with mpool
1949
    import bzrlib.ui
1950
    
800 by Martin Pool
Merge John's import-speedup branch:
1951
    bzrlib.trace.open_tracefile(argv)
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1952
1092.1.21 by Robert Collins
merge up with mpool
1953
    bzrlib.ui.ui_factory = bzrlib.ui.TextUIFactory()
1954
1 by mbp at sourcefrog
import from baz patch-364
1955
    try:
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1956
        try:
1092.1.18 by Robert Collins
merge from mpool
1957
            return run_bzr(argv[1:])
1958
        finally:
1959
            # do this here inside the exception wrappers to catch EPIPE
1960
            sys.stdout.flush()
1961
    except BzrCommandError, e:
1962
        # command line syntax error, etc
1963
        log_error(str(e))
1964
        return 1
1965
    except BzrError, e:
1966
        bzrlib.trace.log_exception()
1967
        return 1
1968
    except AssertionError, e:
1969
        bzrlib.trace.log_exception('assertion failed: ' + str(e))
1970
        return 3
1971
    except KeyboardInterrupt, e:
1972
        bzrlib.trace.note('interrupted')
1973
        return 2
1974
    except Exception, e:
1975
        import errno
1976
        if (isinstance(e, IOError) 
1977
            and hasattr(e, 'errno')
1978
            and e.errno == errno.EPIPE):
1979
            bzrlib.trace.note('broken pipe')
1980
            return 2
1981
        else:
1982
            bzrlib.trace.log_exception('terminated by exception')
1983
            return 2
1 by mbp at sourcefrog
import from baz patch-364
1984
1985
1986
if __name__ == '__main__':
1987
    sys.exit(main(sys.argv))