/brz/remove-bazaar

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