~abentley/bzrtools/bzrtools.dev

504 by Aaron Bentley
Clarify version mismatch warnings
1
# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron.bentley@utoronto.ca>
460 by Aaron Bentley
Add encoding parameter everywhere
2
# Copyright (C) 2005, 2006 Canonical Limited.
3
# Copyright (C) 2006 Michael Ellerman.
4
#
5
#    This program is free software; you can redistribute it and/or modify
6
#    it under the terms of the GNU General Public License as published by
7
#    the Free Software Foundation; either version 2 of the License, or
8
#    (at your option) any later version.
9
#
10
#    This program is distributed in the hope that it will be useful,
11
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
12
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
#    GNU General Public License for more details.
14
#
15
#    You should have received a copy of the GNU General Public License
16
#    along with this program; if not, write to the Free Software
17
#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
246 by Aaron Bentley
Merged shelf_v2
19
"""\
20
Various useful plugins for working with bzr.
21
"""
428 by Aaron Bentley
Add version number, check against bzrlib version
22
23
import bzrlib
24
25
502 by Aaron Bentley
Update versions to 0.15
26
__version__ = '0.15.0'
428 by Aaron Bentley
Add version number, check against bzrlib version
27
28
29
version_info = tuple(int(n) for n in __version__.split('.'))
30
31
32
def check_bzrlib_version(desired):
33
    """Check that bzrlib is compatible.
34
35
    If version is < bzrtools version, assume incompatible.
36
    If version == bzrtools version, assume completely compatible
37
    If version == bzrtools version + 1, assume compatible, with deprecations
38
    Otherwise, assume incompatible.
39
    """
40
    desired_plus = (desired[0], desired[1]+1)
41
    bzrlib_version = bzrlib.version_info[:2]
42
    if bzrlib_version == desired:
43
        return
44
    try:
45
        from bzrlib.trace import warning
46
    except ImportError:
47
        # get the message out any way we can
48
        from warnings import warn as warning
49
    if bzrlib_version < desired:
515.1.1 by Aaron Bentley
Fix typo
50
        warning('Installed Bazaar version %s is too old to be used with'
504 by Aaron Bentley
Clarify version mismatch warnings
51
                ' plugin \n'
52
                '"Bzrtools" %s.' % (bzrlib.__version__, __version__))
428 by Aaron Bentley
Add version number, check against bzrlib version
53
        # Not using BzrNewError, because it may not exist.
447 by Aaron Bentley
Fix up test and selftest, make robust against missing PyBaz
54
        raise Exception, ('Version mismatch', version_info)
428 by Aaron Bentley
Add version number, check against bzrlib version
55
    else:
504 by Aaron Bentley
Clarify version mismatch warnings
56
        warning('Plugin "Bzrtools" is not up to date with installed Bazaar'
57
                ' version %s.\n'
58
                ' There should be a newer version of Bzrtools available, e.g.'
59
                ' %i.%i.'
428 by Aaron Bentley
Add version number, check against bzrlib version
60
                % (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
61
        if bzrlib_version != desired_plus:
62
            raise Exception, 'Version mismatch'
63
64
65
check_bzrlib_version(version_info[:2])
66
512 by Aaron Bentley
More import-time fixups
67
from bzrlib.lazy_import import lazy_import
68
lazy_import(globals(), """
69
from bzrlib import help
70
import shelf
71
""")
428 by Aaron Bentley
Add version number, check against bzrlib version
72
447 by Aaron Bentley
Fix up test and selftest, make robust against missing PyBaz
73
from errors import CommandError, NoPyBaz
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
74
from patchsource import BzrPatchSource
246 by Aaron Bentley
Merged shelf_v2
75
import sys
76
import os.path
399 by Aaron Bentley
Implement cdiff (based on old Fai code)
77
78
import bzrlib.builtins
79
import bzrlib.commands
410 by Aaron Bentley
Ensure the option settings come from the right 'diff' in colordiff
80
from bzrlib.commands import get_cmd_object
0.1.39 by Michael Ellerman
Fix shelve and unshelve to pass location to Shelf().
81
from bzrlib.errors import BzrCommandError
423 by Aaron Bentley
Add runtime ignores for shelf
82
import bzrlib.ignores
399 by Aaron Bentley
Implement cdiff (based on old Fai code)
83
from bzrlib.option import Option
147.1.41 by Aaron Bentley
Merge from mainline
84
sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), 
147.4.37 by Robert Collins
Convert push to rpush.
85
                                                 "external")))
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
86
465 by Aaron Bentley
Add show-paths command from Alexander Belchenko
87
import show_paths
88
0.7.2 by Michael Ellerman
Convert from DEFAULT_IGNORES to bzrlib.ignores.add_runtime_ignores().
89
bzrlib.ignores.add_runtime_ignores(['./.shelf'])
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
90
246 by Aaron Bentley
Merged shelf_v2
91
92
class cmd_clean_tree(bzrlib.commands.Command):
415 by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions
93
    """Remove unwanted files from working tree.
417 by Aaron Bentley
Update clean-tree docs
94
95
    By default, only unknown files, not ignored files, are deleted.  Versioned
96
    files are never deleted.
97
98
    Another class is 'detritus', which includes files emitted by bzr during
99
    normal operations and selftests.  (The value of these files decreases with
100
    time.)
101
102
    If no options are specified, unknown files are deleted.  Otherwise, option
103
    flags are respected, and may be combined.
104
105
    To check what clean-tree will do, use --dry-run.
246 by Aaron Bentley
Merged shelf_v2
106
    """
