~abentley/bzrtools/bzrtools.dev

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