3
Various useful plugins for working with bzr.
1
# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron@aaronbentley.com>
2
# Copyright (C) 2005, 2006 Canonical Limited.
3
# Copyright (C) 2006 Michael Ellerman.
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.
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.
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
23
from bzrlib.lazy_import import lazy_import
24
lazy_import(globals(), """
25
from bzrlib import help, urlutils
29
from command import BzrToolsCommand
7
30
from errors import CommandError
8
31
from patchsource import BzrPatchSource
9
from shelf import Shelf
10
from switch import cmd_switch
13
from bzrlib.option import Option
35
import bzrlib.builtins
36
import bzrlib.commands
37
from bzrlib.branch import Branch
38
from bzrlib.bzrdir import BzrDir
39
from bzrlib.commands import get_cmd_object
15
40
from bzrlib.errors import BzrCommandError
16
sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__),
18
from bzrlib import DEFAULT_IGNORE
21
DEFAULT_IGNORE.append('./.shelf')
22
DEFAULT_IGNORE.append('./.bzr-shelf*')
25
Option.OPTIONS['ignored'] = Option('ignored',
26
help='delete all ignored files.')
27
Option.OPTIONS['detritus'] = Option('detritus',
28
help='delete conflict files merge backups, and failed selftest dirs.' +
29
'(*.THIS, *.BASE, *.OTHER, *~, *.tmp')
30
Option.OPTIONS['dry-run'] = Option('dry-run',
31
help='show files to delete instead of deleting them.')
33
class cmd_clean_tree(bzrlib.commands.Command):
34
"""Remove unwanted files from working tree. <BZRTOOLS>
35
Normally, ignored files are left alone.
37
takes_options = ['ignored', 'detritus', 'dry-run']
38
def run(self, ignored=False, detritus=False, dry_run=False):
39
from clean_tree import clean_tree
40
clean_tree('.', ignored=ignored, detritus=detritus, dry_run=dry_run)
42
Option.OPTIONS['merge-branch'] = Option('merge-branch',type=str)
44
class cmd_graph_ancestry(bzrlib.commands.Command):
45
"""Produce ancestry graphs using dot. <BZRTOOLS>
42
from bzrlib.trace import note
43
from bzrlib.option import Option, RegistryOption
44
from bzrlib.workingtree import WorkingTree
46
from command import BzrToolsCommand
49
class cmd_graph_ancestry(BzrToolsCommand):
50
"""Produce ancestry graphs using dot.
47
52
Output format is detected according to file extension. Some of the more
48
53
common output formats are html, png, gif, svg, ps. An extension of '.dot'
76
81
If available, rsvg is used to antialias PNG and JPEG output, but this can
77
82
be disabled with --no-antialias.
79
takes_args = ['branch', 'file']
80
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."),
81
86
Option('no-antialias',
82
help="Do not use rsvg to produce antialiased output"),
83
Option('merge-branch', type=str,
84
help="Use this branch to calcuate a merge base"),
85
Option('cluster', help="Use clustered output.")]
86
def run(self, branch, file, no_collapse=False, no_antialias=False,
87
merge_branch=None, cluster=False):
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."),
90
Option('cluster', help="Use clustered output."),
91
Option('max-distance',
92
help="Show no nodes farther than this.", type=int),
94
help='Source branch to use (default is current'
99
def run(self, file, merge_branch=None, no_collapse=False,
100
no_antialias=False, cluster=False, max_distance=100,
102
if max_distance == -1:
90
106
ranking = "cluster"
92
108
ranking = "forced"
93
graph.write_ancestry_file(branch, file, not no_collapse,
94
not no_antialias, merge_branch, ranking)
96
class cmd_fetch_ghosts(bzrlib.commands.Command):
97
"""Attempt to retrieve ghosts from another branch. <BZRTOOLS>
109
graph.write_ancestry_file(directory, file, not no_collapse,
110
not no_antialias, merge_branch, ranking,
111
max_distance=max_distance)
114
class cmd_fetch_ghosts(BzrToolsCommand):
115
"""Attempt to retrieve ghosts from another branch.
98
116
If the other branch is not supplied, the last-pulled branch is used.
100
118
aliases = ['fetch-missing']
101
119
takes_args = ['branch?']
102
takes_options = [Option('no-fix')]
120
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
103
121
def run(self, branch=None, no_fix=False):
104
122
from fetch_ghosts import fetch_ghosts
105
fetch_ghosts(branch, no_fix)
123
fetch_ghosts(branch, do_reconcile=not no_fix)
107
125
strip_help="""Strip the smallest prefix containing num leading slashes from \
108
126
each file name found in the patch file."""
109
Option.OPTIONS['strip'] = Option('strip', type=int, help=strip_help)
110
Option.OPTIONS['bzrdiff'] = Option('bzrdiff',type=None,
111
help="""Handle extra bzr tags""")
112
class cmd_patch(bzrlib.commands.Command):
113
"""Apply a named patch to the current tree. <BZRTOOLS>
129
class cmd_patch(BzrToolsCommand):
130
"""Apply a named patch to the current tree.
115
132
takes_args = ['filename?']
116
takes_options = ['strip','bzrdiff']
117
def run(self, filename=None, strip=-1, bzrdiff=0):
133
takes_options = [Option('strip', type=int, help=strip_help),
134
Option('silent', help='Suppress chatter.')]
135
def run(self, filename=None, strip=None, silent=False):
118
136
from patch import patch
119
137
from bzrlib.workingtree import WorkingTree
120
138
wt = WorkingTree.open_containing('.')[0]
122
if bzrdiff: strip = 0
125
return patch(wt, filename, strip, legacy= not bzrdiff)
127
class cmd_shelve(bzrlib.commands.Command):
128
"""Temporarily set aside some changes from the current tree. <BZRTOOLS>
141
return patch(wt, filename, strip, silent)
144
class cmd_shelve1(BzrToolsCommand):
145
"""Temporarily set aside some changes from the current tree.
130
147
Shelve allows you to temporarily put changes you've made "on the shelf",
131
148
ie. out of the way, until a later time when you can bring them back from
132
the shelf with the 'unshelve' command.
149
the shelf with the 'unshelve1' command.
134
151
Shelve is intended to help separate several sets of text changes that have
135
152
been inappropriately mingled. If you just want to get rid of all changes
136
153
(text and otherwise) and you don't need to restore them later, use revert.
137
If you want to shelve all text changes at once, use shelve --all.
139
By default shelve asks you what you want to shelve, press '?' at the
140
prompt to get help. To shelve everything run shelve --all.
142
You can put multiple items on the shelf, each time you run unshelve the
143
most recently shelved changes will be reinstated.
154
If you want to shelve all text changes at once, use shelve1 --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.
145
159
If filenames are specified, only the changes to those files will be
146
160
shelved, other files will be left untouched.
148
162
If a revision is specified, changes since that revision will be shelved.
164
You can put multiple items on the shelf. Normally each time you run
165
unshelve1 the most recently shelved changes will be reinstated. However,
166
you can also unshelve changes in a different order by explicitly
167
specifiying which changes to unshelve1. This works best when the changes
168
don't depend on each other.
170
While you have patches on the shelf you can view and manipulate them with
171
the 'shelf1' command. Run 'bzr shelf1 -h' for more info.
151
174
takes_args = ['file*']
152
takes_options = ['message', 'revision',
153
Option('all', help='Shelve all changes without prompting')]
175
takes_options = [Option('message',
176
help='A message to associate with the shelved changes.',
177
short_name='m', type=unicode),
179
Option('all', help='Shelve all changes without prompting.'),
180
Option('no-color', help='Never display changes in color.')]
155
def run(self, all=False, file_list=None, message=None, revision=None):
182
def run(self, all=False, file_list=None, message=None, revision=None,
156
184
if revision is not None and revision:
157
185
if len(revision) == 1:
158
186
revision = revision[0]
163
191
source = BzrPatchSource(revision, file_list)
164
s = Shelf(source.base)
165
s.shelve(source, all, message)
192
s = shelf.Shelf(source.base)
193
s.shelve(source, all, message, no_color)
168
class cmd_shelf(bzrlib.commands.Command):
169
"""Perform various operations on your shelved patches. See also shelve.
172
list (ls) List the patches on the current shelf.
173
delete (del) <patch> Delete a patch from the current shelf.
174
switch <shelf> Switch to the named shelf, create it if necessary.
175
show <patch> Show the contents of the specified patch.
176
upgrade Upgrade old format shelves.
197
# The following classes are only used as subcommands for 'shelf1', they're
198
# not to be registered directly with bzr.
200
class cmd_shelf_list(bzrlib.commands.Command):
201
"""List the patches on the current shelf."""
202
aliases = ['list', 'ls']
207
class cmd_shelf_delete(bzrlib.commands.Command):
208
"""Delete the patch from the current shelf."""
209
aliases = ['delete', 'del']
210
takes_args = ['patch']
211
def run(self, patch):
212
self.shelf.delete(patch)
215
class cmd_shelf_switch(bzrlib.commands.Command):
216
"""Switch to the other shelf, create it if necessary."""
218
takes_args = ['othershelf']
219
def run(self, othershelf):
220
s = shelf.Shelf(self.shelf.base, othershelf)
224
class cmd_shelf_show(bzrlib.commands.Command):
225
"""Show the contents of the specified or topmost patch."""
226
aliases = ['show', 'cat', 'display']
227
takes_args = ['patch?']
228
def run(self, patch=None):
229
self.shelf.display(patch)
232
class cmd_shelf_upgrade(bzrlib.commands.Command):
233
"""Upgrade old format shelves."""
234
aliases = ['upgrade']
239
class cmd_shelf1(BzrToolsCommand):
240
"""Perform various operations on your shelved patches. See also shelve1."""
178
241
takes_args = ['subcommand', 'args*']
243
subcommands = [cmd_shelf_list, cmd_shelf_delete, cmd_shelf_switch,
244
cmd_shelf_show, cmd_shelf_upgrade]
180
246
def run(self, subcommand, args_list):
249
if args_list is None:
251
cmd = self._get_cmd_object(subcommand)
183
252
source = BzrPatchSource()
184
s = Shelf(source.base)
186
if subcommand == 'ls' or subcommand == 'list':
187
self.__check_no_args(args_list, "shelf list takes no arguments!")
189
elif subcommand == 'delete' or subcommand == 'del':
190
self.__check_one_arg(args_list, "shelf delete takes one argument!")
191
s.delete(args_list[0])
192
elif subcommand == 'switch':
193
self.__check_one_arg(args_list, "shelf switch takes one argument!")
194
s = Shelf(source.base, args_list[0])
196
elif subcommand == 'show':
197
self.__check_one_arg(args_list, "shelf show takes one argument!")
198
s.display(args_list[0])
199
elif subcommand == 'upgrade':
200
self.__check_no_args(args_list, "shelf upgrade takes no arguments!")
203
print subcommand, args_list
204
print >>sys.stderr, "Unknown shelf subcommand '%s'" % subcommand
206
def __check_one_arg(self, args, msg):
207
if args is None or len(args) != 1:
208
raise CommandError(msg)
210
def __check_no_args(self, args, msg):
212
raise CommandError(msg)
215
class cmd_unshelve(bzrlib.commands.Command):
216
"""Restore the most recently shelved changes to current tree. <BZRTOOLS>
217
See 'shelve' for more information.
253
s = shelf.Shelf(source.base)
256
if args_list is None:
258
return cmd.run_argv_aliases(args_list)
260
def _get_cmd_object(self, cmd_name):
261
for cmd_class in self.subcommands:
262
for alias in cmd_class.aliases:
263
if alias == cmd_name:
265
raise CommandError("Unknown shelf subcommand '%s'" % cmd_name)
268
text = ["%s\n\nSubcommands:\n" % self.__doc__]
270
for cmd_class in self.subcommands:
271
text.extend(self.sub_help(cmd_class) + ['\n'])
275
def sub_help(self, cmd_class):
277
cmd_obj = cmd_class()
280
usage = cmd_obj._usage()
281
usage = usage.replace('bzr shelf-', '')
282
text.append('%s%s\n' % (indent, usage))
284
text.append('%s%s\n' % (2 * indent, cmd_class.__doc__))
286
# Somewhat copied from bzrlib.help.help_on_command_options
288
for option_name, option in sorted(cmd_obj.options().items()):
289
if option_name == 'help':
291
option_help.append('%s--%s' % (3 * indent, option_name))
292
if option.type is not None:
293
option_help.append(' %s' % option.argname.upper())
294
if option.short_name():
295
option_help.append(', -%s' % option.short_name())
296
option_help.append('%s%s\n' % (2 * indent, option.help))
298
if len(option_help) > 0:
299
text.append('%soptions:\n' % (2 * indent))
300
text.extend(option_help)
305
class cmd_unshelve1(BzrToolsCommand):
306
"""Restore shelved changes.
308
By default the most recently shelved changes are restored. However if you
309
specify a patch by name those changes will be restored instead.
311
See 'shelve1' for more information.
219
313
takes_options = [
220
Option('all', help='Unshelve all changes without prompting'),
221
Option('force', help='Force unshelving even if errors occur'),
223
def run(self, all=False, force=False):
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.')
318
takes_args = ['patch?']
319
def run(self, patch=None, all=False, force=False, no_color=False):
224
320
source = BzrPatchSource()
225
s = Shelf(source.base)
226
s.unshelve(source, all, force)
321
s = shelf.Shelf(source.base)
322
s.unshelve(source, patch, all, force, no_color)
230
class cmd_shell(bzrlib.commands.Command):
231
"""Begin an interactive shell tailored for bzr. <BZRTOOLS>
326
class cmd_shell(BzrToolsCommand):
327
"""Begin an interactive shell tailored for bzr.
232
328
Bzr commands can be used without typing bzr first, and will be run natively
233
329
when possible. Tab completion is tailored for bzr. The shell prompt shows
234
330
the branch nick, revno, and path.
260
357
takes_args = ["branch?"]
261
358
def run(self, branch=None):
262
from branchhistory import branch_history
359
from branchhistory import branch_history
263
360
return branch_history(branch)
266
class cmd_zap(bzrlib.commands.Command):
363
class cmd_zap(BzrToolsCommand):
268
Remove a checkout, if it can be done safely. <BZRTOOLS>
270
This command will remove a checkout without losing data. That means
271
it only removes checkouts, and only if they have no uncommitted changes.
365
Remove a lightweight checkout, if it can be done safely.
367
This command will remove a lightweight checkout without losing data. That
368
means it only removes lightweight checkouts, and only if they have no
371
If --branch is specified, the branch will be deleted too, but only if the
372
the branch has no new commits (relative to its parent).
273
takes_options = [Option("branch", help="Remove associtated branch from"
374
takes_options = [Option("branch", help="Remove associated branch from"
376
Option('force', help='Delete tree even if contents are'
275
378
takes_args = ["checkout"]
276
def run(self, checkout, branch=False):
379
def run(self, checkout, branch=False, force=False):
277
380
from zap import zap
278
return zap(checkout, remove_branch=branch)
281
class cmd_cbranch(bzrlib.commands.Command):
283
Create a new checkout, associated with a new repository branch. <BZRTOOLS>
285
When you cbranch, bzr looks up the repository associated with your current
286
directory in branches.conf. It creates a new branch in that repository
287
with the same name and relative path as the checkout you request.
289
The branches.conf parameter is "cbranch_root". So if you want
290
cbranch operations in /home/jrandom/bigproject to produce branches in
291
/home/jrandom/bigproject/repository, you'd add this:
293
[/home/jrandom/bigproject]
294
cbranch_root = /home/jrandom/bigproject/repository
296
Note that if "/home/jrandom/bigproject/repository" isn't a repository,
297
standalone branches will be produced. Standalone branches will also
298
be produced if the source branch is in 0.7 format (or earlier).
300
takes_options = [Option("lightweight",
301
help="Create a lightweight checkout")]
381
return zap(checkout, remove_branch=branch, allow_modified=force)
384
class cmd_cbranch(BzrToolsCommand):
386
Create a new checkout, associated with a new repository branch.
388
When you cbranch, bzr looks up a target location in locations.conf, and
389
creates the branch there.
391
In your locations.conf, add the following lines:
392
[/working_directory_root]
393
cbranch_target = /branch_root
394
cbranch_target:policy = appendpath
396
This will mean that if you run "bzr cbranch foo/bar foo/baz" in the
397
working directory root, the branch will be created in
398
"/branch_root/foo/baz"
400
NOTE: cbranch also supports "cbranch_root", but that behaviour is
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'
409
help='Hard-link files from source/files-from tree'
302
411
takes_args = ["source", "target?"]
303
def run(self, source, target=None, lightweight=False):
412
def run(self, source, target=None, lightweight=False, revision=None,
413
files_from=None, hardlink=False):
304
414
from cbranch import cbranch
305
return cbranch(source, target, lightweight=lightweight)
308
class cmd_branches(bzrlib.commands.Command):
309
"""Scan a location for branches <BZRTOOLS>"""
415
return cbranch(source, target, lightweight=lightweight,
416
revision=revision, files_from=files_from,
420
class cmd_branches(BzrToolsCommand):
421
"""Scan a location for branches"""
310
422
takes_args = ["location?"]
311
423
def run(self, location=None):
312
424
from branches import branches
313
425
return branches(location)
316
class cmd_multi_pull(bzrlib.commands.Command):
317
"""Pull all the branches under a location, e.g. a repository. <BZRTOOLS>
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))
438
class cmd_multi_pull(BzrToolsCommand):
439
"""Pull all the branches under a location, e.g. a repository.
319
441
Both branches present in the directory and the branches of checkouts are
322
444
takes_args = ["location?"]
323
445
def run(self, location=None):
324
from bzrlib.branch import Branch
325
446
from bzrlib.transport import get_transport
326
447
from bzrtools import iter_branch_tree
327
448
if location is None:
329
450
t = get_transport(location)
451
possible_transports = []
330
452
if not t.listable():
331
453
print "Can't list this type of location."
349
471
print "Pulling %s from %s" % (relpath, parent)
351
pullable.pull(Branch.open(parent))
473
branch_t = get_transport(parent, possible_transports)
474
pullable.pull(Branch.open_from_transport(branch_t))
352
475
except Exception, e:
356
class cmd_branch_mark(bzrlib.commands.Command):
358
Add, view or list branch markers <EXPERIMENTAL>
360
To add a mark, do 'bzr branch-mark MARK'.
361
To list marks, do 'bzr branch-mark' (this lists all marks for the branch's
363
To delete a mark, do 'bzr branch-mark --delete MARK'
365
These marks can be used to track a branch's status.
367
takes_args = ['mark?', 'branch?']
368
takes_options = [Option('delete', help='Delete this mark')]
369
def run(self, mark=None, branch=None, delete=False):
370
from branch_mark import branch_mark
371
branch_mark(mark, branch, delete)
374
commands = [cmd_shelve, cmd_unshelve, cmd_shelf, cmd_clean_tree,
375
cmd_graph_ancestry, cmd_fetch_ghosts, cmd_patch, cmd_shell,
376
cmd_branch_history, cmd_zap, cmd_cbranch, cmd_branches,
377
cmd_multi_pull, cmd_switch, cmd_branch_mark]
382
import bzrlib.builtins
383
commands.append(rspush.cmd_rspush)
385
from errors import NoPyBaz
388
commands.append(baz_import.cmd_baz_import_branch)
389
commands.append(baz_import.cmd_baz_import)
392
class cmd_baz_import_branch(bzrlib.commands.Command):
393
"""Disabled. (Requires PyBaz) <BZRTOOLS>"""
394
takes_args = ['to_location?', 'from_branch?', 'reuse_history*']
395
takes_options = ['verbose', Option('max-count', type=int)]
396
def run(self, to_location=None, from_branch=None, fast=False,
397
max_count=None, verbose=False, dry_run=False,
398
reuse_history_list=[]):
399
print "This command is disabled. Please install PyBaz."
402
class cmd_baz_import(bzrlib.commands.Command):
403
"""Disabled. (Requires PyBaz) <BZRTOOLS>"""
404
takes_args = ['to_root_dir?', 'from_archive?', 'reuse_history*']
405
takes_options = ['verbose', Option('prefixes', type=str,
406
help="Prefixes of branches to import")]
407
def run(self, to_root_dir=None, from_archive=None, verbose=False,
408
reuse_history_list=[], prefixes=None):
409
print "This command is disabled. Please install PyBaz."
410
commands.extend((cmd_baz_import_branch, cmd_baz_import))
413
if hasattr(bzrlib.commands, 'register_command'):
414
for command in commands:
415
bzrlib.commands.register_command(command)
420
from bzrlib.tests.TestUtil import TestLoader
422
from doctest import DocTestSuite, ELLIPSIS
423
from unittest import TestSuite
426
import tests.blackbox
427
import tests.shelf_tests
429
result.addTest(DocTestSuite(bzrtools, optionflags=ELLIPSIS))
430
result.addTest(clean_tree.test_suite())
431
result.addTest(DocTestSuite(baz_import))
432
result.addTest(tests.test_suite())
433
result.addTest(TestLoader().loadTestsFromModule(tests.shelf_tests))
434
result.addTest(tests.blackbox.test_suite())
435
result.addTest(zap.test_suite())
480
class cmd_import(BzrToolsCommand):
481
"""Import sources from a directory, tarball or zip file
483
This command will import a directory, tarball or zip file into a bzr
484
tree, replacing any versioned files already present. If a directory is
485
specified, it is used as the target. If the directory does not exist, or
486
is not versioned, it is created.
488
Tarballs may be gzip or bzip2 compressed. This is autodetected.
490
If the tarball or zip has a single root directory, that directory is
491
stripped when extracting the tarball. This is not done for directories.
494
takes_args = ['source', 'tree?']
495
def run(self, source, tree=None):
496
from upstream_import import do_import
497
do_import(source, tree)
500
class cmd_cdiff(BzrToolsCommand):
501
"""A color version of bzr's diff"""
502
takes_args = property(lambda x: get_cmd_object('diff').takes_args)
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'
510
always='Always colorize output (default).'),
511
Option('check-style',
512
help='Warn if trailing whitespace or spurious changes have been'
515
def run(self, color='always', check_style=False, *args, **kwargs):
516
from colordiff import colordiff
517
colordiff(color, check_style, *args, **kwargs)
520
class cmd_conflict_diff(BzrToolsCommand):
522
"""Compare a conflicted file against BASE."""
524
encoding_type = 'exact'
525
takes_args = ['file']
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.')]
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)
539
class cmd_rspush(BzrToolsCommand):
540
"""Upload this branch to another location using rsync.
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.
547
takes_args = ['location?']
548
takes_options = [Option('overwrite', help='Ignore differences between'
549
' branches and overwrite unconditionally.'),
550
Option('no-tree', help='Do not push the working tree,'
553
def run(self, location=None, overwrite=False, no_tree=False):
554
from bzrlib import workingtree
556
cur_branch = workingtree.WorkingTree.open_containing(".")[0]
557
bzrtools.rspush(cur_branch, location, overwrite=overwrite,
558
working_tree=not no_tree)
561
class cmd_link_tree(BzrToolsCommand):
562
"""Hardlink matching files to another tree.
564
Only files with identical content and execute bit will be linked.
566
takes_args = ['location']
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()
575
source_tree.lock_read()
577
link_tree(target_tree, source_tree)
584
class cmd_create_mirror(BzrToolsCommand):
585
"""Create a mirror of another branch.
587
This is similar to `bzr branch`, but copies more settings, including the
588
submit branch and nickname.
590
It sets the public branch and parent of the target to the source location.
593
takes_args = ['source', 'target']
595
def run(self, source, target):
596
source_branch = Branch.open(source)
597
from bzrlib.plugins.bzrtools.mirror import create_mirror
598
create_mirror(source_branch, target, [])
added
removed
command_classes.py
