612
by Aaron Bentley
Update email address |
1 |
# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron@aaronbentley.com>
|
460
by Aaron Bentley
Add encoding parameter everywhere |
2 |
# Copyright (C) 2005, 2006 Canonical Limited.
|
3 |
# Copyright (C) 2006 Michael Ellerman.
|
|
4 |
#
|
|
5 |
# This program is free software; you can redistribute it and/or modify
|
|
6 |
# it under the terms of the GNU General Public License as published by
|
|
7 |
# the Free Software Foundation; either version 2 of the License, or
|
|
8 |
# (at your option) any later version.
|
|
9 |
#
|
|
10 |
# This program is distributed in the hope that it will be useful,
|
|
11 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13 |
# GNU General Public License for more details.
|
|
14 |
#
|
|
15 |
# You should have received a copy of the GNU General Public License
|
|
16 |
# along with this program; if not, write to the Free Software
|
|
17 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
18 |
||
701
by Aaron Bentley
Use LCA tree for base if not provided. |
19 |
import errno |
20 |
||
428
by Aaron Bentley
Add version number, check against bzrlib version |
21 |
import bzrlib |
22 |
||
512
by Aaron Bentley
More import-time fixups |
23 |
from bzrlib.lazy_import import lazy_import |
24 |
lazy_import(globals(), """ |
|
577.1.1
by Aaron Bentley
bzr switch works when the source branch is renamed |
25 |
from bzrlib import help, urlutils
|
512
by Aaron Bentley
More import-time fixups |
26 |
import shelf
|
27 |
""") |
|
428
by Aaron Bentley
Add version number, check against bzrlib version |
28 |
|
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
29 |
from command import BzrToolsCommand |
650
by Aaron Bentley
Remove references to PyBaz |
30 |
from errors import CommandError |
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
31 |
from patchsource import BzrPatchSource |
246
by Aaron Bentley
Merged shelf_v2 |
32 |
import sys |
33 |
import os.path |
|
399
by Aaron Bentley
Implement cdiff (based on old Fai code) |
34 |
|
35 |
import bzrlib.builtins |
|
36 |
import bzrlib.commands |
|
577.1.1
by Aaron Bentley
bzr switch works when the source branch is renamed |
37 |
from bzrlib.branch import Branch |
38 |
from bzrlib.bzrdir import BzrDir |
|
410
by Aaron Bentley
Ensure the option settings come from the right 'diff' in colordiff |
39 |
from bzrlib.commands import get_cmd_object |
0.1.39
by Michael Ellerman
Fix shelve and unshelve to pass location to Shelf(). |
40 |
from bzrlib.errors import BzrCommandError |
423
by Aaron Bentley
Add runtime ignores for shelf |
41 |
import bzrlib.ignores |
577.1.1
by Aaron Bentley
bzr switch works when the source branch is renamed |
42 |
from bzrlib.trace import note |
680.1.3
by Benoît Pierre
Add --color=MODE option to cdiff; MODE can be: |
43 |
from bzrlib.option import Option, RegistryOption |
701
by Aaron Bentley
Use LCA tree for base if not provided. |
44 |
from bzrlib.workingtree import WorkingTree |
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
45 |
|
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
46 |
from command import BzrToolsCommand |
465
by Aaron Bentley
Add show-paths command from Alexander Belchenko |
47 |
|
246
by Aaron Bentley
Merged shelf_v2 |
48 |
|
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
49 |
class cmd_graph_ancestry(BzrToolsCommand): |
415
by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions |
50 |
"""Produce ancestry graphs using dot.
|
246
by Aaron Bentley
Merged shelf_v2 |
51 |
|
52 |
Output format is detected according to file extension. Some of the more
|
|
296
by Aaron Bentley
Updated graph-ancestry help |
53 |
common output formats are html, png, gif, svg, ps. An extension of '.dot'
|
54 |
will cause a dot graph file to be produced. HTML output has mouseovers
|
|
55 |
that show the commit message.
|
|
246
by Aaron Bentley
Merged shelf_v2 |
56 |
|
57 |
Branches are labeled r?, where ? is the revno. If they have no revno,
|
|
58 |
with the last 5 characters of their revision identifier are used instead.
|
|
296
by Aaron Bentley
Updated graph-ancestry help |
59 |
|
60 |
The value starting with d is "(maximum) distance from the null revision".
|
|
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
61 |
|
246
by Aaron Bentley
Merged shelf_v2 |
62 |
If --merge-branch is specified, the two branches are compared and a merge
|
63 |
base is selected.
|
|
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
64 |
|
246
by Aaron Bentley
Merged shelf_v2 |
65 |
Legend:
|
66 |
white normal revision
|
|
67 |
yellow THIS history
|
|
68 |
red OTHER history
|
|
69 |
orange COMMON history
|
|
70 |
blue COMMON non-history ancestor
|
|
296
by Aaron Bentley
Updated graph-ancestry help |
71 |
green Merge base (COMMON ancestor farthest from the null revision)
|
72 |
dotted Ghost revision (missing from branch storage)
|
|
246
by Aaron Bentley
Merged shelf_v2 |
73 |
|
296
by Aaron Bentley
Updated graph-ancestry help |
74 |
Ancestry is usually collapsed by skipping revisions with a single parent
|
246
by Aaron Bentley
Merged shelf_v2 |
75 |
and descendant. The number of skipped revisions is shown on the arrow.
|
76 |
This feature can be disabled with --no-collapse.
|
|
77 |
||
78 |
By default, revisions are ordered by distance from root, but they can be
|
|
79 |
clustered instead using --cluster.
|
|
80 |
||
81 |
If available, rsvg is used to antialias PNG and JPEG output, but this can
|
|
82 |
be disabled with --no-antialias.
|
|
83 |
"""
|
|
546
by Aaron Bentley
Fix argument handling in graph-ancestry |
84 |
takes_args = ['file', 'merge_branch?'] |
553.1.1
by Vincent Ladeuil
Fix option help strings to comply with the style guide. |
85 |
takes_options = [Option('no-collapse', help="Do not skip simple nodes."), |
296
by Aaron Bentley
Updated graph-ancestry help |
86 |
Option('no-antialias', |
553.1.1
by Vincent Ladeuil
Fix option help strings to comply with the style guide. |
87 |
help="Do not use rsvg to produce antialiased output."), |
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
88 |
Option('merge-branch', type=str, |
553.1.1
by Vincent Ladeuil
Fix option help strings to comply with the style guide. |
89 |
help="Use this branch to calcuate a merge base."), |
476.1.2
by Aaron Bentley
graph-ancestry can restrict the number of nodes shown by distance |
90 |
Option('cluster', help="Use clustered output."), |
544
by Aaron Bentley
Update graph-ancestry to support new graph API |
91 |
Option('max-distance', |
553.1.1
by Vincent Ladeuil
Fix option help strings to comply with the style guide. |
92 |
help="Show no nodes farther than this.", type=int), |
544
by Aaron Bentley
Update graph-ancestry to support new graph API |
93 |
Option('directory', |
94 |
help='Source branch to use (default is current' |
|
553.1.1
by Vincent Ladeuil
Fix option help strings to comply with the style guide. |
95 |
' directory).', |
544
by Aaron Bentley
Update graph-ancestry to support new graph API |
96 |
short_name='d', |
97 |
type=unicode), |
|
98 |
]
|
|
546
by Aaron Bentley
Fix argument handling in graph-ancestry |
99 |
def run(self, file, merge_branch=None, no_collapse=False, |
100 |
no_antialias=False, cluster=False, max_distance=100, |
|
101 |
directory='.'): |
|
544
by Aaron Bentley
Update graph-ancestry to support new graph API |
102 |
if max_distance == -1: |
103 |
max_distance = None |
|
246
by Aaron Bentley
Merged shelf_v2 |
104 |
import graph |
105 |
if cluster: |
|
106 |
ranking = "cluster" |
|
107 |
else: |
|
108 |
ranking = "forced" |
|
544
by Aaron Bentley
Update graph-ancestry to support new graph API |
109 |
graph.write_ancestry_file(directory, file, not no_collapse, |
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
110 |
not no_antialias, merge_branch, ranking, |
476.1.2
by Aaron Bentley
graph-ancestry can restrict the number of nodes shown by distance |
111 |
max_distance=max_distance) |
246
by Aaron Bentley
Merged shelf_v2 |
112 |
|
445
by Aaron Bentley
Remove shove, tweak imports, docs |
113 |
|
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
114 |
class cmd_fetch_ghosts(BzrToolsCommand): |
415
by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions |
115 |
"""Attempt to retrieve ghosts from another branch.
|
246
by Aaron Bentley
Merged shelf_v2 |
116 |
If the other branch is not supplied, the last-pulled branch is used.
|
117 |
"""
|
|
118 |
aliases = ['fetch-missing'] |
|
119 |
takes_args = ['branch?'] |
|
558
by Aaron Bentley
Fix the --no-fix option of fetch-ghosts |
120 |
takes_options = [Option('no-fix', help="Skip additional synchonization.")] |
275.1.3
by Daniel Silverstone
Fix up fetch_ghosts to lock the branches, and to invoke bzr fix if it fetches any ghosts into the tree |
121 |
def run(self, branch=None, no_fix=False): |
246
by Aaron Bentley
Merged shelf_v2 |
122 |
from fetch_ghosts import fetch_ghosts |
707
by Aaron Bentley
Clean up fetch_ghosts. |
123 |
fetch_ghosts(branch, do_reconcile=not no_fix) |
246
by Aaron Bentley
Merged shelf_v2 |
124 |
|
125 |
strip_help="""Strip the smallest prefix containing num leading slashes from \ |
|
126 |
each file name found in the patch file."""
|
|
445
by Aaron Bentley
Remove shove, tweak imports, docs |
127 |
|
128 |
||
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
129 |
class cmd_patch(BzrToolsCommand): |
415
by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions |
130 |
"""Apply a named patch to the current tree.
|
246
by Aaron Bentley
Merged shelf_v2 |
131 |
"""
|
132 |
takes_args = ['filename?'] |
|
496
by Aaron Bentley
Add --silent option to patch |
133 |
takes_options = [Option('strip', type=int, help=strip_help), |
553.1.1
by Vincent Ladeuil
Fix option help strings to comply with the style guide. |
134 |
Option('silent', help='Suppress chatter.')] |
496
by Aaron Bentley
Add --silent option to patch |
135 |
def run(self, filename=None, strip=None, silent=False): |
246
by Aaron Bentley
Merged shelf_v2 |
136 |
from patch import patch |
340
by Aaron Bentley
Fixed patch on checkouts |
137 |
from bzrlib.workingtree import WorkingTree |
138 |
wt = WorkingTree.open_containing('.')[0] |
|
473
by Aaron Bentley
Clean up patch command (support http urls again) |
139 |
if strip is None: |
140 |
strip = 0 |
|
496
by Aaron Bentley
Add --silent option to patch |
141 |
return patch(wt, filename, strip, silent) |
246
by Aaron Bentley
Merged shelf_v2 |
142 |
|
427
by Aaron Bentley
Merge latest changes from Shelf |
143 |
|
668
by Aaron Bentley
Rename shelve/unshelve to shelve1/unshelve1, alias to old names |
144 |
class cmd_shelve1(BzrToolsCommand): |
415
by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions |
145 |
"""Temporarily set aside some changes from the current tree.
|
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
146 |
|
147 |
Shelve allows you to temporarily put changes you've made "on the shelf",
|
|
148 |
ie. out of the way, until a later time when you can bring them back from
|
|
669
by Aaron Bentley
Update docs |
149 |
the shelf with the 'unshelve1' command.
|
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
150 |
|
289
by Aaron Bentley
Updated shelf help |
151 |
Shelve is intended to help separate several sets of text changes that have
|
152 |
been inappropriately mingled. If you just want to get rid of all changes
|
|
153 |
(text and otherwise) and you don't need to restore them later, use revert.
|
|
669
by Aaron Bentley
Update docs |
154 |
If you want to shelve all text changes at once, use shelve1 --all.
|
289
by Aaron Bentley
Updated shelf help |
155 |
|
669
by Aaron Bentley
Update docs |
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.
|
|
0.1.90
by Michael Ellerman
Update help text to try and be clearer, some stolen from bzrtools. |
158 |
|
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
159 |
If filenames are specified, only the changes to those files will be
|
160 |
shelved, other files will be left untouched.
|
|
161 |
||
162 |
If a revision is specified, changes since that revision will be shelved.
|
|
0.1.113
by Michael Ellerman
Support for unshelving in arbitrary order. |
163 |
|
164 |
You can put multiple items on the shelf. Normally each time you run
|
|
669
by Aaron Bentley
Update docs |
165 |
unshelve1 the most recently shelved changes will be reinstated. However,
|
0.1.113
by Michael Ellerman
Support for unshelving in arbitrary order. |
166 |
you can also unshelve changes in a different order by explicitly
|
669
by Aaron Bentley
Update docs |
167 |
specifiying which changes to unshelve1. This works best when the changes
|
0.1.113
by Michael Ellerman
Support for unshelving in arbitrary order. |
168 |
don't depend on each other.
|
0.7.3
by Michael Ellerman
Add a reference from 'shelve' help to 'shelf'. |
169 |
|
170 |
While you have patches on the shelf you can view and manipulate them with
|
|
689
by Aaron Bentley
Clarify distinction between shelf1/shelf2 commands |
171 |
the 'shelf1' command. Run 'bzr shelf1 -h' for more info.
|
0.1.90
by Michael Ellerman
Update help text to try and be clearer, some stolen from bzrtools. |
172 |
"""
|
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
173 |
|
174 |
takes_args = ['file*'] |
|
556
by Aaron Bentley
Fix shelf's message parameter |
175 |
takes_options = [Option('message', |
176 |
help='A message to associate with the shelved changes.', |
|
561
by Aaron Bentley
Fix shelf message option |
177 |
short_name='m', type=unicode), |
556
by Aaron Bentley
Fix shelf's message parameter |
178 |
'revision', |
553.1.1
by Vincent Ladeuil
Fix option help strings to comply with the style guide. |
179 |
Option('all', help='Shelve all changes without prompting.'), |
180 |
Option('no-color', help='Never display changes in color.')] |
|
0.1.90
by Michael Ellerman
Update help text to try and be clearer, some stolen from bzrtools. |
181 |
|
423.1.4
by Aaron Bentley
Add --no-color option to shelf |
182 |
def run(self, all=False, file_list=None, message=None, revision=None, |
183 |
no_color=False): |
|
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
184 |
if revision is not None and revision: |
185 |
if len(revision) == 1: |
|
186 |
revision = revision[0] |
|
187 |
else: |
|
188 |
raise CommandError("shelve only accepts a single revision " |
|
189 |
"parameter.") |
|
190 |
||
191 |
source = BzrPatchSource(revision, file_list) |
|
512
by Aaron Bentley
More import-time fixups |
192 |
s = shelf.Shelf(source.base) |
423.1.4
by Aaron Bentley
Add --no-color option to shelf |
193 |
s.shelve(source, all, message, no_color) |
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
194 |
return 0 |
195 |
||
0.1.109
by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'. |
196 |
|
689
by Aaron Bentley
Clarify distinction between shelf1/shelf2 commands |
197 |
# The following classes are only used as subcommands for 'shelf1', they're
|
0.1.109
by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'. |
198 |
# not to be registered directly with bzr.
|
199 |
||
200 |
class cmd_shelf_list(bzrlib.commands.Command): |
|
201 |
"""List the patches on the current shelf."""
|
|
202 |
aliases = ['list', 'ls'] |
|
203 |
def run(self): |
|
204 |
self.shelf.list() |
|
205 |
||
206 |
||
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) |
|
213 |
||
214 |
||
215 |
class cmd_shelf_switch(bzrlib.commands.Command): |
|
216 |
"""Switch to the other shelf, create it if necessary."""
|
|
217 |
aliases = ['switch'] |
|
0.1.117
by Michael Ellerman
Arg names with hyphens don't seem to work (broke shelf switch). |
218 |
takes_args = ['othershelf'] |
219 |
def run(self, othershelf): |
|
512
by Aaron Bentley
More import-time fixups |
220 |
s = shelf.Shelf(self.shelf.base, othershelf) |
0.1.109
by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'. |
221 |
s.make_default() |
222 |
||
223 |
||
224 |
class cmd_shelf_show(bzrlib.commands.Command): |
|
0.1.110
by Michael Ellerman
Make the patch argument to 'shelf show' optional. |
225 |
"""Show the contents of the specified or topmost patch."""
|
0.1.109
by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'. |
226 |
aliases = ['show', 'cat', 'display'] |
0.1.110
by Michael Ellerman
Make the patch argument to 'shelf show' optional. |
227 |
takes_args = ['patch?'] |
228 |
def run(self, patch=None): |
|
0.1.109
by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'. |
229 |
self.shelf.display(patch) |
230 |
||
231 |
||
232 |
class cmd_shelf_upgrade(bzrlib.commands.Command): |
|
233 |
"""Upgrade old format shelves."""
|
|
234 |
aliases = ['upgrade'] |
|
235 |
def run(self): |
|
236 |
self.shelf.upgrade() |
|
237 |
||
238 |
||
689
by Aaron Bentley
Clarify distinction between shelf1/shelf2 commands |
239 |
class cmd_shelf1(BzrToolsCommand): |
669
by Aaron Bentley
Update docs |
240 |
"""Perform various operations on your shelved patches. See also shelve1."""
|
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
241 |
takes_args = ['subcommand', 'args*'] |
242 |
||
0.1.109
by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'. |
243 |
subcommands = [cmd_shelf_list, cmd_shelf_delete, cmd_shelf_switch, |
244 |
cmd_shelf_show, cmd_shelf_upgrade] |
|
245 |
||
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
246 |
def run(self, subcommand, args_list): |
247 |
import sys |
|
248 |
||
456.1.1
by Aaron Bentley
Fix shelf ls with no args (Alexander Belchenko) |
249 |
if args_list is None: |
250 |
args_list = [] |
|
0.1.109
by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'. |
251 |
cmd = self._get_cmd_object(subcommand) |
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
252 |
source = BzrPatchSource() |
512
by Aaron Bentley
More import-time fixups |
253 |
s = shelf.Shelf(source.base) |
0.1.109
by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'. |
254 |
cmd.shelf = s |
0.7.4
by Michael Ellerman
Cope with run_argv_aliases() API change |
255 |
|
256 |
if args_list is None: |
|
257 |
args_list = [] |
|
0.1.109
by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'. |
258 |
return cmd.run_argv_aliases(args_list) |
259 |
||
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: |
|
264 |
return cmd_class() |
|
265 |
raise CommandError("Unknown shelf subcommand '%s'" % cmd_name) |
|
266 |
||
267 |
def help(self): |
|
0.1.111
by Michael Ellerman
Make help for subcommands more readable, print options in help also. |
268 |
text = ["%s\n\nSubcommands:\n" % self.__doc__] |
0.1.109
by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'. |
269 |
|
270 |
for cmd_class in self.subcommands: |
|
0.1.111
by Michael Ellerman
Make help for subcommands more readable, print options in help also. |
271 |
text.extend(self.sub_help(cmd_class) + ['\n']) |
272 |
||
273 |
return ''.join(text) |
|
274 |
||
275 |
def sub_help(self, cmd_class): |
|
276 |
text = [] |
|
277 |
cmd_obj = cmd_class() |
|
278 |
indent = 2 * ' ' |
|
279 |
||
531.1.1
by Aaron Bentley
Add test for shelf help, since it's custom |
280 |
usage = cmd_obj._usage() |
0.1.111
by Michael Ellerman
Make help for subcommands more readable, print options in help also. |
281 |
usage = usage.replace('bzr shelf-', '') |
282 |
text.append('%s%s\n' % (indent, usage)) |
|
283 |
||
284 |
text.append('%s%s\n' % (2 * indent, cmd_class.__doc__)) |
|
285 |
||
286 |
# Somewhat copied from bzrlib.help.help_on_command_options
|
|
287 |
option_help = [] |
|
288 |
for option_name, option in sorted(cmd_obj.options().items()): |
|
289 |
if option_name == 'help': |
|
290 |
continue
|
|
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)) |
|
297 |
||
298 |
if len(option_help) > 0: |
|
299 |
text.append('%soptions:\n' % (2 * indent)) |
|
300 |
text.extend(option_help) |
|
301 |
||
302 |
return text |
|
0.1.109
by Michael Ellerman
Hijack the bzr command infrastructure to do subcommands for 'shelf'. |
303 |
|
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
304 |
|
668
by Aaron Bentley
Rename shelve/unshelve to shelve1/unshelve1, alias to old names |
305 |
class cmd_unshelve1(BzrToolsCommand): |
415
by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions |
306 |
"""Restore shelved changes.
|
0.1.113
by Michael Ellerman
Support for unshelving in arbitrary order. |
307 |
|
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.
|
|
310 |
||
669
by Aaron Bentley
Update docs |
311 |
See 'shelve1' for more information.
|
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
312 |
"""
|
0.1.91
by Michael Ellerman
Add --force option to unshelve, which runs the shelved changes through |
313 |
takes_options = [ |
553.1.1
by Vincent Ladeuil
Fix option help strings to comply with the style guide. |
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.') |
|
423.1.4
by Aaron Bentley
Add --no-color option to shelf |
317 |
]
|
0.1.113
by Michael Ellerman
Support for unshelving in arbitrary order. |
318 |
takes_args = ['patch?'] |
423.1.4
by Aaron Bentley
Add --no-color option to shelf |
319 |
def run(self, patch=None, all=False, force=False, no_color=False): |
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
320 |
source = BzrPatchSource() |
512
by Aaron Bentley
More import-time fixups |
321 |
s = shelf.Shelf(source.base) |
423.1.4
by Aaron Bentley
Add --no-color option to shelf |
322 |
s.unshelve(source, patch, all, force, no_color) |
0.1.73
by Michael Ellerman
Merge most of the standalone shelf branch. This brings in a few changes which |
323 |
return 0 |
324 |
||
0.1.22
by Michael Ellerman
Add __init__.py, put cmd_shelve/unshelve in there. |
325 |
|
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
326 |
class cmd_shell(BzrToolsCommand): |
415
by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions |
327 |
"""Begin an interactive shell tailored for bzr.
|
287
by Aaron Bentley
Added shell docstring |
328 |
Bzr commands can be used without typing bzr first, and will be run natively
|
329 |
when possible. Tab completion is tailored for bzr. The shell prompt shows
|
|
330 |
the branch nick, revno, and path.
|
|
331 |
||
332 |
If it encounters any moderately complicated shell command, it will punt to
|
|
333 |
the system shell.
|
|
334 |
||
335 |
Example:
|
|
336 |
$ bzr shell
|
|
337 |
bzr bzrtools:287/> status
|
|
338 |
modified:
|
|
339 |
__init__.py
|
|
340 |
bzr bzrtools:287/> status --[TAB][TAB]
|
|
341 |
--all --help --revision --show-ids
|
|
342 |
bzr bzrtools:287/> status --
|
|
343 |
"""
|
|
249
by Aaron Bentley
Got the shell basics working properly |
344 |
def run(self): |
345 |
import shell |
|
281
by Aaron Bentley
Handled whitespace branch names better |
346 |
return shell.run_shell() |
246
by Aaron Bentley
Merged shelf_v2 |
347 |
|
445
by Aaron Bentley
Remove shove, tweak imports, docs |
348 |
|
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
349 |
class cmd_branch_history(BzrToolsCommand): |
292
by Aaron Bentley
Introduced branch-history command |
350 |
"""\
|
415
by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions |
351 |
Display the development history of a branch.
|
292
by Aaron Bentley
Introduced branch-history command |
352 |
|
293
by Aaron Bentley
Updated help |
353 |
Each different committer or branch nick is considered a different line of
|
354 |
development. Committers are treated as the same if they have the same
|
|
355 |
name, or if they have the same email address.
|
|
292
by Aaron Bentley
Introduced branch-history command |
356 |
"""
|
357 |
takes_args = ["branch?"] |
|
358 |
def run(self, branch=None): |
|
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
359 |
from branchhistory import branch_history |
292
by Aaron Bentley
Introduced branch-history command |
360 |
return branch_history(branch) |
361 |
||
345
by Aaron Bentley
Added zap command |
362 |
|
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
363 |
class cmd_zap(BzrToolsCommand): |
345
by Aaron Bentley
Added zap command |
364 |
"""\
|
415
by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions |
365 |
Remove a lightweight checkout, if it can be done safely.
|
411
by Aaron Bentley
Update zap documentation |
366 |
|
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
|
|
369 |
uncommitted changes.
|
|
370 |
||
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).
|
|
345
by Aaron Bentley
Added zap command |
373 |
"""
|
553.1.1
by Vincent Ladeuil
Fix option help strings to comply with the style guide. |
374 |
takes_options = [Option("branch", help="Remove associated branch from" |
573.1.3
by Aaron Bentley
Allow zap --force to delete modified checkouts |
375 |
" repository."), |
376 |
Option('force', help='Delete tree even if contents are' |
|
377 |
' modified.')] |
|
345
by Aaron Bentley
Added zap command |
378 |
takes_args = ["checkout"] |
573.1.3
by Aaron Bentley
Allow zap --force to delete modified checkouts |
379 |
def run(self, checkout, branch=False, force=False): |
345
by Aaron Bentley
Added zap command |
380 |
from zap import zap |
573.1.3
by Aaron Bentley
Allow zap --force to delete modified checkouts |
381 |
return zap(checkout, remove_branch=branch, allow_modified=force) |
345
by Aaron Bentley
Added zap command |
382 |
|
383 |
||
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
384 |
class cmd_cbranch(BzrToolsCommand): |
349
by Aaron Bentley
Added cbranch command |
385 |
"""
|
415
by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions |
386 |
Create a new checkout, associated with a new repository branch.
|
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
387 |
|
486
by Aaron Bentley
Support deep cbranch hierarcy via appendpath |
388 |
When you cbranch, bzr looks up a target location in locations.conf, and
|
389 |
creates the branch there.
|
|
390 |
||
391 |
In your locations.conf, add the following lines:
|
|
392 |
[/working_directory_root]
|
|
393 |
cbranch_target = /branch_root
|
|
394 |
cbranch_target:policy = appendpath
|
|
395 |
||
396 |
This will mean that if you run "bzr cbranch foo/bar foo/baz" in the
|
|
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
397 |
working directory root, the branch will be created in
|
486
by Aaron Bentley
Support deep cbranch hierarcy via appendpath |
398 |
"/branch_root/foo/baz"
|
399 |
||
400 |
NOTE: cbranch also supports "cbranch_root", but that behaviour is
|
|
401 |
deprecated.
|
|
349
by Aaron Bentley
Added cbranch command |
402 |
"""
|
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
403 |
takes_options = [Option("lightweight", |
596.1.1
by Aaron Bentley
Update cbranch to accelerate checkouts |
404 |
help="Create a lightweight checkout."), 'revision', |
600
by Aaron Bentley
Rename from-files to files-from, to match bzr proper |
405 |
Option('files-from', type=unicode, |
596.1.1
by Aaron Bentley
Update cbranch to accelerate checkouts |
406 |
help='Accelerate checkout using files from this' |
619
by Aaron Bentley
Add support for hard-link in cbranch |
407 |
' tree.'), |
408 |
Option('hardlink', |
|
409 |
help='Hard-link files from source/files-from tree' |
|
410 |
' where posible.')] |
|
355.1.2
by Aaron Bentley
cbranch mimics checkout wrt --lightweight |
411 |
takes_args = ["source", "target?"] |
596.1.1
by Aaron Bentley
Update cbranch to accelerate checkouts |
412 |
def run(self, source, target=None, lightweight=False, revision=None, |
619
by Aaron Bentley
Add support for hard-link in cbranch |
413 |
files_from=None, hardlink=False): |
349
by Aaron Bentley
Added cbranch command |
414 |
from cbranch import cbranch |
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
415 |
return cbranch(source, target, lightweight=lightweight, |
619
by Aaron Bentley
Add support for hard-link in cbranch |
416 |
revision=revision, files_from=files_from, |
417 |
hardlink=hardlink) |
|
355.1.2
by Aaron Bentley
cbranch mimics checkout wrt --lightweight |
418 |
|
349
by Aaron Bentley
Added cbranch command |
419 |
|
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
420 |
class cmd_branches(BzrToolsCommand): |
415
by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions |
421 |
"""Scan a location for branches"""
|
352
by Aaron Bentley
Added branches subcommand |
422 |
takes_args = ["location?"] |
423 |
def run(self, location=None): |
|
424 |
from branches import branches |
|
425 |
return branches(location) |
|
426 |
||
603
by Aaron Bentley
Update branches, multi-pull to new APIs, create trees |
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)) |
|
353
by Aaron Bentley
Added multi-pull, working on branches and checkouts |
437 |
|
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
438 |
class cmd_multi_pull(BzrToolsCommand): |
415
by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions |
439 |
"""Pull all the branches under a location, e.g. a repository.
|
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
440 |
|
353
by Aaron Bentley
Added multi-pull, working on branches and checkouts |
441 |
Both branches present in the directory and the branches of checkouts are
|
442 |
pulled.
|
|
443 |
"""
|
|
444 |
takes_args = ["location?"] |
|
445 |
def run(self, location=None): |
|
446 |
from bzrlib.transport import get_transport |
|
447 |
from bzrtools import iter_branch_tree |
|
448 |
if location is None: |
|
449 |
location = '.' |
|
450 |
t = get_transport(location) |
|
572
by Aaron Bentley
multi-pull reuses connections where possible |
451 |
possible_transports = [] |
353
by Aaron Bentley
Added multi-pull, working on branches and checkouts |
452 |
if not t.listable(): |
453 |
print "Can't list this type of location." |
|
454 |
return 3 |
|
455 |
for branch, wt in iter_branch_tree(t): |
|
456 |
if wt is None: |
|
457 |
pullable = branch |
|
458 |
else: |
|
459 |
pullable = wt |
|
460 |
parent = branch.get_parent() |
|
461 |
if parent is None: |
|
462 |
continue
|
|
463 |
if wt is not None: |
|
464 |
base = wt.basedir |
|
465 |
else: |
|
466 |
base = branch.base |
|
467 |
if base.startswith(t.base): |
|
468 |
relpath = base[len(t.base):].rstrip('/') |
|
469 |
else: |
|
470 |
relpath = base |
|
471 |
print "Pulling %s from %s" % (relpath, parent) |
|
472 |
try: |
|
572
by Aaron Bentley
multi-pull reuses connections where possible |
473 |
branch_t = get_transport(parent, possible_transports) |
474 |
pullable.pull(Branch.open_from_transport(branch_t)) |
|
353
by Aaron Bentley
Added multi-pull, working on branches and checkouts |
475 |
except Exception, e: |
476 |
print e |
|
477 |
||
478 |
||
603
by Aaron Bentley
Update branches, multi-pull to new APIs, create trees |
479 |
|
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
480 |
class cmd_import(BzrToolsCommand): |
490
by Aaron Bentley
Improve bzr import docs |
481 |
"""Import sources from a directory, tarball or zip file
|
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
482 |
|
490
by Aaron Bentley
Improve bzr import docs |
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.
|
|
380
by Aaron Bentley
Got import working decently |
487 |
|
488 |
Tarballs may be gzip or bzip2 compressed. This is autodetected.
|
|
489 |
||
490
by Aaron Bentley
Improve bzr import docs |
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.
|
|
380
by Aaron Bentley
Got import working decently |
492 |
"""
|
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
493 |
|
380
by Aaron Bentley
Got import working decently |
494 |
takes_args = ['source', 'tree?'] |
495 |
def run(self, source, tree=None): |
|
377
by Aaron Bentley
Got import command working |
496 |
from upstream_import import do_import |
380
by Aaron Bentley
Got import working decently |
497 |
do_import(source, tree) |
377
by Aaron Bentley
Got import command working |
498 |
|
392.1.1
by Aaron Bentley
Implement 'shove' for moving changes to other trees |
499 |
|
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
500 |
class cmd_cdiff(BzrToolsCommand): |
415
by Aaron Bentley
Remove <BZRTOOLS> tag from command descriptions |
501 |
"""A color version of bzr's diff"""
|
410
by Aaron Bentley
Ensure the option settings come from the right 'diff' in colordiff |
502 |
takes_args = property(lambda x: get_cmd_object('diff').takes_args) |
560
by Aaron Bentley
Update cdiff option definition |
503 |
takes_options = list(get_cmd_object('diff').takes_options) + [ |
680.1.3
by Benoît Pierre
Add --color=MODE option to cdiff; MODE can be: |
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.', |
|
684
by Aaron Bentley
Fix cdiff color switch by deferring to DiffWriter |
510 |
always='Always colorize output (default).'), |
560
by Aaron Bentley
Update cdiff option definition |
511 |
Option('check-style', |
500
by Aaron Bentley
Add help |
512 |
help='Warn if trailing whitespace or spurious changes have been' |
560
by Aaron Bentley
Update cdiff option definition |
513 |
' added.')] |
497
by Aaron Bentley
Add optional style checks to colordiff |
514 |
|
680.1.3
by Benoît Pierre
Add --color=MODE option to cdiff; MODE can be: |
515 |
def run(self, color='always', check_style=False, *args, **kwargs): |
399
by Aaron Bentley
Implement cdiff (based on old Fai code) |
516 |
from colordiff import colordiff |
680.1.3
by Benoît Pierre
Add --color=MODE option to cdiff; MODE can be: |
517 |
colordiff(color, check_style, *args, **kwargs) |
360.1.3
by Aaron Bentley
Add experimental branch-mark command |
518 |
|
430
by Aaron Bentley
Avoid loading PyBaz unless running baz-import |
519 |
|
698
by Aaron Bentley
Implement conflict-diff |
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 = [ |
|
699
by Aaron Bentley
Clean up conflict-diff |
527 |
RegistryOption.from_kwargs('direction', 'Direction of comparison.', |
528 |
value_switches=True, enum_switch=False, |
|
698
by Aaron Bentley
Implement conflict-diff |
529 |
other='Compare OTHER against common base.', |
530 |
this='Compare THIS against common base.')] |
|
531 |
||
699
by Aaron Bentley
Clean up conflict-diff |
532 |
def run(self, file, direction='other'): |
698
by Aaron Bentley
Implement conflict-diff |
533 |
from bzrlib.plugins.bzrtools.colordiff import DiffWriter |
702
by Aaron Bentley
Get conflict-diff under test. |
534 |
from conflict_diff import conflict_diff |
698
by Aaron Bentley
Implement conflict-diff |
535 |
dw = DiffWriter(self.outf, check_style=False, color='auto') |
702
by Aaron Bentley
Get conflict-diff under test. |
536 |
conflict_diff(dw, file, direction) |
698
by Aaron Bentley
Implement conflict-diff |
537 |
|
538 |
||
568
by Aaron Bentley
Don't check version when running non-bzrtools commands |
539 |
class cmd_rspush(BzrToolsCommand): |
460
by Aaron Bentley
Add encoding parameter everywhere |
540 |
"""Upload this branch to another location using rsync.
|
541 |
||
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
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.
|
|
460
by Aaron Bentley
Add encoding parameter everywhere |
546 |
"""
|
547 |
takes_args = ['location?'] |
|
548 |
takes_options = [Option('overwrite', help='Ignore differences between' |
|
553.1.1
by Vincent Ladeuil
Fix option help strings to comply with the style guide. |
549 |
' branches and overwrite unconditionally.'), |
460
by Aaron Bentley
Add encoding parameter everywhere |
550 |
Option('no-tree', help='Do not push the working tree,' |
551 |
' just the .bzr.')] |
|
552 |
||
553 |
def run(self, location=None, overwrite=False, no_tree=False): |
|
554 |
from bzrlib import workingtree |
|
555 |
import bzrtools |
|
556 |
cur_branch = workingtree.WorkingTree.open_containing(".")[0] |
|
531.2.2
by Charlie Shepherd
Remove all trailing whitespace |
557 |
bzrtools.rspush(cur_branch, location, overwrite=overwrite, |
460
by Aaron Bentley
Add encoding parameter everywhere |
558 |
working_tree=not no_tree) |
559 |
||
560 |
||
622
by Aaron Bentley
Add link-tree command |
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() |
|
711
by Aaron Bentley
Implement create-mirror command |
582 |
|
583 |
||
584 |
class cmd_create_mirror(BzrToolsCommand): |
|
585 |
"""Create a mirror of another branch.
|
|
586 |
||
712
by Aaron Bentley
Copy submit branch in create_mirror. |
587 |
This is similar to `bzr branch`, but copies more settings, including the
|
588 |
submit branch and nickname.
|
|
711
by Aaron Bentley
Implement create-mirror command |
589 |
|
590 |
It sets the public branch and parent of the target to the source location.
|
|
591 |
"""
|
|
592 |
||
593 |
takes_args = ['source', 'target'] |
|
594 |
||
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, []) |