386 by Aaron Bentley
Stop adding global options
107
    takes_options = [Option('ignored', help='delete all ignored files.'), 
417 by Aaron Bentley
Update clean-tree docs
108
                     Option('detritus', help='delete conflict files, merge'
109
                            ' backups, and failed selftest dirs.'), 
416 by Aaron Bentley
clean-tree --detritus no longer implies --unknown
110
                     Option('unknown', 
111
                            help='delete files unknown to bzr.  (default)'),
386 by Aaron Bentley
Stop adding global options
112
                     Option('dry-run', help='show files to delete instead of'
113
                            ' deleting them.')]
415.1.1 by Adeodato Simó
Make clean-tree --detritus or --ignored not delete also unknown files,
114
    def run(self, unknown=False, ignored=False, detritus=False, dry_run=False):
246 by Aaron Bentley
Merged shelf_v2
115
        from clean_tree import clean_tree
415.1.1 by Adeodato Simó
Make clean-tree --detritus or --ignored not delete also unknown files,
116
        if not (unknown or ignored or detritus):
117
            unknown = True
416 by Aaron Bentley
clean-tree --detritus no longer implies --unknown
118
        clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus, 
119
                   dry_run=dry_run)
246 by Aaron Bentley
Merged shelf_v2
120
445 by Aaron Bentley
Remove shove, tweak imports, docs
121
246 by Aaron Bentley
Merged shelf_v2
122
class cmd_graph_ancestry(bzrlib.commands.Command):
415 by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions
123
    """Produce ancestry graphs using dot.
246 by Aaron Bentley
Merged shelf_v2
124
    
125
    Output format is detected according to file extension.  Some of the more
296 by Aaron Bentley
Updated graph-ancestry help
126
    common output formats are html, png, gif, svg, ps.  An extension of '.dot'
127
    will cause a dot graph file to be produced.  HTML output has mouseovers
128
    that show the commit message.
246 by Aaron Bentley
Merged shelf_v2
129
130
    Branches are labeled r?, where ? is the revno.  If they have no revno,
131
    with the last 5 characters of their revision identifier are used instead.
296 by Aaron Bentley
Updated graph-ancestry help
132
133
    The value starting with d is "(maximum) distance from the null revision".
246 by Aaron Bentley
Merged shelf_v2
134
    
135
    If --merge-branch is specified, the two branches are compared and a merge
136
    base is selected.
137
    
138
    Legend:
139
    white    normal revision
140
    yellow   THIS  history
141
    red      OTHER history
142
    orange   COMMON history
143
    blue     COMMON non-history ancestor
296 by Aaron Bentley
Updated graph-ancestry help
144
    green    Merge base (COMMON ancestor farthest from the null revision)
145
    dotted   Ghost revision (missing from branch storage)
246 by Aaron Bentley
Merged shelf_v2
146
296 by Aaron Bentley
Updated graph-ancestry help
147
    Ancestry is usually collapsed by skipping revisions with a single parent
246 by Aaron Bentley
Merged shelf_v2
148
    and descendant.  The number of skipped revisions is shown on the arrow.
149
    This feature can be disabled with --no-collapse.
150
151
    By default, revisions are ordered by distance from root, but they can be
152
    clustered instead using --cluster.
153
154
    If available, rsvg is used to antialias PNG and JPEG output, but this can
155
    be disabled with --no-antialias.
156
    """
157
    takes_args = ['branch', 'file']
296 by Aaron Bentley
Updated graph-ancestry help
158
    takes_options = [Option('no-collapse', help="Do not skip simple nodes"), 
159
                     Option('no-antialias',
160
                     help="Do not use rsvg to produce antialiased output"), 
161
                     Option('merge-branch', type=str, 
162
                     help="Use this branch to calcuate a merge base"), 
476.1.2 by Aaron Bentley
graph-ancestry can restrict the number of nodes shown by distance
163
                     Option('cluster', help="Use clustered output."),
164
                     Option('max-distance', help="Show no nodes farther than this",
165
                            type=int)]
246 by Aaron Bentley
Merged shelf_v2
166
    def run(self, branch, file, no_collapse=False, no_antialias=False,
476.1.2 by Aaron Bentley
graph-ancestry can restrict the number of nodes shown by distance
167
        merge_branch=None, cluster=False, max_distance=None):
246 by Aaron Bentley
Merged shelf_v2
168
        import graph
169
        if cluster:
170
            ranking = "cluster"
171
        else:
172
            ranking = "forced"
173
        graph.write_ancestry_file(branch, file, not no_collapse, 
476.1.2 by Aaron Bentley
graph-ancestry can restrict the number of nodes shown by distance
174
                                  not no_antialias, merge_branch, ranking, 
175
                                  max_distance=max_distance)
