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