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