246 by Aaron Bentley
Merged shelf_v2
176
445 by Aaron Bentley
Remove shove, tweak imports, docs
177
246 by Aaron Bentley
Merged shelf_v2
178
class cmd_fetch_ghosts(bzrlib.commands.Command):
415 by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions
179
    """Attempt to retrieve ghosts from another branch.
246 by Aaron Bentley
Merged shelf_v2
180
    If the other branch is not supplied, the last-pulled branch is used.
181
    """
182
    aliases = ['fetch-missing']
183
    takes_args = ['branch?']
275.1.3 by Daniel Silverstone
Fix up fetch_ghosts to lock the branches, and to invoke bzr fix if it fetches any ghosts into the tree
184
    takes_options = [Option('no-fix')]
185
    def run(self, branch=None, no_fix=False):
246 by Aaron Bentley
Merged shelf_v2
186
        from fetch_ghosts import fetch_ghosts
275.1.3 by Daniel Silverstone
Fix up fetch_ghosts to lock the branches, and to invoke bzr fix if it fetches any ghosts into the tree
187
        fetch_ghosts(branch, no_fix)
246 by Aaron Bentley
Merged shelf_v2
188
189
strip_help="""Strip the smallest prefix containing num leading slashes  from \
190
each file name found in the patch file."""
445 by Aaron Bentley
Remove shove, tweak imports, docs
191
192
246 by Aaron Bentley
Merged shelf_v2
193
class cmd_patch(bzrlib.commands.Command):
415 by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions
194
    """Apply a named patch to the current tree.
246 by Aaron Bentley
Merged shelf_v2
195
    """
196
    takes_args = ['filename?']
496 by Aaron Bentley
Add --silent option to patch
197
    takes_options = [Option('strip', type=int, help=strip_help),
198
                     Option('silent', help='Suppress chatter')]
199
    def run(self, filename=None, strip=None, silent=False):
246 by Aaron Bentley
Merged shelf_v2
200
        from patch import patch
340 by Aaron Bentley
Fixed patch on checkouts
201
        from bzrlib.workingtree import WorkingTree
202
        wt = WorkingTree.open_containing('.')[0]
473 by Aaron Bentley
Clean up patch command (support http urls again)
203
        if strip is None:
204
            strip = 0
496 by Aaron Bentley
Add --silent option to patch
205
        return patch(wt, filename, strip, silent)
246 by Aaron Bentley
Merged shelf_v2
206
427 by Aaron Bentley
Merge latest changes from Shelf
207
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
208
class cmd_shelve(bzrlib.commands.Command):
415 by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions
209
    """Temporarily set aside some changes from the current tree.
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
210
211
    Shelve allows you to temporarily put changes you've made "on the shelf",
212
    ie. out of the way, until a later time when you can bring them back from
213
    the shelf with the 'unshelve' command.
214
289 by Aaron Bentley
Updated shelf help
215
    Shelve is intended to help separate several sets of text changes that have
216
    been inappropriately mingled.  If you just want to get rid of all changes
217
    (text and otherwise) and you don't need to restore them later, use revert.
218
    If you want to shelve all text changes at once, use shelve --all.
219
0.1.90 by Michael Ellerman
Update help text to try and be clearer, some stolen from bzrtools.
220
    By default shelve asks you what you want to shelve, press '?' at the
221
    prompt to get help. To shelve everything run shelve --all.
222
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
223
    If filenames are specified, only the changes to those files will be
224
    shelved, other files will be left untouched.
225
226
    If a revision is specified, changes since that revision will be shelved.
0.1.113 by Michael Ellerman
Support for unshelving in arbitrary order.
227
228
    You can put multiple items on the shelf. Normally each time you run
229
    unshelve the most recently shelved changes will be reinstated. However,
230
    you can also unshelve changes in a different order by explicitly
231
    specifiying which changes to unshelve. This works best when the changes
232
    don't depend on each other.
0.7.3 by Michael Ellerman
Add a reference from 'shelve' help to 'shelf'.
233
234
    While you have patches on the shelf you can view and manipulate them with
235
    the 'shelf' command. Run 'bzr shelf -h' for more info.
0.1.90 by Michael Ellerman
Update help text to try and be clearer, some stolen from bzrtools.
236
    """
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
237
238
    takes_args = ['file*']
0.1.90 by Michael Ellerman
Update help text to try and be clearer, some stolen from bzrtools.
239
    takes_options = ['message', 'revision',
423.1.4 by Aaron Bentley
Add --no-color option to shelf
240
            Option('all', help='Shelve all changes without prompting'), 
241
            Option('no-color', help='Never display changes in color')]
0.1.90 by Michael Ellerman
Update help text to try and be clearer, some stolen from bzrtools.
242
423.1.4 by Aaron Bentley
Add --no-color option to shelf
243
    def run(self, all=False, file_list=None, message=None, revision=None,
244
            no_color=False):
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
245
        if revision is not None and revision:
246
            if len(revision) == 1:
247
                revision = revision[0]
248
            else:
249
                raise CommandError("shelve only accepts a single revision "
250
                                  "parameter.")
251
252
        source = BzrPatchSource(revision, file_list)
512 by Aaron Bentley
More import-time fixups
253
        s = shelf.Shelf(source.base)
