/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
794 by Martin Pool
- Merge John's nice short-log format.
845
        from bzrlib.log import log_formatter
562 by Martin Pool
- bug fix for printing logs containing unicode
846
        import codecs
545 by Martin Pool
- --forward option for log
847
848
        direction = (forward and 'forward') or 'reverse'
527 by Martin Pool
- refactor log command
849
        
378 by Martin Pool
- New usage bzr log FILENAME
850
        if filename:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
851
            b = find_branch(filename)
527 by Martin Pool
- refactor log command
852
            fp = b.relpath(filename)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
853
            if fp:
854
                file_id = b.read_working_inventory().path2id(fp)
855
            else:
856
                file_id = None  # points to branch root
527 by Martin Pool
- refactor log command
857
        else:
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
858
            b = find_branch('.')
527 by Martin Pool
- refactor log command
859
            file_id = None
860
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
861
        if revision == None:
862
            revision = [None, None]
863
        elif isinstance(revision, int):
864
            revision = [revision, revision]
865
        else:
866
            # pair of revisions?
867
            pass
868
            
869
        assert len(revision) == 2
870
562 by Martin Pool
- bug fix for printing logs containing unicode
871
        mutter('encoding log as %r' % bzrlib.user_encoding)
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
872
873
        # use 'replace' so that we don't abort if trying to write out
874
        # in e.g. the default C locale.
875
        outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
562 by Martin Pool
- bug fix for printing logs containing unicode
876
794 by Martin Pool
- Merge John's nice short-log format.
877
        lf = log_formatter('short',
878
                           show_ids=show_ids,
879
                           to_file=outf,
880
                           show_timezone=timezone)
881
882
        show_log(b,
883
                 lf,
884
                 file_id,
527 by Martin Pool
- refactor log command
885
                 verbose=verbose,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
886
                 direction=direction,
887
                 start_revision=revision[0],
888
                 end_revision=revision[1])
329 by Martin Pool
- refactor command functions into command classes
889
890
375 by Martin Pool
- New command touching-revisions and function to trace
891
892
class cmd_touching_revisions(Command):
523 by Martin Pool
doc
893
    """Return revision-ids which affected a particular file.
894
895
    A more user-friendly interface is "bzr log FILE"."""
375 by Martin Pool
- New command touching-revisions and function to trace
896
    hidden = True
897
    takes_args = ["filename"]
898
    def run(self, filename):
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
899
        b = Branch(filename)
375 by Martin Pool
- New command touching-revisions and function to trace
900
        inv = b.read_working_inventory()
901
        file_id = inv.path2id(b.relpath(filename))
902
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
903
            print "%6d %s" % (revno, what)
904
905
329 by Martin Pool
- refactor command functions into command classes
906
class cmd_ls(Command):
1 by mbp at sourcefrog
import from baz patch-364
907
    """List files in a tree.
908
254 by Martin Pool
- Doc cleanups from Magnus Therning
909
    TODO: Take a revision or remote path and list that tree instead.
1 by mbp at sourcefrog
import from baz patch-364
910
    """
329 by Martin Pool
- refactor command functions into command classes
911
    hidden = True
912
    def run(self, revision=None, verbose=False):
913
        b = Branch('.')
914
        if revision == None:
915
            tree = b.working_tree()
916
        else:
917
            tree = b.revision_tree(b.lookup_revision(revision))
918
919
        for fp, fc, kind, fid in tree.list_files():
920
            if verbose:
921
                if kind == 'directory':
922
                    kindch = '/'
923
                elif kind == 'file':
924
                    kindch = ''
925
                else:
926
                    kindch = '???'
927
928
                print '%-8s %s%s' % (fc, fp, kindch)
1 by mbp at sourcefrog
import from baz patch-364
929
            else:
329 by Martin Pool
- refactor command functions into command classes
930
                print fp
931
932
933
934
class cmd_unknowns(Command):
634 by Martin Pool
- Tidy help messages
935
    """List unknown files."""
329 by Martin Pool
- refactor command functions into command classes
936
    def run(self):
937
        for f in Branch('.').unknowns():
938
            print quotefn(f)
939
940
941
942
class cmd_ignore(Command):
634 by Martin Pool
- Tidy help messages
943
    """Ignore a command or pattern.
420 by Martin Pool
Doc
944
945
    To remove patterns from the ignore list, edit the .bzrignore file.
946
947
    If the pattern contains a slash, it is compared to the whole path
948
    from the branch root.  Otherwise, it is comapred to only the last
949
    component of the path.
950
951
    Ignore patterns are case-insensitive on case-insensitive systems.
952
953
    Note: wildcards must be quoted from the shell on Unix.
954
955
    examples:
956
        bzr ignore ./Makefile
957
        bzr ignore '*.class'
958
    """
329 by Martin Pool
- refactor command functions into command classes
959
    takes_args = ['name_pattern']
310 by Martin Pool
- new 'bzr ignored' command!
960
    
329 by Martin Pool
- refactor command functions into command classes
961
    def run(self, name_pattern):
409 by Martin Pool
- New AtomicFile class
962
        from bzrlib.atomicfile import AtomicFile
575 by Martin Pool
- cleanup imports
963
        import os.path
409 by Martin Pool
- New AtomicFile class
964
329 by Martin Pool
- refactor command functions into command classes
965
        b = Branch('.')
410 by Martin Pool
- Fix ignore command and add tests
966
        ifn = b.abspath('.bzrignore')
