« back to all changes in this revision
Viewing changes to command_classes.py
- browse files at revision 706
- compare with another revision
- download diff
- download tarball
- view history from revision 706
- Committer: Aaron Bentley
- Date: 2009-05-20 10:30:15 UTC
- Revision ID: aaron@aaronbentley.com-20090520103015-tu82oepmgpklixj2
Update version to 1.15
- files added:
- .be/bugs/0fc1fb5e-c545-453c-999d-5fc5ef852ca5
- .be/bugs/55bd43ce-953b-4233-83d2-2034ea63a805
- .be/bugs/945dc3f8-75e1-4312-b56d-9ecb02310783
- .be/bugs/945dc3f8-75e1-4312-b56d-9ecb02310783/comments
- .be/bugs/945dc3f8-75e1-4312-b56d-9ecb02310783/comments/5c42de60-2f51-48a0-9756-dcef5f6955ab
- .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
- .be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab
- .be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab/comments
- .be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab/comments/3448c47d-def5-4d03-9b8c-f0968e0c787c
- .be/bugs/c4664fbc-3b6a-48a6-bc09-9e96fa250592
- .be/bugs/c4664fbc-3b6a-48a6-bc09-9e96fa250592/comments
- .be/bugs/c4664fbc-3b6a-48a6-bc09-9e96fa250592/comments/f752631b-5590-4b6f-86d9-57aadca441ce
- files removed:
- baz_import.py
- external
- obsolete
- files renamed:
- __init__.py => command_classes.py
- files modified:
- .be/bugs/83031098-bd41-4159-852d-eec95740ab19/values
added
removed
command_classes.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
#
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.16.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
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
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
123
fetch_ghosts(branch, no_fix)
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
133
takes_options = [Option('strip', type=int, help=strip_help),
198
Option('silent', help='Suppress chatter')]
134
Option('silent', help='Suppress chatter.')]
199
135
def run(self, filename=None, strip=None, silent=False):
200
136
from patch import patch
201
137
from bzrlib.workingtree import WorkingTree
205
141
return patch(wt, filename, strip, silent)
206
142
207
143
208
class cmd_shelve(bzrlib.commands.Command):
144
class cmd_shelve1(BzrToolsCommand):
209
145
"""Temporarily set aside some changes from the current tree.
210
146
211
147
Shelve allows you to temporarily put changes you've made "on the shelf",
212
148
ie. out of the way, until a later time when you can bring them back from
213
the shelf with the 'unshelve' command.
149
the shelf with the 'unshelve1' command.
214
150
215
151
Shelve is intended to help separate several sets of text changes that have
216
152
been inappropriately mingled. If you just want to get rid of all changes
217
153
(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.
154
If you want to shelve all text changes at once, use shelve1 --all.
219
155
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.
156
By default shelve1 asks you what you want to shelve, press '?' at the
157
prompt to get help. To shelve everything run shelve1 --all.
222
158
223
159
If filenames are specified, only the changes to those files will be
224
160
shelved, other files will be left untouched.
226
162
If a revision is specified, changes since that revision will be shelved.
227
163
228
164
You can put multiple items on the shelf. Normally each time you run
229
unshelve the most recently shelved changes will be reinstated. However,
165
unshelve1 the most recently shelved changes will be reinstated. However,
230
166
you can also unshelve changes in a different order by explicitly
231
specifiying which changes to unshelve. This works best when the changes
167
specifiying which changes to unshelve1. This works best when the changes
232
168
don't depend on each other.
233
169
234
170
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.
171
the 'shelf1' command. Run 'bzr shelf1 -h' for more info.
236
172
"""
237
173
238
174
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')]
175
takes_options = [Option('message',
176
help='A message to associate with the shelved changes.',
177
short_name='m', type=unicode),
178
'revision',
179
Option('all', help='Shelve all changes without prompting.'),
180
Option('no-color', help='Never display changes in color.')]
242
181
243
182
def run(self, all=False, file_list=None, message=None, revision=None,
244
183
no_color=False):
255
194
return 0
256
195
257
196
258
# The following classes are only used as subcommands for 'shelf', they're
197
# The following classes are only used as subcommands for 'shelf1', they're
259
198
# not to be registered directly with bzr.
260
199
261
200
class cmd_shelf_list(bzrlib.commands.Command):
297
236
self.shelf.upgrade()
298
237
299
238
300
class cmd_shelf(bzrlib.commands.Command):
301
"""Perform various operations on your shelved patches. See also shelve."""
239
class cmd_shelf1(BzrToolsCommand):
240
"""Perform various operations on your shelved patches. See also shelve1."""
302
241
takes_args = ['subcommand', 'args*']
303
242
304
243
subcommands = [cmd_shelf_list, cmd_shelf_delete, cmd_shelf_switch,
338
277
cmd_obj = cmd_class()
339
278
indent = 2 * ' '
340
279
341
usage = help.command_usage(cmd_obj)
280
usage = cmd_obj._usage()
342
281
usage = usage.replace('bzr shelf-', '')
343
282
text.append('%s%s\n' % (indent, usage))
344
283
363
302
return text
364
303
365
304
366
class cmd_unshelve(bzrlib.commands.Command):
305
class cmd_unshelve1(BzrToolsCommand):
367
306
"""Restore shelved changes.
368
307
369
308
By default the most recently shelved changes are restored. However if you
370
309
specify a patch by name those changes will be restored instead.
371
310
372
See 'shelve' for more information.
311
See 'shelve1' for more information.
373
312
"""
374
313
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')
314
Option('all', help='Unshelve all changes without prompting.'),
315
Option('force', help='Force unshelving even if errors occur.'),
316
Option('no-color', help='Never display changes in color.')
378
317
]
379
318
takes_args = ['patch?']
380
319
def run(self, patch=None, all=False, force=False, no_color=False):
384
323
return 0
385
324
386
325
387
class cmd_shell(bzrlib.commands.Command):
326
class cmd_shell(BzrToolsCommand):
388
327
"""Begin an interactive shell tailored for bzr.
389
328
Bzr commands can be used without typing bzr first, and will be run natively
390
329
when possible. Tab completion is tailored for bzr. The shell prompt shows
407
346
return shell.run_shell()
408
347
409
348
410
class cmd_branch_history(bzrlib.commands.Command):
349
class cmd_branch_history(BzrToolsCommand):
411
350
"""\
412
351
Display the development history of a branch.
413
352
417
356
"""
418
357
takes_args = ["branch?"]
419
358
def run(self, branch=None):
420
from branchhistory import branch_history
359
from branchhistory import branch_history
421
360
return branch_history(branch)
422
361
423
362
424
class cmd_zap(bzrlib.commands.Command):
363
class cmd_zap(BzrToolsCommand):
425
364
"""\
426
365
Remove a lightweight checkout, if it can be done safely.
427
366
432
371
If --branch is specified, the branch will be deleted too, but only if the
433
372
the branch has no new commits (relative to its parent).
434
373
"""
435
takes_options = [Option("branch", help="Remove associtated branch from"
436
" repository")]
374
takes_options = [Option("branch", help="Remove associated branch from"
375
" repository."),
376
Option('force', help='Delete tree even if contents are'
377
' modified.')]
437
378
takes_args = ["checkout"]
438
def run(self, checkout, branch=False):
379
def run(self, checkout, branch=False, force=False):
439
380
from zap import zap
440
return zap(checkout, remove_branch=branch)
441
442
443
class cmd_cbranch(bzrlib.commands.Command):
381
return zap(checkout, remove_branch=branch, allow_modified=force)
382
383
384
class cmd_cbranch(BzrToolsCommand):
444
385
"""
445
386
Create a new checkout, associated with a new repository branch.
446
387
447
388
When you cbranch, bzr looks up a target location in locations.conf, and
448
389
creates the branch there.
449
390
453
394
cbranch_target:policy = appendpath
454
395
455
396
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
397
working directory root, the branch will be created in
457
398
"/branch_root/foo/baz"
458
399
459
400
NOTE: cbranch also supports "cbranch_root", but that behaviour is
460
401
deprecated.
461
402
"""
462
takes_options = [Option("lightweight",
463
help="Create a lightweight checkout"), 'revision']
403
takes_options = [Option("lightweight",
404
help="Create a lightweight checkout."), 'revision',
405
Option('files-from', type=unicode,
406
help='Accelerate checkout using files from this'
407
' tree.'),
408
Option('hardlink',
409
help='Hard-link files from source/files-from tree'
410
' where posible.')]
464
411
takes_args = ["source", "target?"]
465
def run(self, source, target=None, lightweight=False, revision=None):
412
def run(self, source, target=None, lightweight=False, revision=None,
413
files_from=None, hardlink=False):
466
414
from cbranch import cbranch
467
return cbranch(source, target, lightweight=lightweight,
468
revision=revision)
469
470
471
class cmd_branches(bzrlib.commands.Command):
415
return cbranch(source, target, lightweight=lightweight,
416
revision=revision, files_from=files_from,
417
hardlink=hardlink)
418
419
420
class cmd_branches(BzrToolsCommand):
472
421
"""Scan a location for branches"""
473
422
takes_args = ["location?"]
474
423
def run(self, location=None):
475
424
from branches import branches
476
425
return branches(location)
477
426
427
class cmd_trees(BzrToolsCommand):
428
"""Scan a location for trees"""
429
takes_args = ['location?']
430
def run(self, location='.'):
431
from bzrlib.workingtree import WorkingTree
432
from bzrlib.transport import get_transport
433
t = get_transport(location)
434
for tree in WorkingTree.find_trees(location):
435
self.outf.write('%s\n' % t.relpath(
436
tree.bzrdir.root_transport.base))
478
437
479
class cmd_multi_pull(bzrlib.commands.Command):
438
class cmd_multi_pull(BzrToolsCommand):
480
439
"""Pull all the branches under a location, e.g. a repository.
481
440
482
441
Both branches present in the directory and the branches of checkouts are
483
442
pulled.
484
443
"""
485
444
takes_args = ["location?"]
486
445
def run(self, location=None):
487
from bzrlib.branch import Branch
488
446
from bzrlib.transport import get_transport
489
447
from bzrtools import iter_branch_tree
490
448
if location is None:
491
449
location = '.'
492
450
t = get_transport(location)
451
possible_transports = []
493
452
if not t.listable():
494
453
print "Can't list this type of location."
495
454
return 3
511
470
relpath = base
512
471
print "Pulling %s from %s" % (relpath, parent)
513
472
try:
514
pullable.pull(Branch.open(parent))
473
branch_t = get_transport(parent, possible_transports)
474
pullable.pull(Branch.open_from_transport(branch_t))
515
475
except Exception, e:
516
476
print e
517
477
518
478
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):
479
480
class cmd_import(BzrToolsCommand):
538
481
"""Import sources from a directory, tarball or zip file
539
482
540
483
This command will import a directory, tarball or zip file into a bzr
541
484
tree, replacing any versioned files already present. If a directory is
542
485
specified, it is used as the target. If the directory does not exist, or
547
490
If the tarball or zip has a single root directory, that directory is
548
491
stripped when extracting the tarball. This is not done for directories.
549
492
"""
550
493
551
494
takes_args = ['source', 'tree?']
552
495
def run(self, source, tree=None):
553
496
from upstream_import import do_import
554
497
do_import(source, tree)
555
498
556
499
557
class cmd_cdiff(bzrlib.commands.Command):
500
class cmd_cdiff(BzrToolsCommand):
558
501
"""A color version of bzr's diff"""
559
502
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',
503
takes_options = list(get_cmd_object('diff').takes_options) + [
504
RegistryOption.from_kwargs('color',
505
'Color mode to use.',
506
title='Color Mode', value_switches=False, enum_switch=True,
507
never='Never colorize output.',
508
auto='Only colorize output if terminal supports it and STDOUT is a'
509
' TTY.',
510
always='Always colorize output (default).'),
511
Option('check-style',
564
512
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):
513
' added.')]
514
515
def run(self, color='always', check_style=False, *args, **kwargs):
571
516
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):
517
colordiff(color, check_style, *args, **kwargs)
518
519
520
class cmd_conflict_diff(BzrToolsCommand):
521
522
"""Compare a conflicted file against BASE."""
523
524
encoding_type = 'exact'
525
takes_args = ['file']
526
takes_options = [
527
RegistryOption.from_kwargs('direction', 'Direction of comparison.',
528
value_switches=True, enum_switch=False,
529
other='Compare OTHER against common base.',
530
this='Compare THIS against common base.')]
531
532
def run(self, file, direction='other'):
533
from bzrlib.plugins.bzrtools.colordiff import DiffWriter
534
from conflict_diff import conflict_diff
535
dw = DiffWriter(self.outf, check_style=False, color='auto')
536
conflict_diff(dw, file, direction)
537
538
539
class cmd_rspush(BzrToolsCommand):
646
540
"""Upload this branch to another location using rsync.
647
541
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.
542
If no location is specified, the last-used location will be used. To
543
prevent dirty trees from being uploaded, rspush will error out if there are
544
unknown files or local changes. It will also error out if the upstream
545
directory is non-empty and not an earlier version of the branch.
652
546
"""
653
547
takes_args = ['location?']
654
548
takes_options = [Option('overwrite', help='Ignore differences between'
655
' branches and overwrite unconditionally'),
549
' branches and overwrite unconditionally.'),
656
550
Option('no-tree', help='Do not push the working tree,'
657
551
' just the .bzr.')]
658
552
660
554
from bzrlib import workingtree
661
555
import bzrtools
662
556
cur_branch = workingtree.WorkingTree.open_containing(".")[0]
663
bzrtools.rspush(cur_branch, location, overwrite=overwrite,
557
bzrtools.rspush(cur_branch, location, overwrite=overwrite,
664
558
working_tree=not no_tree)
665
559
666
560
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
561
class cmd_link_tree(BzrToolsCommand):
562
"""Hardlink matching files to another tree.
563
564
Only files with identical content and execute bit will be linked.
565
"""
566
takes_args = ['location']
567
568
def run(self, location):
569
from bzrlib import workingtree
570
from bzrlib.plugins.bzrtools.link_tree import link_tree
571
target_tree = workingtree.WorkingTree.open_containing(".")[0]
572
source_tree = workingtree.WorkingTree.open(location)
573
target_tree.lock_write()
574
try:
575
source_tree.lock_read()
576
try:
577
link_tree(target_tree, source_tree)
578
finally:
579
source_tree.unlock()
580
finally:
581
target_tree.unlock()
Loggerhead is a web-based interface for Breezy
Version: 2.0.1