12
12
import bzrlib.branch
13
13
from bzrlib.errors import BzrCommandError
14
14
sys.path.append(os.path.dirname(__file__))
15
from reweave_inventory import cmd_fix
16
17
Option.OPTIONS['ignored'] = Option('ignored',
17
18
help='delete all ignored files.')
18
Option.OPTIONS['detrius'] = Option('detrius',
19
Option.OPTIONS['detritus'] = Option('detritus',
19
20
help='delete conflict files merge backups, and failed selftest dirs.' +
20
21
'(*.THIS, *.BASE, *.OTHER, *~, *.tmp')
21
22
Option.OPTIONS['dry-run'] = Option('dry-run',
25
26
"""Remove unwanted files from working tree.
26
27
Normally, ignored files are left alone.
28
takes_options = ['ignored', 'detrius', 'dry-run']
29
def run(self, ignored=False, detrius=False, dry_run=False):
29
takes_options = ['ignored', 'detritus', 'dry-run']
30
def run(self, ignored=False, detritus=False, dry_run=False):
30
31
from clean_tree import clean_tree
31
clean_tree('.', ignored=ignored, detrius=detrius, dry_run=dry_run)
32
clean_tree('.', ignored=ignored, detritus=detritus, dry_run=dry_run)
33
Option.OPTIONS['no-collapse'] = Option('no-collapse')
34
Option.OPTIONS['no-antialias'] = Option('no-antialias')
35
Option.OPTIONS['cluster'] = Option('cluster')
36
34
Option.OPTIONS['merge-branch'] = Option('merge-branch',type=str)
38
36
class cmd_graph_ancestry(bzrlib.commands.Command):
39
37
"""Produce ancestry graphs using dot.
41
39
Output format is detected according to file extension. Some of the more
42
common output formats are png, gif, svg, ps. An extension of '.dot' will
43
cause a dot graph file to be produced.
40
common output formats are html, png, gif, svg, ps. An extension of '.dot'
41
will cause a dot graph file to be produced. HTML output has mouseovers
42
that show the commit message.
45
44
Branches are labeled r?, where ? is the revno. If they have no revno,
46
45
with the last 5 characters of their revision identifier are used instead.
47
The value starting with d is "(maximum) distance from the null revision".
48
49
If --merge-branch is specified, the two branches are compared and a merge
55
56
orange COMMON history
56
57
blue COMMON non-history ancestor
57
dotted Missing from branch storage
58
green Merge base (COMMON ancestor farthest from the null revision)
59
dotted Ghost revision (missing from branch storage)
59
Ancestry is usually collapsed by removing revisions with a single parent
61
Ancestry is usually collapsed by skipping revisions with a single parent
60
62
and descendant. The number of skipped revisions is shown on the arrow.
61
63
This feature can be disabled with --no-collapse.
67
69
be disabled with --no-antialias.
69
71
takes_args = ['branch', 'file']
70
takes_options = ['no-collapse', 'no-antialias', 'merge-branch', 'cluster']
72
takes_options = [Option('no-collapse', help="Do not skip simple nodes"),
73
Option('no-antialias',
74
help="Do not use rsvg to produce antialiased output"),
75
Option('merge-branch', type=str,
76
help="Use this branch to calcuate a merge base"),
77
Option('cluster', help="Use clustered output.")]
71
78
def run(self, branch, file, no_collapse=False, no_antialias=False,
72
79
merge_branch=None, cluster=False):
85
92
aliases = ['fetch-missing']
86
93
takes_args = ['branch?']
87
def run(self, branch=None):
94
takes_options = [Option('no-fix')]
95
def run(self, branch=None, no_fix=False):
88
96
from fetch_ghosts import fetch_ghosts
97
fetch_ghosts(branch, no_fix)
91
99
strip_help="""Strip the smallest prefix containing num leading slashes from \
92
100
each file name found in the patch file."""
106
114
class cmd_shelve(bzrlib.commands.Command):
107
"""Temporarily remove some changes from the current tree.
115
"""Temporarily remove some text changes from the current tree.
108
116
Use 'unshelve' to restore these changes.
110
If filenames are specified, only changes to those files will be unshelved.
118
Shelve is intended to help separate several sets of text changes that have
119
been inappropriately mingled. If you just want to get rid of all changes
120
(text and otherwise) and you don't need to restore them later, use revert.
121
If you want to shelve all text changes at once, use shelve --all.
123
If filenames are specified, only changes to those files will be shelved.
111
124
If a revision is specified, all changes since that revision will may be
114
127
takes_args = ['file*']
115
takes_options = ['all', 'message', 'revision']
128
takes_options = [Option('all',
129
help='Shelve all changes without prompting'),
130
'message', 'revision']
116
131
def run(self, all=False, file_list=None, message=None, revision=None):
117
132
if file_list is not None and len(file_list) > 0:
118
133
branchdir = file_list[0]
139
154
return s.unshelve()
141
156
class cmd_shell(bzrlib.commands.Command):
157
"""Begin an interactive shell tailored for bzr.
158
Bzr commands can be used without typing bzr first, and will be run natively
159
when possible. Tab completion is tailored for bzr. The shell prompt shows
160
the branch nick, revno, and path.
162
If it encounters any moderately complicated shell command, it will punt to
167
bzr bzrtools:287/> status
170
bzr bzrtools:287/> status --[TAB][TAB]
171
--all --help --revision --show-ids
172
bzr bzrtools:287/> status --
176
return shell.run_shell()
178
class cmd_branch_history(bzrlib.commands.Command):
180
Display the revision history with reference to lines of development.
182
Each different committer or branch nick is considered a different line of
183
development. Committers are treated as the same if they have the same
184
name, or if they have the same email address.
186
takes_args = ["branch?"]
187
def run(self, branch=None):
188
from branchhistory import branch_history
189
return branch_history(branch)
146
191
commands = [cmd_shelve, cmd_unshelve, cmd_clean_tree, cmd_graph_ancestry,
147
cmd_fetch_ghosts, cmd_patch, cmd_shell]
192
cmd_fetch_ghosts, cmd_patch, cmd_shell, cmd_fix, cmd_branch_history]
194
command_decorators = []
149
196
import bzrlib.builtins
150
197
if not hasattr(bzrlib.builtins, "cmd_annotate"):
151
198
commands.append(annotate.cmd_annotate)
152
199
if not hasattr(bzrlib.builtins, "cmd_push"):
153
200
commands.append(push.cmd_push)
202
command_decorators.append(push.cmd_push)
155
204
from errors import NoPyBaz
166
215
print "This command is disabled. Please install PyBaz."
167
216
commands.append(cmd_baz_import)
169
219
if hasattr(bzrlib.commands, 'register_command'):
170
220
for command in commands:
171
221
bzrlib.commands.register_command(command)
222
for command in command_decorators:
223
command._original_command = bzrlib.commands.register_command(
173
227
def test_suite():
174
228
from doctest import DocTestSuite