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