/brz/remove-bazaar

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