329 by Martin Pool
- refactor command functions into command classes
967
410 by Martin Pool
- Fix ignore command and add tests
968
        if os.path.exists(ifn):
498 by Martin Pool
bugfix for bzr ignore reported by ddaa:
969
            f = open(ifn, 'rt')
970
            try:
971
                igns = f.read().decode('utf-8')
972
            finally:
973
                f.close()
409 by Martin Pool
- New AtomicFile class
974
        else:
975
            igns = ''
976
575 by Martin Pool
- cleanup imports
977
        # TODO: If the file already uses crlf-style termination, maybe
978
        # we should use that for the newly added lines?
979
409 by Martin Pool
- New AtomicFile class
980
        if igns and igns[-1] != '\n':
981
            igns += '\n'
982
        igns += name_pattern + '\n'
983
498 by Martin Pool
bugfix for bzr ignore reported by ddaa:
984
        try:
985
            f = AtomicFile(ifn, 'wt')
986
            f.write(igns.encode('utf-8'))
987
            f.commit()
988
        finally:
989
            f.close()
329 by Martin Pool
- refactor command functions into command classes
990
991
        inv = b.working_tree().inventory
992
        if inv.path2id('.bzrignore'):
993
            mutter('.bzrignore is already versioned')
994
        else:
995
            mutter('need to make new .bzrignore file versioned')
996
            b.add(['.bzrignore'])
997
998
999
1000
class cmd_ignored(Command):
421 by Martin Pool
doc
1001
    """List ignored files and the patterns that matched them.
1002
1003
    See also: bzr ignore"""
329 by Martin Pool
- refactor command functions into command classes
1004
    def run(self):
1005
        tree = Branch('.').working_tree()
1006
        for path, file_class, kind, file_id in tree.list_files():
1007
            if file_class != 'I':
1008
                continue
1009
            ## XXX: Slightly inefficient since this was already calculated
1010
            pat = tree.is_ignored(path)
1011
            print '%-50s %s' % (path, pat)
1012
1013
1014
class cmd_lookup_revision(Command):
1015
    """Lookup the revision-id from a revision-number
1016
1017
    example:
1018
        bzr lookup-revision 33
421 by Martin Pool
doc
1019
    """
329 by Martin Pool
- refactor command functions into command classes
1020
    hidden = True
338 by Martin Pool
- cleanup of some imports
1021
    takes_args = ['revno']
1022
    
329 by Martin Pool
- refactor command functions into command classes
1023
    def run(self, revno):
1024
        try:
1025
            revno = int(revno)
1026
        except ValueError:
338 by Martin Pool
- cleanup of some imports
1027
            raise BzrCommandError("not a valid revision-number: %r" % revno)
1028
1029
        print Branch('.').lookup_revision(revno)
329 by Martin Pool
- refactor command functions into command classes
1030
1031
1032
class cmd_export(Command):
1033
    """Export past revision to destination directory.
1034
678 by Martin Pool
- export to tarballs
1035
    If no revision is specified this exports the last committed revision.
1036
1037
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
1038
    given, exports to a directory (equivalent to --format=dir)."""
1039
    # TODO: list known exporters
329 by Martin Pool
- refactor command functions into command classes
1040
    takes_args = ['dest']
678 by Martin Pool
- export to tarballs
1041
    takes_options = ['revision', 'format']
1042
    def run(self, dest, revision=None, format='dir'):
329 by Martin Pool
- refactor command functions into command classes
1043
        b = Branch('.')
394 by Martin Pool
- Fix argument handling in export command
1044
        if revision == None:
1045
            rh = b.revision_history()[-1]
329 by Martin Pool
- refactor command functions into command classes
1046
        else:
394 by Martin Pool
- Fix argument handling in export command
1047
            rh = b.lookup_revision(int(revision))
329 by Martin Pool
- refactor command functions into command classes
1048
        t = b.revision_tree(rh)
678 by Martin Pool
- export to tarballs
1049
        t.export(dest, format)
329 by Martin Pool
- refactor command functions into command classes
1050
1051
1052
class cmd_cat(Command):
1053
    """Write a file's text from a previous revision."""
1054
1055
    takes_options = ['revision']
1056
    takes_args = ['filename']
1057
1058
    def run(self, filename, revision=None):
1059
        if revision == None:
1060
            raise BzrCommandError("bzr cat requires a revision number")
1061
        b = Branch('.')
1062
        b.print_file(b.relpath(filename), int(revision))
1063
1064
1065
class cmd_local_time_offset(Command):
1066
    """Show the offset in seconds from GMT to local time."""
1067
    hidden = True    
1068
    def run(self):
1069
        print bzrlib.osutils.local_time_offset()
1070
1071
1072
1073
class cmd_commit(Command):
1074
    """Commit changes into a new revision.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1075
491 by Martin Pool
- Selective commit!
1076
    If selected files are specified, only changes to those files are
1077
    committed.  If a directory is specified then its contents are also
1078
    committed.
1079
1080
    A selected-file commit may fail in some cases where the committed
1081
    tree would be invalid, such as trying to commit a file in a
1082
    newly-added directory that is not itself committed.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1083
1084
    TODO: Run hooks on tree to-be-committed, and after commit.
1085
1086
    TODO: Strict commit that fails if there are unknown or deleted files.
1087
    """
491 by Martin Pool
- Selective commit!
1088
    takes_args = ['selected*']
389 by Martin Pool
- new commit --file option!
1089
    takes_options = ['message', 'file', 'verbose']
