« back to all changes in this revision
Viewing changes to command_classes.py
- browse files at revision 772
- compare with another revision
- download diff
- download tarball
- view history from revision 772
- Committer: Aaron Bentley
- Date: 2011-06-27 23:07:10 UTC
- Revision ID: aaron@aaronbentley.com-20110627230710-orth0tzf1kwknfen
Better handling of compound tar names.
- 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
- .the_kraken
- files removed:
- baz_import.py
- external
- obsolete
- files renamed:
- release.py => check-release.py
- __init__.py => command_classes.py
- files modified:
- .be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab/values
added
removed
command_classes.py
1
# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron.bentley@utoronto.ca>
2
# Copyright (C) 2005, 2006 Canonical Limited.
1
# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron@aaronbentley.com>
2
# Copyright (C) 2005, 2006, 2011 Canonical Limited.
3
3
# Copyright (C) 2006 Michael Ellerman.
4
4
#
5
5
# This program is free software; you can redistribute it and/or modify
16
16
# along with this program; if not, write to the Free Software
17
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
19
"""\
20
Various useful plugins for working with bzr.
21
"""
19
import errno
22
20
23
21
import bzrlib
24
22
25
26
__version__ = '0.17.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 Bazaar 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
23
from bzrlib.lazy_import import lazy_import
68
24
lazy_import(globals(), """
69
from bzrlib import help
25
from bzrlib import help, urlutils
70
26
import shelf
71
27
""")
72
28
73
from errors import CommandError, NoPyBaz
29
from command import BzrToolsCommand
30
from errors import CommandError
74
31
from patchsource import BzrPatchSource
75
32
import sys
76
33
import os.path
77
34
78
35
import bzrlib.builtins
79
36
import bzrlib.commands
37
from bzrlib.branch import Branch
38
from bzrlib.bzrdir import BzrDir
80
39
from bzrlib.commands import get_cmd_object
81
40
from bzrlib.errors import BzrCommandError
82
41
import bzrlib.ignores
83
from bzrlib.option import Option
84
sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__),
85
"external")))
86
87
import show_paths
88
89
bzrlib.ignores.add_runtime_ignores(['./.shelf'])
90
91
92
class cmd_clean_tree(bzrlib.commands.Command):
93
"""Remove unwanted files from working tree.
94
95
By default, only unknown files, not ignored files, are deleted. Versioned
96
files are never deleted.
97
98
Another class is 'detritus', which includes files emitted by bzr during
99
normal operations and selftests. (The value of these files decreases with
100
time.)
101
102
If no options are specified, unknown files are deleted. Otherwise, option
103
flags are respected, and may be combined.
104
105
To check what clean-tree will do, use --dry-run.
106
"""
107
takes_options = [Option('ignored', help='delete all ignored files.'),
108
Option('detritus', help='delete conflict files, merge'
109
' backups, and failed selftest dirs.'),
110
Option('unknown',
111
help='delete files unknown to bzr. (default)'),
112
Option('dry-run', help='show files to delete instead of'
113
' deleting them.')]
114
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False):
115
from clean_tree import clean_tree
116
if not (unknown or ignored or detritus):
117
unknown = True
118
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
119
dry_run=dry_run)
120
121
122
class cmd_graph_ancestry(bzrlib.commands.Command):
42
from bzrlib.trace import note
43
from bzrlib.option import Option, RegistryOption
44
from bzrlib.workingtree import WorkingTree
45
46
from command import BzrToolsCommand
47
48
49
class cmd_graph_ancestry(BzrToolsCommand):
123
50
"""Produce ancestry graphs using dot.
124
51
125
52
Output format is detected according to file extension. Some of the more
126
53
common output formats are html, png, gif, svg, ps. An extension of '.dot'
127
54
will cause a dot graph file to be produced. HTML output has mouseovers
131
58
with the last 5 characters of their revision identifier are used instead.
132
59
133
60
The value starting with d is "(maximum) distance from the null revision".
134
61
135
62
If --merge-branch is specified, the two branches are compared and a merge
136
63
base is selected.
137
64
138
65
Legend:
139
66
white normal revision
140
67
yellow THIS history
154
81
If available, rsvg is used to antialias PNG and JPEG output, but this can
155
82
be disabled with --no-antialias.
156
83
"""
157
takes_args = ['branch', 'file']
158
takes_options = [Option('no-collapse', help="Do not skip simple nodes"),
84
takes_args = ['file', 'merge_branch?']
85
takes_options = [Option('no-collapse', help="Do not skip simple nodes."),
159
86
Option('no-antialias',
160
help="Do not use rsvg to produce antialiased output"),
161
Option('merge-branch', type=str,
162
help="Use this branch to calcuate a merge base"),
87
help="Do not use rsvg to produce antialiased output."),
88
Option('merge-branch', type=str,
89
help="Use this branch to calcuate a merge base."),
163
90
Option('cluster', help="Use clustered output."),
164
Option('max-distance', help="Show no nodes farther than this",
165
type=int)]
166
def run(self, branch, file, no_collapse=False, no_antialias=False,
167
merge_branch=None, cluster=False, max_distance=None):
91
Option('max-distance',
92
help="Show no nodes farther than this.", type=int),
93
Option('directory',
94
help='Source branch to use (default is current'
95
' directory).',
96
short_name='d',
97
type=unicode),
98
]
99
def run(self, file, merge_branch=None, no_collapse=False,
100
no_antialias=False, cluster=False, max_distance=100,
101
directory='.'):
102
if max_distance == -1:
103
max_distance = None
168
104
import graph
169
105
if cluster:
170
106
ranking = "cluster"
171
107
else:
172
108
ranking = "forced"
173
graph.write_ancestry_file(branch, file, not no_collapse,
174
not no_antialias, merge_branch, ranking,
109
graph.write_ancestry_file(directory, file, not no_collapse,
110
not no_antialias, merge_branch, ranking,
175
111
max_distance=max_distance)
176
112
177
113
178
class cmd_fetch_ghosts(bzrlib.commands.Command):
114
class cmd_fetch_ghosts(BzrToolsCommand):
179
115
"""Attempt to retrieve ghosts from another branch.
180
116
If the other branch is not supplied, the last-pulled branch is used.
181
117
"""
182
118
aliases = ['fetch-missing']
183
119
takes_args = ['branch?']
184
takes_options = [Option('no-fix')]
120
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
185
121
def run(self, branch=None, no_fix=False):
186
122
from fetch_ghosts import fetch_ghosts
187
fetch_ghosts(branch, no_fix)
123
fetch_ghosts(branch, do_reconcile=not no_fix)
188
124
189
125
strip_help="""Strip the smallest prefix containing num leading slashes from \
190
126
each file name found in the patch file."""
191
127
192
128
193
class cmd_patch(bzrlib.commands.Command):
129
class cmd_patch(BzrToolsCommand):
194
130
"""Apply a named patch to the current tree.
195
131
"""
196
132
takes_args = ['filename?']
197
takes_options = [Option('strip', type=int, help=strip_help),
198
Option('silent', help='Suppress chatter')]
133
takes_options = [Option('strip', type=int, short_name='p',
134
help=strip_help),
135
Option('silent', help='Suppress chatter.')]
199
136
def run(self, filename=None, strip=None, silent=False):
200
137
from patch import patch
201
138
from bzrlib.workingtree import WorkingTree
205
142
return patch(wt, filename, strip, silent)
206
143
207
144
208
class cmd_shelve(bzrlib.commands.Command):
145
class cmd_shelve1(BzrToolsCommand):
209
146
"""Temporarily set aside some changes from the current tree.
210
147
211
148
Shelve allows you to temporarily put changes you've made "on the shelf",
212
149
ie. out of the way, until a later time when you can bring them back from
213
the shelf with the 'unshelve' command.
150
the shelf with the 'unshelve1' command.
214
151
215
152
Shelve is intended to help separate several sets of text changes that have
216
153
been inappropriately mingled. If you just want to get rid of all changes
217
154
(text and otherwise) and you don't need to restore them later, use revert.
218
If you want to shelve all text changes at once, use shelve --all.
155
If you want to shelve all text changes at once, use shelve1 --all.
219
156
220
By default shelve asks you what you want to shelve, press '?' at the
221
prompt to get help. To shelve everything run shelve --all.
157
By default shelve1 asks you what you want to shelve, press '?' at the
158
prompt to get help. To shelve everything run shelve1 --all.
222
159
223
160
If filenames are specified, only the changes to those files will be
224
161
shelved, other files will be left untouched.
226
163
If a revision is specified, changes since that revision will be shelved.
227
164
228
165
You can put multiple items on the shelf. Normally each time you run
229
unshelve the most recently shelved changes will be reinstated. However,
166
unshelve1 the most recently shelved changes will be reinstated. However,
230
167
you can also unshelve changes in a different order by explicitly
231
specifiying which changes to unshelve. This works best when the changes
168
specifiying which changes to unshelve1. This works best when the changes
232
169
don't depend on each other.
233
170
234
171
While you have patches on the shelf you can view and manipulate them with
235
the 'shelf' command. Run 'bzr shelf -h' for more info.
172
the 'shelf1' command. Run 'bzr shelf1 -h' for more info.
236
173
"""
237
174
238
175
takes_args = ['file*']
239
takes_options = ['message', 'revision',
240
Option('all', help='Shelve all changes without prompting'),
241
Option('no-color', help='Never display changes in color')]
176
takes_options = [Option('message',
177
help='A message to associate with the shelved changes.',
178
short_name='m', type=unicode),
179
'revision',
180
Option('all', help='Shelve all changes without prompting.'),
181
Option('no-color', help='Never display changes in color.')]
242
182
243
183
def run(self, all=False, file_list=None, message=None, revision=None,
244
184
no_color=False):
255
195
return 0
256
196
257
197
258
# The following classes are only used as subcommands for 'shelf', they're
198
# The following classes are only used as subcommands for 'shelf1', they're
259
199
# not to be registered directly with bzr.
260
200
261
201
class cmd_shelf_list(bzrlib.commands.Command):
297
237
self.shelf.upgrade()
298
238
299
239
300
class cmd_shelf(bzrlib.commands.Command):
301
"""Perform various operations on your shelved patches. See also shelve."""
240
class cmd_shelf1(BzrToolsCommand):
241
"""Perform various operations on your shelved patches. See also shelve1."""
302
242
takes_args = ['subcommand', 'args*']
303
243
304
244
subcommands = [cmd_shelf_list, cmd_shelf_delete, cmd_shelf_switch,
363
303
return text
364
304
365
305
366
class cmd_unshelve(bzrlib.commands.Command):
306
class cmd_unshelve1(BzrToolsCommand):
367
307
"""Restore shelved changes.
368
308
369
309
By default the most recently shelved changes are restored. However if you
370
310
specify a patch by name those changes will be restored instead.
371
311
372
See 'shelve' for more information.
312
See 'shelve1' for more information.
373
313
"""
374
314
takes_options = [
375
Option('all', help='Unshelve all changes without prompting'),
376
Option('force', help='Force unshelving even if errors occur'),
377
Option('no-color', help='Never display changes in color')
315
Option('all', help='Unshelve all changes without prompting.'),
316
Option('force', help='Force unshelving even if errors occur.'),
317
Option('no-color', help='Never display changes in color.')
378
318
]
379
319
takes_args = ['patch?']
380
320
def run(self, patch=None, all=False, force=False, no_color=False):
384
324
return 0
385
325
386
326
387
class cmd_shell(bzrlib.commands.Command):
327
class cmd_shell(BzrToolsCommand):
388
328
"""Begin an interactive shell tailored for bzr.
389
329
Bzr commands can be used without typing bzr first, and will be run natively
390
330
when possible. Tab completion is tailored for bzr. The shell prompt shows
402
342
--all --help --revision --show-ids
403
343
bzr bzrtools:287/> status --
404
344
"""
405
def run(self):
345
takes_options = [
346
Option('directory',
347
help='Branch in which to start the shell, '
348
'rather than the one containing the working directory.',
349
short_name='d',
350
type=unicode,
351
),
352
]
353
def run(self, directory=None):
406
354
import shell
407
return shell.run_shell()
408
409
410
class cmd_branch_history(bzrlib.commands.Command):
355
return shell.run_shell(directory)
356
357
358
class cmd_branch_history(BzrToolsCommand):
411
359
"""\
412
360
Display the development history of a branch.
413
361
417
365
"""
418
366
takes_args = ["branch?"]
419
367
def run(self, branch=None):
420
from branchhistory import branch_history
368
from branchhistory import branch_history
421
369
return branch_history(branch)
422
370
423
371
424
class cmd_zap(bzrlib.commands.Command):
372
class cmd_zap(BzrToolsCommand):
425
373
"""\
426
374
Remove a lightweight checkout, if it can be done safely.
427
375
431
379
432
380
If --branch is specified, the branch will be deleted too, but only if the
433
381
the branch has no new commits (relative to its parent).
382
383
If bzr-pipeline is also installed, the --store option will store changes
384
in the branch before deleting the tree. To restore the changes, do::
385
386
bzr checkout --lightweight $BRANCH $CHECKOUT
387
bzr switch-pipe -d $CHECKOUT `bzr nick -d $CHECKOUT`
434
388
"""
435
takes_options = [Option("branch", help="Remove associtated branch from"
436
" repository")]
389
takes_options = [Option("branch", help="Remove associated branch from"
390
" repository."),
391
RegistryOption('change_policy',
392
'How to handle changed files',
393
lazy_registry =
394
('bzrlib.plugins.bzrtools.zap',
395
'change_policy_registry'),
396
value_switches=True,
397
enum_switch=False)]
437
398
takes_args = ["checkout"]
438
def run(self, checkout, branch=False):
439
from zap import zap
440
return zap(checkout, remove_branch=branch)
441
442
443
class cmd_cbranch(bzrlib.commands.Command):
399
def run(self, checkout, branch=False, change_policy=None):
400
from zap import (
401
change_policy_registry,
402
StoreChanges,
403
zap,
404
)
405
if change_policy is None:
406
change_policy = change_policy_registry.get()
407
if change_policy is StoreChanges:
408
try:
409
import bzrlib.plugins.pipeline
410
except ImportError:
411
raise BzrCommandError('--store requires bzr-pipeline.')
412
return zap(checkout, remove_branch=branch, policy=change_policy)
413
414
415
class cmd_cbranch(BzrToolsCommand):
444
416
"""
445
417
Create a new checkout, associated with a new repository branch.
446
418
447
419
When you cbranch, bzr looks up a target location in locations.conf, and
448
420
creates the branch there.
449
421
453
425
cbranch_target:policy = appendpath
454
426
455
427
This will mean that if you run "bzr cbranch foo/bar foo/baz" in the
456
working directory root, the branch will be created in
428
working directory root, the branch will be created in
457
429
"/branch_root/foo/baz"
458
430
459
431
NOTE: cbranch also supports "cbranch_root", but that behaviour is
460
432
deprecated.
461
433
"""
462
takes_options = [Option("lightweight",
463
help="Create a lightweight checkout"), 'revision']
434
takes_options = [Option("lightweight",
435
help="Create a lightweight checkout."), 'revision',
436
Option('files-from', type=unicode,
437
help='Accelerate checkout using files from this'
438
' tree.'),
439
Option('hardlink',
440
help='Hard-link files from source/files-from tree'
441
' where posible.')]
464
442
takes_args = ["source", "target?"]
465
def run(self, source, target=None, lightweight=False, revision=None):
443
def run(self, source, target=None, lightweight=False, revision=None,
444
files_from=None, hardlink=False):
466
445
from cbranch import cbranch
467
return cbranch(source, target, lightweight=lightweight,
468
revision=revision)
469
470
471
class cmd_branches(bzrlib.commands.Command):
446
return cbranch(source, target, lightweight=lightweight,
447
revision=revision, files_from=files_from,
448
hardlink=hardlink)
449
450
451
class cmd_branches(BzrToolsCommand):
472
452
"""Scan a location for branches"""
473
453
takes_args = ["location?"]
474
454
def run(self, location=None):
475
455
from branches import branches
476
456
return branches(location)
477
457
458
class cmd_trees(BzrToolsCommand):
459
"""Scan a location for trees"""
460
takes_args = ['location?']
461
def run(self, location='.'):
462
from bzrlib.workingtree import WorkingTree
463
from bzrlib.transport import get_transport
464
t = get_transport(location)
465
for tree in WorkingTree.find_trees(location):
466
self.outf.write('%s\n' % t.relpath(
467
tree.bzrdir.root_transport.base))
478
468
479
class cmd_multi_pull(bzrlib.commands.Command):
469
class cmd_multi_pull(BzrToolsCommand):
480
470
"""Pull all the branches under a location, e.g. a repository.
481
471
482
472
Both branches present in the directory and the branches of checkouts are
483
473
pulled.
484
474
"""
485
475
takes_args = ["location?"]
486
476
def run(self, location=None):
487
from bzrlib.branch import Branch
488
477
from bzrlib.transport import get_transport
489
478
from bzrtools import iter_branch_tree
490
479
if location is None:
491
480
location = '.'
492
481
t = get_transport(location)
482
possible_transports = []
493
483
if not t.listable():
494
484
print "Can't list this type of location."
495
485
return 3
511
501
relpath = base
512
502
print "Pulling %s from %s" % (relpath, parent)
513
503
try:
514
pullable.pull(Branch.open(parent))
504
branch_t = get_transport(parent, possible_transports)
505
pullable.pull(Branch.open_from_transport(branch_t))
515
506
except Exception, e:
516
507
print e
517
508
518
509
519
class cmd_branch_mark(bzrlib.commands.Command):
520
"""
521
Add, view or list branch markers <EXPERIMENTAL>
522
523
To add a mark, do 'bzr branch-mark MARK'.
524
To list marks, do 'bzr branch-mark' (this lists all marks for the branch's
525
repository).
526
To delete a mark, do 'bzr branch-mark --delete MARK'
527
528
These marks can be used to track a branch's status.
529
"""
530
takes_args = ['mark?', 'branch?']
531
takes_options = [Option('delete', help='Delete this mark')]
532
def run(self, mark=None, branch=None, delete=False):
533
from branch_mark import branch_mark
534
branch_mark(mark, branch, delete)
535
536
537
class cmd_import(bzrlib.commands.Command):
510
511
class cmd_import(BzrToolsCommand):
538
512
"""Import sources from a directory, tarball or zip file
539
513
540
514
This command will import a directory, tarball or zip file into a bzr
541
515
tree, replacing any versioned files already present. If a directory is
542
516
specified, it is used as the target. If the directory does not exist, or
547
521
If the tarball or zip has a single root directory, that directory is
548
522
stripped when extracting the tarball. This is not done for directories.
549
523
"""
550
524
551
525
takes_args = ['source', 'tree?']
552
526
def run(self, source, tree=None):
553
527
from upstream_import import do_import
554
528
do_import(source, tree)
555
529
556
530
557
class cmd_cdiff(bzrlib.commands.Command):
531
class cmd_cdiff(BzrToolsCommand):
558
532
"""A color version of bzr's diff"""
559
533
takes_args = property(lambda x: get_cmd_object('diff').takes_args)
560
561
def _takes_options(self):
562
options = list(get_cmd_object('diff').takes_options)
563
options.append(Option('check-style',
534
takes_options = list(get_cmd_object('diff').takes_options) + [
535
RegistryOption.from_kwargs('color',
536
'Color mode to use.',
537
title='Color Mode', value_switches=False, enum_switch=True,
538
never='Never colorize output.',
539
auto='Only colorize output if terminal supports it and STDOUT is a'
540
' TTY.',
541
always='Always colorize output (default).'),
542
Option('check-style',
564
543
help='Warn if trailing whitespace or spurious changes have been'
565
' added.'))
566
return options
567
568
takes_options = property(_takes_options)
569
570
def run(self, check_style=False, *args, **kwargs):
544
' added.')]
545
546
def run(self, color='always', check_style=False, *args, **kwargs):
571
547
from colordiff import colordiff
572
colordiff(check_style, *args, **kwargs)
573
574
575
class cmd_baz_import(bzrlib.commands.Command):
576
"""Import an Arch or Baz archive into a bzr repository.
577
578
This command should be used on local archives (or mirrors) only. It is
579
quite slow on remote archives.
580
581
reuse_history allows you to specify any previous imports you
582
have done of different archives, which this archive has branches
583
tagged from. This will dramatically reduce the time to convert
584
the archive as it will not have to convert the history already
585
converted in that other branch.
586
587
If you specify prefixes, only branches whose names start with that prefix
588
will be imported. Skipped branches will be listed, so you can import any
589
branches you missed by accident. Here's an example of doing a partial
590
import from thelove@canonical.com:
591
bzr baz-import thelove thelove@canonical.com --prefixes dists:talloc-except
592
593
WARNING: Encoding should not be specified unless necessary, because if you
594
specify an encoding, your converted branch will not interoperate with
595
independently-converted branches, unless the other branches were converted
596
with exactly the same encoding. Any encoding recognized by Python may
597
be specified. Aliases are not detected, so 'utf_8', 'U8', 'UTF' and 'utf8'
598
are incompatible.
599
"""
600
takes_args = ['to_root_dir', 'from_archive', 'reuse_history*']
601
takes_options = ['verbose', Option('prefixes', type=str,
602
help="Prefixes of branches to import, colon-separated"),
603
Option('encoding', type=str,
604
help='Force encoding to specified value. See WARNING.')]
605
606
def run(self, to_root_dir, from_archive, encoding=None, verbose=False,
607
reuse_history_list=[], prefixes=None):
608
from errors import NoPyBaz
609
try:
610
import baz_import
611
baz_import.baz_import(to_root_dir, from_archive, encoding,
612
verbose, reuse_history_list, prefixes)
613
except NoPyBaz:
614
print "This command is disabled. Please install PyBaz."
615
616
617
class cmd_baz_import_branch(bzrlib.commands.Command):
618
"""Import an Arch or Baz branch into a bzr branch.
619
620
WARNING: Encoding should not be specified unless necessary, because if you
621
specify an encoding, your converted branch will not interoperate with
622
independently-converted branches, unless the other branches were converted
623
with exactly the same encoding. Any encoding recognized by Python may
624
be specified. Aliases are not detected, so 'utf_8', 'U8', 'UTF' and 'utf8'
625
are incompatible.
626
"""
627
takes_args = ['to_location', 'from_branch?', 'reuse_history*']
628
takes_options = ['verbose', Option('max-count', type=int),
629
Option('encoding', type=str,
630
help='Force encoding to specified value. See WARNING.')]
631
632
def run(self, to_location, from_branch=None, fast=False, max_count=None,
633
encoding=None, verbose=False, dry_run=False,
634
reuse_history_list=[]):
635
from errors import NoPyBaz
636
try:
637
import baz_import
638
baz_import.baz_import_branch(to_location, from_branch, fast,
639
max_count, verbose, encoding, dry_run,
640
reuse_history_list)
641
except NoPyBaz:
642
print "This command is disabled. Please install PyBaz."
643
644
645
class cmd_rspush(bzrlib.commands.Command):
548
colordiff(color, check_style, *args, **kwargs)
549
550
551
class cmd_conflict_diff(BzrToolsCommand):
552
553
"""Compare a conflicted file against BASE."""
554
555
encoding_type = 'exact'
556
takes_args = ['file*']
557
takes_options = [
558
RegistryOption.from_kwargs('direction', 'Direction of comparison.',
559
value_switches=True, enum_switch=False,
560
other='Compare OTHER against common base.',
561
this='Compare THIS against common base.')]
562
563
def run(self, file_list, direction='other'):
564
from bzrlib.plugins.bzrtools.colordiff import DiffWriter
565
from conflict_diff import ConflictDiffer
566
dw = DiffWriter(self.outf, check_style=False, color='auto')
567
ConflictDiffer().run(dw, file_list, direction)
568
569
570
class cmd_rspush(BzrToolsCommand):
646
571
"""Upload this branch to another location using rsync.
647
572
648
If no location is specified, the last-used location will be used. To
649
prevent dirty trees from being uploaded, rspush will error out if there are
650
unknown files or local changes. It will also error out if the upstream
651
directory is non-empty and not an earlier version of the branch.
573
If no location is specified, the last-used location will be used. To
574
prevent dirty trees from being uploaded, rspush will error out if there are
575
unknown files or local changes. It will also error out if the upstream
576
directory is non-empty and not an earlier version of the branch.
652
577
"""
653
578
takes_args = ['location?']
654
579
takes_options = [Option('overwrite', help='Ignore differences between'
655
' branches and overwrite unconditionally'),
580
' branches and overwrite unconditionally.'),
656
581
Option('no-tree', help='Do not push the working tree,'
657
582
' just the .bzr.')]
658
583
660
585
from bzrlib import workingtree
661
586
import bzrtools
662
587
cur_branch = workingtree.WorkingTree.open_containing(".")[0]
663
bzrtools.rspush(cur_branch, location, overwrite=overwrite,
588
bzrtools.rspush(cur_branch, location, overwrite=overwrite,
664
589
working_tree=not no_tree)
665
590
666
591
667
class cmd_switch(bzrlib.commands.Command):
668
"""Set the branch of a lightweight checkout and update."""
669
670
takes_args = ['to_location']
671
672
def run(self, to_location):
673
from switch import cmd_switch
674
cmd_switch().run(to_location)
675
676
677
commands = [
678
cmd_baz_import,
679
cmd_baz_import_branch,
680
cmd_branches,
681
cmd_branch_history,
682
cmd_branch_mark,
683
cmd_cbranch,
684
cmd_cdiff,
685
cmd_clean_tree,
686
cmd_fetch_ghosts,
687
cmd_graph_ancestry,
688
cmd_import,
689
cmd_multi_pull,
690
cmd_patch,
691
cmd_rspush,
692
cmd_shelf,
693
cmd_shell,
694
cmd_shelve,
695
cmd_switch,
696
cmd_unshelve,
697
cmd_zap,
698
]
699
700
701
if hasattr(bzrlib.commands, 'register_command'):
702
for command in commands:
703
bzrlib.commands.register_command(command)
704
705
706
def test_suite():
707
from bzrlib.tests.TestUtil import TestLoader
708
import tests
709
from doctest import DocTestSuite, ELLIPSIS
710
from unittest import TestSuite
711
import bzrtools
712
import tests.clean_tree
713
import tests.is_clean
714
import tests.upstream_import
715
import zap
716
import tests.blackbox
717
import tests.shelf_tests
718
result = TestSuite()
719
result.addTest(DocTestSuite(bzrtools, optionflags=ELLIPSIS))
720
result.addTest(tests.clean_tree.test_suite())
721
try:
722
import baz_import
723
result.addTest(DocTestSuite(baz_import))
724
except NoPyBaz:
725
pass
726
result.addTest(tests.test_suite())
727
result.addTest(TestLoader().loadTestsFromModule(tests.shelf_tests))
728
result.addTest(tests.blackbox.test_suite())
729
result.addTest(tests.upstream_import.test_suite())
730
result.addTest(zap.test_suite())
731
result.addTest(TestLoader().loadTestsFromModule(tests.is_clean))
732
return result
592
class cmd_link_tree(BzrToolsCommand):
593
"""Hardlink matching files to another tree.
594
595
Only files with identical content and execute bit will be linked.
596
"""
597
takes_args = ['location']
598
599
def run(self, location):
600
from bzrlib import workingtree
601
from bzrlib.plugins.bzrtools.link_tree import link_tree
602
target_tree = workingtree.WorkingTree.open_containing(".")[0]
603
source_tree = workingtree.WorkingTree.open(location)
604
target_tree.lock_write()
605
try:
606
source_tree.lock_read()
607
try:
608
link_tree(target_tree, source_tree)
609
finally:
610
source_tree.unlock()
611
finally:
612
target_tree.unlock()
613
614
615
class cmd_create_mirror(BzrToolsCommand):
616
"""Create a mirror of another branch.
617
618
This is similar to `bzr branch`, but copies more settings, including the
619
submit branch and nickname.
620
621
It sets the public branch and parent of the target to the source location.
622
"""
623
624
takes_args = ['source', 'target']
625
626
def run(self, source, target):
627
source_branch = Branch.open(source)
628
from bzrlib.plugins.bzrtools.mirror import create_mirror
629
create_mirror(source_branch, target, [])
Loggerhead is a web-based interface for Breezy
Version: 2.0.1