423.1.4 by Aaron Bentley
Add --no-color option to shelf
254
        s.shelve(source, all, message, no_color)
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
255
        return 0
256
0.1.109 by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'.
257
258
# The following classes are only used as subcommands for 'shelf', they're
259
# not to be registered directly with bzr.
260
261
class cmd_shelf_list(bzrlib.commands.Command):
262
    """List the patches on the current shelf."""
263
    aliases = ['list', 'ls']
264
    def run(self):
265
        self.shelf.list()
266
267
268
class cmd_shelf_delete(bzrlib.commands.Command):
269
    """Delete the patch from the current shelf."""
270
    aliases = ['delete', 'del']
271
    takes_args = ['patch']
272
    def run(self, patch):
273
        self.shelf.delete(patch)
274
275
276
class cmd_shelf_switch(bzrlib.commands.Command):
277
    """Switch to the other shelf, create it if necessary."""
278
    aliases = ['switch']
0.1.117 by Michael Ellerman
Arg names with hyphens don't seem to work (broke shelf switch).
279
    takes_args = ['othershelf']
280
    def run(self, othershelf):
512 by Aaron Bentley
More import-time fixups
281
        s = shelf.Shelf(self.shelf.base, othershelf)
0.1.109 by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'.
282
        s.make_default()
283
284
285
class cmd_shelf_show(bzrlib.commands.Command):
0.1.110 by Michael Ellerman
Make the patch argument to 'shelf show' optional.
286
    """Show the contents of the specified or topmost patch."""
0.1.109 by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'.
287
    aliases = ['show', 'cat', 'display']
0.1.110 by Michael Ellerman
Make the patch argument to 'shelf show' optional.
288
    takes_args = ['patch?']
289
    def run(self, patch=None):
0.1.109 by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'.
290
        self.shelf.display(patch)
291
292
293
class cmd_shelf_upgrade(bzrlib.commands.Command):
294
    """Upgrade old format shelves."""
295
    aliases = ['upgrade']
296
    def run(self):
297
        self.shelf.upgrade()
298
299
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
300
class cmd_shelf(bzrlib.commands.Command):
0.1.109 by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'.
301
    """Perform various operations on your shelved patches. See also shelve."""
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
302
    takes_args = ['subcommand', 'args*']
303
0.1.109 by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'.
304
    subcommands = [cmd_shelf_list, cmd_shelf_delete, cmd_shelf_switch,
305
        cmd_shelf_show, cmd_shelf_upgrade]
306
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
307
    def run(self, subcommand, args_list):
308
        import sys
309
456.1.1 by Aaron Bentley
Fix shelf ls with no args (Alexander Belchenko)
310
        if args_list is None:
311
            args_list = []
0.1.109 by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'.
312
        cmd = self._get_cmd_object(subcommand)
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
313
        source = BzrPatchSource()
512 by Aaron Bentley
More import-time fixups
314
        s = shelf.Shelf(source.base)
0.1.109 by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'.
315
        cmd.shelf = s
0.7.4 by Michael Ellerman
Cope with run_argv_aliases() API change
316
317
        if args_list is None:
318
            args_list = []
0.1.109 by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'.
319
        return cmd.run_argv_aliases(args_list)
320
321
    def _get_cmd_object(self, cmd_name):
322
        for cmd_class in self.subcommands:
323
            for alias in cmd_class.aliases:
324
                if alias == cmd_name:
325
                    return cmd_class()
326
        raise CommandError("Unknown shelf subcommand '%s'" % cmd_name)
327
328
    def help(self):
0.1.111 by Michael Ellerman
Make help for subcommands more readable, print options in help also.
329
        text = ["%s\n\nSubcommands:\n" % self.__doc__]
0.1.109 by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'.
330
331
        for cmd_class in self.subcommands:
0.1.111 by Michael Ellerman
Make help for subcommands more readable, print options in help also.
332
            text.extend(self.sub_help(cmd_class) + ['\n'])
333
334
        return ''.join(text)
335
336
    def sub_help(self, cmd_class):
337
        text = []
338
        cmd_obj = cmd_class()
339
        indent = 2 * ' '
340
512 by Aaron Bentley
More import-time fixups
341
        usage = help.command_usage(cmd_obj)
0.1.111 by Michael Ellerman
Make help for subcommands more readable, print options in help also.
342
        usage = usage.replace('bzr shelf-', '')
343
        text.append('%s%s\n' % (indent, usage))
344
345
        text.append('%s%s\n' % (2 * indent, cmd_class.__doc__))
346
347
        # Somewhat copied from bzrlib.help.help_on_command_options
348
        option_help = []
349
        for option_name, option in sorted(cmd_obj.options().items()):
350
            if option_name == 'help':
351
                continue
352
            option_help.append('%s--%s' % (3 * indent, option_name))
353
            if option.type is not None:
354
                option_help.append(' %s' % option.argname.upper())
355
            if option.short_name():
356
                option_help.append(', -%s' % option.short_name())
357
            option_help.append('%s%s\n' % (2 * indent, option.help))
358
359
        if len(option_help) > 0:
360
            text.append('%soptions:\n' % (2 * indent))
361
            text.extend(option_help)
362
363
        return text