350 by Martin Pool
- refactor command aliases into command classes
1090
    aliases = ['ci', 'checkin']
1091
505 by Martin Pool
- commit is verbose by default
1092
    def run(self, message=None, file=None, verbose=True, selected_list=None):
485 by Martin Pool
- move commit code into its own module
1093
        from bzrlib.commit import commit
763 by Martin Pool
- Patch from Torsten Marek to take commit messages through an
1094
        from bzrlib.osutils import get_text_message
485 by Martin Pool
- move commit code into its own module
1095
389 by Martin Pool
- new commit --file option!
1096
        ## Warning: shadows builtin file()
1097
        if not message and not file:
763 by Martin Pool
- Patch from Torsten Marek to take commit messages through an
1098
            import cStringIO
1099
            stdout = sys.stdout
1100
            catcher = cStringIO.StringIO()
1101
            sys.stdout = catcher
1102
            cmd_status({"file_list":selected_list}, {})
1103
            info = catcher.getvalue()
1104
            sys.stdout = stdout
1105
            message = get_text_message(info)
1106
            
1107
            if message is None:
1108
                raise BzrCommandError("please specify a commit message",
1109
                                      ["use either --message or --file"])
389 by Martin Pool
- new commit --file option!
1110
        elif message and file:
1111
            raise BzrCommandError("please specify either --message or --file")
1112
        
1113
        if file:
1114
            import codecs
1115
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1116
485 by Martin Pool
- move commit code into its own module
1117
        b = Branch('.')
491 by Martin Pool
- Selective commit!
1118
        commit(b, message, verbose=verbose, specific_files=selected_list)
329 by Martin Pool
- refactor command functions into command classes
1119
1120
1121
class cmd_check(Command):
1122
    """Validate consistency of branch history.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1123
1124
    This command checks various invariants about the branch storage to
1125
    detect data corruption or bzr bugs.
674 by Martin Pool
- check command now also checks new inventory_sha1 and
1126
1127
    If given the --update flag, it will update some optional fields
1128
    to help ensure data consistency.
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1129
    """
329 by Martin Pool
- refactor command functions into command classes
1130
    takes_args = ['dir?']
674 by Martin Pool
- check command now also checks new inventory_sha1 and
1131
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
1132
    def run(self, dir='.'):
329 by Martin Pool
- refactor command functions into command classes
1133
        import bzrlib.check
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
1134
        bzrlib.check.check(Branch(dir))
1135
1136
1137
1138
class cmd_upgrade(Command):
1139
    """Upgrade branch storage to current format.
1140
1141
    This should normally be used only after the check command tells
1142
    you to run it.
1143
    """
1144
    takes_args = ['dir?']
1145
1146
    def run(self, dir='.'):
1147
        from bzrlib.upgrade import upgrade
1148
        upgrade(Branch(dir))
329 by Martin Pool
- refactor command functions into command classes
1149
1150
1151
1152
class cmd_whoami(Command):
1153
    """Show bzr user id."""
1154
    takes_options = ['email']
286 by Martin Pool
- New bzr whoami --email option
1155
    
329 by Martin Pool
- refactor command functions into command classes
1156
    def run(self, email=False):
1157
        if email:
1158
            print bzrlib.osutils.user_email()
1159
        else:
1160
            print bzrlib.osutils.username()
1161
1162
1163
class cmd_selftest(Command):
55 by mbp at sourcefrog
bzr selftest shows some counts of tests
1164
    """Run internal test suite"""
329 by Martin Pool
- refactor command functions into command classes
1165
    hidden = True
1166
    def run(self):
608 by Martin Pool
- Split selftests out into a new module and start changing them
1167
        from bzrlib.selftest import selftest
723 by Martin Pool
- move whitebox/blackbox modules into bzrlib.selftest subdirectory
1168
        return int(not selftest())
329 by Martin Pool
- refactor command functions into command classes
1169
1170
1171
class cmd_version(Command):
634 by Martin Pool
- Tidy help messages
1172
    """Show version of bzr."""
329 by Martin Pool
- refactor command functions into command classes
1173
    def run(self):
1174
        show_version()
1175
1176
def show_version():
1177
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
605 by Martin Pool
- patch from Lalo Martins to show version of bzr itself
1178
    # is bzrlib itself in a branch?
606 by Martin Pool
- new bzrlib.get_bzr_revision() tells about the history of
1179
    bzrrev = bzrlib.get_bzr_revision()
1180
    if bzrrev:
1181
        print "  (bzr checkout, revision %d {%s})" % bzrrev
329 by Martin Pool
- refactor command functions into command classes
1182
    print bzrlib.__copyright__
1183
    print "http://bazaar-ng.org/"
1184
    print
1185
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
1186
    print "you may use, modify and redistribute it under the terms of the GNU"
1187
    print "General Public License version 2 or later."
1188
1189
1190
class cmd_rocks(Command):
1191
    """Statement of optimism."""
1192
    hidden = True
1193
    def run(self):
1194
        print "it sure does!"
1195
493 by Martin Pool
- Merge aaron's merge command
1196
def parse_spec(spec):
622 by Martin Pool
Updated merge patch from Aaron
1197
    """
1198
    >>> parse_spec(None)
1199
    [None, None]
1200
    >>> parse_spec("./")
1201
    ['./', None]
1202
    >>> parse_spec("../@")
1203
    ['..', -1]
1204
    >>> parse_spec("../f/@35")
1205
    ['../f', 35]
1206
    """
1207
    if spec is None:
1208
        return [None, None]
