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