« back to all changes in this revision
Viewing changes to __init__.py
- browse files at revision 407
- compare with another revision
- download diff
- download tarball
- view history from revision 407
- Committer: Aaron Bentley
- Date: 2006-06-27 14:36:32 UTC
- Revision ID: abentley@panoramicfeedback.com-20060627143632-0f4114d7b0a8d7d9
Fix zap for checkouts of branches with no parents
- files added:
- debian
- files removed:
- .be/bugs/c59acbbf-25f4-450a-9a8f-7a6a45b3985e
- files modified:
- .bzrignore
added
removed
__init__.py
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
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.14.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 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.
53
raise Exception, ('Version mismatch', version_info)
54
else:
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.'
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
65
from errors import CommandError, NoPyBaz
5
import rspush
6
from errors import CommandError
66
7
from patchsource import BzrPatchSource
67
8
from shelf import Shelf
9
from switch import cmd_switch
68
10
import sys
69
11
import os.path
70
12
13
from bzrlib import DEFAULT_IGNORE
71
14
import bzrlib.builtins
15
import bzrlib.branch
72
16
import bzrlib.commands
73
from bzrlib.commands import get_cmd_object
74
17
from bzrlib.errors import BzrCommandError
75
18
from bzrlib.help import command_usage
76
import bzrlib.ignores
77
19
from bzrlib.option import Option
78
20
sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__),
79
21
"external")))
80
22
81
import show_paths
82
23
83
bzrlib.ignores.add_runtime_ignores(['./.shelf'])
24
DEFAULT_IGNORE.append('./.shelf')
25
DEFAULT_IGNORE.append('./.bzr-shelf*')
84
26
85
27
86
28
class cmd_clean_tree(bzrlib.commands.Command):
87
"""Remove unwanted files from working tree.
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.
29
"""Remove unwanted files from working tree. <BZRTOOLS>
30
Normally, ignored files are left alone.
100
31
"""
101
32
takes_options = [Option('ignored', help='delete all ignored files.'),
102
Option('detritus', help='delete conflict files, merge'
103
' backups, and failed selftest dirs.'),
104
Option('unknown',
105
help='delete files unknown to bzr. (default)'),
33
Option('detritus', help='delete conflict files merge'
34
' backups, and failed selftest dirs. (*.THIS, '
35
'*.BASE, *.OTHER, *~, *.tmp)'),
106
36
Option('dry-run', help='show files to delete instead of'
107
37
' deleting them.')]
108
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False):
38
def run(self, ignored=False, detritus=False, dry_run=False):
109
39
from clean_tree import clean_tree
110
if not (unknown or ignored or detritus):
111
unknown = True
112
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
113
dry_run=dry_run)
114
40
clean_tree('.', ignored=ignored, detritus=detritus, dry_run=dry_run)
115
41
116
42
class cmd_graph_ancestry(bzrlib.commands.Command):
117
"""Produce ancestry graphs using dot.
43
"""Produce ancestry graphs using dot. <BZRTOOLS>
118
44
119
45
Output format is detected according to file extension. Some of the more
120
46
common output formats are html, png, gif, svg, ps. An extension of '.dot'
165
91
graph.write_ancestry_file(branch, file, not no_collapse,
166
92
not no_antialias, merge_branch, ranking)
167
93
168
169
94
class cmd_fetch_ghosts(bzrlib.commands.Command):
170
"""Attempt to retrieve ghosts from another branch.
95
"""Attempt to retrieve ghosts from another branch. <BZRTOOLS>
171
96
If the other branch is not supplied, the last-pulled branch is used.
172
97
"""
173
98
aliases = ['fetch-missing']
179
104
180
105
strip_help="""Strip the smallest prefix containing num leading slashes from \
181
106
each file name found in the patch file."""
182
183
107
Option.OPTIONS['bzrdiff'] = Option('bzrdiff',type=None,
108
help="""Handle extra bzr tags""")
184
109
class cmd_patch(bzrlib.commands.Command):
185
"""Apply a named patch to the current tree.
110
"""Apply a named patch to the current tree. <BZRTOOLS>
186
111
"""
187
112
takes_args = ['filename?']
188
113
takes_options = [Option('strip', type=int, help=strip_help)]
189
def run(self, filename=None, strip=None):
114
def run(self, filename=None, strip=-1, bzrdiff=0):
190
115
from patch import patch
191
116
from bzrlib.workingtree import WorkingTree
192
117
wt = WorkingTree.open_containing('.')[0]
193
if strip is None:
194
strip = 0
195
return patch(wt, filename, strip)
118
if strip == -1:
119
if bzrdiff: strip = 0
120
else: strip = 0
196
121
122
return patch(wt, filename, strip, legacy= not bzrdiff)
197
123
198
124
class cmd_shelve(bzrlib.commands.Command):
199
"""Temporarily set aside some changes from the current tree.
125
"""Temporarily set aside some changes from the current tree. <BZRTOOLS>
200
126
201
127
Shelve allows you to temporarily put changes you've made "on the shelf",
202
128
ie. out of the way, until a later time when you can bring them back from
220
146
you can also unshelve changes in a different order by explicitly
221
147
specifiying which changes to unshelve. This works best when the changes
222
148
don't depend on each other.
223
224
While you have patches on the shelf you can view and manipulate them with
225
the 'shelf' command. Run 'bzr shelf -h' for more info.
226
149
"""
227
150
228
151
takes_args = ['file*']
229
152
takes_options = ['message', 'revision',
230
Option('all', help='Shelve all changes without prompting'),
231
Option('no-color', help='Never display changes in color')]
153
Option('all', help='Shelve all changes without prompting')]
232
154
233
def run(self, all=False, file_list=None, message=None, revision=None,
234
no_color=False):
155
def run(self, all=False, file_list=None, message=None, revision=None):
235
156
if revision is not None and revision:
236
157
if len(revision) == 1:
237
158
revision = revision[0]
241
162
242
163
source = BzrPatchSource(revision, file_list)
243
164
s = Shelf(source.base)
244
s.shelve(source, all, message, no_color)
165
s.shelve(source, all, message)
245
166
return 0
246
167
247
168
297
218
def run(self, subcommand, args_list):
298
219
import sys
299
220
300
if args_list is None:
301
args_list = []
302
221
cmd = self._get_cmd_object(subcommand)
303
222
source = BzrPatchSource()
304
223
s = Shelf(source.base)
350
269
return text
351
270
352
271
272
353
273
class cmd_unshelve(bzrlib.commands.Command):
354
"""Restore shelved changes.
274
"""Restore shelved changes. <BZRTOOLS>
355
275
356
276
By default the most recently shelved changes are restored. However if you
357
277
specify a patch by name those changes will be restored instead.
361
281
takes_options = [
362
282
Option('all', help='Unshelve all changes without prompting'),
363
283
Option('force', help='Force unshelving even if errors occur'),
364
Option('no-color', help='Never display changes in color')
365
]
284
]
366
285
takes_args = ['patch?']
367
def run(self, patch=None, all=False, force=False, no_color=False):
286
def run(self, patch=None, all=False, force=False):
368
287
source = BzrPatchSource()
369
288
s = Shelf(source.base)
370
s.unshelve(source, patch, all, force, no_color)
289
s.unshelve(source, patch, all, force)
371
290
return 0
372
291
373
292
374
293
class cmd_shell(bzrlib.commands.Command):
375
"""Begin an interactive shell tailored for bzr.
294
"""Begin an interactive shell tailored for bzr. <BZRTOOLS>
376
295
Bzr commands can be used without typing bzr first, and will be run natively
377
296
when possible. Tab completion is tailored for bzr. The shell prompt shows
378
297
the branch nick, revno, and path.
393
312
import shell
394
313
return shell.run_shell()
395
314
396
397
315
class cmd_branch_history(bzrlib.commands.Command):
398
316
"""\
399
Display the development history of a branch.
317
Display the development history of a branch <BZRTOOLS>.
400
318
401
319
Each different committer or branch nick is considered a different line of
402
320
development. Committers are treated as the same if they have the same
410
328
411
329
class cmd_zap(bzrlib.commands.Command):
412
330
"""\
413
Remove a lightweight checkout, if it can be done safely.
414
415
This command will remove a lightweight checkout without losing data. That
416
means it only removes lightweight checkouts, and only if they have no
417
uncommitted changes.
418
419
If --branch is specified, the branch will be deleted too, but only if the
420
the branch has no new commits (relative to its parent).
331
Remove a checkout, if it can be done safely. <BZRTOOLS>
332
333
This command will remove a checkout without losing data. That means
334
it only removes checkouts, and only if they have no uncommitted changes.
421
335
"""
422
336
takes_options = [Option("branch", help="Remove associtated branch from"
423
337
" repository")]
429
343
430
344
class cmd_cbranch(bzrlib.commands.Command):
431
345
"""
432
Create a new checkout, associated with a new repository branch.
346
Create a new checkout, associated with a new repository branch. <BZRTOOLS>
433
347
434
348
When you cbranch, bzr looks up the repository associated with your current
435
directory in locations.conf. It creates a new branch in that repository
349
directory in branches.conf. It creates a new branch in that repository
436
350
with the same name and relative path as the checkout you request.
437
351
438
The locations.conf parameter is "cbranch_root". So if you want
352
The branches.conf parameter is "cbranch_root". So if you want
439
353
cbranch operations in /home/jrandom/bigproject to produce branches in
440
354
/home/jrandom/bigproject/repository, you'd add this:
441
355
447
361
be produced if the source branch is in 0.7 format (or earlier).
448
362
"""
449
363
takes_options = [Option("lightweight",
450
help="Create a lightweight checkout"), 'revision']
364
help="Create a lightweight checkout")]
451
365
takes_args = ["source", "target?"]
452
def run(self, source, target=None, lightweight=False, revision=None):
366
def run(self, source, target=None, lightweight=False):
453
367
from cbranch import cbranch
454
return cbranch(source, target, lightweight=lightweight,
455
revision=revision)
368
return cbranch(source, target, lightweight=lightweight)
456
369
457
370
458
371
class cmd_branches(bzrlib.commands.Command):
459
"""Scan a location for branches"""
372
"""Scan a location for branches <BZRTOOLS>"""
460
373
takes_args = ["location?"]
461
374
def run(self, location=None):
462
375
from branches import branches
464
377
465
378
466
379
class cmd_multi_pull(bzrlib.commands.Command):
467
"""Pull all the branches under a location, e.g. a repository.
380
"""Pull all the branches under a location, e.g. a repository. <BZRTOOLS>
468
381
469
382
Both branches present in the directory and the branches of checkouts are
470
383
pulled.
520
433
from branch_mark import branch_mark
521
434
branch_mark(mark, branch, delete)
522
435
523
524
436
class cmd_import(bzrlib.commands.Command):
525
"""Import sources from a tarball
437
"""Import sources from a tarball <BZRTOOLS>
526
438
527
439
This command will import a tarball into a bzr tree, replacing any versioned
528
440
files already present. If a directory is specified, it is used as the
540
452
from upstream_import import do_import
541
453
do_import(source, tree)
542
454
455
class cmd_shove(bzrlib.commands.Command):
456
"""Apply uncommitted changes to another tree <BZRTOOLS>
457
458
This is useful when you start to make changes in one tree, then realize
459
they should really be done in a different tree.
460
461
Shove is implemented using merge, so:
462
- All changes, including renames and adds, will be applied.
463
- No changes that have already been applied will be applied.
464
- If the target is significantly different from the source, conflicts may
465
be produced.
466
"""
467
468
takes_args = ['source?', 'target']
469
def run(self, target, source='.'):
470
from shove import do_shove
471
do_shove(source, target)
543
472
544
473
class cmd_cdiff(bzrlib.commands.Command):
545
"""A color version of bzr's diff"""
546
takes_args = property(lambda x: get_cmd_object('diff').takes_args)
547
takes_options = property(lambda x: get_cmd_object('diff').takes_options)
474
"""A color version of bzr's diff <BZRTOOLS>"""
475
takes_args = bzrlib.builtins.cmd_diff.takes_args
476
takes_options = bzrlib.builtins.cmd_diff.takes_options
548
477
def run(*args, **kwargs):
549
478
from colordiff import colordiff
550
479
colordiff(*args, **kwargs)
551
480
552
553
class cmd_baz_import(bzrlib.commands.Command):
554
"""Import an Arch or Baz archive into a bzr repository.
555
556
This command should be used on local archives (or mirrors) only. It is
557
quite slow on remote archives.
558
559
reuse_history allows you to specify any previous imports you
560
have done of different archives, which this archive has branches
561
tagged from. This will dramatically reduce the time to convert
562
the archive as it will not have to convert the history already
563
converted in that other branch.
564
565
If you specify prefixes, only branches whose names start with that prefix
566
will be imported. Skipped branches will be listed, so you can import any
567
branches you missed by accident. Here's an example of doing a partial
568
import from thelove@canonical.com:
569
bzr baz-import thelove thelove@canonical.com --prefixes dists:talloc-except
570
571
WARNING: Encoding should not be specified unless necessary, because if you
572
specify an encoding, your converted branch will not interoperate with
573
independently-converted branches, unless the other branches were converted
574
with exactly the same encoding. Any encoding recognized by Python may
575
be specified. Aliases are not detected, so 'utf_8', 'U8', 'UTF' and 'utf8'
576
are incompatible.
577
"""
578
takes_args = ['to_root_dir', 'from_archive', 'reuse_history*']
579
takes_options = ['verbose', Option('prefixes', type=str,
580
help="Prefixes of branches to import, colon-separated"),
581
Option('encoding', type=str,
582
help='Force encoding to specified value. See WARNING.')]
583
584
def run(self, to_root_dir, from_archive, encoding=None, verbose=False,
585
reuse_history_list=[], prefixes=None):
586
from errors import NoPyBaz
587
try:
588
import baz_import
589
baz_import.baz_import(to_root_dir, from_archive, encoding,
590
verbose, reuse_history_list, prefixes)
591
except NoPyBaz:
592
print "This command is disabled. Please install PyBaz."
593
594
595
class cmd_baz_import_branch(bzrlib.commands.Command):
596
"""Import an Arch or Baz branch into a bzr branch.
597
598
WARNING: Encoding should not be specified unless necessary, because if you
599
specify an encoding, your converted branch will not interoperate with
600
independently-converted branches, unless the other branches were converted
601
with exactly the same encoding. Any encoding recognized by Python may
602
be specified. Aliases are not detected, so 'utf_8', 'U8', 'UTF' and 'utf8'
603
are incompatible.
604
"""
605
takes_args = ['to_location', 'from_branch?', 'reuse_history*']
606
takes_options = ['verbose', Option('max-count', type=int),
607
Option('encoding', type=str,
608
help='Force encoding to specified value. See WARNING.')]
609
610
def run(self, to_location, from_branch=None, fast=False, max_count=None,
611
encoding=None, verbose=False, dry_run=False,
612
reuse_history_list=[]):
613
from errors import NoPyBaz
614
try:
615
import baz_import
616
baz_import.baz_import_branch(to_location, from_branch, fast,
617
max_count, verbose, encoding, dry_run,
618
reuse_history_list)
619
except NoPyBaz:
620
print "This command is disabled. Please install PyBaz."
621
622
623
class cmd_rspush(bzrlib.commands.Command):
624
"""Upload this branch to another location using rsync.
625
626
If no location is specified, the last-used location will be used. To
627
prevent dirty trees from being uploaded, rspush will error out if there are
628
unknown files or local changes. It will also error out if the upstream
629
directory is non-empty and not an earlier version of the branch.
630
"""
631
takes_args = ['location?']
632
takes_options = [Option('overwrite', help='Ignore differences between'
633
' branches and overwrite unconditionally'),
634
Option('no-tree', help='Do not push the working tree,'
635
' just the .bzr.')]
636
637
def run(self, location=None, overwrite=False, no_tree=False):
638
from bzrlib import workingtree
639
import bzrtools
640
cur_branch = workingtree.WorkingTree.open_containing(".")[0]
641
bzrtools.rspush(cur_branch, location, overwrite=overwrite,
642
working_tree=not no_tree)
643
644
645
class cmd_switch(bzrlib.commands.Command):
646
"""Set the branch of a lightweight checkout and update."""
647
648
takes_args = ['to_location']
649
650
def run(self, to_location):
651
from switch import cmd_switch
652
cmd_switch().run(to_location)
653
654
655
commands = [
656
cmd_baz_import,
657
cmd_baz_import_branch,
658
cmd_branches,
659
cmd_branch_history,
660
cmd_branch_mark,
661
cmd_cbranch,
662
cmd_cdiff,
663
cmd_clean_tree,
664
cmd_fetch_ghosts,
665
cmd_graph_ancestry,
666
cmd_import,
667
cmd_multi_pull,
668
cmd_patch,
669
cmd_rspush,
670
cmd_shelf,
671
cmd_shell,
672
cmd_shelve,
673
cmd_switch,
674
cmd_unshelve,
675
cmd_zap,
676
]
481
commands = [cmd_shelve, cmd_unshelve, cmd_shelf, cmd_clean_tree,
482
cmd_graph_ancestry, cmd_fetch_ghosts, cmd_patch, cmd_shell,
483
cmd_branch_history, cmd_zap, cmd_cbranch, cmd_branches,
484
cmd_multi_pull, cmd_switch, cmd_branch_mark, cmd_import, cmd_shove,
485
cmd_cdiff]
486
487
488
commands.append(rspush.cmd_rspush)
489
490
from errors import NoPyBaz
491
try:
492
import baz_import
493
commands.append(baz_import.cmd_baz_import_branch)
494
commands.append(baz_import.cmd_baz_import)
495
496
except NoPyBaz:
497
class cmd_baz_import_branch(bzrlib.commands.Command):
498
"""Disabled. (Requires PyBaz) <BZRTOOLS>"""
499
takes_args = ['to_location?', 'from_branch?', 'reuse_history*']
500
takes_options = ['verbose', Option('max-count', type=int)]
501
def run(self, to_location=None, from_branch=None, fast=False,
502
max_count=None, verbose=False, dry_run=False,
503
reuse_history_list=[]):
504
print "This command is disabled. Please install PyBaz."
505
506
507
class cmd_baz_import(bzrlib.commands.Command):
508
"""Disabled. (Requires PyBaz) <BZRTOOLS>"""
509
takes_args = ['to_root_dir?', 'from_archive?', 'reuse_history*']
510
takes_options = ['verbose', Option('prefixes', type=str,
511
help="Prefixes of branches to import")]
512
def run(self, to_root_dir=None, from_archive=None, verbose=False,
513
reuse_history_list=[], prefixes=None):
514
print "This command is disabled. Please install PyBaz."
515
commands.extend((cmd_baz_import_branch, cmd_baz_import))
677
516
678
517
679
518
if hasattr(bzrlib.commands, 'register_command'):
686
525
import tests
687
526
from doctest import DocTestSuite, ELLIPSIS
688
527
from unittest import TestSuite
689
import bzrtools
690
528
import tests.clean_tree
691
529
import upstream_import
692
530
import zap
Loggerhead is a web-based interface for Breezy
Version: 2.0.1