493 by Martin Pool
- Merge aaron's merge command
1209
    if '/@' in spec:
1210
        parsed = spec.split('/@')
1211
        assert len(parsed) == 2
1212
        if parsed[1] == "":
1213
            parsed[1] = -1
1214
        else:
1215
            parsed[1] = int(parsed[1])
1216
            assert parsed[1] >=0
1217
    else:
1218
        parsed = [spec, None]
1219
    return parsed
1220
628 by Martin Pool
- merge aaron's updated merge/pull code
1221
1222
493 by Martin Pool
- Merge aaron's merge command
1223
class cmd_merge(Command):
622 by Martin Pool
Updated merge patch from Aaron
1224
    """Perform a three-way merge of trees.
1225
    
1226
    The SPEC parameters are working tree or revision specifiers.  Working trees
1227
    are specified using standard paths or urls.  No component of a directory
1228
    path may begin with '@'.
1229
    
1230
    Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1231
1232
    Revisions are specified using a dirname/@revno pair, where dirname is the
1233
    branch directory and revno is the revision within that branch.  If no revno
1234
    is specified, the latest revision is used.
1235
1236
    Revision examples: './@127', 'foo/@', '../@1'
1237
1238
    The OTHER_SPEC parameter is required.  If the BASE_SPEC parameter is
1239
    not supplied, the common ancestor of OTHER_SPEC the current branch is used
1240
    as the BASE.
628 by Martin Pool
- merge aaron's updated merge/pull code
1241
1242
    merge refuses to run if there are any uncommitted changes, unless
1243
    --force is given.
622 by Martin Pool
Updated merge patch from Aaron
1244
    """
1245
    takes_args = ['other_spec', 'base_spec?']
628 by Martin Pool
- merge aaron's updated merge/pull code
1246
    takes_options = ['force']
622 by Martin Pool
Updated merge patch from Aaron
1247
628 by Martin Pool
- merge aaron's updated merge/pull code
1248
    def run(self, other_spec, base_spec=None, force=False):
591 by Martin Pool
- trim imports
1249
        from bzrlib.merge import merge
628 by Martin Pool
- merge aaron's updated merge/pull code
1250
        merge(parse_spec(other_spec), parse_spec(base_spec),
1251
              check_clean=(not force))
329 by Martin Pool
- refactor command functions into command classes
1252
622 by Martin Pool
Updated merge patch from Aaron
1253
778 by Martin Pool
- simple revert of text files
1254
784 by Martin Pool
- rename merge-based revert command to 'merge-revert'
1255
class cmd_revert(Command):
778 by Martin Pool
- simple revert of text files
1256
    """Restore selected files from a previous revision.
1257
    """
1258
    takes_args = ['file+']
1259
    def run(self, file_list):
786 by Martin Pool
- fix missing import
1260
        from bzrlib.branch import find_branch
1261
        
778 by Martin Pool
- simple revert of text files
1262
        if not file_list:
1263
            file_list = ['.']
1264
            
1265
        b = find_branch(file_list[0])
1266
1267
        b.revert([b.relpath(f) for f in file_list])
1268
1269
784 by Martin Pool
- rename merge-based revert command to 'merge-revert'
1270
class cmd_merge_revert(Command):
628 by Martin Pool
- merge aaron's updated merge/pull code
1271
    """Reverse all changes since the last commit.
1272
1273
    Only versioned files are affected.
1274
1275
    TODO: Store backups of any files that will be reverted, so
1276
          that the revert can be undone.          
622 by Martin Pool
Updated merge patch from Aaron
1277
    """
1278
    takes_options = ['revision']
1279
1280
    def run(self, revision=-1):
636 by Martin Pool
- fix missing import in revert
1281
        from bzrlib.merge import merge
628 by Martin Pool
- merge aaron's updated merge/pull code
1282
        merge(('.', revision), parse_spec('.'),
1283
              check_clean=False,
1284
              ignore_zero=True)
622 by Martin Pool
Updated merge patch from Aaron
1285
1286
329 by Martin Pool
- refactor command functions into command classes
1287
class cmd_assert_fail(Command):
1288
    """Test reporting of assertion failures"""
1289
    hidden = True
1290
    def run(self):
1291
        assert False, "always fails"
1292
1293
1294
class cmd_help(Command):
1295
    """Show help on a command or other topic.
1296
1297
    For a list of all available commands, say 'bzr help commands'."""
1298
    takes_args = ['topic?']
350 by Martin Pool
- refactor command aliases into command classes
1299
    aliases = ['?']
329 by Martin Pool
- refactor command functions into command classes
1300
    
1301
    def run(self, topic=None):
351 by Martin Pool
- Split out help functions into bzrlib.help
1302
        import help
1303
        help.help(topic)
1304
1 by mbp at sourcefrog
import from baz patch-364
1305
429 by Martin Pool
- New command update-stat-cache for testing
1306
class cmd_update_stat_cache(Command):
1307
    """Update stat-cache mapping inodes to SHA-1 hashes.
1308
1309
    For testing only."""
1310
    hidden = True
1311
    def run(self):
1312
        import statcache
1313
        b = Branch('.')
454 by Martin Pool
- fix update-stat-cache command
1314
        statcache.update_cache(b.base, b.read_working_inventory())
429 by Martin Pool
- New command update-stat-cache for testing
1315
1316
1 by mbp at sourcefrog
import from baz patch-364
1317
755 by Martin Pool
- new 'plugins' command
1318
class cmd_plugins(Command):
1319
    """List plugins"""
