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