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