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