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