0.1.109 by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'.
364
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
365
366
class cmd_unshelve(bzrlib.commands.Command):
415 by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions
367
    """Restore shelved changes.
0.1.113 by Michael Ellerman
Support for unshelving in arbitrary order.
368
369
    By default the most recently shelved changes are restored. However if you
370
    specify a patch by name those changes will be restored instead.
371
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
372
    See 'shelve' for more information.
373
    """
0.1.91 by Michael Ellerman
Add --force option to unshelve, which runs the shelved changes through
374
    takes_options = [
375
            Option('all', help='Unshelve all changes without prompting'),
376
            Option('force', help='Force unshelving even if errors occur'),
423.1.4 by Aaron Bentley
Add --no-color option to shelf
377
            Option('no-color', help='Never display changes in color')
378
        ]
0.1.113 by Michael Ellerman
Support for unshelving in arbitrary order.
379
    takes_args = ['patch?']
423.1.4 by Aaron Bentley
Add --no-color option to shelf
380
    def run(self, patch=None, all=False, force=False, no_color=False):
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
381
        source = BzrPatchSource()
512 by Aaron Bentley
More import-time fixups
382
        s = shelf.Shelf(source.base)
423.1.4 by Aaron Bentley
Add --no-color option to shelf
383
        s.unshelve(source, patch, all, force, no_color)
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
384
        return 0
385
0.1.22 by Michael Ellerman
Add __init__.py, put cmd_shelve/unshelve in there.
386
249 by Aaron Bentley
Got the shell basics working properly
387
class cmd_shell(bzrlib.commands.Command):
415 by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions
388
    """Begin an interactive shell tailored for bzr.
287 by Aaron Bentley
Added shell docstring
389
    Bzr commands can be used without typing bzr first, and will be run natively
390
    when possible.  Tab completion is tailored for bzr.  The shell prompt shows
391
    the branch nick, revno, and path.
392
393
    If it encounters any moderately complicated shell command, it will punt to
394
    the system shell.
395
396
    Example:
397
    $ bzr shell
398
    bzr bzrtools:287/> status
399
    modified:
400
      __init__.py
401
    bzr bzrtools:287/> status --[TAB][TAB]
402
    --all        --help       --revision   --show-ids
403
    bzr bzrtools:287/> status --
404
    """
249 by Aaron Bentley
Got the shell basics working properly
405
    def run(self):
406
        import shell
281 by Aaron Bentley
Handled whitespace branch names better
407
        return shell.run_shell()
246 by Aaron Bentley
Merged shelf_v2
408
445 by Aaron Bentley
Remove shove, tweak imports, docs
409
292 by Aaron Bentley
Introduced branch-history command
410
class cmd_branch_history(bzrlib.commands.Command):
411
    """\
415 by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions
412
    Display the development history of a branch.
292 by Aaron Bentley
Introduced branch-history command
413
293 by Aaron Bentley
Updated help
414
    Each different committer or branch nick is considered a different line of
415
    development.  Committers are treated as the same if they have the same
416
    name, or if they have the same email address.
292 by Aaron Bentley
Introduced branch-history command
417
    """
418
    takes_args = ["branch?"]
419
    def run(self, branch=None):
420
        from branchhistory import branch_history 
421
        return branch_history(branch)
422
345 by Aaron Bentley
Added zap command
423
424
class cmd_zap(bzrlib.commands.Command):
425
    """\
415 by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions
426
    Remove a lightweight checkout, if it can be done safely.
411 by Aaron Bentley
Update zap documentation
427
428
    This command will remove a lightweight checkout without losing data.  That
429
    means it only removes lightweight checkouts, and only if they have no
430
    uncommitted changes.
431
432
    If --branch is specified, the branch will be deleted too, but only if the
433
    the branch has no new commits (relative to its parent).
345 by Aaron Bentley
Added zap command
434
    """
355.1.1 by Aaron Bentley
Provided --branch option to for zapping branches
435
    takes_options = [Option("branch", help="Remove associtated branch from"
436
                                           " repository")]
345 by Aaron Bentley
Added zap command
437
    takes_args = ["checkout"]
355.1.1 by Aaron Bentley
Provided --branch option to for zapping branches
438
    def run(self, checkout, branch=False):
345 by Aaron Bentley
Added zap command
439
        from zap import zap
355.1.1 by Aaron Bentley
Provided --branch option to for zapping branches
440
        return zap(checkout, remove_branch=branch)
345 by Aaron Bentley
Added zap command
441
442
349 by Aaron Bentley
Added cbranch command
443
class cmd_cbranch(bzrlib.commands.Command):
444
    """
415 by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions
445
    Create a new checkout, associated with a new repository branch.
349 by Aaron Bentley
Added cbranch command
446
    
486 by Aaron Bentley
Support deep cbranch hierarcy via appendpath
447
    When you cbranch, bzr looks up a target location in locations.conf, and
448
    creates the branch there.
449
450
    In your locations.conf, add the following lines:
451
    [/working_directory_root]
452
    cbranch_target = /branch_root
453
    cbranch_target:policy = appendpath
454
455
    This will mean that if you run "bzr cbranch foo/bar foo/baz" in the
456
    working directory root, the branch will be created in 
457
    "/branch_root/foo/baz"
458
459
    NOTE: cbranch also supports "cbranch_root", but that behaviour is
460
    deprecated.
349 by Aaron Bentley
Added cbranch command
461
    """