1320
    hidden = True
1321
    def run(self):
1322
        import bzrlib.plugin
756 by Martin Pool
- plugins documentation; better error reporting when failing to
1323
        from pprint import pprint
1324
        pprint(bzrlib.plugin.all_plugins)
755 by Martin Pool
- new 'plugins' command
1325
1326
1327
1 by mbp at sourcefrog
import from baz patch-364
1328
# list of all available options; the rhs can be either None for an
1329
# option that takes no argument, or a constructor function that checks
1330
# the type.
1331
OPTIONS = {
1332
    'all':                    None,
571 by Martin Pool
- new --diff-options to pass options through to external
1333
    'diff-options':           str,
1 by mbp at sourcefrog
import from baz patch-364
1334
    'help':                   None,
389 by Martin Pool
- new commit --file option!
1335
    'file':                   unicode,
628 by Martin Pool
- merge aaron's updated merge/pull code
1336
    'force':                  None,
678 by Martin Pool
- export to tarballs
1337
    'format':                 unicode,
545 by Martin Pool
- --forward option for log
1338
    'forward':                None,
1 by mbp at sourcefrog
import from baz patch-364
1339
    'message':                unicode,
594 by Martin Pool
- add --no-recurse option for add command
1340
    'no-recurse':             None,
137 by mbp at sourcefrog
new --profile option
1341
    'profile':                None,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
1342
    'revision':               _parse_revision_str,
1 by mbp at sourcefrog
import from baz patch-364
1343
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
1344
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
1345
    'verbose':                None,
1346
    'version':                None,
286 by Martin Pool
- New bzr whoami --email option
1347
    'email':                  None,
674 by Martin Pool
- check command now also checks new inventory_sha1 and
1348
    'update':                 None,
1 by mbp at sourcefrog
import from baz patch-364
1349
    }
1350
1351
SHORT_OPTIONS = {
583 by Martin Pool
- add -h as short name for --help
1352
    'F':                      'file', 
1353
    'h':                      'help',
1 by mbp at sourcefrog
import from baz patch-364
1354
    'm':                      'message',
1355
    'r':                      'revision',
1356
    'v':                      'verbose',
1357
}
1358
1359
1360
def parse_args(argv):
1361
    """Parse command line.
1362
    
1363
    Arguments and options are parsed at this level before being passed
1364
    down to specific command handlers.  This routine knows, from a
1365
    lookup table, something about the available options, what optargs
1366
    they take, and which commands will accept them.
1367
31 by Martin Pool
fix up parse_args doctest
1368
    >>> parse_args('--help'.split())
1 by mbp at sourcefrog
import from baz patch-364
1369
    ([], {'help': True})
31 by Martin Pool
fix up parse_args doctest
1370
    >>> parse_args('--version'.split())
1 by mbp at sourcefrog
import from baz patch-364
1371
    ([], {'version': True})
31 by Martin Pool
fix up parse_args doctest
1372
    >>> parse_args('status --all'.split())
1 by mbp at sourcefrog
import from baz patch-364
1373
    (['status'], {'all': True})
31 by Martin Pool
fix up parse_args doctest
1374
    >>> parse_args('commit --message=biter'.split())
17 by mbp at sourcefrog
allow --option=ARG syntax
1375
    (['commit'], {'message': u'biter'})
683 by Martin Pool
- short option stacking patch from John A Meinel
1376
    >>> parse_args('log -r 500'.split())
1377
    (['log'], {'revision': 500})
1378
    >>> parse_args('log -r500:600'.split())
1379
    (['log'], {'revision': [500, 600]})
1380
    >>> parse_args('log -vr500:600'.split())
1381
    (['log'], {'verbose': True, 'revision': [500, 600]})
1382
    >>> parse_args('log -rv500:600'.split()) #the r takes an argument
1383
    Traceback (most recent call last):
1384
    ...
1385
    ValueError: invalid literal for int(): v500
1 by mbp at sourcefrog
import from baz patch-364
1386
    """
1387
    args = []
1388
    opts = {}
1389
1390
    # TODO: Maybe handle '--' to end options?
1391
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1392
    while argv:
1393
        a = argv.pop(0)
1 by mbp at sourcefrog
import from baz patch-364
1394
        if a[0] == '-':
264 by Martin Pool
parse_args: option names must be ascii
1395
            # option names must not be unicode
