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