355.1.2 by Aaron Bentley
cbranch mimics checkout wrt --lightweight
462
    takes_options = [Option("lightweight", 
418 by Aaron Bentley
Cbranch takes a revision option
463
                            help="Create a lightweight checkout"), 'revision']
355.1.2 by Aaron Bentley
cbranch mimics checkout wrt --lightweight
464
    takes_args = ["source", "target?"]
418 by Aaron Bentley
Cbranch takes a revision option
465
    def run(self, source, target=None, lightweight=False, revision=None):
349 by Aaron Bentley
Added cbranch command
466
        from cbranch import cbranch
418 by Aaron Bentley
Cbranch takes a revision option
467
        return cbranch(source, target, lightweight=lightweight, 
468
                       revision=revision)
355.1.2 by Aaron Bentley
cbranch mimics checkout wrt --lightweight
469
349 by Aaron Bentley
Added cbranch command
470
352 by Aaron Bentley
Added branches subcommand
471
class cmd_branches(bzrlib.commands.Command):
415 by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions
472
    """Scan a location for branches"""
352 by Aaron Bentley
Added branches subcommand
473
    takes_args = ["location?"]
474
    def run(self, location=None):
475
        from branches import branches
476
        return branches(location)
477
353 by Aaron Bentley
Added multi-pull, working on branches and checkouts
478
479
class cmd_multi_pull(bzrlib.commands.Command):
415 by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions
480
    """Pull all the branches under a location, e.g. a repository.
353 by Aaron Bentley
Added multi-pull, working on branches and checkouts
481
    
482
    Both branches present in the directory and the branches of checkouts are
483
    pulled.
484
    """
485
    takes_args = ["location?"]
486
    def run(self, location=None):
487
        from bzrlib.branch import Branch
488
        from bzrlib.transport import get_transport
489
        from bzrtools import iter_branch_tree
490
        if location is None:
491
            location = '.'
492
        t = get_transport(location)
493
        if not t.listable():
494
            print "Can't list this type of location."
495
            return 3
496
        for branch, wt in iter_branch_tree(t):
497
            if wt is None:
498
                pullable = branch
499
            else:
500
                pullable = wt
501
            parent = branch.get_parent()
502
            if parent is None:
503
                continue
504
            if wt is not None:
505
                base = wt.basedir
506
            else:
507
                base = branch.base
508
            if base.startswith(t.base):
509
                relpath = base[len(t.base):].rstrip('/')
510
            else:
511
                relpath = base
512
            print "Pulling %s from %s" % (relpath, parent)
513
            try:
514
                pullable.pull(Branch.open(parent))
515
            except Exception, e:
516
                print e
517
518
360.1.3 by Aaron Bentley
Add experimental branch-mark command
519
class cmd_branch_mark(bzrlib.commands.Command):
520
    """
521
    Add, view or list branch markers <EXPERIMENTAL>
522
523
    To add a mark, do 'bzr branch-mark MARK'.
524
    To list marks, do 'bzr branch-mark' (this lists all marks for the branch's
525
    repository).
526
    To delete a mark, do 'bzr branch-mark --delete MARK'
527
528
    These marks can be used to track a branch's status.
529
    """
530
    takes_args = ['mark?', 'branch?']
531
    takes_options = [Option('delete', help='Delete this mark')]
532
    def run(self, mark=None, branch=None, delete=False):
533
        from branch_mark import branch_mark
534
        branch_mark(mark, branch, delete)
535
445 by Aaron Bentley
Remove shove, tweak imports, docs
536
377 by Aaron Bentley
Got import command working
537
class cmd_import(bzrlib.commands.Command):
490 by Aaron Bentley
Improve bzr import docs
538
    """Import sources from a directory, tarball or zip file
380 by Aaron Bentley
Got import working decently
539
    
490 by Aaron Bentley
Improve bzr import docs
540
    This command will import a directory, tarball or zip file into a bzr
541
    tree, replacing any versioned files already present.  If a directory is
542
    specified, it is used as the target.  If the directory does not exist, or
543
    is not versioned, it is created.
380 by Aaron Bentley
Got import working decently
544
545
    Tarballs may be gzip or bzip2 compressed.  This is autodetected.
546
490 by Aaron Bentley
Improve bzr import docs
547
    If the tarball or zip has a single root directory, that directory is
548
    stripped when extracting the tarball.  This is not done for directories.
380 by Aaron Bentley
Got import working decently
549
    """
550
    
551
    takes_args = ['source', 'tree?']
552
    def run(self, source, tree=None):
377 by Aaron Bentley
Got import command working
553
        from upstream_import import do_import
380 by Aaron Bentley
Got import working decently
554
        do_import(source, tree)
377 by Aaron Bentley
Got import command working
555
392.1.1 by Aaron Bentley
Implement 'shove' for moving changes to other trees
556
399 by Aaron Bentley
Implement cdiff (based on old Fai code)
557
class cmd_cdiff(bzrlib.commands.Command):
415 by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions
558
    """A color version of bzr's diff"""
