« back to all changes in this revision
Viewing changes to __init__.py
- browse files at revision 360.1.3
- compare with another revision
- download diff
- download tarball
- view history from revision 360.1.3
- Committer: Aaron Bentley
- Date: 2006-04-14 21:56:35 UTC
- mto: This revision was merged to the branch mainline in revision 363.
- Revision ID: aaron.bentley@utoronto.ca-20060414215635-f271c593839053b3
Add experimental branch-mark command
- files added:
- debian
- testdata
- files removed:
- .be/bugs/1804f828-abfe-4433-b287-7560ff9ea354
- .be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/comments
- .be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/comments/a68c4dc0-c796-4747-b7a1-60bee9fb2c86
- .be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/comments/aa6140d3-b4a7-46c3-abae-4c7b8a3523ce
- .be/bugs/5be3aa64-4585-49e4-8479-172c67afcc1b
- .be/bugs/5be3aa64-4585-49e4-8479-172c67afcc1b/comments
- .be/bugs/5be3aa64-4585-49e4-8479-172c67afcc1b/comments/298847ed-8d6a-416f-a3aa-4fd6d3f3417b
- .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25
- .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments
- .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/906938f4-be68-4d65-9b75-def07743b043
- .be/bugs/c59acbbf-25f4-450a-9a8f-7a6a45b3985e
- .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af
- .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments
- .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/f13e3358-1a65-4a45-9472-781548bc3fc3
- files renamed:
- rspush.py => push.py
- files modified:
- .be/bugs/dbd10145-51f8-4bda-96d9-06b5d3ef80b8/values
added
removed
__init__.py
1
# Copyright (C) 2005, 2006, 2007 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
1
#!/usr/bin/python
19
2
"""\
20
3
Various useful plugins for working with bzr.
21
4
"""
22
23
import bzrlib
24
25
26
__version__ = '0.15.0'
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 Bazzar version %s is too old to be used with'
51
' plugin \n'
52
'"Bzrtools" %s.' % (bzrlib.__version__, __version__))
53
# Not using BzrNewError, because it may not exist.
54
raise Exception, ('Version mismatch', version_info)
55
else:
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.'
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
67
68
from errors import CommandError, NoPyBaz
5
import bzrlib.commands
6
import push
7
from errors import CommandError
69
8
from patchsource import BzrPatchSource
70
9
from shelf import Shelf
10
from switch import cmd_switch
71
11
import sys
72
12
import os.path
73
74
import bzrlib.builtins
75
import bzrlib.commands
76
from bzrlib.commands import get_cmd_object
13
from bzrlib.option import Option
14
import bzrlib.branch
77
15
from bzrlib.errors import BzrCommandError
78
from bzrlib.help import command_usage
79
import bzrlib.ignores
80
from bzrlib.option import Option
81
16
sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__),
82
"external")))
83
84
import show_paths
85
86
bzrlib.ignores.add_runtime_ignores(['./.shelf'])
87
17
"external")))
18
from bzrlib import DEFAULT_IGNORE
19
20
21
DEFAULT_IGNORE.append('./.shelf')
22
DEFAULT_IGNORE.append('./.bzr-shelf*')
23
24
25
Option.OPTIONS['ignored'] = Option('ignored',
26
help='delete all ignored files.')
27
Option.OPTIONS['detritus'] = Option('detritus',
28
help='delete conflict files merge backups, and failed selftest dirs.' +
29
'(*.THIS, *.BASE, *.OTHER, *~, *.tmp')
30
Option.OPTIONS['dry-run'] = Option('dry-run',
31
help='show files to delete instead of deleting them.')
88
32
89
33
class cmd_clean_tree(bzrlib.commands.Command):
90
"""Remove unwanted files from working tree.
91
92
By default, only unknown files, not ignored files, are deleted. Versioned
93
files are never deleted.
94
95
Another class is 'detritus', which includes files emitted by bzr during
96
normal operations and selftests. (The value of these files decreases with
97
time.)
98
99
If no options are specified, unknown files are deleted. Otherwise, option
100
flags are respected, and may be combined.
101
102
To check what clean-tree will do, use --dry-run.
34
"""Remove unwanted files from working tree. <BZRTOOLS>
35
Normally, ignored files are left alone.
103
36
"""
104
takes_options = [Option('ignored', help='delete all ignored files.'),
105
Option('detritus', help='delete conflict files, merge'
106
' backups, and failed selftest dirs.'),
107
Option('unknown',
108
help='delete files unknown to bzr. (default)'),
109
Option('dry-run', help='show files to delete instead of'
110
' deleting them.')]
111
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False):
37
takes_options = ['ignored', 'detritus', 'dry-run']
38
def run(self, ignored=False, detritus=False, dry_run=False):
112
39
from clean_tree import clean_tree
113
if not (unknown or ignored or detritus):
114
unknown = True
115
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
116
dry_run=dry_run)
40
clean_tree('.', ignored=ignored, detritus=detritus, dry_run=dry_run)
117
41
42
Option.OPTIONS['merge-branch'] = Option('merge-branch',type=str)
118
43
119
44
class cmd_graph_ancestry(bzrlib.commands.Command):
120
"""Produce ancestry graphs using dot.
45
"""Produce ancestry graphs using dot. <BZRTOOLS>
121
46
122
47
Output format is detected according to file extension. Some of the more
123
48
common output formats are html, png, gif, svg, ps. An extension of '.dot'
157
82
help="Do not use rsvg to produce antialiased output"),
158
83
Option('merge-branch', type=str,
159
84
help="Use this branch to calcuate a merge base"),
160
Option('cluster', help="Use clustered output."),
161
Option('max-distance', help="Show no nodes farther than this",
162
type=int)]
85
Option('cluster', help="Use clustered output.")]
163
86
def run(self, branch, file, no_collapse=False, no_antialias=False,
164
merge_branch=None, cluster=False, max_distance=None):
87
merge_branch=None, cluster=False):
165
88
import graph
166
89
if cluster:
167
90
ranking = "cluster"
168
91
else:
169
92
ranking = "forced"
170
93
graph.write_ancestry_file(branch, file, not no_collapse,
171
not no_antialias, merge_branch, ranking,
172
max_distance=max_distance)
173
94
not no_antialias, merge_branch, ranking)
174
95
175
96
class cmd_fetch_ghosts(bzrlib.commands.Command):
176
"""Attempt to retrieve ghosts from another branch.
97
"""Attempt to retrieve ghosts from another branch. <BZRTOOLS>
177
98
If the other branch is not supplied, the last-pulled branch is used.
178
99
"""
179
100
aliases = ['fetch-missing']
185
106
186
107
strip_help="""Strip the smallest prefix containing num leading slashes from \
187
108
each file name found in the patch file."""
188
189
109
Option.OPTIONS['strip'] = Option('strip', type=int, help=strip_help)
110
Option.OPTIONS['bzrdiff'] = Option('bzrdiff',type=None,
111
help="""Handle extra bzr tags""")
190
112
class cmd_patch(bzrlib.commands.Command):
191
"""Apply a named patch to the current tree.
113
"""Apply a named patch to the current tree. <BZRTOOLS>
192
114
"""
193
115
takes_args = ['filename?']
194
takes_options = [Option('strip', type=int, help=strip_help),
195
Option('silent', help='Suppress chatter')]
196
def run(self, filename=None, strip=None, silent=False):
116
takes_options = ['strip','bzrdiff']
117
def run(self, filename=None, strip=-1, bzrdiff=0):
197
118
from patch import patch
198
119
from bzrlib.workingtree import WorkingTree
199
120
wt = WorkingTree.open_containing('.')[0]
200
if strip is None:
201
strip = 0
202
return patch(wt, filename, strip, silent)
121
if strip == -1:
122
if bzrdiff: strip = 0
123
else: strip = 1
203
124
125
return patch(wt, filename, strip, legacy= not bzrdiff)
204
126
205
127
class cmd_shelve(bzrlib.commands.Command):
206
"""Temporarily set aside some changes from the current tree.
128
"""Temporarily set aside some changes from the current tree. <BZRTOOLS>
207
129
208
130
Shelve allows you to temporarily put changes you've made "on the shelf",
209
131
ie. out of the way, until a later time when you can bring them back from
217
139
By default shelve asks you what you want to shelve, press '?' at the
218
140
prompt to get help. To shelve everything run shelve --all.
219
141
142
You can put multiple items on the shelf, each time you run unshelve the
143
most recently shelved changes will be reinstated.
144
220
145
If filenames are specified, only the changes to those files will be
221
146
shelved, other files will be left untouched.
222
147
223
148
If a revision is specified, changes since that revision will be shelved.
224
225
You can put multiple items on the shelf. Normally each time you run
226
unshelve the most recently shelved changes will be reinstated. However,
227
you can also unshelve changes in a different order by explicitly
228
specifiying which changes to unshelve. This works best when the changes
229
don't depend on each other.
230
231
While you have patches on the shelf you can view and manipulate them with
232
the 'shelf' command. Run 'bzr shelf -h' for more info.
233
149
"""
234
150
235
151
takes_args = ['file*']
236
152
takes_options = ['message', 'revision',
237
Option('all', help='Shelve all changes without prompting'),
238
Option('no-color', help='Never display changes in color')]
153
Option('all', help='Shelve all changes without prompting')]
239
154
240
def run(self, all=False, file_list=None, message=None, revision=None,
241
no_color=False):
155
def run(self, all=False, file_list=None, message=None, revision=None):
242
156
if revision is not None and revision:
243
157
if len(revision) == 1:
244
158
revision = revision[0]
248
162
249
163
source = BzrPatchSource(revision, file_list)
250
164
s = Shelf(source.base)
251
s.shelve(source, all, message, no_color)
165
s.shelve(source, all, message)
252
166
return 0
253
167
254
255
# The following classes are only used as subcommands for 'shelf', they're
256
# not to be registered directly with bzr.
257
258
class cmd_shelf_list(bzrlib.commands.Command):
259
"""List the patches on the current shelf."""
260
aliases = ['list', 'ls']
261
def run(self):
262
self.shelf.list()
263
264
265
class cmd_shelf_delete(bzrlib.commands.Command):
266
"""Delete the patch from the current shelf."""
267
aliases = ['delete', 'del']
268
takes_args = ['patch']
269
def run(self, patch):
270
self.shelf.delete(patch)
271
272
273
class cmd_shelf_switch(bzrlib.commands.Command):
274
"""Switch to the other shelf, create it if necessary."""
275
aliases = ['switch']
276
takes_args = ['othershelf']
277
def run(self, othershelf):
278
s = Shelf(self.shelf.base, othershelf)
279
s.make_default()
280
281
282
class cmd_shelf_show(bzrlib.commands.Command):
283
"""Show the contents of the specified or topmost patch."""
284
aliases = ['show', 'cat', 'display']
285
takes_args = ['patch?']
286
def run(self, patch=None):
287
self.shelf.display(patch)
288
289
290
class cmd_shelf_upgrade(bzrlib.commands.Command):
291
"""Upgrade old format shelves."""
292
aliases = ['upgrade']
293
def run(self):
294
self.shelf.upgrade()
295
296
297
168
class cmd_shelf(bzrlib.commands.Command):
298
"""Perform various operations on your shelved patches. See also shelve."""
169
"""Perform various operations on your shelved patches. See also shelve.
170
171
Subcommands:
172
list (ls) List the patches on the current shelf.
173
delete (del) <patch> Delete a patch from the current shelf.
174
switch <shelf> Switch to the named shelf, create it if necessary.
175
show <patch> Show the contents of the specified patch.
176
upgrade Upgrade old format shelves.
177
"""
299
178
takes_args = ['subcommand', 'args*']
300
179
301
subcommands = [cmd_shelf_list, cmd_shelf_delete, cmd_shelf_switch,
302
cmd_shelf_show, cmd_shelf_upgrade]
303
304
180
def run(self, subcommand, args_list):
305
181
import sys
306
182
307
if args_list is None:
308
args_list = []
309
cmd = self._get_cmd_object(subcommand)
310
183
source = BzrPatchSource()
311
184
s = Shelf(source.base)
312
cmd.shelf = s
313
return cmd.run_argv_aliases(args_list)
314
315
def _get_cmd_object(self, cmd_name):
316
for cmd_class in self.subcommands:
317
for alias in cmd_class.aliases:
318
if alias == cmd_name:
319
return cmd_class()
320
raise CommandError("Unknown shelf subcommand '%s'" % cmd_name)
321
322
def help(self):
323
text = ["%s\n\nSubcommands:\n" % self.__doc__]
324
325
for cmd_class in self.subcommands:
326
text.extend(self.sub_help(cmd_class) + ['\n'])
327
328
return ''.join(text)
329
330
def sub_help(self, cmd_class):
331
text = []
332
cmd_obj = cmd_class()
333
indent = 2 * ' '
334
335
usage = command_usage(cmd_obj)
336
usage = usage.replace('bzr shelf-', '')
337
text.append('%s%s\n' % (indent, usage))
338
339
text.append('%s%s\n' % (2 * indent, cmd_class.__doc__))
340
341
# Somewhat copied from bzrlib.help.help_on_command_options
342
option_help = []
343
for option_name, option in sorted(cmd_obj.options().items()):
344
if option_name == 'help':
345
continue
346
option_help.append('%s--%s' % (3 * indent, option_name))
347
if option.type is not None:
348
option_help.append(' %s' % option.argname.upper())
349
if option.short_name():
350
option_help.append(', -%s' % option.short_name())
351
option_help.append('%s%s\n' % (2 * indent, option.help))
352
353
if len(option_help) > 0:
354
text.append('%soptions:\n' % (2 * indent))
355
text.extend(option_help)
356
357
return text
185
186
if subcommand == 'ls' or subcommand == 'list':
187
self.__check_no_args(args_list, "shelf list takes no arguments!")
188
s.list()
189
elif subcommand == 'delete' or subcommand == 'del':
190
self.__check_one_arg(args_list, "shelf delete takes one argument!")
191
s.delete(args_list[0])
192
elif subcommand == 'switch':
193
self.__check_one_arg(args_list, "shelf switch takes one argument!")
194
s = Shelf(source.base, args_list[0])
195
s.make_default()
196
elif subcommand == 'show':
197
self.__check_one_arg(args_list, "shelf show takes one argument!")
198
s.display(args_list[0])
199
elif subcommand == 'upgrade':
200
self.__check_no_args(args_list, "shelf upgrade takes no arguments!")
201
s.upgrade()
202
else:
203
print subcommand, args_list
204
print >>sys.stderr, "Unknown shelf subcommand '%s'" % subcommand
205
206
def __check_one_arg(self, args, msg):
207
if args is None or len(args) != 1:
208
raise CommandError(msg)
209
210
def __check_no_args(self, args, msg):
211
if args is not None:
212
raise CommandError(msg)
358
213
359
214
360
215
class cmd_unshelve(bzrlib.commands.Command):
361
"""Restore shelved changes.
362
363
By default the most recently shelved changes are restored. However if you
364
specify a patch by name those changes will be restored instead.
365
216
"""Restore the most recently shelved changes to current tree. <BZRTOOLS>
366
217
See 'shelve' for more information.
367
218
"""
368
219
takes_options = [
369
220
Option('all', help='Unshelve all changes without prompting'),
370
221
Option('force', help='Force unshelving even if errors occur'),
371
Option('no-color', help='Never display changes in color')
372
]
373
takes_args = ['patch?']
374
def run(self, patch=None, all=False, force=False, no_color=False):
222
]
223
def run(self, all=False, force=False):
375
224
source = BzrPatchSource()
376
225
s = Shelf(source.base)
377
s.unshelve(source, patch, all, force, no_color)
226
s.unshelve(source, all, force)
378
227
return 0
379
228
380
229
381
230
class cmd_shell(bzrlib.commands.Command):
382
"""Begin an interactive shell tailored for bzr.
231
"""Begin an interactive shell tailored for bzr. <BZRTOOLS>
383
232
Bzr commands can be used without typing bzr first, and will be run natively
384
233
when possible. Tab completion is tailored for bzr. The shell prompt shows
385
234
the branch nick, revno, and path.
400
249
import shell
401
250
return shell.run_shell()
402
251
403
404
252
class cmd_branch_history(bzrlib.commands.Command):
405
253
"""\
406
Display the development history of a branch.
254
Display the development history of a branch <BZRTOOLS>.
407
255
408
256
Each different committer or branch nick is considered a different line of
409
257
development. Committers are treated as the same if they have the same
417
265
418
266
class cmd_zap(bzrlib.commands.Command):
419
267
"""\
420
Remove a lightweight checkout, if it can be done safely.
421
422
This command will remove a lightweight checkout without losing data. That
423
means it only removes lightweight checkouts, and only if they have no
424
uncommitted changes.
425
426
If --branch is specified, the branch will be deleted too, but only if the
427
the branch has no new commits (relative to its parent).
268
Remove a checkout, if it can be done safely. <BZRTOOLS>
269
270
This command will remove a checkout without losing data. That means
271
it only removes checkouts, and only if they have no uncommitted changes.
428
272
"""
429
273
takes_options = [Option("branch", help="Remove associtated branch from"
430
274
" repository")]
436
280
437
281
class cmd_cbranch(bzrlib.commands.Command):
438
282
"""
439
Create a new checkout, associated with a new repository branch.
283
Create a new checkout, associated with a new repository branch. <BZRTOOLS>
440
284
441
When you cbranch, bzr looks up a target location in locations.conf, and
442
creates the branch there.
443
444
In your locations.conf, add the following lines:
445
[/working_directory_root]
446
cbranch_target = /branch_root
447
cbranch_target:policy = appendpath
448
449
This will mean that if you run "bzr cbranch foo/bar foo/baz" in the
450
working directory root, the branch will be created in
451
"/branch_root/foo/baz"
452
453
NOTE: cbranch also supports "cbranch_root", but that behaviour is
454
deprecated.
285
When you cbranch, bzr looks up the repository associated with your current
286
directory in branches.conf. It creates a new branch in that repository
287
with the same name and relative path as the checkout you request.
288
289
The branches.conf parameter is "cbranch_root". So if you want
290
cbranch operations in /home/jrandom/bigproject to produce branches in
291
/home/jrandom/bigproject/repository, you'd add this:
292
293
[/home/jrandom/bigproject]
294
cbranch_root = /home/jrandom/bigproject/repository
295
296
Note that if "/home/jrandom/bigproject/repository" isn't a repository,
297
standalone branches will be produced. Standalone branches will also
298
be produced if the source branch is in 0.7 format (or earlier).
455
299
"""
456
300
takes_options = [Option("lightweight",
457
help="Create a lightweight checkout"), 'revision']
301
help="Create a lightweight checkout")]
458
302
takes_args = ["source", "target?"]
459
def run(self, source, target=None, lightweight=False, revision=None):
303
def run(self, source, target=None, lightweight=False):
460
304
from cbranch import cbranch
461
return cbranch(source, target, lightweight=lightweight,
462
revision=revision)
305
return cbranch(source, target, lightweight=lightweight)
463
306
464
307
465
308
class cmd_branches(bzrlib.commands.Command):
466
"""Scan a location for branches"""
309
"""Scan a location for branches <BZRTOOLS>"""
467
310
takes_args = ["location?"]
468
311
def run(self, location=None):
469
312
from branches import branches
471
314
472
315
473
316
class cmd_multi_pull(bzrlib.commands.Command):
474
"""Pull all the branches under a location, e.g. a repository.
317
"""Pull all the branches under a location, e.g. a repository. <BZRTOOLS>
475
318
476
319
Both branches present in the directory and the branches of checkouts are
477
320
pulled.
528
371
branch_mark(mark, branch, delete)
529
372
530
373
531
class cmd_import(bzrlib.commands.Command):
532
"""Import sources from a directory, tarball or zip file
533
534
This command will import a directory, tarball or zip file into a bzr
535
tree, replacing any versioned files already present. If a directory is
536
specified, it is used as the target. If the directory does not exist, or
537
is not versioned, it is created.
538
539
Tarballs may be gzip or bzip2 compressed. This is autodetected.
540
541
If the tarball or zip has a single root directory, that directory is
542
stripped when extracting the tarball. This is not done for directories.
543
"""
544
545
takes_args = ['source', 'tree?']
546
def run(self, source, tree=None):
547
from upstream_import import do_import
548
do_import(source, tree)
549
550
551
class cmd_cdiff(bzrlib.commands.Command):
552
"""A color version of bzr's diff"""
553
takes_args = property(lambda x: get_cmd_object('diff').takes_args)
554
555
def _takes_options(self):
556
options = list(get_cmd_object('diff').takes_options)
557
options.append(Option('check-style',
558
help='Warn if trailing whitespace or spurious changes have been'
559
' added.'))
560
return options
561
562
takes_options = property(_takes_options)
563
564
def run(self, check_style=False, *args, **kwargs):
565
from colordiff import colordiff
566
colordiff(check_style, *args, **kwargs)
567
568
569
class cmd_baz_import(bzrlib.commands.Command):
570
"""Import an Arch or Baz archive into a bzr repository.
571
572
This command should be used on local archives (or mirrors) only. It is
573
quite slow on remote archives.
574
575
reuse_history allows you to specify any previous imports you
576
have done of different archives, which this archive has branches
577
tagged from. This will dramatically reduce the time to convert
578
the archive as it will not have to convert the history already
579
converted in that other branch.
580
581
If you specify prefixes, only branches whose names start with that prefix
582
will be imported. Skipped branches will be listed, so you can import any
583
branches you missed by accident. Here's an example of doing a partial
584
import from thelove@canonical.com:
585
bzr baz-import thelove thelove@canonical.com --prefixes dists:talloc-except
586
587
WARNING: Encoding should not be specified unless necessary, because if you
588
specify an encoding, your converted branch will not interoperate with
589
independently-converted branches, unless the other branches were converted
590
with exactly the same encoding. Any encoding recognized by Python may
591
be specified. Aliases are not detected, so 'utf_8', 'U8', 'UTF' and 'utf8'
592
are incompatible.
593
"""
594
takes_args = ['to_root_dir', 'from_archive', 'reuse_history*']
595
takes_options = ['verbose', Option('prefixes', type=str,
596
help="Prefixes of branches to import, colon-separated"),
597
Option('encoding', type=str,
598
help='Force encoding to specified value. See WARNING.')]
599
600
def run(self, to_root_dir, from_archive, encoding=None, verbose=False,
601
reuse_history_list=[], prefixes=None):
602
from errors import NoPyBaz
603
try:
604
import baz_import
605
baz_import.baz_import(to_root_dir, from_archive, encoding,
606
verbose, reuse_history_list, prefixes)
607
except NoPyBaz:
608
print "This command is disabled. Please install PyBaz."
609
610
611
class cmd_baz_import_branch(bzrlib.commands.Command):
612
"""Import an Arch or Baz branch into a bzr branch.
613
614
WARNING: Encoding should not be specified unless necessary, because if you
615
specify an encoding, your converted branch will not interoperate with
616
independently-converted branches, unless the other branches were converted
617
with exactly the same encoding. Any encoding recognized by Python may
618
be specified. Aliases are not detected, so 'utf_8', 'U8', 'UTF' and 'utf8'
619
are incompatible.
620
"""
621
takes_args = ['to_location', 'from_branch?', 'reuse_history*']
622
takes_options = ['verbose', Option('max-count', type=int),
623
Option('encoding', type=str,
624
help='Force encoding to specified value. See WARNING.')]
625
626
def run(self, to_location, from_branch=None, fast=False, max_count=None,
627
encoding=None, verbose=False, dry_run=False,
628
reuse_history_list=[]):
629
from errors import NoPyBaz
630
try:
631
import baz_import
632
baz_import.baz_import_branch(to_location, from_branch, fast,
633
max_count, verbose, encoding, dry_run,
634
reuse_history_list)
635
except NoPyBaz:
636
print "This command is disabled. Please install PyBaz."
637
638
639
class cmd_rspush(bzrlib.commands.Command):
640
"""Upload this branch to another location using rsync.
641
642
If no location is specified, the last-used location will be used. To
643
prevent dirty trees from being uploaded, rspush will error out if there are
644
unknown files or local changes. It will also error out if the upstream
645
directory is non-empty and not an earlier version of the branch.
646
"""
647
takes_args = ['location?']
648
takes_options = [Option('overwrite', help='Ignore differences between'
649
' branches and overwrite unconditionally'),
650
Option('no-tree', help='Do not push the working tree,'
651
' just the .bzr.')]
652
653
def run(self, location=None, overwrite=False, no_tree=False):
654
from bzrlib import workingtree
655
import bzrtools
656
cur_branch = workingtree.WorkingTree.open_containing(".")[0]
657
bzrtools.rspush(cur_branch, location, overwrite=overwrite,
658
working_tree=not no_tree)
659
660
661
class cmd_switch(bzrlib.commands.Command):
662
"""Set the branch of a lightweight checkout and update."""
663
664
takes_args = ['to_location']
665
666
def run(self, to_location):
667
from switch import cmd_switch
668
cmd_switch().run(to_location)
669
670
671
commands = [
672
cmd_baz_import,
673
cmd_baz_import_branch,
674
cmd_branches,
675
cmd_branch_history,
676
cmd_branch_mark,
677
cmd_cbranch,
678
cmd_cdiff,
679
cmd_clean_tree,
680
cmd_fetch_ghosts,
681
cmd_graph_ancestry,
682
cmd_import,
683
cmd_multi_pull,
684
cmd_patch,
685
cmd_rspush,
686
cmd_shelf,
687
cmd_shell,
688
cmd_shelve,
689
cmd_switch,
690
cmd_unshelve,
691
cmd_zap,
692
]
374
commands = [cmd_shelve, cmd_unshelve, cmd_shelf, cmd_clean_tree,
375
cmd_graph_ancestry, cmd_fetch_ghosts, cmd_patch, cmd_shell,
376
cmd_branch_history, cmd_zap, cmd_cbranch, cmd_branches,
377
cmd_multi_pull, cmd_switch, cmd_branch_mark]
378
379
380
command_decorators = []
381
382
383
import bzrlib.builtins
384
if not hasattr(bzrlib.builtins, "cmd_push"):
385
commands.append(push.cmd_push)
386
else:
387
command_decorators.append(push.cmd_push)
388
389
from errors import NoPyBaz
390
try:
391
import baz_import
392
commands.append(baz_import.cmd_baz_import_branch)
393
commands.append(baz_import.cmd_baz_import)
394
395
except NoPyBaz:
396
class cmd_baz_import_branch(bzrlib.commands.Command):
397
"""Disabled. (Requires PyBaz) <BZRTOOLS>"""
398
takes_args = ['to_location?', 'from_branch?', 'reuse_history*']
399
takes_options = ['verbose', Option('max-count', type=int)]
400
def run(self, to_location=None, from_branch=None, fast=False,
401
max_count=None, verbose=False, dry_run=False,
402
reuse_history_list=[]):
403
print "This command is disabled. Please install PyBaz."
404
405
406
class cmd_baz_import(bzrlib.commands.Command):
407
"""Disabled. (Requires PyBaz) <BZRTOOLS>"""
408
takes_args = ['to_root_dir?', 'from_archive?', 'reuse_history*']
409
takes_options = ['verbose', Option('prefixes', type=str,
410
help="Prefixes of branches to import")]
411
def run(self, to_root_dir=None, from_archive=None, verbose=False,
412
reuse_history_list=[], prefixes=None):
413
print "This command is disabled. Please install PyBaz."
414
commands.extend((cmd_baz_import_branch, cmd_baz_import))
693
415
694
416
695
417
if hasattr(bzrlib.commands, 'register_command'):
696
418
for command in commands:
697
419
bzrlib.commands.register_command(command)
420
for command in command_decorators:
421
command._original_command = bzrlib.commands.register_command(
422
command, True)
698
423
699
424
700
425
def test_suite():
426
import baz_import
701
427
from bzrlib.tests.TestUtil import TestLoader
702
428
import tests
703
429
from doctest import DocTestSuite, ELLIPSIS
704
430
from unittest import TestSuite
705
import bzrtools
706
import tests.clean_tree
707
import tests.upstream_import
431
import clean_tree
708
432
import zap
709
433
import tests.blackbox
710
434
import tests.shelf_tests
711
435
result = TestSuite()
712
436
result.addTest(DocTestSuite(bzrtools, optionflags=ELLIPSIS))
713
result.addTest(tests.clean_tree.test_suite())
714
try:
715
import baz_import
716
result.addTest(DocTestSuite(baz_import))
717
except NoPyBaz:
718
pass
437
result.addTest(clean_tree.test_suite())
438
result.addTest(DocTestSuite(baz_import))
719
439
result.addTest(tests.test_suite())
720
440
result.addTest(TestLoader().loadTestsFromModule(tests.shelf_tests))
721
441
result.addTest(tests.blackbox.test_suite())
722
result.addTest(tests.upstream_import.test_suite())
723
442
result.addTest(zap.test_suite())
724
443
return result
Loggerhead is a web-based interface for Breezy
Version: 2.0.1