« back to all changes in this revision
Viewing changes to __init__.py
- browse files at revision 650
- compare with another revision
- download diff
- download tarball
- view history from revision 650
- Committer: Aaron Bentley
- Date: 2008-05-30 02:46:25 UTC
- Revision ID: aaron@aaronbentley.com-20080530024625-anlzob2j6z2s7ebv
Remove references to PyBaz
- files added:
- .be/bugs/55bd43ce-953b-4233-83d2-2034ea63a805
- .be/bugs/b394a88a-3ecc-4058-8e29-4ebdbf96c95f
- .be/bugs/b394a88a-3ecc-4058-8e29-4ebdbf96c95f/comments
- .be/bugs/b394a88a-3ecc-4058-8e29-4ebdbf96c95f/comments/0978c6a8-194e-4437-b3fc-2c99adf96499
- .be/bugs/b47ef4d6-6a96-44ad-9694-6dd2c855d9c3
- .be/bugs/b47ef4d6-6a96-44ad-9694-6dd2c855d9c3/comments
- .be/bugs/b47ef4d6-6a96-44ad-9694-6dd2c855d9c3/comments/4946aca8-392b-4d95-ae22-65c1a38d842c
- files removed:
- baz_import.py
- obsolete
- files modified:
- .be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab/values
added
removed
__init__.py
1
# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron.bentley@utoronto.ca>
1
# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron@aaronbentley.com>
2
2
# Copyright (C) 2005, 2006 Canonical Limited.
3
3
# Copyright (C) 2006 Michael Ellerman.
4
4
#
22
22
23
23
import bzrlib
24
24
25
26
__version__ = '0.18.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 or (bzrlib_version == desired_plus and
43
bzrlib.version_info[3] == 'dev'):
44
return
45
try:
46
from bzrlib.trace import warning
47
except ImportError:
48
# get the message out any way we can
49
from warnings import warn as warning
50
if bzrlib_version < desired:
51
warning('Installed Bazaar version %s is too old to be used with'
52
' plugin \n'
53
'"Bzrtools" %s.' % (bzrlib.__version__, __version__))
54
# Not using BzrNewError, because it may not exist.
55
raise Exception, ('Version mismatch', version_info)
56
else:
57
warning('Plugin "Bzrtools" is not up to date with installed Bazaar'
58
' version %s.\n'
59
' There should be a newer version of Bzrtools available, e.g.'
60
' %i.%i.'
61
% (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
62
if bzrlib_version != desired_plus:
63
raise Exception, 'Version mismatch'
64
65
66
check_bzrlib_version(version_info[:2])
67
68
25
from bzrlib.lazy_import import lazy_import
69
26
lazy_import(globals(), """
70
from bzrlib import help
27
from bzrlib import help, urlutils
71
28
import shelf
72
29
""")
73
30
74
from errors import CommandError, NoPyBaz
31
from version import version_info, __version__
32
from command import BzrToolsCommand
33
from errors import CommandError
75
34
from patchsource import BzrPatchSource
76
35
import sys
77
36
import os.path
78
37
79
38
import bzrlib.builtins
80
39
import bzrlib.commands
40
from bzrlib.branch import Branch
41
from bzrlib.bzrdir import BzrDir
81
42
from bzrlib.commands import get_cmd_object
82
43
from bzrlib.errors import BzrCommandError
83
44
import bzrlib.ignores
45
from bzrlib.trace import note
84
46
from bzrlib.option import Option
85
47
sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__),
86
48
"external")))
87
49
88
50
import show_paths
51
from command import BzrToolsCommand
89
52
90
53
bzrlib.ignores.add_runtime_ignores(['./.shelf'])
91
54
92
55
93
class cmd_clean_tree(bzrlib.commands.Command):
56
class cmd_clean_tree(BzrToolsCommand):
94
57
"""Remove unwanted files from working tree.
95
58
96
59
By default, only unknown files, not ignored files, are deleted. Versioned
105
68
106
69
To check what clean-tree will do, use --dry-run.
107
70
"""
108
takes_options = [Option('ignored', help='delete all ignored files.'),
109
Option('detritus', help='delete conflict files, merge'
71
takes_options = [Option('ignored', help='Delete all ignored files.'),
72
Option('detritus', help='Delete conflict files, merge'
110
73
' backups, and failed selftest dirs.'),
111
74
Option('unknown',
112
help='delete files unknown to bzr. (default)'),
113
Option('dry-run', help='show files to delete instead of'
75
help='Delete files unknown to bzr (default).'),
76
Option('dry-run', help='Show files to delete instead of'
114
77
' deleting them.')]
115
78
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False):
116
79
from clean_tree import clean_tree
120
83
dry_run=dry_run)
121
84
122
85
123
class cmd_graph_ancestry(bzrlib.commands.Command):
86
class cmd_graph_ancestry(BzrToolsCommand):
124
87
"""Produce ancestry graphs using dot.
125
88
126
89
Output format is detected according to file extension. Some of the more
155
118
If available, rsvg is used to antialias PNG and JPEG output, but this can
156
119
be disabled with --no-antialias.
157
120
"""
158
takes_args = ['branch', 'file']
159
takes_options = [Option('no-collapse', help="Do not skip simple nodes"),
121
takes_args = ['file', 'merge_branch?']
122
takes_options = [Option('no-collapse', help="Do not skip simple nodes."),
160
123
Option('no-antialias',
161
help="Do not use rsvg to produce antialiased output"),
124
help="Do not use rsvg to produce antialiased output."),
162
125
Option('merge-branch', type=str,
163
help="Use this branch to calcuate a merge base"),
126
help="Use this branch to calcuate a merge base."),
164
127
Option('cluster', help="Use clustered output."),
165
Option('max-distance', help="Show no nodes farther than this",
166
type=int)]
167
def run(self, branch, file, no_collapse=False, no_antialias=False,
168
merge_branch=None, cluster=False, max_distance=None):
128
Option('max-distance',
129
help="Show no nodes farther than this.", type=int),
130
Option('directory',
131
help='Source branch to use (default is current'
132
' directory).',
133
short_name='d',
134
type=unicode),
135
]
136
def run(self, file, merge_branch=None, no_collapse=False,
137
no_antialias=False, cluster=False, max_distance=100,
138
directory='.'):
139
if max_distance == -1:
140
max_distance = None
169
141
import graph
170
142
if cluster:
171
143
ranking = "cluster"
172
144
else:
173
145
ranking = "forced"
174
graph.write_ancestry_file(branch, file, not no_collapse,
146
graph.write_ancestry_file(directory, file, not no_collapse,
175
147
not no_antialias, merge_branch, ranking,
176
148
max_distance=max_distance)
177
149
178
150
179
class cmd_fetch_ghosts(bzrlib.commands.Command):
151
class cmd_fetch_ghosts(BzrToolsCommand):
180
152
"""Attempt to retrieve ghosts from another branch.
181
153
If the other branch is not supplied, the last-pulled branch is used.
182
154
"""
183
155
aliases = ['fetch-missing']
184
156
takes_args = ['branch?']
185
takes_options = [Option('no-fix')]
157
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
186
158
def run(self, branch=None, no_fix=False):
187
159
from fetch_ghosts import fetch_ghosts
188
160
fetch_ghosts(branch, no_fix)
191
163
each file name found in the patch file."""
192
164
193
165
194
class cmd_patch(bzrlib.commands.Command):
166
class cmd_patch(BzrToolsCommand):
195
167
"""Apply a named patch to the current tree.
196
168
"""
197
169
takes_args = ['filename?']
198
170
takes_options = [Option('strip', type=int, help=strip_help),
199
Option('silent', help='Suppress chatter')]
171
Option('silent', help='Suppress chatter.')]
200
172
def run(self, filename=None, strip=None, silent=False):
201
173
from patch import patch
202
174
from bzrlib.workingtree import WorkingTree
206
178
return patch(wt, filename, strip, silent)
207
179
208
180
209
class cmd_shelve(bzrlib.commands.Command):
181
class cmd_shelve(BzrToolsCommand):
210
182
"""Temporarily set aside some changes from the current tree.
211
183
212
184
Shelve allows you to temporarily put changes you've made "on the shelf",
237
209
"""
238
210
239
211
takes_args = ['file*']
240
takes_options = ['message', 'revision',
241
Option('all', help='Shelve all changes without prompting'),
242
Option('no-color', help='Never display changes in color')]
212
takes_options = [Option('message',
213
help='A message to associate with the shelved changes.',
214
short_name='m', type=unicode),
215
'revision',
216
Option('all', help='Shelve all changes without prompting.'),
217
Option('no-color', help='Never display changes in color.')]
243
218
244
219
def run(self, all=False, file_list=None, message=None, revision=None,
245
220
no_color=False):
298
273
self.shelf.upgrade()
299
274
300
275
301
class cmd_shelf(bzrlib.commands.Command):
276
class cmd_shelf(BzrToolsCommand):
302
277
"""Perform various operations on your shelved patches. See also shelve."""
303
278
takes_args = ['subcommand', 'args*']
304
279
364
339
return text
365
340
366
341
367
class cmd_unshelve(bzrlib.commands.Command):
342
class cmd_unshelve(BzrToolsCommand):
368
343
"""Restore shelved changes.
369
344
370
345
By default the most recently shelved changes are restored. However if you
373
348
See 'shelve' for more information.
374
349
"""
375
350
takes_options = [
376
Option('all', help='Unshelve all changes without prompting'),
377
Option('force', help='Force unshelving even if errors occur'),
378
Option('no-color', help='Never display changes in color')
351
Option('all', help='Unshelve all changes without prompting.'),
352
Option('force', help='Force unshelving even if errors occur.'),
353
Option('no-color', help='Never display changes in color.')
379
354
]
380
355
takes_args = ['patch?']
381
356
def run(self, patch=None, all=False, force=False, no_color=False):
385
360
return 0
386
361
387
362
388
class cmd_shell(bzrlib.commands.Command):
363
class cmd_shell(BzrToolsCommand):
389
364
"""Begin an interactive shell tailored for bzr.
390
365
Bzr commands can be used without typing bzr first, and will be run natively
391
366
when possible. Tab completion is tailored for bzr. The shell prompt shows
408
383
return shell.run_shell()
409
384
410
385
411
class cmd_branch_history(bzrlib.commands.Command):
386
class cmd_branch_history(BzrToolsCommand):
412
387
"""\
413
388
Display the development history of a branch.
414
389
422
397
return branch_history(branch)
423
398
424
399
425
class cmd_zap(bzrlib.commands.Command):
400
class cmd_zap(BzrToolsCommand):
426
401
"""\
427
402
Remove a lightweight checkout, if it can be done safely.
428
403
433
408
If --branch is specified, the branch will be deleted too, but only if the
434
409
the branch has no new commits (relative to its parent).
435
410
"""
436
takes_options = [Option("branch", help="Remove associtated branch from"
437
" repository")]
411
takes_options = [Option("branch", help="Remove associated branch from"
412
" repository."),
413
Option('force', help='Delete tree even if contents are'
414
' modified.')]
438
415
takes_args = ["checkout"]
439
def run(self, checkout, branch=False):
416
def run(self, checkout, branch=False, force=False):
440
417
from zap import zap
441
return zap(checkout, remove_branch=branch)
442
443
444
class cmd_cbranch(bzrlib.commands.Command):
418
return zap(checkout, remove_branch=branch, allow_modified=force)
419
420
421
class cmd_cbranch(BzrToolsCommand):
445
422
"""
446
423
Create a new checkout, associated with a new repository branch.
447
424
461
438
deprecated.
462
439
"""
463
440
takes_options = [Option("lightweight",
464
help="Create a lightweight checkout"), 'revision']
441
help="Create a lightweight checkout."), 'revision',
442
Option('files-from', type=unicode,
443
help='Accelerate checkout using files from this'
444
' tree.'),
445
Option('hardlink',
446
help='Hard-link files from source/files-from tree'
447
' where posible.')]
465
448
takes_args = ["source", "target?"]
466
def run(self, source, target=None, lightweight=False, revision=None):
449
def run(self, source, target=None, lightweight=False, revision=None,
450
files_from=None, hardlink=False):
467
451
from cbranch import cbranch
468
452
return cbranch(source, target, lightweight=lightweight,
469
revision=revision)
470
471
472
class cmd_branches(bzrlib.commands.Command):
453
revision=revision, files_from=files_from,
454
hardlink=hardlink)
455
456
457
class cmd_branches(BzrToolsCommand):
473
458
"""Scan a location for branches"""
474
459
takes_args = ["location?"]
475
460
def run(self, location=None):
476
461
from branches import branches
477
462
return branches(location)
478
463
464
class cmd_trees(BzrToolsCommand):
465
"""Scan a location for trees"""
466
takes_args = ['location?']
467
def run(self, location='.'):
468
from bzrlib.workingtree import WorkingTree
469
from bzrlib.transport import get_transport
470
t = get_transport(location)
471
for tree in WorkingTree.find_trees(location):
472
self.outf.write('%s\n' % t.relpath(
473
tree.bzrdir.root_transport.base))
479
474
480
class cmd_multi_pull(bzrlib.commands.Command):
475
class cmd_multi_pull(BzrToolsCommand):
481
476
"""Pull all the branches under a location, e.g. a repository.
482
477
483
478
Both branches present in the directory and the branches of checkouts are
485
480
"""
486
481
takes_args = ["location?"]
487
482
def run(self, location=None):
488
from bzrlib.branch import Branch
489
483
from bzrlib.transport import get_transport
490
484
from bzrtools import iter_branch_tree
491
485
if location is None:
492
486
location = '.'
493
487
t = get_transport(location)
488
possible_transports = []
494
489
if not t.listable():
495
490
print "Can't list this type of location."
496
491
return 3
512
507
relpath = base
513
508
print "Pulling %s from %s" % (relpath, parent)
514
509
try:
515
pullable.pull(Branch.open(parent))
510
branch_t = get_transport(parent, possible_transports)
511
pullable.pull(Branch.open_from_transport(branch_t))
516
512
except Exception, e:
517
513
print e
518
514
519
515
520
class cmd_branch_mark(bzrlib.commands.Command):
521
"""
522
Add, view or list branch markers <EXPERIMENTAL>
523
524
To add a mark, do 'bzr branch-mark MARK'.
525
To list marks, do 'bzr branch-mark' (this lists all marks for the branch's
526
repository).
527
To delete a mark, do 'bzr branch-mark --delete MARK'
528
529
These marks can be used to track a branch's status.
530
"""
531
takes_args = ['mark?', 'branch?']
532
takes_options = [Option('delete', help='Delete this mark')]
533
def run(self, mark=None, branch=None, delete=False):
534
from branch_mark import branch_mark
535
branch_mark(mark, branch, delete)
536
537
538
class cmd_import(bzrlib.commands.Command):
516
517
class cmd_import(BzrToolsCommand):
539
518
"""Import sources from a directory, tarball or zip file
540
519
541
520
This command will import a directory, tarball or zip file into a bzr
555
534
do_import(source, tree)
556
535
557
536
558
class cmd_cdiff(bzrlib.commands.Command):
537
class cmd_cdiff(BzrToolsCommand):
559
538
"""A color version of bzr's diff"""
560
539
takes_args = property(lambda x: get_cmd_object('diff').takes_args)
561
562
def _takes_options(self):
563
options = list(get_cmd_object('diff').takes_options)
564
options.append(Option('check-style',
540
takes_options = list(get_cmd_object('diff').takes_options) + [
541
Option('check-style',
565
542
help='Warn if trailing whitespace or spurious changes have been'
566
' added.'))
567
return options
568
569
takes_options = property(_takes_options)
543
' added.')]
570
544
571
545
def run(self, check_style=False, *args, **kwargs):
572
546
from colordiff import colordiff
573
547
colordiff(check_style, *args, **kwargs)
574
548
575
549
576
class cmd_baz_import(bzrlib.commands.Command):
577
"""Import an Arch or Baz archive into a bzr repository.
578
579
This command should be used on local archives (or mirrors) only. It is
580
quite slow on remote archives.
581
582
reuse_history allows you to specify any previous imports you
583
have done of different archives, which this archive has branches
584
tagged from. This will dramatically reduce the time to convert
585
the archive as it will not have to convert the history already
586
converted in that other branch.
587
588
If you specify prefixes, only branches whose names start with that prefix
589
will be imported. Skipped branches will be listed, so you can import any
590
branches you missed by accident. Here's an example of doing a partial
591
import from thelove@canonical.com:
592
bzr baz-import thelove thelove@canonical.com --prefixes dists:talloc-except
593
594
WARNING: Encoding should not be specified unless necessary, because if you
595
specify an encoding, your converted branch will not interoperate with
596
independently-converted branches, unless the other branches were converted
597
with exactly the same encoding. Any encoding recognized by Python may
598
be specified. Aliases are not detected, so 'utf_8', 'U8', 'UTF' and 'utf8'
599
are incompatible.
600
"""
601
takes_args = ['to_root_dir', 'from_archive', 'reuse_history*']
602
takes_options = ['verbose', Option('prefixes', type=str,
603
help="Prefixes of branches to import, colon-separated"),
604
Option('encoding', type=str,
605
help='Force encoding to specified value. See WARNING.')]
606
607
def run(self, to_root_dir, from_archive, encoding=None, verbose=False,
608
reuse_history_list=[], prefixes=None):
609
from errors import NoPyBaz
610
try:
611
import baz_import
612
baz_import.baz_import(to_root_dir, from_archive, encoding,
613
verbose, reuse_history_list, prefixes)
614
except NoPyBaz:
615
print "This command is disabled. Please install PyBaz."
616
617
618
class cmd_baz_import_branch(bzrlib.commands.Command):
619
"""Import an Arch or Baz branch into a bzr branch.
620
621
WARNING: Encoding should not be specified unless necessary, because if you
622
specify an encoding, your converted branch will not interoperate with
623
independently-converted branches, unless the other branches were converted
624
with exactly the same encoding. Any encoding recognized by Python may
625
be specified. Aliases are not detected, so 'utf_8', 'U8', 'UTF' and 'utf8'
626
are incompatible.
627
"""
628
takes_args = ['to_location', 'from_branch?', 'reuse_history*']
629
takes_options = ['verbose', Option('max-count', type=int),
630
Option('encoding', type=str,
631
help='Force encoding to specified value. See WARNING.')]
632
633
def run(self, to_location, from_branch=None, fast=False, max_count=None,
634
encoding=None, verbose=False, dry_run=False,
635
reuse_history_list=[]):
636
from errors import NoPyBaz
637
try:
638
import baz_import
639
baz_import.baz_import_branch(to_location, from_branch, fast,
640
max_count, verbose, encoding, dry_run,
641
reuse_history_list)
642
except NoPyBaz:
643
print "This command is disabled. Please install PyBaz."
644
645
646
class cmd_rspush(bzrlib.commands.Command):
550
class cmd_rspush(BzrToolsCommand):
647
551
"""Upload this branch to another location using rsync.
648
552
649
553
If no location is specified, the last-used location will be used. To
653
557
"""
654
558
takes_args = ['location?']
655
559
takes_options = [Option('overwrite', help='Ignore differences between'
656
' branches and overwrite unconditionally'),
560
' branches and overwrite unconditionally.'),
657
561
Option('no-tree', help='Do not push the working tree,'
658
562
' just the .bzr.')]
659
563
665
569
working_tree=not no_tree)
666
570
667
571
668
class cmd_switch(bzrlib.commands.Command):
669
"""Set the branch of a lightweight checkout and update."""
670
671
takes_args = ['to_location']
672
673
def run(self, to_location):
674
from switch import cmd_switch
675
cmd_switch().run(to_location)
676
677
572
class cmd_link_tree(BzrToolsCommand):
573
"""Hardlink matching files to another tree.
574
575
Only files with identical content and execute bit will be linked.
576
"""
577
takes_args = ['location']
578
579
def run(self, location):
580
from bzrlib import workingtree
581
from bzrlib.plugins.bzrtools.link_tree import link_tree
582
target_tree = workingtree.WorkingTree.open_containing(".")[0]
583
source_tree = workingtree.WorkingTree.open(location)
584
target_tree.lock_write()
585
try:
586
source_tree.lock_read()
587
try:
588
link_tree(target_tree, source_tree)
589
finally:
590
source_tree.unlock()
591
finally:
592
target_tree.unlock()
593
594
from heads import cmd_heads
678
595
commands = [
679
cmd_baz_import,
680
cmd_baz_import_branch,
681
596
cmd_branches,
682
597
cmd_branch_history,
683
cmd_branch_mark,
684
598
cmd_cbranch,
685
599
cmd_cdiff,
686
600
cmd_clean_tree,
687
601
cmd_fetch_ghosts,
688
602
cmd_graph_ancestry,
603
cmd_heads,
689
604
cmd_import,
605
cmd_link_tree,
690
606
cmd_multi_pull,
691
607
cmd_patch,
692
608
cmd_rspush,
693
609
cmd_shelf,
694
610
cmd_shell,
695
611
cmd_shelve,
696
cmd_switch,
612
cmd_trees,
697
613
cmd_unshelve,
698
614
cmd_zap,
699
615
]
711
627
from unittest import TestSuite
712
628
import bzrtools
713
629
import tests.clean_tree
630
import tests.test_dotgraph
714
631
import tests.is_clean
632
import tests.test_cbranch
633
import tests.test_link_tree
634
import tests.test_patch
635
import tests.test_rspush
715
636
import tests.upstream_import
716
637
import zap
717
638
import tests.blackbox
719
640
result = TestSuite()
720
641
result.addTest(DocTestSuite(bzrtools, optionflags=ELLIPSIS))
721
642
result.addTest(tests.clean_tree.test_suite())
722
try:
723
import baz_import
724
result.addTest(DocTestSuite(baz_import))
725
except NoPyBaz:
726
pass
727
643
result.addTest(tests.test_suite())
728
644
result.addTest(TestLoader().loadTestsFromModule(tests.shelf_tests))
729
645
result.addTest(tests.blackbox.test_suite())
730
646
result.addTest(tests.upstream_import.test_suite())
731
647
result.addTest(zap.test_suite())
648
result.addTest(TestLoader().loadTestsFromModule(tests.test_dotgraph))
732
649
result.addTest(TestLoader().loadTestsFromModule(tests.is_clean))
650
result.addTest(TestLoader().loadTestsFromModule(tests.test_link_tree))
651
result.addTest(TestLoader().loadTestsFromModule(tests.test_patch))
652
result.addTest(TestLoader().loadTestsFromModule(tests.test_rspush))
653
result.addTest(TestLoader().loadTestsFromModule(tests.test_cbranch))
733
654
return result
Loggerhead is a web-based interface for Breezy
Version: 2.0.1