1396
            a = str(a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1397
            optarg = None
1 by mbp at sourcefrog
import from baz patch-364
1398
            if a[1] == '-':
1399
                mutter("  got option %r" % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1400
                if '=' in a:
1401
                    optname, optarg = a[2:].split('=', 1)
1402
                else:
1403
                    optname = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
1404
                if optname not in OPTIONS:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1405
                    raise BzrError('unknown long option %r' % a)
1 by mbp at sourcefrog
import from baz patch-364
1406
            else:
1407
                shortopt = a[1:]
683 by Martin Pool
- short option stacking patch from John A Meinel
1408
                if shortopt in SHORT_OPTIONS:
1409
                    # Multi-character options must have a space to delimit
1410
                    # their value
1411
                    optname = SHORT_OPTIONS[shortopt]
1412
                else:
1413
                    # Single character short options, can be chained,
1414
                    # and have their value appended to their name
1415
                    shortopt = a[1:2]
1416
                    if shortopt not in SHORT_OPTIONS:
1417
                        # We didn't find the multi-character name, and we
1418
                        # didn't find the single char name
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1419
                        raise BzrError('unknown short option %r' % a)
683 by Martin Pool
- short option stacking patch from John A Meinel
1420
                    optname = SHORT_OPTIONS[shortopt]
1421
1422
                    if a[2:]:
1423
                        # There are extra things on this option
1424
                        # see if it is the value, or if it is another
1425
                        # short option
1426
                        optargfn = OPTIONS[optname]
1427
                        if optargfn is None:
1428
                            # This option does not take an argument, so the
1429
                            # next entry is another short option, pack it back
1430
                            # into the list
1431
                            argv.insert(0, '-' + a[2:])
1432
                        else:
1433
                            # This option takes an argument, so pack it
1434
                            # into the array
1435
                            optarg = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
1436
            
1437
            if optname in opts:
1438
                # 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
1439
                raise BzrError('repeated option %r' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1440
                
1 by mbp at sourcefrog
import from baz patch-364
1441
            optargfn = OPTIONS[optname]
1442
            if optargfn:
17 by mbp at sourcefrog
allow --option=ARG syntax
1443
                if optarg == None:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1444
                    if not argv:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1445
                        raise BzrError('option %r needs an argument' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
1446
                    else:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1447
                        optarg = argv.pop(0)
17 by mbp at sourcefrog
allow --option=ARG syntax
1448
                opts[optname] = optargfn(optarg)
1 by mbp at sourcefrog
import from baz patch-364
1449
            else:
17 by mbp at sourcefrog
allow --option=ARG syntax
1450
                if optarg != None:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1451
                    raise BzrError('option %r takes no argument' % optname)
1 by mbp at sourcefrog
import from baz patch-364
1452
                opts[optname] = True
1453
        else:
1454
            args.append(a)
1455
1456
    return args, opts
1457
1458
1459
1460
329 by Martin Pool
- refactor command functions into command classes
1461
def _match_argform(cmd, takes_args, args):
1 by mbp at sourcefrog
import from baz patch-364
1462
    argdict = {}
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
1463
329 by Martin Pool
- refactor command functions into command classes
1464
    # step through args and takes_args, allowing appropriate 0-many matches
1465
    for ap in takes_args:
1 by mbp at sourcefrog
import from baz patch-364
1466
        argname = ap[:-1]
1467
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
1468
            if args:
1469
                argdict[argname] = args.pop(0)
196 by mbp at sourcefrog
selected-file diff
1470
        elif ap[-1] == '*': # all remaining arguments
1471
            if args:
1472
                argdict[argname + '_list'] = args[:]
1473
                args = []
1474
            else:
1475
                argdict[argname + '_list'] = None
1 by mbp at sourcefrog
import from baz patch-364
1476
        elif ap[-1] == '+':
1477
            if not args:
329 by Martin Pool
- refactor command functions into command classes
1478
                raise BzrCommandError("command %r needs one or more %s"
1 by mbp at sourcefrog
import from baz patch-364
1479
                        % (cmd, argname.upper()))
1480
            else:
1481
                argdict[argname + '_list'] = args[:]
1482
                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
1483
        elif ap[-1] == '$': # all but one
1484
            if len(args) < 2:
329 by Martin Pool
- refactor command functions into command classes
1485
                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
1486
                        % (cmd, argname.upper()))
1487
            argdict[argname + '_list'] = args[:-1]
1488
            args[:-1] = []                
1 by mbp at sourcefrog
import from baz patch-364
1489
        else:
1490
            # just a plain arg
1491
            argname = ap
1492
            if not args:
329 by Martin Pool
- refactor command functions into command classes
1493
                raise BzrCommandError("command %r requires argument %s"
1 by mbp at sourcefrog
import from baz patch-364
1494
                        % (cmd, argname.upper()))
1495
            else:
1496
                argdict[argname] = args.pop(0)
1497
            
1498
    if args:
329 by Martin Pool
- refactor command functions into command classes
1499
        raise BzrCommandError("extra argument to command %s: %s"
1500
                              % (cmd, args[0]))
1 by mbp at sourcefrog
import from baz patch-364
1501
1502
    return argdict
1503
1504
731 by Martin Pool
- merge plugin patch from john
1505
def _parse_master_args(argv):
1506
    """Parse the arguments that always go with the original command.
1507
    These are things like bzr --no-plugins, etc.
1508
1509
    There are now 2 types of option flags. Ones that come *before* the command,
1510
    and ones that come *after* the command.
1511
    Ones coming *before* the command are applied against all possible commands.
1512
    And are generally applied before plugins are loaded.
1513
1514
    The current list are:
1515
        --builtin   Allow plugins to load, but don't let them override builtin commands,
1516
                    they will still be allowed if they do not override a builtin.
1517
        --no-plugins    Don't load any plugins. This lets you get back to official source
1518
                        behavior.
1519
        --profile   Enable the hotspot profile before running the command.
1520
                    For backwards compatibility, this is also a non-master option.
1521
        --version   Spit out the version of bzr that is running and exit.
1522
                    This is also a non-master option.
1523
        --help      Run help and exit, also a non-master option (I think that should stay, though)
1524
1525
    >>> argv, opts = _parse_master_args(['bzr', '--test'])
1526
    Traceback (most recent call last):
1527
    ...
1528
    BzrCommandError: Invalid master option: 'test'
1529
    >>> argv, opts = _parse_master_args(['bzr', '--version', 'command'])
1530
    >>> print argv
1531
    ['command']
1532
    >>> print opts['version']
1533
    True
1534
    >>> argv, opts = _parse_master_args(['bzr', '--profile', 'command', '--more-options'])
1535
    >>> print argv
1536
    ['command', '--more-options']
1537
    >>> print opts['profile']
1538
    True
1539
    >>> argv, opts = _parse_master_args(['bzr', '--no-plugins', 'command'])
1540
    >>> print argv
1541
    ['command']
1542
    >>> print opts['no-plugins']
1543
    True
1544
    >>> print opts['profile']
1545
    False
1546
    >>> argv, opts = _parse_master_args(['bzr', 'command', '--profile'])
1547
    >>> print argv
1548
    ['command', '--profile']
1549
    >>> print opts['profile']
1550
    False
1551
    """
1552
    master_opts = {'builtin':False,
1553
        'no-plugins':False,
1554
        'version':False,
1555
        'profile':False,
1556
        'help':False
1557
    }
1558
1559
    # This is the point where we could hook into argv[0] to determine
1560
    # what front-end is supposed to be run
1561
    # For now, we are just ignoring it.
1562
    cmd_name = argv.pop(0)
1563
    for arg in argv[:]:
1564
        if arg[:2] != '--': # at the first non-option, we return the rest
1565
            break
1566
        arg = arg[2:] # Remove '--'
1567
        if arg not in master_opts:
1568
            # We could say that this is not an error, that we should
1569
            # just let it be handled by the main section instead
1570
            raise BzrCommandError('Invalid master option: %r' % arg)
1571
        argv.pop(0) # We are consuming this entry
1572
        master_opts[arg] = True
1573
    return argv, master_opts
1574
1575
1 by mbp at sourcefrog
import from baz patch-364
1576
1577
def run_bzr(argv):
1578
    """Execute a command.
1579
1580
    This is similar to main(), but without all the trappings for
245 by mbp at sourcefrog
- control files always in utf-8-unix format
1581
    logging and error handling.  
1 by mbp at sourcefrog
import from baz patch-364
1582
    """
251 by mbp at sourcefrog
- factor out locale.getpreferredencoding()
1583
    argv = [a.decode(bzrlib.user_encoding) for a in argv]
245 by mbp at sourcefrog
- control files always in utf-8-unix format
1584
    
1 by mbp at sourcefrog
import from baz patch-364
1585
    try:
731 by Martin Pool
- merge plugin patch from john
1586
        # some options like --builtin and --no-plugins have special effects
1587
        argv, master_opts = _parse_master_args(argv)
755 by Martin Pool
- new 'plugins' command
1588
        if not master_opts['no-plugins']:
731 by Martin Pool
- merge plugin patch from john
1589
            bzrlib.load_plugins()
1590
1591
        args, opts = parse_args(argv)
1592
1593
        if master_opts['help']:
1594
            from bzrlib.help import help
1595
            if argv:
1596
                help(argv[0])
1597
            else:
1598
                help()
1599
            return 0            
1600
            
1 by mbp at sourcefrog
import from baz patch-364
1601
        if 'help' in opts:
731 by Martin Pool
- merge plugin patch from john
1602
            from bzrlib.help import help
159 by mbp at sourcefrog
bzr commit --help now works
1603
            if args:
731 by Martin Pool
- merge plugin patch from john
1604
                help(args[0])
159 by mbp at sourcefrog
bzr commit --help now works
1605
            else:
731 by Martin Pool
- merge plugin patch from john
1606
                help()
1 by mbp at sourcefrog
import from baz patch-364
1607
            return 0
1608
        elif 'version' in opts:
336 by Martin Pool
- fix up 'bzr --version'
1609
            show_version()
1 by mbp at sourcefrog
import from baz patch-364
1610
            return 0
641 by Martin Pool
- improved external-command patch from john
1611
        elif args and args[0] == 'builtin':
1612
            include_plugins=False
1613
            args = args[1:]
265 by Martin Pool
parse_args: command names must also be ascii
1614
        cmd = str(args.pop(0))
1 by mbp at sourcefrog
import from baz patch-364
1615
    except IndexError:
448 by Martin Pool
- bzr with no command now shows help, not just an error
1616
        import help
1617
        help.help()
1 by mbp at sourcefrog
import from baz patch-364
1618
        return 1
448 by Martin Pool
- bzr with no command now shows help, not just an error
1619
          
115 by mbp at sourcefrog
todo
1620
731 by Martin Pool
- merge plugin patch from john
1621
    plugins_override = not (master_opts['builtin'])
1622
    canonical_cmd, cmd_class = get_cmd_class(cmd, plugins_override=plugins_override)
1 by mbp at sourcefrog
import from baz patch-364
1623
731 by Martin Pool
- merge plugin patch from john
1624
    profile = master_opts['profile']
1625
    # For backwards compatibility, I would rather stick with --profile being a
1626
    # master/global option
137 by mbp at sourcefrog
new --profile option
1627
    if 'profile' in opts:
1628
        profile = True
1629
        del opts['profile']
1 by mbp at sourcefrog
import from baz patch-364
1630
1631
    # check options are reasonable
329 by Martin Pool
- refactor command functions into command classes
1632
    allowed = cmd_class.takes_options
1 by mbp at sourcefrog
import from baz patch-364
1633
    for oname in opts:
1634
        if oname not in allowed:
381 by Martin Pool
- Better message when a wrong argument is given
1635
            raise BzrCommandError("option '--%s' is not allowed for command %r"
329 by Martin Pool
- refactor command functions into command classes
1636
                                  % (oname, cmd))
176 by mbp at sourcefrog
New cat command contributed by janmar.
1637
137 by mbp at sourcefrog
new --profile option
1638
    # mix arguments and options into one dictionary
329 by Martin Pool
- refactor command functions into command classes
1639
    cmdargs = _match_argform(cmd, cmd_class.takes_args, args)
1640
    cmdopts = {}
136 by mbp at sourcefrog
new --show-ids option for 'deleted' command
1641
    for k, v in opts.items():
329 by Martin Pool
- refactor command functions into command classes
1642
        cmdopts[k.replace('-', '_')] = v
1 by mbp at sourcefrog
import from baz patch-364
1643
137 by mbp at sourcefrog
new --profile option
1644
    if profile:
338 by Martin Pool
- cleanup of some imports
1645
        import hotshot, tempfile
239 by mbp at sourcefrog
- remove profiler temporary file when done
1646
        pffileno, pfname = tempfile.mkstemp()
1647
        try:
1648
            prof = hotshot.Profile(pfname)
329 by Martin Pool
- refactor command functions into command classes
1649
            ret = prof.runcall(cmd_class, cmdopts, cmdargs) or 0
239 by mbp at sourcefrog
- remove profiler temporary file when done
1650
            prof.close()
1651
1652
            import hotshot.stats
1653
            stats = hotshot.stats.load(pfname)
1654
            #stats.strip_dirs()
1655
            stats.sort_stats('time')
1656
            ## XXX: Might like to write to stderr or the trace file instead but
1657
            ## print_stats seems hardcoded to stdout
1658
            stats.print_stats(20)
1659
            
337 by Martin Pool
- Clarify return codes from command objects
1660
            return ret.status
239 by mbp at sourcefrog
- remove profiler temporary file when done
1661
1662
        finally:
1663
            os.close(pffileno)
1664
            os.remove(pfname)
137 by mbp at sourcefrog
new --profile option
1665
    else:
500 by Martin Pool
- fix return value from run_bzr
1666
        return cmd_class(cmdopts, cmdargs).status 
1 by mbp at sourcefrog
import from baz patch-364
1667
1668
359 by Martin Pool
- pychecker fixups
1669
def _report_exception(summary, quiet=False):
267 by Martin Pool
- better reporting of errors
1670
    import traceback
1671
    log_error('bzr: ' + summary)
359 by Martin Pool
- pychecker fixups
1672
    bzrlib.trace.log_exception()
317 by Martin Pool
- better error message for broken pipe
1673
1674
    if not quiet:
1675
        tb = sys.exc_info()[2]
1676
        exinfo = traceback.extract_tb(tb)
1677
        if exinfo:
1678
            sys.stderr.write('  at %s:%d in %s()\n' % exinfo[-1][:3])
1679
        sys.stderr.write('  see ~/.bzr.log for debug information\n')
267 by Martin Pool
- better reporting of errors
1680
1681
1682
1 by mbp at sourcefrog
import from baz patch-364
1683
def main(argv):
317 by Martin Pool
- better error message for broken pipe
1684
    import errno
1685
    
344 by Martin Pool
- It's not an error to use the library without
1686
    bzrlib.open_tracefile(argv)
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1687
1 by mbp at sourcefrog
import from baz patch-364
1688
    try:
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1689
        try:
337 by Martin Pool
- Clarify return codes from command objects
1690
            try:
1691
                return run_bzr(argv)
1692
            finally:
1693
                # do this here inside the exception wrappers to catch EPIPE
1694
                sys.stdout.flush()
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1695
        except BzrError, e:
329 by Martin Pool
- refactor command functions into command classes
1696
            quiet = isinstance(e, (BzrCommandError))
359 by Martin Pool
- pychecker fixups
1697
            _report_exception('error: ' + e.args[0], quiet=quiet)
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1698
            if len(e.args) > 1:
1699
                for h in e.args[1]:
267 by Martin Pool
- better reporting of errors
1700
                    # some explanation or hints
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1701
                    log_error('  ' + h)
1702
            return 1
267 by Martin Pool
- better reporting of errors
1703
        except AssertionError, e:
1704
            msg = 'assertion failed'
1705
            if str(e):
1706
                msg += ': ' + str(e)
359 by Martin Pool
- pychecker fixups
1707
            _report_exception(msg)
318 by Martin Pool
- better error message for Ctrl-c
1708
            return 2
1709
        except KeyboardInterrupt, e:
359 by Martin Pool
- pychecker fixups
1710
            _report_exception('interrupted', quiet=True)
318 by Martin Pool
- better error message for Ctrl-c
1711
            return 2
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1712
        except Exception, e:
317 by Martin Pool
- better error message for broken pipe
1713
            quiet = False
419 by Martin Pool
- RemoteBranch.__str__ and repr
1714
            if (isinstance(e, IOError) 
1715
                and hasattr(e, 'errno')
1716
                and e.errno == errno.EPIPE):
317 by Martin Pool
- better error message for broken pipe
1717
                quiet = True
1718
                msg = 'broken pipe'
1719
            else:
1720
                msg = str(e).rstrip('\n')
359 by Martin Pool
- pychecker fixups
1721
            _report_exception(msg, quiet)
318 by Martin Pool
- better error message for Ctrl-c
1722
            return 2
260 by Martin Pool
- remove atexit() dependency for writing out execution times
1723
    finally:
1724
        bzrlib.trace.close_trace()
1 by mbp at sourcefrog
import from baz patch-364
1725
1726
1727
if __name__ == '__main__':
1728
    sys.exit(main(sys.argv))