410 by Aaron Bentley
Ensure the option settings come from the right 'diff' in colordiff
559
    takes_args = property(lambda x: get_cmd_object('diff').takes_args)
497 by Aaron Bentley
Add optional style checks to colordiff
560
561
    def _takes_options(self):
562
        options = list(get_cmd_object('diff').takes_options)
500 by Aaron Bentley
Add help
563
        options.append(Option('check-style',
564
            help='Warn if trailing whitespace or spurious changes have been'
565
                 ' added.'))
497 by Aaron Bentley
Add optional style checks to colordiff
566
        return options
567
568
    takes_options = property(_takes_options)
569
570
    def run(self, check_style=False, *args, **kwargs):
399 by Aaron Bentley
Implement cdiff (based on old Fai code)
571
        from colordiff import colordiff
497 by Aaron Bentley
Add optional style checks to colordiff
572
        colordiff(check_style, *args, **kwargs)
360.1.3 by Aaron Bentley
Add experimental branch-mark command
573
430 by Aaron Bentley
Avoid loading PyBaz unless running baz-import
574
575
class cmd_baz_import(bzrlib.commands.Command):
576
    """Import an Arch or Baz archive into a bzr repository.
577
578
    This command should be used on local archives (or mirrors) only.  It is
579
    quite slow on remote archives.
580
    
581
    reuse_history allows you to specify any previous imports you 
582
    have done of different archives, which this archive has branches
583
    tagged from. This will dramatically reduce the time to convert 
584
    the archive as it will not have to convert the history already
585
    converted in that other branch.
586
587
    If you specify prefixes, only branches whose names start with that prefix
588
    will be imported.  Skipped branches will be listed, so you can import any
589
    branches you missed by accident.  Here's an example of doing a partial
590
    import from thelove@canonical.com:
591
    bzr baz-import thelove thelove@canonical.com --prefixes dists:talloc-except
463 by Aaron Bentley
Get encoding flag under test
592
593
    WARNING: Encoding should not be specified unless necessary, because if you
594
    specify an encoding, your converted branch will not interoperate with
595
    independently-converted branches, unless the other branches were converted
596
    with exactly the same encoding.  Any encoding recognized by Python may
597
    be specified.  Aliases are not detected, so 'utf_8', 'U8', 'UTF' and 'utf8'
598
    are incompatible.
430 by Aaron Bentley
Avoid loading PyBaz unless running baz-import
599
    """
600
    takes_args = ['to_root_dir', 'from_archive', 'reuse_history*']
601
    takes_options = ['verbose', Option('prefixes', type=str,
463 by Aaron Bentley
Get encoding flag under test
602
                     help="Prefixes of branches to import, colon-separated"),
603
                     Option('encoding', type=str, 
604
                     help='Force encoding to specified value.  See WARNING.')]
430 by Aaron Bentley
Avoid loading PyBaz unless running baz-import
605
460 by Aaron Bentley
Add encoding parameter everywhere
606
    def run(self, to_root_dir, from_archive, encoding=None, verbose=False,
430 by Aaron Bentley
Avoid loading PyBaz unless running baz-import
607
            reuse_history_list=[], prefixes=None):
608
        from errors import NoPyBaz
609
        try:
610
            import baz_import
460 by Aaron Bentley
Add encoding parameter everywhere
611
            baz_import.baz_import(to_root_dir, from_archive, encoding,
430 by Aaron Bentley
Avoid loading PyBaz unless running baz-import
612
                                  verbose, reuse_history_list, prefixes)
613
        except NoPyBaz:
614
            print "This command is disabled.  Please install PyBaz."
615
616
617
class cmd_baz_import_branch(bzrlib.commands.Command):
463 by Aaron Bentley
Get encoding flag under test
618
    """Import an Arch or Baz branch into a bzr branch.
619
620
    WARNING: Encoding should not be specified unless necessary, because if you
621
    specify an encoding, your converted branch will not interoperate with
622
    independently-converted branches, unless the other branches were converted
623
    with exactly the same encoding.  Any encoding recognized by Python may
624
    be specified.  Aliases are not detected, so 'utf_8', 'U8', 'UTF' and 'utf8'
625
    are incompatible.
626
    """
430 by Aaron Bentley
Avoid loading PyBaz unless running baz-import
627
    takes_args = ['to_location', 'from_branch?', 'reuse_history*']
463 by Aaron Bentley
Get encoding flag under test
628
    takes_options = ['verbose', Option('max-count', type=int),
629
                     Option('encoding', type=str, 
630
                     help='Force encoding to specified value.  See WARNING.')]
430 by Aaron Bentley
Avoid loading PyBaz unless running baz-import
631
632
    def run(self, to_location, from_branch=None, fast=False, max_count=None,
460 by Aaron Bentley
Add encoding parameter everywhere
633
            encoding=None, verbose=False, dry_run=False,
634
            reuse_history_list=[]):
430 by Aaron Bentley
Avoid loading PyBaz unless running baz-import
635
        from errors import NoPyBaz
636
        try:
637
            import baz_import
638
            baz_import.baz_import_branch(to_location, from_branch, fast, 
460 by Aaron Bentley
Add encoding parameter everywhere
639
                                         max_count, verbose, encoding, dry_run,
430 by Aaron Bentley
Avoid loading PyBaz unless running baz-import
640
                                         reuse_history_list)
641
        except NoPyBaz:
642
            print "This command is disabled.  Please install PyBaz."
643
644
460 by Aaron Bentley
Add encoding parameter everywhere
645
class cmd_rspush(bzrlib.commands.Command):
646
    """Upload this branch to another location using rsync.
647
648
    If no location is specified, the last-used location will be used.  To 
649
    prevent dirty trees from being uploaded, rspush will error out if there are 
650
    unknown files or local changes.  It will also error out if the upstream 
651
    directory is non-empty and not an earlier version of the branch. 
652
    """
653
    takes_args = ['location?']
654
    takes_options = [Option('overwrite', help='Ignore differences between'
655
                            ' branches and overwrite unconditionally'),
656
                     Option('no-tree', help='Do not push the working tree,'
657
                            ' just the .bzr.')]
658
659
    def run(self, location=None, overwrite=False, no_tree=False):
660
        from bzrlib import workingtree
661
        import bzrtools
662
        cur_branch = workingtree.WorkingTree.open_containing(".")[0]
663
        bzrtools.rspush(cur_branch, location, overwrite=overwrite, 
664
                      working_tree=not no_tree)
665
666
667
class cmd_switch(bzrlib.commands.Command):
668
    """Set the branch of a lightweight checkout and update."""
669
670
    takes_args = ['to_location']
671
672
    def run(self, to_location):
673
        from switch import cmd_switch
674
        cmd_switch().run(to_location)
675
676
445 by Aaron Bentley
Remove shove, tweak imports, docs
677
commands = [
678
            cmd_baz_import,
679
            cmd_baz_import_branch,
680
            cmd_branches,
681
            cmd_branch_history,
682
            cmd_branch_mark,
683
            cmd_cbranch,  
684
            cmd_cdiff,
685
            cmd_clean_tree,
686
            cmd_fetch_ghosts,
687
            cmd_graph_ancestry,
688
            cmd_import,
689
            cmd_multi_pull,
690
            cmd_patch,
460 by Aaron Bentley
Add encoding parameter everywhere
691
            cmd_rspush,
445 by Aaron Bentley
Remove shove, tweak imports, docs
692
            cmd_shelf, 
693
            cmd_shell,
694
            cmd_shelve, 
695
            cmd_switch,
696
            cmd_unshelve, 
697
            cmd_zap,            
698
            ]
399 by Aaron Bentley
Implement cdiff (based on old Fai code)
699
246 by Aaron Bentley
Merged shelf_v2
700
701
if hasattr(bzrlib.commands, 'register_command'):
702
    for command in commands:
703
        bzrlib.commands.register_command(command)
271 by Aaron Bentley
Cherry-picked Robert's diff and push fixes
704
0.1.73 by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which
705
706
def test_suite():
707
    from bzrlib.tests.TestUtil import TestLoader
147.1.41 by Aaron Bentley
Merge from mainline
708
    import tests
321.1.3 by Aaron Bentley
Fixed up Robert's test changes
709
    from doctest import DocTestSuite, ELLIPSIS
325.1.2 by Aaron Bentley
Merge shelf v2
710
    from unittest import TestSuite
460 by Aaron Bentley
Add encoding parameter everywhere
711
    import bzrtools
391 by Aaron Bentley
Updates from the bzr clean-tree branch
712
    import tests.clean_tree
515 by Aaron Bentley
turn is_clean doctests into unittest, to avoid creating .bazaar directories
713
    import tests.is_clean
477 by Aaron Bentley
split out upstream_import test cases
714
    import tests.upstream_import
345 by Aaron Bentley
Added zap command
715
    import zap
339 by Aaron Bentley
Moved tests into a subdir
716
    import tests.blackbox
717
    import tests.shelf_tests
246 by Aaron Bentley
Merged shelf_v2
718
    result = TestSuite()
321.1.3 by Aaron Bentley
Fixed up Robert's test changes
719
    result.addTest(DocTestSuite(bzrtools, optionflags=ELLIPSIS))
391 by Aaron Bentley
Updates from the bzr clean-tree branch
720
    result.addTest(tests.clean_tree.test_suite())
387 by Aaron Bentley
Got test suite running with PyBaz unavailable
721
    try:
722
        import baz_import
723
        result.addTest(DocTestSuite(baz_import))
724
    except NoPyBaz:
725
        pass
147.1.41 by Aaron Bentley
Merge from mainline
726
    result.addTest(tests.test_suite())
339 by Aaron Bentley
Moved tests into a subdir
727
    result.addTest(TestLoader().loadTestsFromModule(tests.shelf_tests))
728
    result.addTest(tests.blackbox.test_suite())
477 by Aaron Bentley
split out upstream_import test cases
729
    result.addTest(tests.upstream_import.test_suite())
345 by Aaron Bentley
Added zap command
730
    result.addTest(zap.test_suite())
515 by Aaron Bentley
turn is_clean doctests into unittest, to avoid creating .bazaar directories
731
    result.addTest(TestLoader().loadTestsFromModule(tests.is_clean))
246 by Aaron Bentley
Merged shelf_v2
732
    return result