##// END OF EJS Templates
crecord: rewrite status line text (BC)...
Jun Wu -
r30546:9b674957 default
parent child Browse files
Show More
@@ -1,1631 +1,1655 b''
1 # stuff related specifically to patch manipulation / parsing
1 # stuff related specifically to patch manipulation / parsing
2 #
2 #
3 # Copyright 2008 Mark Edgington <edgimar@gmail.com>
3 # Copyright 2008 Mark Edgington <edgimar@gmail.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7 #
7 #
8 # This code is based on the Mark Edgington's crecord extension.
8 # This code is based on the Mark Edgington's crecord extension.
9 # (Itself based on Bryan O'Sullivan's record extension.)
9 # (Itself based on Bryan O'Sullivan's record extension.)
10
10
11 from __future__ import absolute_import
11 from __future__ import absolute_import
12
12
13 import locale
13 import locale
14 import os
14 import os
15 import re
15 import re
16 import signal
16 import signal
17
17
18 from .i18n import _
18 from .i18n import _
19 from . import (
19 from . import (
20 encoding,
20 encoding,
21 error,
21 error,
22 patch as patchmod,
22 patch as patchmod,
23 scmutil,
23 scmutil,
24 util,
24 util,
25 )
25 )
26 stringio = util.stringio
26 stringio = util.stringio
27
27
28 # This is required for ncurses to display non-ASCII characters in default user
28 # This is required for ncurses to display non-ASCII characters in default user
29 # locale encoding correctly. --immerrr
29 # locale encoding correctly. --immerrr
30 locale.setlocale(locale.LC_ALL, u'')
30 locale.setlocale(locale.LC_ALL, u'')
31
31
32 # patch comments based on the git one
32 # patch comments based on the git one
33 diffhelptext = _("""# To remove '-' lines, make them ' ' lines (context).
33 diffhelptext = _("""# To remove '-' lines, make them ' ' lines (context).
34 # To remove '+' lines, delete them.
34 # To remove '+' lines, delete them.
35 # Lines starting with # will be removed from the patch.
35 # Lines starting with # will be removed from the patch.
36 """)
36 """)
37
37
38 hunkhelptext = _("""#
38 hunkhelptext = _("""#
39 # If the patch applies cleanly, the edited hunk will immediately be
39 # If the patch applies cleanly, the edited hunk will immediately be
40 # added to the record list. If it does not apply cleanly, a rejects file
40 # added to the record list. If it does not apply cleanly, a rejects file
41 # will be generated. You can use that when you try again. If all lines
41 # will be generated. You can use that when you try again. If all lines
42 # of the hunk are removed, then the edit is aborted and the hunk is left
42 # of the hunk are removed, then the edit is aborted and the hunk is left
43 # unchanged.
43 # unchanged.
44 """)
44 """)
45
45
46 patchhelptext = _("""#
46 patchhelptext = _("""#
47 # If the patch applies cleanly, the edited patch will immediately
47 # If the patch applies cleanly, the edited patch will immediately
48 # be finalised. If it does not apply cleanly, rejects files will be
48 # be finalised. If it does not apply cleanly, rejects files will be
49 # generated. You can use those when you try again.
49 # generated. You can use those when you try again.
50 """)
50 """)
51
51
52 try:
52 try:
53 import curses
53 import curses
54 curses.error
54 curses.error
55 except ImportError:
55 except ImportError:
56 # I have no idea if wcurses works with crecord...
56 # I have no idea if wcurses works with crecord...
57 try:
57 try:
58 import wcurses as curses
58 import wcurses as curses
59 curses.error
59 curses.error
60 except ImportError:
60 except ImportError:
61 # wcurses is not shipped on Windows by default, or python is not
61 # wcurses is not shipped on Windows by default, or python is not
62 # compiled with curses
62 # compiled with curses
63 curses = False
63 curses = False
64
64
65 def checkcurses(ui):
65 def checkcurses(ui):
66 """Return True if the user wants to use curses
66 """Return True if the user wants to use curses
67
67
68 This method returns True if curses is found (and that python is built with
68 This method returns True if curses is found (and that python is built with
69 it) and that the user has the correct flag for the ui.
69 it) and that the user has the correct flag for the ui.
70 """
70 """
71 return curses and ui.interface("chunkselector") == "curses"
71 return curses and ui.interface("chunkselector") == "curses"
72
72
73 class patchnode(object):
73 class patchnode(object):
74 """abstract class for patch graph nodes
74 """abstract class for patch graph nodes
75 (i.e. patchroot, header, hunk, hunkline)
75 (i.e. patchroot, header, hunk, hunkline)
76 """
76 """
77
77
78 def firstchild(self):
78 def firstchild(self):
79 raise NotImplementedError("method must be implemented by subclass")
79 raise NotImplementedError("method must be implemented by subclass")
80
80
81 def lastchild(self):
81 def lastchild(self):
82 raise NotImplementedError("method must be implemented by subclass")
82 raise NotImplementedError("method must be implemented by subclass")
83
83
84 def allchildren(self):
84 def allchildren(self):
85 "Return a list of all of the direct children of this node"
85 "Return a list of all of the direct children of this node"
86 raise NotImplementedError("method must be implemented by subclass")
86 raise NotImplementedError("method must be implemented by subclass")
87
87
88 def nextsibling(self):
88 def nextsibling(self):
89 """
89 """
90 Return the closest next item of the same type where there are no items
90 Return the closest next item of the same type where there are no items
91 of different types between the current item and this closest item.
91 of different types between the current item and this closest item.
92 If no such item exists, return None.
92 If no such item exists, return None.
93 """
93 """
94 raise NotImplementedError("method must be implemented by subclass")
94 raise NotImplementedError("method must be implemented by subclass")
95
95
96 def prevsibling(self):
96 def prevsibling(self):
97 """
97 """
98 Return the closest previous item of the same type where there are no
98 Return the closest previous item of the same type where there are no
99 items of different types between the current item and this closest item.
99 items of different types between the current item and this closest item.
100 If no such item exists, return None.
100 If no such item exists, return None.
101 """
101 """
102 raise NotImplementedError("method must be implemented by subclass")
102 raise NotImplementedError("method must be implemented by subclass")
103
103
104 def parentitem(self):
104 def parentitem(self):
105 raise NotImplementedError("method must be implemented by subclass")
105 raise NotImplementedError("method must be implemented by subclass")
106
106
107 def nextitem(self, skipfolded=True):
107 def nextitem(self, skipfolded=True):
108 """
108 """
109 Try to return the next item closest to this item, regardless of item's
109 Try to return the next item closest to this item, regardless of item's
110 type (header, hunk, or hunkline).
110 type (header, hunk, or hunkline).
111
111
112 If skipfolded == True, and the current item is folded, then the child
112 If skipfolded == True, and the current item is folded, then the child
113 items that are hidden due to folding will be skipped when determining
113 items that are hidden due to folding will be skipped when determining
114 the next item.
114 the next item.
115
115
116 If it is not possible to get the next item, return None.
116 If it is not possible to get the next item, return None.
117 """
117 """
118 try:
118 try:
119 itemfolded = self.folded
119 itemfolded = self.folded
120 except AttributeError:
120 except AttributeError:
121 itemfolded = False
121 itemfolded = False
122 if skipfolded and itemfolded:
122 if skipfolded and itemfolded:
123 nextitem = self.nextsibling()
123 nextitem = self.nextsibling()
124 if nextitem is None:
124 if nextitem is None:
125 try:
125 try:
126 nextitem = self.parentitem().nextsibling()
126 nextitem = self.parentitem().nextsibling()
127 except AttributeError:
127 except AttributeError:
128 nextitem = None
128 nextitem = None
129 return nextitem
129 return nextitem
130 else:
130 else:
131 # try child
131 # try child
132 item = self.firstchild()
132 item = self.firstchild()
133 if item is not None:
133 if item is not None:
134 return item
134 return item
135
135
136 # else try next sibling
136 # else try next sibling
137 item = self.nextsibling()
137 item = self.nextsibling()
138 if item is not None:
138 if item is not None:
139 return item
139 return item
140
140
141 try:
141 try:
142 # else try parent's next sibling
142 # else try parent's next sibling
143 item = self.parentitem().nextsibling()
143 item = self.parentitem().nextsibling()
144 if item is not None:
144 if item is not None:
145 return item
145 return item
146
146
147 # else return grandparent's next sibling (or None)
147 # else return grandparent's next sibling (or None)
148 return self.parentitem().parentitem().nextsibling()
148 return self.parentitem().parentitem().nextsibling()
149
149
150 except AttributeError: # parent and/or grandparent was None
150 except AttributeError: # parent and/or grandparent was None
151 return None
151 return None
152
152
153 def previtem(self):
153 def previtem(self):
154 """
154 """
155 Try to return the previous item closest to this item, regardless of
155 Try to return the previous item closest to this item, regardless of
156 item's type (header, hunk, or hunkline).
156 item's type (header, hunk, or hunkline).
157
157
158 If it is not possible to get the previous item, return None.
158 If it is not possible to get the previous item, return None.
159 """
159 """
160 # try previous sibling's last child's last child,
160 # try previous sibling's last child's last child,
161 # else try previous sibling's last child, else try previous sibling
161 # else try previous sibling's last child, else try previous sibling
162 prevsibling = self.prevsibling()
162 prevsibling = self.prevsibling()
163 if prevsibling is not None:
163 if prevsibling is not None:
164 prevsiblinglastchild = prevsibling.lastchild()
164 prevsiblinglastchild = prevsibling.lastchild()
165 if ((prevsiblinglastchild is not None) and
165 if ((prevsiblinglastchild is not None) and
166 not prevsibling.folded):
166 not prevsibling.folded):
167 prevsiblinglclc = prevsiblinglastchild.lastchild()
167 prevsiblinglclc = prevsiblinglastchild.lastchild()
168 if ((prevsiblinglclc is not None) and
168 if ((prevsiblinglclc is not None) and
169 not prevsiblinglastchild.folded):
169 not prevsiblinglastchild.folded):
170 return prevsiblinglclc
170 return prevsiblinglclc
171 else:
171 else:
172 return prevsiblinglastchild
172 return prevsiblinglastchild
173 else:
173 else:
174 return prevsibling
174 return prevsibling
175
175
176 # try parent (or None)
176 # try parent (or None)
177 return self.parentitem()
177 return self.parentitem()
178
178
179 class patch(patchnode, list): # todo: rename patchroot
179 class patch(patchnode, list): # todo: rename patchroot
180 """
180 """
181 list of header objects representing the patch.
181 list of header objects representing the patch.
182 """
182 """
183 def __init__(self, headerlist):
183 def __init__(self, headerlist):
184 self.extend(headerlist)
184 self.extend(headerlist)
185 # add parent patch object reference to each header
185 # add parent patch object reference to each header
186 for header in self:
186 for header in self:
187 header.patch = self
187 header.patch = self
188
188
189 class uiheader(patchnode):
189 class uiheader(patchnode):
190 """patch header
190 """patch header
191
191
192 xxx shouldn't we move this to mercurial/patch.py ?
192 xxx shouldn't we move this to mercurial/patch.py ?
193 """
193 """
194
194
195 def __init__(self, header):
195 def __init__(self, header):
196 self.nonuiheader = header
196 self.nonuiheader = header
197 # flag to indicate whether to apply this chunk
197 # flag to indicate whether to apply this chunk
198 self.applied = True
198 self.applied = True
199 # flag which only affects the status display indicating if a node's
199 # flag which only affects the status display indicating if a node's
200 # children are partially applied (i.e. some applied, some not).
200 # children are partially applied (i.e. some applied, some not).
201 self.partial = False
201 self.partial = False
202
202
203 # flag to indicate whether to display as folded/unfolded to user
203 # flag to indicate whether to display as folded/unfolded to user
204 self.folded = True
204 self.folded = True
205
205
206 # list of all headers in patch
206 # list of all headers in patch
207 self.patch = None
207 self.patch = None
208
208
209 # flag is False if this header was ever unfolded from initial state
209 # flag is False if this header was ever unfolded from initial state
210 self.neverunfolded = True
210 self.neverunfolded = True
211 self.hunks = [uihunk(h, self) for h in self.hunks]
211 self.hunks = [uihunk(h, self) for h in self.hunks]
212
212
213 def prettystr(self):
213 def prettystr(self):
214 x = stringio()
214 x = stringio()
215 self.pretty(x)
215 self.pretty(x)
216 return x.getvalue()
216 return x.getvalue()
217
217
218 def nextsibling(self):
218 def nextsibling(self):
219 numheadersinpatch = len(self.patch)
219 numheadersinpatch = len(self.patch)
220 indexofthisheader = self.patch.index(self)
220 indexofthisheader = self.patch.index(self)
221
221
222 if indexofthisheader < numheadersinpatch - 1:
222 if indexofthisheader < numheadersinpatch - 1:
223 nextheader = self.patch[indexofthisheader + 1]
223 nextheader = self.patch[indexofthisheader + 1]
224 return nextheader
224 return nextheader
225 else:
225 else:
226 return None
226 return None
227
227
228 def prevsibling(self):
228 def prevsibling(self):
229 indexofthisheader = self.patch.index(self)
229 indexofthisheader = self.patch.index(self)
230 if indexofthisheader > 0:
230 if indexofthisheader > 0:
231 previousheader = self.patch[indexofthisheader - 1]
231 previousheader = self.patch[indexofthisheader - 1]
232 return previousheader
232 return previousheader
233 else:
233 else:
234 return None
234 return None
235
235
236 def parentitem(self):
236 def parentitem(self):
237 """
237 """
238 there is no 'real' parent item of a header that can be selected,
238 there is no 'real' parent item of a header that can be selected,
239 so return None.
239 so return None.
240 """
240 """
241 return None
241 return None
242
242
243 def firstchild(self):
243 def firstchild(self):
244 "return the first child of this item, if one exists. otherwise None."
244 "return the first child of this item, if one exists. otherwise None."
245 if len(self.hunks) > 0:
245 if len(self.hunks) > 0:
246 return self.hunks[0]
246 return self.hunks[0]
247 else:
247 else:
248 return None
248 return None
249
249
250 def lastchild(self):
250 def lastchild(self):
251 "return the last child of this item, if one exists. otherwise None."
251 "return the last child of this item, if one exists. otherwise None."
252 if len(self.hunks) > 0:
252 if len(self.hunks) > 0:
253 return self.hunks[-1]
253 return self.hunks[-1]
254 else:
254 else:
255 return None
255 return None
256
256
257 def allchildren(self):
257 def allchildren(self):
258 "return a list of all of the direct children of this node"
258 "return a list of all of the direct children of this node"
259 return self.hunks
259 return self.hunks
260
260
261 def __getattr__(self, name):
261 def __getattr__(self, name):
262 return getattr(self.nonuiheader, name)
262 return getattr(self.nonuiheader, name)
263
263
264 class uihunkline(patchnode):
264 class uihunkline(patchnode):
265 "represents a changed line in a hunk"
265 "represents a changed line in a hunk"
266 def __init__(self, linetext, hunk):
266 def __init__(self, linetext, hunk):
267 self.linetext = linetext
267 self.linetext = linetext
268 self.applied = True
268 self.applied = True
269 # the parent hunk to which this line belongs
269 # the parent hunk to which this line belongs
270 self.hunk = hunk
270 self.hunk = hunk
271 # folding lines currently is not used/needed, but this flag is needed
271 # folding lines currently is not used/needed, but this flag is needed
272 # in the previtem method.
272 # in the previtem method.
273 self.folded = False
273 self.folded = False
274
274
275 def prettystr(self):
275 def prettystr(self):
276 return self.linetext
276 return self.linetext
277
277
278 def nextsibling(self):
278 def nextsibling(self):
279 numlinesinhunk = len(self.hunk.changedlines)
279 numlinesinhunk = len(self.hunk.changedlines)
280 indexofthisline = self.hunk.changedlines.index(self)
280 indexofthisline = self.hunk.changedlines.index(self)
281
281
282 if (indexofthisline < numlinesinhunk - 1):
282 if (indexofthisline < numlinesinhunk - 1):
283 nextline = self.hunk.changedlines[indexofthisline + 1]
283 nextline = self.hunk.changedlines[indexofthisline + 1]
284 return nextline
284 return nextline
285 else:
285 else:
286 return None
286 return None
287
287
288 def prevsibling(self):
288 def prevsibling(self):
289 indexofthisline = self.hunk.changedlines.index(self)
289 indexofthisline = self.hunk.changedlines.index(self)
290 if indexofthisline > 0:
290 if indexofthisline > 0:
291 previousline = self.hunk.changedlines[indexofthisline - 1]
291 previousline = self.hunk.changedlines[indexofthisline - 1]
292 return previousline
292 return previousline
293 else:
293 else:
294 return None
294 return None
295
295
296 def parentitem(self):
296 def parentitem(self):
297 "return the parent to the current item"
297 "return the parent to the current item"
298 return self.hunk
298 return self.hunk
299
299
300 def firstchild(self):
300 def firstchild(self):
301 "return the first child of this item, if one exists. otherwise None."
301 "return the first child of this item, if one exists. otherwise None."
302 # hunk-lines don't have children
302 # hunk-lines don't have children
303 return None
303 return None
304
304
305 def lastchild(self):
305 def lastchild(self):
306 "return the last child of this item, if one exists. otherwise None."
306 "return the last child of this item, if one exists. otherwise None."
307 # hunk-lines don't have children
307 # hunk-lines don't have children
308 return None
308 return None
309
309
310 class uihunk(patchnode):
310 class uihunk(patchnode):
311 """ui patch hunk, wraps a hunk and keep track of ui behavior """
311 """ui patch hunk, wraps a hunk and keep track of ui behavior """
312 maxcontext = 3
312 maxcontext = 3
313
313
314 def __init__(self, hunk, header):
314 def __init__(self, hunk, header):
315 self._hunk = hunk
315 self._hunk = hunk
316 self.changedlines = [uihunkline(line, self) for line in hunk.hunk]
316 self.changedlines = [uihunkline(line, self) for line in hunk.hunk]
317 self.header = header
317 self.header = header
318 # used at end for detecting how many removed lines were un-applied
318 # used at end for detecting how many removed lines were un-applied
319 self.originalremoved = self.removed
319 self.originalremoved = self.removed
320
320
321 # flag to indicate whether to display as folded/unfolded to user
321 # flag to indicate whether to display as folded/unfolded to user
322 self.folded = True
322 self.folded = True
323 # flag to indicate whether to apply this chunk
323 # flag to indicate whether to apply this chunk
324 self.applied = True
324 self.applied = True
325 # flag which only affects the status display indicating if a node's
325 # flag which only affects the status display indicating if a node's
326 # children are partially applied (i.e. some applied, some not).
326 # children are partially applied (i.e. some applied, some not).
327 self.partial = False
327 self.partial = False
328
328
329 def nextsibling(self):
329 def nextsibling(self):
330 numhunksinheader = len(self.header.hunks)
330 numhunksinheader = len(self.header.hunks)
331 indexofthishunk = self.header.hunks.index(self)
331 indexofthishunk = self.header.hunks.index(self)
332
332
333 if (indexofthishunk < numhunksinheader - 1):
333 if (indexofthishunk < numhunksinheader - 1):
334 nexthunk = self.header.hunks[indexofthishunk + 1]
334 nexthunk = self.header.hunks[indexofthishunk + 1]
335 return nexthunk
335 return nexthunk
336 else:
336 else:
337 return None
337 return None
338
338
339 def prevsibling(self):
339 def prevsibling(self):
340 indexofthishunk = self.header.hunks.index(self)
340 indexofthishunk = self.header.hunks.index(self)
341 if indexofthishunk > 0:
341 if indexofthishunk > 0:
342 previoushunk = self.header.hunks[indexofthishunk - 1]
342 previoushunk = self.header.hunks[indexofthishunk - 1]
343 return previoushunk
343 return previoushunk
344 else:
344 else:
345 return None
345 return None
346
346
347 def parentitem(self):
347 def parentitem(self):
348 "return the parent to the current item"
348 "return the parent to the current item"
349 return self.header
349 return self.header
350
350
351 def firstchild(self):
351 def firstchild(self):
352 "return the first child of this item, if one exists. otherwise None."
352 "return the first child of this item, if one exists. otherwise None."
353 if len(self.changedlines) > 0:
353 if len(self.changedlines) > 0:
354 return self.changedlines[0]
354 return self.changedlines[0]
355 else:
355 else:
356 return None
356 return None
357
357
358 def lastchild(self):
358 def lastchild(self):
359 "return the last child of this item, if one exists. otherwise None."
359 "return the last child of this item, if one exists. otherwise None."
360 if len(self.changedlines) > 0:
360 if len(self.changedlines) > 0:
361 return self.changedlines[-1]
361 return self.changedlines[-1]
362 else:
362 else:
363 return None
363 return None
364
364
365 def allchildren(self):
365 def allchildren(self):
366 "return a list of all of the direct children of this node"
366 "return a list of all of the direct children of this node"
367 return self.changedlines
367 return self.changedlines
368
368
369 def countchanges(self):
369 def countchanges(self):
370 """changedlines -> (n+,n-)"""
370 """changedlines -> (n+,n-)"""
371 add = len([l for l in self.changedlines if l.applied
371 add = len([l for l in self.changedlines if l.applied
372 and l.prettystr()[0] == '+'])
372 and l.prettystr()[0] == '+'])
373 rem = len([l for l in self.changedlines if l.applied
373 rem = len([l for l in self.changedlines if l.applied
374 and l.prettystr()[0] == '-'])
374 and l.prettystr()[0] == '-'])
375 return add, rem
375 return add, rem
376
376
377 def getfromtoline(self):
377 def getfromtoline(self):
378 # calculate the number of removed lines converted to context lines
378 # calculate the number of removed lines converted to context lines
379 removedconvertedtocontext = self.originalremoved - self.removed
379 removedconvertedtocontext = self.originalremoved - self.removed
380
380
381 contextlen = (len(self.before) + len(self.after) +
381 contextlen = (len(self.before) + len(self.after) +
382 removedconvertedtocontext)
382 removedconvertedtocontext)
383 if self.after and self.after[-1] == '\\ No newline at end of file\n':
383 if self.after and self.after[-1] == '\\ No newline at end of file\n':
384 contextlen -= 1
384 contextlen -= 1
385 fromlen = contextlen + self.removed
385 fromlen = contextlen + self.removed
386 tolen = contextlen + self.added
386 tolen = contextlen + self.added
387
387
388 # diffutils manual, section "2.2.2.2 detailed description of unified
388 # diffutils manual, section "2.2.2.2 detailed description of unified
389 # format": "an empty hunk is considered to end at the line that
389 # format": "an empty hunk is considered to end at the line that
390 # precedes the hunk."
390 # precedes the hunk."
391 #
391 #
392 # so, if either of hunks is empty, decrease its line start. --immerrr
392 # so, if either of hunks is empty, decrease its line start. --immerrr
393 # but only do this if fromline > 0, to avoid having, e.g fromline=-1.
393 # but only do this if fromline > 0, to avoid having, e.g fromline=-1.
394 fromline, toline = self.fromline, self.toline
394 fromline, toline = self.fromline, self.toline
395 if fromline != 0:
395 if fromline != 0:
396 if fromlen == 0:
396 if fromlen == 0:
397 fromline -= 1
397 fromline -= 1
398 if tolen == 0:
398 if tolen == 0:
399 toline -= 1
399 toline -= 1
400
400
401 fromtoline = '@@ -%d,%d +%d,%d @@%s\n' % (
401 fromtoline = '@@ -%d,%d +%d,%d @@%s\n' % (
402 fromline, fromlen, toline, tolen,
402 fromline, fromlen, toline, tolen,
403 self.proc and (' ' + self.proc))
403 self.proc and (' ' + self.proc))
404 return fromtoline
404 return fromtoline
405
405
406 def write(self, fp):
406 def write(self, fp):
407 # updated self.added/removed, which are used by getfromtoline()
407 # updated self.added/removed, which are used by getfromtoline()
408 self.added, self.removed = self.countchanges()
408 self.added, self.removed = self.countchanges()
409 fp.write(self.getfromtoline())
409 fp.write(self.getfromtoline())
410
410
411 hunklinelist = []
411 hunklinelist = []
412 # add the following to the list: (1) all applied lines, and
412 # add the following to the list: (1) all applied lines, and
413 # (2) all unapplied removal lines (convert these to context lines)
413 # (2) all unapplied removal lines (convert these to context lines)
414 for changedline in self.changedlines:
414 for changedline in self.changedlines:
415 changedlinestr = changedline.prettystr()
415 changedlinestr = changedline.prettystr()
416 if changedline.applied:
416 if changedline.applied:
417 hunklinelist.append(changedlinestr)
417 hunklinelist.append(changedlinestr)
418 elif changedlinestr[0] == "-":
418 elif changedlinestr[0] == "-":
419 hunklinelist.append(" " + changedlinestr[1:])
419 hunklinelist.append(" " + changedlinestr[1:])
420
420
421 fp.write(''.join(self.before + hunklinelist + self.after))
421 fp.write(''.join(self.before + hunklinelist + self.after))
422
422
423 pretty = write
423 pretty = write
424
424
425 def prettystr(self):
425 def prettystr(self):
426 x = stringio()
426 x = stringio()
427 self.pretty(x)
427 self.pretty(x)
428 return x.getvalue()
428 return x.getvalue()
429
429
430 def __getattr__(self, name):
430 def __getattr__(self, name):
431 return getattr(self._hunk, name)
431 return getattr(self._hunk, name)
432
432
433 def __repr__(self):
433 def __repr__(self):
434 return '<hunk %r@%d>' % (self.filename(), self.fromline)
434 return '<hunk %r@%d>' % (self.filename(), self.fromline)
435
435
436 def filterpatch(ui, chunks, chunkselector, operation=None):
436 def filterpatch(ui, chunks, chunkselector, operation=None):
437 """interactively filter patch chunks into applied-only chunks"""
437 """interactively filter patch chunks into applied-only chunks"""
438 chunks = list(chunks)
438 chunks = list(chunks)
439 # convert chunks list into structure suitable for displaying/modifying
439 # convert chunks list into structure suitable for displaying/modifying
440 # with curses. create a list of headers only.
440 # with curses. create a list of headers only.
441 headers = [c for c in chunks if isinstance(c, patchmod.header)]
441 headers = [c for c in chunks if isinstance(c, patchmod.header)]
442
442
443 # if there are no changed files
443 # if there are no changed files
444 if len(headers) == 0:
444 if len(headers) == 0:
445 return [], {}
445 return [], {}
446 uiheaders = [uiheader(h) for h in headers]
446 uiheaders = [uiheader(h) for h in headers]
447 # let user choose headers/hunks/lines, and mark their applied flags
447 # let user choose headers/hunks/lines, and mark their applied flags
448 # accordingly
448 # accordingly
449 ret = chunkselector(ui, uiheaders, operation=operation)
449 ret = chunkselector(ui, uiheaders, operation=operation)
450 appliedhunklist = []
450 appliedhunklist = []
451 for hdr in uiheaders:
451 for hdr in uiheaders:
452 if (hdr.applied and
452 if (hdr.applied and
453 (hdr.special() or len([h for h in hdr.hunks if h.applied]) > 0)):
453 (hdr.special() or len([h for h in hdr.hunks if h.applied]) > 0)):
454 appliedhunklist.append(hdr)
454 appliedhunklist.append(hdr)
455 fixoffset = 0
455 fixoffset = 0
456 for hnk in hdr.hunks:
456 for hnk in hdr.hunks:
457 if hnk.applied:
457 if hnk.applied:
458 appliedhunklist.append(hnk)
458 appliedhunklist.append(hnk)
459 # adjust the 'to'-line offset of the hunk to be correct
459 # adjust the 'to'-line offset of the hunk to be correct
460 # after de-activating some of the other hunks for this file
460 # after de-activating some of the other hunks for this file
461 if fixoffset:
461 if fixoffset:
462 #hnk = copy.copy(hnk) # necessary??
462 #hnk = copy.copy(hnk) # necessary??
463 hnk.toline += fixoffset
463 hnk.toline += fixoffset
464 else:
464 else:
465 fixoffset += hnk.removed - hnk.added
465 fixoffset += hnk.removed - hnk.added
466
466
467 return (appliedhunklist, ret)
467 return (appliedhunklist, ret)
468
468
469 def chunkselector(ui, headerlist, operation=None):
469 def chunkselector(ui, headerlist, operation=None):
470 """
470 """
471 curses interface to get selection of chunks, and mark the applied flags
471 curses interface to get selection of chunks, and mark the applied flags
472 of the chosen chunks.
472 of the chosen chunks.
473 """
473 """
474 ui.write(_('starting interactive selection\n'))
474 ui.write(_('starting interactive selection\n'))
475 chunkselector = curseschunkselector(headerlist, ui, operation)
475 chunkselector = curseschunkselector(headerlist, ui, operation)
476 f = signal.getsignal(signal.SIGTSTP)
476 f = signal.getsignal(signal.SIGTSTP)
477 curses.wrapper(chunkselector.main)
477 curses.wrapper(chunkselector.main)
478 if chunkselector.initerr is not None:
478 if chunkselector.initerr is not None:
479 raise error.Abort(chunkselector.initerr)
479 raise error.Abort(chunkselector.initerr)
480 # ncurses does not restore signal handler for SIGTSTP
480 # ncurses does not restore signal handler for SIGTSTP
481 signal.signal(signal.SIGTSTP, f)
481 signal.signal(signal.SIGTSTP, f)
482 return chunkselector.opts
482 return chunkselector.opts
483
483
484 def testdecorator(testfn, f):
484 def testdecorator(testfn, f):
485 def u(*args, **kwargs):
485 def u(*args, **kwargs):
486 return f(testfn, *args, **kwargs)
486 return f(testfn, *args, **kwargs)
487 return u
487 return u
488
488
489 def testchunkselector(testfn, ui, headerlist, operation=None):
489 def testchunkselector(testfn, ui, headerlist, operation=None):
490 """
490 """
491 test interface to get selection of chunks, and mark the applied flags
491 test interface to get selection of chunks, and mark the applied flags
492 of the chosen chunks.
492 of the chosen chunks.
493 """
493 """
494 chunkselector = curseschunkselector(headerlist, ui, operation)
494 chunkselector = curseschunkselector(headerlist, ui, operation)
495 if testfn and os.path.exists(testfn):
495 if testfn and os.path.exists(testfn):
496 testf = open(testfn)
496 testf = open(testfn)
497 testcommands = map(lambda x: x.rstrip('\n'), testf.readlines())
497 testcommands = map(lambda x: x.rstrip('\n'), testf.readlines())
498 testf.close()
498 testf.close()
499 while True:
499 while True:
500 if chunkselector.handlekeypressed(testcommands.pop(0), test=True):
500 if chunkselector.handlekeypressed(testcommands.pop(0), test=True):
501 break
501 break
502 return chunkselector.opts
502 return chunkselector.opts
503
503
504 class curseschunkselector(object):
504 class curseschunkselector(object):
505 def __init__(self, headerlist, ui, operation=None):
505 def __init__(self, headerlist, ui, operation=None):
506 # put the headers into a patch object
506 # put the headers into a patch object
507 self.headerlist = patch(headerlist)
507 self.headerlist = patch(headerlist)
508
508
509 self.ui = ui
509 self.ui = ui
510 self.opts = {}
510 self.opts = {}
511
511
512 self.errorstr = None
512 self.errorstr = None
513 # list of all chunks
513 # list of all chunks
514 self.chunklist = []
514 self.chunklist = []
515 for h in headerlist:
515 for h in headerlist:
516 self.chunklist.append(h)
516 self.chunklist.append(h)
517 self.chunklist.extend(h.hunks)
517 self.chunklist.extend(h.hunks)
518
518
519 # dictionary mapping (fgcolor, bgcolor) pairs to the
519 # dictionary mapping (fgcolor, bgcolor) pairs to the
520 # corresponding curses color-pair value.
520 # corresponding curses color-pair value.
521 self.colorpairs = {}
521 self.colorpairs = {}
522 # maps custom nicknames of color-pairs to curses color-pair values
522 # maps custom nicknames of color-pairs to curses color-pair values
523 self.colorpairnames = {}
523 self.colorpairnames = {}
524
524
525 # the currently selected header, hunk, or hunk-line
525 # the currently selected header, hunk, or hunk-line
526 self.currentselecteditem = self.headerlist[0]
526 self.currentselecteditem = self.headerlist[0]
527
527
528 # updated when printing out patch-display -- the 'lines' here are the
528 # updated when printing out patch-display -- the 'lines' here are the
529 # line positions *in the pad*, not on the screen.
529 # line positions *in the pad*, not on the screen.
530 self.selecteditemstartline = 0
530 self.selecteditemstartline = 0
531 self.selecteditemendline = None
531 self.selecteditemendline = None
532
532
533 # define indentation levels
533 # define indentation levels
534 self.headerindentnumchars = 0
534 self.headerindentnumchars = 0
535 self.hunkindentnumchars = 3
535 self.hunkindentnumchars = 3
536 self.hunklineindentnumchars = 6
536 self.hunklineindentnumchars = 6
537
537
538 # the first line of the pad to print to the screen
538 # the first line of the pad to print to the screen
539 self.firstlineofpadtoprint = 0
539 self.firstlineofpadtoprint = 0
540
540
541 # keeps track of the number of lines in the pad
541 # keeps track of the number of lines in the pad
542 self.numpadlines = None
542 self.numpadlines = None
543
543
544 self.numstatuslines = 1
544 self.numstatuslines = 1
545
545
546 # keep a running count of the number of lines printed to the pad
546 # keep a running count of the number of lines printed to the pad
547 # (used for determining when the selected item begins/ends)
547 # (used for determining when the selected item begins/ends)
548 self.linesprintedtopadsofar = 0
548 self.linesprintedtopadsofar = 0
549
549
550 # the first line of the pad which is visible on the screen
550 # the first line of the pad which is visible on the screen
551 self.firstlineofpadtoprint = 0
551 self.firstlineofpadtoprint = 0
552
552
553 # stores optional text for a commit comment provided by the user
553 # stores optional text for a commit comment provided by the user
554 self.commenttext = ""
554 self.commenttext = ""
555
555
556 # if the last 'toggle all' command caused all changes to be applied
556 # if the last 'toggle all' command caused all changes to be applied
557 self.waslasttoggleallapplied = True
557 self.waslasttoggleallapplied = True
558
558
559 # affects some ui text
559 # affects some ui text
560 self.operation = operation
560 self.operation = operation
561
561
562 def uparrowevent(self):
562 def uparrowevent(self):
563 """
563 """
564 try to select the previous item to the current item that has the
564 try to select the previous item to the current item that has the
565 most-indented level. for example, if a hunk is selected, try to select
565 most-indented level. for example, if a hunk is selected, try to select
566 the last hunkline of the hunk prior to the selected hunk. or, if
566 the last hunkline of the hunk prior to the selected hunk. or, if
567 the first hunkline of a hunk is currently selected, then select the
567 the first hunkline of a hunk is currently selected, then select the
568 hunk itself.
568 hunk itself.
569 """
569 """
570 currentitem = self.currentselecteditem
570 currentitem = self.currentselecteditem
571
571
572 nextitem = currentitem.previtem()
572 nextitem = currentitem.previtem()
573
573
574 if nextitem is None:
574 if nextitem is None:
575 # if no parent item (i.e. currentitem is the first header), then
575 # if no parent item (i.e. currentitem is the first header), then
576 # no change...
576 # no change...
577 nextitem = currentitem
577 nextitem = currentitem
578
578
579 self.currentselecteditem = nextitem
579 self.currentselecteditem = nextitem
580
580
581 def uparrowshiftevent(self):
581 def uparrowshiftevent(self):
582 """
582 """
583 select (if possible) the previous item on the same level as the
583 select (if possible) the previous item on the same level as the
584 currently selected item. otherwise, select (if possible) the
584 currently selected item. otherwise, select (if possible) the
585 parent-item of the currently selected item.
585 parent-item of the currently selected item.
586 """
586 """
587 currentitem = self.currentselecteditem
587 currentitem = self.currentselecteditem
588 nextitem = currentitem.prevsibling()
588 nextitem = currentitem.prevsibling()
589 # if there's no previous sibling, try choosing the parent
589 # if there's no previous sibling, try choosing the parent
590 if nextitem is None:
590 if nextitem is None:
591 nextitem = currentitem.parentitem()
591 nextitem = currentitem.parentitem()
592 if nextitem is None:
592 if nextitem is None:
593 # if no parent item (i.e. currentitem is the first header), then
593 # if no parent item (i.e. currentitem is the first header), then
594 # no change...
594 # no change...
595 nextitem = currentitem
595 nextitem = currentitem
596
596
597 self.currentselecteditem = nextitem
597 self.currentselecteditem = nextitem
598
598
599 def downarrowevent(self):
599 def downarrowevent(self):
600 """
600 """
601 try to select the next item to the current item that has the
601 try to select the next item to the current item that has the
602 most-indented level. for example, if a hunk is selected, select
602 most-indented level. for example, if a hunk is selected, select
603 the first hunkline of the selected hunk. or, if the last hunkline of
603 the first hunkline of the selected hunk. or, if the last hunkline of
604 a hunk is currently selected, then select the next hunk, if one exists,
604 a hunk is currently selected, then select the next hunk, if one exists,
605 or if not, the next header if one exists.
605 or if not, the next header if one exists.
606 """
606 """
607 #self.startprintline += 1 #debug
607 #self.startprintline += 1 #debug
608 currentitem = self.currentselecteditem
608 currentitem = self.currentselecteditem
609
609
610 nextitem = currentitem.nextitem()
610 nextitem = currentitem.nextitem()
611 # if there's no next item, keep the selection as-is
611 # if there's no next item, keep the selection as-is
612 if nextitem is None:
612 if nextitem is None:
613 nextitem = currentitem
613 nextitem = currentitem
614
614
615 self.currentselecteditem = nextitem
615 self.currentselecteditem = nextitem
616
616
617 def downarrowshiftevent(self):
617 def downarrowshiftevent(self):
618 """
618 """
619 select (if possible) the next item on the same level as the currently
619 select (if possible) the next item on the same level as the currently
620 selected item. otherwise, select (if possible) the next item on the
620 selected item. otherwise, select (if possible) the next item on the
621 same level as the parent item of the currently selected item.
621 same level as the parent item of the currently selected item.
622 """
622 """
623 currentitem = self.currentselecteditem
623 currentitem = self.currentselecteditem
624 nextitem = currentitem.nextsibling()
624 nextitem = currentitem.nextsibling()
625 # if there's no next sibling, try choosing the parent's nextsibling
625 # if there's no next sibling, try choosing the parent's nextsibling
626 if nextitem is None:
626 if nextitem is None:
627 try:
627 try:
628 nextitem = currentitem.parentitem().nextsibling()
628 nextitem = currentitem.parentitem().nextsibling()
629 except AttributeError:
629 except AttributeError:
630 # parentitem returned None, so nextsibling() can't be called
630 # parentitem returned None, so nextsibling() can't be called
631 nextitem = None
631 nextitem = None
632 if nextitem is None:
632 if nextitem is None:
633 # if parent has no next sibling, then no change...
633 # if parent has no next sibling, then no change...
634 nextitem = currentitem
634 nextitem = currentitem
635
635
636 self.currentselecteditem = nextitem
636 self.currentselecteditem = nextitem
637
637
638 def rightarrowevent(self):
638 def rightarrowevent(self):
639 """
639 """
640 select (if possible) the first of this item's child-items.
640 select (if possible) the first of this item's child-items.
641 """
641 """
642 currentitem = self.currentselecteditem
642 currentitem = self.currentselecteditem
643 nextitem = currentitem.firstchild()
643 nextitem = currentitem.firstchild()
644
644
645 # turn off folding if we want to show a child-item
645 # turn off folding if we want to show a child-item
646 if currentitem.folded:
646 if currentitem.folded:
647 self.togglefolded(currentitem)
647 self.togglefolded(currentitem)
648
648
649 if nextitem is None:
649 if nextitem is None:
650 # if no next item on parent-level, then no change...
650 # if no next item on parent-level, then no change...
651 nextitem = currentitem
651 nextitem = currentitem
652
652
653 self.currentselecteditem = nextitem
653 self.currentselecteditem = nextitem
654
654
655 def leftarrowevent(self):
655 def leftarrowevent(self):
656 """
656 """
657 if the current item can be folded (i.e. it is an unfolded header or
657 if the current item can be folded (i.e. it is an unfolded header or
658 hunk), then fold it. otherwise try select (if possible) the parent
658 hunk), then fold it. otherwise try select (if possible) the parent
659 of this item.
659 of this item.
660 """
660 """
661 currentitem = self.currentselecteditem
661 currentitem = self.currentselecteditem
662
662
663 # try to fold the item
663 # try to fold the item
664 if not isinstance(currentitem, uihunkline):
664 if not isinstance(currentitem, uihunkline):
665 if not currentitem.folded:
665 if not currentitem.folded:
666 self.togglefolded(item=currentitem)
666 self.togglefolded(item=currentitem)
667 return
667 return
668
668
669 # if it can't be folded, try to select the parent item
669 # if it can't be folded, try to select the parent item
670 nextitem = currentitem.parentitem()
670 nextitem = currentitem.parentitem()
671
671
672 if nextitem is None:
672 if nextitem is None:
673 # if no item on parent-level, then no change...
673 # if no item on parent-level, then no change...
674 nextitem = currentitem
674 nextitem = currentitem
675 if not nextitem.folded:
675 if not nextitem.folded:
676 self.togglefolded(item=nextitem)
676 self.togglefolded(item=nextitem)
677
677
678 self.currentselecteditem = nextitem
678 self.currentselecteditem = nextitem
679
679
680 def leftarrowshiftevent(self):
680 def leftarrowshiftevent(self):
681 """
681 """
682 select the header of the current item (or fold current item if the
682 select the header of the current item (or fold current item if the
683 current item is already a header).
683 current item is already a header).
684 """
684 """
685 currentitem = self.currentselecteditem
685 currentitem = self.currentselecteditem
686
686
687 if isinstance(currentitem, uiheader):
687 if isinstance(currentitem, uiheader):
688 if not currentitem.folded:
688 if not currentitem.folded:
689 self.togglefolded(item=currentitem)
689 self.togglefolded(item=currentitem)
690 return
690 return
691
691
692 # select the parent item recursively until we're at a header
692 # select the parent item recursively until we're at a header
693 while True:
693 while True:
694 nextitem = currentitem.parentitem()
694 nextitem = currentitem.parentitem()
695 if nextitem is None:
695 if nextitem is None:
696 break
696 break
697 else:
697 else:
698 currentitem = nextitem
698 currentitem = nextitem
699
699
700 self.currentselecteditem = currentitem
700 self.currentselecteditem = currentitem
701
701
702 def updatescroll(self):
702 def updatescroll(self):
703 "scroll the screen to fully show the currently-selected"
703 "scroll the screen to fully show the currently-selected"
704 selstart = self.selecteditemstartline
704 selstart = self.selecteditemstartline
705 selend = self.selecteditemendline
705 selend = self.selecteditemendline
706
706
707 padstart = self.firstlineofpadtoprint
707 padstart = self.firstlineofpadtoprint
708 padend = padstart + self.yscreensize - self.numstatuslines - 1
708 padend = padstart + self.yscreensize - self.numstatuslines - 1
709 # 'buffered' pad start/end values which scroll with a certain
709 # 'buffered' pad start/end values which scroll with a certain
710 # top/bottom context margin
710 # top/bottom context margin
711 padstartbuffered = padstart + 3
711 padstartbuffered = padstart + 3
712 padendbuffered = padend - 3
712 padendbuffered = padend - 3
713
713
714 if selend > padendbuffered:
714 if selend > padendbuffered:
715 self.scrolllines(selend - padendbuffered)
715 self.scrolllines(selend - padendbuffered)
716 elif selstart < padstartbuffered:
716 elif selstart < padstartbuffered:
717 # negative values scroll in pgup direction
717 # negative values scroll in pgup direction
718 self.scrolllines(selstart - padstartbuffered)
718 self.scrolllines(selstart - padstartbuffered)
719
719
720 def scrolllines(self, numlines):
720 def scrolllines(self, numlines):
721 "scroll the screen up (down) by numlines when numlines >0 (<0)."
721 "scroll the screen up (down) by numlines when numlines >0 (<0)."
722 self.firstlineofpadtoprint += numlines
722 self.firstlineofpadtoprint += numlines
723 if self.firstlineofpadtoprint < 0:
723 if self.firstlineofpadtoprint < 0:
724 self.firstlineofpadtoprint = 0
724 self.firstlineofpadtoprint = 0
725 if self.firstlineofpadtoprint > self.numpadlines - 1:
725 if self.firstlineofpadtoprint > self.numpadlines - 1:
726 self.firstlineofpadtoprint = self.numpadlines - 1
726 self.firstlineofpadtoprint = self.numpadlines - 1
727
727
728 def toggleapply(self, item=None):
728 def toggleapply(self, item=None):
729 """
729 """
730 toggle the applied flag of the specified item. if no item is specified,
730 toggle the applied flag of the specified item. if no item is specified,
731 toggle the flag of the currently selected item.
731 toggle the flag of the currently selected item.
732 """
732 """
733 if item is None:
733 if item is None:
734 item = self.currentselecteditem
734 item = self.currentselecteditem
735
735
736 item.applied = not item.applied
736 item.applied = not item.applied
737
737
738 if isinstance(item, uiheader):
738 if isinstance(item, uiheader):
739 item.partial = False
739 item.partial = False
740 if item.applied:
740 if item.applied:
741 # apply all its hunks
741 # apply all its hunks
742 for hnk in item.hunks:
742 for hnk in item.hunks:
743 hnk.applied = True
743 hnk.applied = True
744 # apply all their hunklines
744 # apply all their hunklines
745 for hunkline in hnk.changedlines:
745 for hunkline in hnk.changedlines:
746 hunkline.applied = True
746 hunkline.applied = True
747 else:
747 else:
748 # un-apply all its hunks
748 # un-apply all its hunks
749 for hnk in item.hunks:
749 for hnk in item.hunks:
750 hnk.applied = False
750 hnk.applied = False
751 hnk.partial = False
751 hnk.partial = False
752 # un-apply all their hunklines
752 # un-apply all their hunklines
753 for hunkline in hnk.changedlines:
753 for hunkline in hnk.changedlines:
754 hunkline.applied = False
754 hunkline.applied = False
755 elif isinstance(item, uihunk):
755 elif isinstance(item, uihunk):
756 item.partial = False
756 item.partial = False
757 # apply all it's hunklines
757 # apply all it's hunklines
758 for hunkline in item.changedlines:
758 for hunkline in item.changedlines:
759 hunkline.applied = item.applied
759 hunkline.applied = item.applied
760
760
761 siblingappliedstatus = [hnk.applied for hnk in item.header.hunks]
761 siblingappliedstatus = [hnk.applied for hnk in item.header.hunks]
762 allsiblingsapplied = not (False in siblingappliedstatus)
762 allsiblingsapplied = not (False in siblingappliedstatus)
763 nosiblingsapplied = not (True in siblingappliedstatus)
763 nosiblingsapplied = not (True in siblingappliedstatus)
764
764
765 siblingspartialstatus = [hnk.partial for hnk in item.header.hunks]
765 siblingspartialstatus = [hnk.partial for hnk in item.header.hunks]
766 somesiblingspartial = (True in siblingspartialstatus)
766 somesiblingspartial = (True in siblingspartialstatus)
767
767
768 #cases where applied or partial should be removed from header
768 #cases where applied or partial should be removed from header
769
769
770 # if no 'sibling' hunks are applied (including this hunk)
770 # if no 'sibling' hunks are applied (including this hunk)
771 if nosiblingsapplied:
771 if nosiblingsapplied:
772 if not item.header.special():
772 if not item.header.special():
773 item.header.applied = False
773 item.header.applied = False
774 item.header.partial = False
774 item.header.partial = False
775 else: # some/all parent siblings are applied
775 else: # some/all parent siblings are applied
776 item.header.applied = True
776 item.header.applied = True
777 item.header.partial = (somesiblingspartial or
777 item.header.partial = (somesiblingspartial or
778 not allsiblingsapplied)
778 not allsiblingsapplied)
779
779
780 elif isinstance(item, uihunkline):
780 elif isinstance(item, uihunkline):
781 siblingappliedstatus = [ln.applied for ln in item.hunk.changedlines]
781 siblingappliedstatus = [ln.applied for ln in item.hunk.changedlines]
782 allsiblingsapplied = not (False in siblingappliedstatus)
782 allsiblingsapplied = not (False in siblingappliedstatus)
783 nosiblingsapplied = not (True in siblingappliedstatus)
783 nosiblingsapplied = not (True in siblingappliedstatus)
784
784
785 # if no 'sibling' lines are applied
785 # if no 'sibling' lines are applied
786 if nosiblingsapplied:
786 if nosiblingsapplied:
787 item.hunk.applied = False
787 item.hunk.applied = False
788 item.hunk.partial = False
788 item.hunk.partial = False
789 elif allsiblingsapplied:
789 elif allsiblingsapplied:
790 item.hunk.applied = True
790 item.hunk.applied = True
791 item.hunk.partial = False
791 item.hunk.partial = False
792 else: # some siblings applied
792 else: # some siblings applied
793 item.hunk.applied = True
793 item.hunk.applied = True
794 item.hunk.partial = True
794 item.hunk.partial = True
795
795
796 parentsiblingsapplied = [hnk.applied for hnk
796 parentsiblingsapplied = [hnk.applied for hnk
797 in item.hunk.header.hunks]
797 in item.hunk.header.hunks]
798 noparentsiblingsapplied = not (True in parentsiblingsapplied)
798 noparentsiblingsapplied = not (True in parentsiblingsapplied)
799 allparentsiblingsapplied = not (False in parentsiblingsapplied)
799 allparentsiblingsapplied = not (False in parentsiblingsapplied)
800
800
801 parentsiblingspartial = [hnk.partial for hnk
801 parentsiblingspartial = [hnk.partial for hnk
802 in item.hunk.header.hunks]
802 in item.hunk.header.hunks]
803 someparentsiblingspartial = (True in parentsiblingspartial)
803 someparentsiblingspartial = (True in parentsiblingspartial)
804
804
805 # if all parent hunks are not applied, un-apply header
805 # if all parent hunks are not applied, un-apply header
806 if noparentsiblingsapplied:
806 if noparentsiblingsapplied:
807 if not item.hunk.header.special():
807 if not item.hunk.header.special():
808 item.hunk.header.applied = False
808 item.hunk.header.applied = False
809 item.hunk.header.partial = False
809 item.hunk.header.partial = False
810 # set the applied and partial status of the header if needed
810 # set the applied and partial status of the header if needed
811 else: # some/all parent siblings are applied
811 else: # some/all parent siblings are applied
812 item.hunk.header.applied = True
812 item.hunk.header.applied = True
813 item.hunk.header.partial = (someparentsiblingspartial or
813 item.hunk.header.partial = (someparentsiblingspartial or
814 not allparentsiblingsapplied)
814 not allparentsiblingsapplied)
815
815
816 def toggleall(self):
816 def toggleall(self):
817 "toggle the applied flag of all items."
817 "toggle the applied flag of all items."
818 if self.waslasttoggleallapplied: # then unapply them this time
818 if self.waslasttoggleallapplied: # then unapply them this time
819 for item in self.headerlist:
819 for item in self.headerlist:
820 if item.applied:
820 if item.applied:
821 self.toggleapply(item)
821 self.toggleapply(item)
822 else:
822 else:
823 for item in self.headerlist:
823 for item in self.headerlist:
824 if not item.applied:
824 if not item.applied:
825 self.toggleapply(item)
825 self.toggleapply(item)
826 self.waslasttoggleallapplied = not self.waslasttoggleallapplied
826 self.waslasttoggleallapplied = not self.waslasttoggleallapplied
827
827
828 def togglefolded(self, item=None, foldparent=False):
828 def togglefolded(self, item=None, foldparent=False):
829 "toggle folded flag of specified item (defaults to currently selected)"
829 "toggle folded flag of specified item (defaults to currently selected)"
830 if item is None:
830 if item is None:
831 item = self.currentselecteditem
831 item = self.currentselecteditem
832 if foldparent or (isinstance(item, uiheader) and item.neverunfolded):
832 if foldparent or (isinstance(item, uiheader) and item.neverunfolded):
833 if not isinstance(item, uiheader):
833 if not isinstance(item, uiheader):
834 # we need to select the parent item in this case
834 # we need to select the parent item in this case
835 self.currentselecteditem = item = item.parentitem()
835 self.currentselecteditem = item = item.parentitem()
836 elif item.neverunfolded:
836 elif item.neverunfolded:
837 item.neverunfolded = False
837 item.neverunfolded = False
838
838
839 # also fold any foldable children of the parent/current item
839 # also fold any foldable children of the parent/current item
840 if isinstance(item, uiheader): # the original or 'new' item
840 if isinstance(item, uiheader): # the original or 'new' item
841 for child in item.allchildren():
841 for child in item.allchildren():
842 child.folded = not item.folded
842 child.folded = not item.folded
843
843
844 if isinstance(item, (uiheader, uihunk)):
844 if isinstance(item, (uiheader, uihunk)):
845 item.folded = not item.folded
845 item.folded = not item.folded
846
846
847 def alignstring(self, instr, window):
847 def alignstring(self, instr, window):
848 """
848 """
849 add whitespace to the end of a string in order to make it fill
849 add whitespace to the end of a string in order to make it fill
850 the screen in the x direction. the current cursor position is
850 the screen in the x direction. the current cursor position is
851 taken into account when making this calculation. the string can span
851 taken into account when making this calculation. the string can span
852 multiple lines.
852 multiple lines.
853 """
853 """
854 y, xstart = window.getyx()
854 y, xstart = window.getyx()
855 width = self.xscreensize
855 width = self.xscreensize
856 # turn tabs into spaces
856 # turn tabs into spaces
857 instr = instr.expandtabs(4)
857 instr = instr.expandtabs(4)
858 strwidth = encoding.colwidth(instr)
858 strwidth = encoding.colwidth(instr)
859 numspaces = (width - ((strwidth + xstart) % width) - 1)
859 numspaces = (width - ((strwidth + xstart) % width) - 1)
860 return instr + " " * numspaces + "\n"
860 return instr + " " * numspaces + "\n"
861
861
862 def printstring(self, window, text, fgcolor=None, bgcolor=None, pair=None,
862 def printstring(self, window, text, fgcolor=None, bgcolor=None, pair=None,
863 pairname=None, attrlist=None, towin=True, align=True, showwhtspc=False):
863 pairname=None, attrlist=None, towin=True, align=True, showwhtspc=False):
864 """
864 """
865 print the string, text, with the specified colors and attributes, to
865 print the string, text, with the specified colors and attributes, to
866 the specified curses window object.
866 the specified curses window object.
867
867
868 the foreground and background colors are of the form
868 the foreground and background colors are of the form
869 curses.color_xxxx, where xxxx is one of: [black, blue, cyan, green,
869 curses.color_xxxx, where xxxx is one of: [black, blue, cyan, green,
870 magenta, red, white, yellow]. if pairname is provided, a color
870 magenta, red, white, yellow]. if pairname is provided, a color
871 pair will be looked up in the self.colorpairnames dictionary.
871 pair will be looked up in the self.colorpairnames dictionary.
872
872
873 attrlist is a list containing text attributes in the form of
873 attrlist is a list containing text attributes in the form of
874 curses.a_xxxx, where xxxx can be: [bold, dim, normal, standout,
874 curses.a_xxxx, where xxxx can be: [bold, dim, normal, standout,
875 underline].
875 underline].
876
876
877 if align == True, whitespace is added to the printed string such that
877 if align == True, whitespace is added to the printed string such that
878 the string stretches to the right border of the window.
878 the string stretches to the right border of the window.
879
879
880 if showwhtspc == True, trailing whitespace of a string is highlighted.
880 if showwhtspc == True, trailing whitespace of a string is highlighted.
881 """
881 """
882 # preprocess the text, converting tabs to spaces
882 # preprocess the text, converting tabs to spaces
883 text = text.expandtabs(4)
883 text = text.expandtabs(4)
884 # strip \n, and convert control characters to ^[char] representation
884 # strip \n, and convert control characters to ^[char] representation
885 text = re.sub(r'[\x00-\x08\x0a-\x1f]',
885 text = re.sub(r'[\x00-\x08\x0a-\x1f]',
886 lambda m:'^' + chr(ord(m.group()) + 64), text.strip('\n'))
886 lambda m:'^' + chr(ord(m.group()) + 64), text.strip('\n'))
887
887
888 if pair is not None:
888 if pair is not None:
889 colorpair = pair
889 colorpair = pair
890 elif pairname is not None:
890 elif pairname is not None:
891 colorpair = self.colorpairnames[pairname]
891 colorpair = self.colorpairnames[pairname]
892 else:
892 else:
893 if fgcolor is None:
893 if fgcolor is None:
894 fgcolor = -1
894 fgcolor = -1
895 if bgcolor is None:
895 if bgcolor is None:
896 bgcolor = -1
896 bgcolor = -1
897 if (fgcolor, bgcolor) in self.colorpairs:
897 if (fgcolor, bgcolor) in self.colorpairs:
898 colorpair = self.colorpairs[(fgcolor, bgcolor)]
898 colorpair = self.colorpairs[(fgcolor, bgcolor)]
899 else:
899 else:
900 colorpair = self.getcolorpair(fgcolor, bgcolor)
900 colorpair = self.getcolorpair(fgcolor, bgcolor)
901 # add attributes if possible
901 # add attributes if possible
902 if attrlist is None:
902 if attrlist is None:
903 attrlist = []
903 attrlist = []
904 if colorpair < 256:
904 if colorpair < 256:
905 # then it is safe to apply all attributes
905 # then it is safe to apply all attributes
906 for textattr in attrlist:
906 for textattr in attrlist:
907 colorpair |= textattr
907 colorpair |= textattr
908 else:
908 else:
909 # just apply a select few (safe?) attributes
909 # just apply a select few (safe?) attributes
910 for textattr in (curses.A_UNDERLINE, curses.A_BOLD):
910 for textattr in (curses.A_UNDERLINE, curses.A_BOLD):
911 if textattr in attrlist:
911 if textattr in attrlist:
912 colorpair |= textattr
912 colorpair |= textattr
913
913
914 y, xstart = self.chunkpad.getyx()
914 y, xstart = self.chunkpad.getyx()
915 t = "" # variable for counting lines printed
915 t = "" # variable for counting lines printed
916 # if requested, show trailing whitespace
916 # if requested, show trailing whitespace
917 if showwhtspc:
917 if showwhtspc:
918 origlen = len(text)
918 origlen = len(text)
919 text = text.rstrip(' \n') # tabs have already been expanded
919 text = text.rstrip(' \n') # tabs have already been expanded
920 strippedlen = len(text)
920 strippedlen = len(text)
921 numtrailingspaces = origlen - strippedlen
921 numtrailingspaces = origlen - strippedlen
922
922
923 if towin:
923 if towin:
924 window.addstr(text, colorpair)
924 window.addstr(text, colorpair)
925 t += text
925 t += text
926
926
927 if showwhtspc:
927 if showwhtspc:
928 wscolorpair = colorpair | curses.A_REVERSE
928 wscolorpair = colorpair | curses.A_REVERSE
929 if towin:
929 if towin:
930 for i in range(numtrailingspaces):
930 for i in range(numtrailingspaces):
931 window.addch(curses.ACS_CKBOARD, wscolorpair)
931 window.addch(curses.ACS_CKBOARD, wscolorpair)
932 t += " " * numtrailingspaces
932 t += " " * numtrailingspaces
933
933
934 if align:
934 if align:
935 if towin:
935 if towin:
936 extrawhitespace = self.alignstring("", window)
936 extrawhitespace = self.alignstring("", window)
937 window.addstr(extrawhitespace, colorpair)
937 window.addstr(extrawhitespace, colorpair)
938 else:
938 else:
939 # need to use t, since the x position hasn't incremented
939 # need to use t, since the x position hasn't incremented
940 extrawhitespace = self.alignstring(t, window)
940 extrawhitespace = self.alignstring(t, window)
941 t += extrawhitespace
941 t += extrawhitespace
942
942
943 # is reset to 0 at the beginning of printitem()
943 # is reset to 0 at the beginning of printitem()
944
944
945 linesprinted = (xstart + len(t)) / self.xscreensize
945 linesprinted = (xstart + len(t)) / self.xscreensize
946 self.linesprintedtopadsofar += linesprinted
946 self.linesprintedtopadsofar += linesprinted
947 return t
947 return t
948
948
949 def _getstatuslinesegments(self):
950 """-> [str]. return segments"""
951 segments = [
952 _('Select hunks to record'),
953 '-',
954 _('[x]=selected **=collapsed'),
955 _('c: confirm'),
956 _('q: abort'),
957 _('arrow keys: move/expand/collapse'),
958 _('space: select'),
959 _('?: help'),
960 ]
961 return segments
962
949 def _getstatuslines(self):
963 def _getstatuslines(self):
950 """() -> [str]. return short help used in the top status window"""
964 """() -> [str]. return short help used in the top status window"""
951 if self.errorstr is not None:
965 if self.errorstr is not None:
952 lines = [self.errorstr, _('Press any key to continue')]
966 lines = [self.errorstr, _('Press any key to continue')]
953 else:
967 else:
954 lines = [_("SELECT CHUNKS: (j/k/up/dn/pgup/pgdn) move cursor; "
968 # wrap segments to lines
955 "(space/A) toggle hunk/all; (e)dit hunk;"),
969 segments = self._getstatuslinesegments()
956 _(" (f)old/unfold; (c)onfirm applied; (q)uit; (?) help "
970 width = self.xscreensize
957 "| [X]=hunk applied **=folded, toggle [a]mend mode")]
971 lines = []
972 lastwidth = width
973 for s in segments:
974 w = encoding.colwidth(s)
975 sep = ' ' * (1 + (s and s[0] not in '-['))
976 if lastwidth + w + len(sep) >= width:
977 lines.append(s)
978 lastwidth = w
979 else:
980 lines[-1] += sep + s
981 lastwidth += w + len(sep)
958 if len(lines) != self.numstatuslines:
982 if len(lines) != self.numstatuslines:
959 self.numstatuslines = len(lines)
983 self.numstatuslines = len(lines)
960 self.statuswin.resize(self.numstatuslines, self.xscreensize)
984 self.statuswin.resize(self.numstatuslines, self.xscreensize)
961 return [util.ellipsis(l, self.xscreensize - 1) for l in lines]
985 return [util.ellipsis(l, self.xscreensize - 1) for l in lines]
962
986
963 def updatescreen(self):
987 def updatescreen(self):
964 self.statuswin.erase()
988 self.statuswin.erase()
965 self.chunkpad.erase()
989 self.chunkpad.erase()
966
990
967 printstring = self.printstring
991 printstring = self.printstring
968
992
969 # print out the status lines at the top
993 # print out the status lines at the top
970 try:
994 try:
971 for line in self._getstatuslines():
995 for line in self._getstatuslines():
972 printstring(self.statuswin, line, pairname="legend")
996 printstring(self.statuswin, line, pairname="legend")
973 self.statuswin.refresh()
997 self.statuswin.refresh()
974 except curses.error:
998 except curses.error:
975 pass
999 pass
976 if self.errorstr is not None:
1000 if self.errorstr is not None:
977 return
1001 return
978
1002
979 # print out the patch in the remaining part of the window
1003 # print out the patch in the remaining part of the window
980 try:
1004 try:
981 self.printitem()
1005 self.printitem()
982 self.updatescroll()
1006 self.updatescroll()
983 self.chunkpad.refresh(self.firstlineofpadtoprint, 0,
1007 self.chunkpad.refresh(self.firstlineofpadtoprint, 0,
984 self.numstatuslines, 0,
1008 self.numstatuslines, 0,
985 self.yscreensize - self.numstatuslines,
1009 self.yscreensize - self.numstatuslines,
986 self.xscreensize)
1010 self.xscreensize)
987 except curses.error:
1011 except curses.error:
988 pass
1012 pass
989
1013
990 def getstatusprefixstring(self, item):
1014 def getstatusprefixstring(self, item):
991 """
1015 """
992 create a string to prefix a line with which indicates whether 'item'
1016 create a string to prefix a line with which indicates whether 'item'
993 is applied and/or folded.
1017 is applied and/or folded.
994 """
1018 """
995
1019
996 # create checkbox string
1020 # create checkbox string
997 if item.applied:
1021 if item.applied:
998 if not isinstance(item, uihunkline) and item.partial:
1022 if not isinstance(item, uihunkline) and item.partial:
999 checkbox = "[~]"
1023 checkbox = "[~]"
1000 else:
1024 else:
1001 checkbox = "[x]"
1025 checkbox = "[x]"
1002 else:
1026 else:
1003 checkbox = "[ ]"
1027 checkbox = "[ ]"
1004
1028
1005 try:
1029 try:
1006 if item.folded:
1030 if item.folded:
1007 checkbox += "**"
1031 checkbox += "**"
1008 if isinstance(item, uiheader):
1032 if isinstance(item, uiheader):
1009 # one of "m", "a", or "d" (modified, added, deleted)
1033 # one of "m", "a", or "d" (modified, added, deleted)
1010 filestatus = item.changetype
1034 filestatus = item.changetype
1011
1035
1012 checkbox += filestatus + " "
1036 checkbox += filestatus + " "
1013 else:
1037 else:
1014 checkbox += " "
1038 checkbox += " "
1015 if isinstance(item, uiheader):
1039 if isinstance(item, uiheader):
1016 # add two more spaces for headers
1040 # add two more spaces for headers
1017 checkbox += " "
1041 checkbox += " "
1018 except AttributeError: # not foldable
1042 except AttributeError: # not foldable
1019 checkbox += " "
1043 checkbox += " "
1020
1044
1021 return checkbox
1045 return checkbox
1022
1046
1023 def printheader(self, header, selected=False, towin=True,
1047 def printheader(self, header, selected=False, towin=True,
1024 ignorefolding=False):
1048 ignorefolding=False):
1025 """
1049 """
1026 print the header to the pad. if countlines is True, don't print
1050 print the header to the pad. if countlines is True, don't print
1027 anything, but just count the number of lines which would be printed.
1051 anything, but just count the number of lines which would be printed.
1028 """
1052 """
1029
1053
1030 outstr = ""
1054 outstr = ""
1031 text = header.prettystr()
1055 text = header.prettystr()
1032 chunkindex = self.chunklist.index(header)
1056 chunkindex = self.chunklist.index(header)
1033
1057
1034 if chunkindex != 0 and not header.folded:
1058 if chunkindex != 0 and not header.folded:
1035 # add separating line before headers
1059 # add separating line before headers
1036 outstr += self.printstring(self.chunkpad, '_' * self.xscreensize,
1060 outstr += self.printstring(self.chunkpad, '_' * self.xscreensize,
1037 towin=towin, align=False)
1061 towin=towin, align=False)
1038 # select color-pair based on if the header is selected
1062 # select color-pair based on if the header is selected
1039 colorpair = self.getcolorpair(name=selected and "selected" or "normal",
1063 colorpair = self.getcolorpair(name=selected and "selected" or "normal",
1040 attrlist=[curses.A_BOLD])
1064 attrlist=[curses.A_BOLD])
1041
1065
1042 # print out each line of the chunk, expanding it to screen width
1066 # print out each line of the chunk, expanding it to screen width
1043
1067
1044 # number of characters to indent lines on this level by
1068 # number of characters to indent lines on this level by
1045 indentnumchars = 0
1069 indentnumchars = 0
1046 checkbox = self.getstatusprefixstring(header)
1070 checkbox = self.getstatusprefixstring(header)
1047 if not header.folded or ignorefolding:
1071 if not header.folded or ignorefolding:
1048 textlist = text.split("\n")
1072 textlist = text.split("\n")
1049 linestr = checkbox + textlist[0]
1073 linestr = checkbox + textlist[0]
1050 else:
1074 else:
1051 linestr = checkbox + header.filename()
1075 linestr = checkbox + header.filename()
1052 outstr += self.printstring(self.chunkpad, linestr, pair=colorpair,
1076 outstr += self.printstring(self.chunkpad, linestr, pair=colorpair,
1053 towin=towin)
1077 towin=towin)
1054 if not header.folded or ignorefolding:
1078 if not header.folded or ignorefolding:
1055 if len(textlist) > 1:
1079 if len(textlist) > 1:
1056 for line in textlist[1:]:
1080 for line in textlist[1:]:
1057 linestr = " "*(indentnumchars + len(checkbox)) + line
1081 linestr = " "*(indentnumchars + len(checkbox)) + line
1058 outstr += self.printstring(self.chunkpad, linestr,
1082 outstr += self.printstring(self.chunkpad, linestr,
1059 pair=colorpair, towin=towin)
1083 pair=colorpair, towin=towin)
1060
1084
1061 return outstr
1085 return outstr
1062
1086
1063 def printhunklinesbefore(self, hunk, selected=False, towin=True,
1087 def printhunklinesbefore(self, hunk, selected=False, towin=True,
1064 ignorefolding=False):
1088 ignorefolding=False):
1065 "includes start/end line indicator"
1089 "includes start/end line indicator"
1066 outstr = ""
1090 outstr = ""
1067 # where hunk is in list of siblings
1091 # where hunk is in list of siblings
1068 hunkindex = hunk.header.hunks.index(hunk)
1092 hunkindex = hunk.header.hunks.index(hunk)
1069
1093
1070 if hunkindex != 0:
1094 if hunkindex != 0:
1071 # add separating line before headers
1095 # add separating line before headers
1072 outstr += self.printstring(self.chunkpad, ' '*self.xscreensize,
1096 outstr += self.printstring(self.chunkpad, ' '*self.xscreensize,
1073 towin=towin, align=False)
1097 towin=towin, align=False)
1074
1098
1075 colorpair = self.getcolorpair(name=selected and "selected" or "normal",
1099 colorpair = self.getcolorpair(name=selected and "selected" or "normal",
1076 attrlist=[curses.A_BOLD])
1100 attrlist=[curses.A_BOLD])
1077
1101
1078 # print out from-to line with checkbox
1102 # print out from-to line with checkbox
1079 checkbox = self.getstatusprefixstring(hunk)
1103 checkbox = self.getstatusprefixstring(hunk)
1080
1104
1081 lineprefix = " "*self.hunkindentnumchars + checkbox
1105 lineprefix = " "*self.hunkindentnumchars + checkbox
1082 frtoline = " " + hunk.getfromtoline().strip("\n")
1106 frtoline = " " + hunk.getfromtoline().strip("\n")
1083
1107
1084 outstr += self.printstring(self.chunkpad, lineprefix, towin=towin,
1108 outstr += self.printstring(self.chunkpad, lineprefix, towin=towin,
1085 align=False) # add uncolored checkbox/indent
1109 align=False) # add uncolored checkbox/indent
1086 outstr += self.printstring(self.chunkpad, frtoline, pair=colorpair,
1110 outstr += self.printstring(self.chunkpad, frtoline, pair=colorpair,
1087 towin=towin)
1111 towin=towin)
1088
1112
1089 if hunk.folded and not ignorefolding:
1113 if hunk.folded and not ignorefolding:
1090 # skip remainder of output
1114 # skip remainder of output
1091 return outstr
1115 return outstr
1092
1116
1093 # print out lines of the chunk preceeding changed-lines
1117 # print out lines of the chunk preceeding changed-lines
1094 for line in hunk.before:
1118 for line in hunk.before:
1095 linestr = " "*(self.hunklineindentnumchars + len(checkbox)) + line
1119 linestr = " "*(self.hunklineindentnumchars + len(checkbox)) + line
1096 outstr += self.printstring(self.chunkpad, linestr, towin=towin)
1120 outstr += self.printstring(self.chunkpad, linestr, towin=towin)
1097
1121
1098 return outstr
1122 return outstr
1099
1123
1100 def printhunklinesafter(self, hunk, towin=True, ignorefolding=False):
1124 def printhunklinesafter(self, hunk, towin=True, ignorefolding=False):
1101 outstr = ""
1125 outstr = ""
1102 if hunk.folded and not ignorefolding:
1126 if hunk.folded and not ignorefolding:
1103 return outstr
1127 return outstr
1104
1128
1105 # a bit superfluous, but to avoid hard-coding indent amount
1129 # a bit superfluous, but to avoid hard-coding indent amount
1106 checkbox = self.getstatusprefixstring(hunk)
1130 checkbox = self.getstatusprefixstring(hunk)
1107 for line in hunk.after:
1131 for line in hunk.after:
1108 linestr = " "*(self.hunklineindentnumchars + len(checkbox)) + line
1132 linestr = " "*(self.hunklineindentnumchars + len(checkbox)) + line
1109 outstr += self.printstring(self.chunkpad, linestr, towin=towin)
1133 outstr += self.printstring(self.chunkpad, linestr, towin=towin)
1110
1134
1111 return outstr
1135 return outstr
1112
1136
1113 def printhunkchangedline(self, hunkline, selected=False, towin=True):
1137 def printhunkchangedline(self, hunkline, selected=False, towin=True):
1114 outstr = ""
1138 outstr = ""
1115 checkbox = self.getstatusprefixstring(hunkline)
1139 checkbox = self.getstatusprefixstring(hunkline)
1116
1140
1117 linestr = hunkline.prettystr().strip("\n")
1141 linestr = hunkline.prettystr().strip("\n")
1118
1142
1119 # select color-pair based on whether line is an addition/removal
1143 # select color-pair based on whether line is an addition/removal
1120 if selected:
1144 if selected:
1121 colorpair = self.getcolorpair(name="selected")
1145 colorpair = self.getcolorpair(name="selected")
1122 elif linestr.startswith("+"):
1146 elif linestr.startswith("+"):
1123 colorpair = self.getcolorpair(name="addition")
1147 colorpair = self.getcolorpair(name="addition")
1124 elif linestr.startswith("-"):
1148 elif linestr.startswith("-"):
1125 colorpair = self.getcolorpair(name="deletion")
1149 colorpair = self.getcolorpair(name="deletion")
1126 elif linestr.startswith("\\"):
1150 elif linestr.startswith("\\"):
1127 colorpair = self.getcolorpair(name="normal")
1151 colorpair = self.getcolorpair(name="normal")
1128
1152
1129 lineprefix = " "*self.hunklineindentnumchars + checkbox
1153 lineprefix = " "*self.hunklineindentnumchars + checkbox
1130 outstr += self.printstring(self.chunkpad, lineprefix, towin=towin,
1154 outstr += self.printstring(self.chunkpad, lineprefix, towin=towin,
1131 align=False) # add uncolored checkbox/indent
1155 align=False) # add uncolored checkbox/indent
1132 outstr += self.printstring(self.chunkpad, linestr, pair=colorpair,
1156 outstr += self.printstring(self.chunkpad, linestr, pair=colorpair,
1133 towin=towin, showwhtspc=True)
1157 towin=towin, showwhtspc=True)
1134 return outstr
1158 return outstr
1135
1159
1136 def printitem(self, item=None, ignorefolding=False, recursechildren=True,
1160 def printitem(self, item=None, ignorefolding=False, recursechildren=True,
1137 towin=True):
1161 towin=True):
1138 """
1162 """
1139 use __printitem() to print the the specified item.applied.
1163 use __printitem() to print the the specified item.applied.
1140 if item is not specified, then print the entire patch.
1164 if item is not specified, then print the entire patch.
1141 (hiding folded elements, etc. -- see __printitem() docstring)
1165 (hiding folded elements, etc. -- see __printitem() docstring)
1142 """
1166 """
1143
1167
1144 if item is None:
1168 if item is None:
1145 item = self.headerlist
1169 item = self.headerlist
1146 if recursechildren:
1170 if recursechildren:
1147 self.linesprintedtopadsofar = 0
1171 self.linesprintedtopadsofar = 0
1148
1172
1149 outstr = []
1173 outstr = []
1150 self.__printitem(item, ignorefolding, recursechildren, outstr,
1174 self.__printitem(item, ignorefolding, recursechildren, outstr,
1151 towin=towin)
1175 towin=towin)
1152 return ''.join(outstr)
1176 return ''.join(outstr)
1153
1177
1154 def outofdisplayedarea(self):
1178 def outofdisplayedarea(self):
1155 y, _ = self.chunkpad.getyx() # cursor location
1179 y, _ = self.chunkpad.getyx() # cursor location
1156 # * 2 here works but an optimization would be the max number of
1180 # * 2 here works but an optimization would be the max number of
1157 # consecutive non selectable lines
1181 # consecutive non selectable lines
1158 # i.e the max number of context line for any hunk in the patch
1182 # i.e the max number of context line for any hunk in the patch
1159 miny = min(0, self.firstlineofpadtoprint - self.yscreensize)
1183 miny = min(0, self.firstlineofpadtoprint - self.yscreensize)
1160 maxy = self.firstlineofpadtoprint + self.yscreensize * 2
1184 maxy = self.firstlineofpadtoprint + self.yscreensize * 2
1161 return y < miny or y > maxy
1185 return y < miny or y > maxy
1162
1186
1163 def handleselection(self, item, recursechildren):
1187 def handleselection(self, item, recursechildren):
1164 selected = (item is self.currentselecteditem)
1188 selected = (item is self.currentselecteditem)
1165 if selected and recursechildren:
1189 if selected and recursechildren:
1166 # assumes line numbering starting from line 0
1190 # assumes line numbering starting from line 0
1167 self.selecteditemstartline = self.linesprintedtopadsofar
1191 self.selecteditemstartline = self.linesprintedtopadsofar
1168 selecteditemlines = self.getnumlinesdisplayed(item,
1192 selecteditemlines = self.getnumlinesdisplayed(item,
1169 recursechildren=False)
1193 recursechildren=False)
1170 self.selecteditemendline = (self.selecteditemstartline +
1194 self.selecteditemendline = (self.selecteditemstartline +
1171 selecteditemlines - 1)
1195 selecteditemlines - 1)
1172 return selected
1196 return selected
1173
1197
1174 def __printitem(self, item, ignorefolding, recursechildren, outstr,
1198 def __printitem(self, item, ignorefolding, recursechildren, outstr,
1175 towin=True):
1199 towin=True):
1176 """
1200 """
1177 recursive method for printing out patch/header/hunk/hunk-line data to
1201 recursive method for printing out patch/header/hunk/hunk-line data to
1178 screen. also returns a string with all of the content of the displayed
1202 screen. also returns a string with all of the content of the displayed
1179 patch (not including coloring, etc.).
1203 patch (not including coloring, etc.).
1180
1204
1181 if ignorefolding is True, then folded items are printed out.
1205 if ignorefolding is True, then folded items are printed out.
1182
1206
1183 if recursechildren is False, then only print the item without its
1207 if recursechildren is False, then only print the item without its
1184 child items.
1208 child items.
1185 """
1209 """
1186
1210
1187 if towin and self.outofdisplayedarea():
1211 if towin and self.outofdisplayedarea():
1188 return
1212 return
1189
1213
1190 selected = self.handleselection(item, recursechildren)
1214 selected = self.handleselection(item, recursechildren)
1191
1215
1192 # patch object is a list of headers
1216 # patch object is a list of headers
1193 if isinstance(item, patch):
1217 if isinstance(item, patch):
1194 if recursechildren:
1218 if recursechildren:
1195 for hdr in item:
1219 for hdr in item:
1196 self.__printitem(hdr, ignorefolding,
1220 self.__printitem(hdr, ignorefolding,
1197 recursechildren, outstr, towin)
1221 recursechildren, outstr, towin)
1198 # todo: eliminate all isinstance() calls
1222 # todo: eliminate all isinstance() calls
1199 if isinstance(item, uiheader):
1223 if isinstance(item, uiheader):
1200 outstr.append(self.printheader(item, selected, towin=towin,
1224 outstr.append(self.printheader(item, selected, towin=towin,
1201 ignorefolding=ignorefolding))
1225 ignorefolding=ignorefolding))
1202 if recursechildren:
1226 if recursechildren:
1203 for hnk in item.hunks:
1227 for hnk in item.hunks:
1204 self.__printitem(hnk, ignorefolding,
1228 self.__printitem(hnk, ignorefolding,
1205 recursechildren, outstr, towin)
1229 recursechildren, outstr, towin)
1206 elif (isinstance(item, uihunk) and
1230 elif (isinstance(item, uihunk) and
1207 ((not item.header.folded) or ignorefolding)):
1231 ((not item.header.folded) or ignorefolding)):
1208 # print the hunk data which comes before the changed-lines
1232 # print the hunk data which comes before the changed-lines
1209 outstr.append(self.printhunklinesbefore(item, selected, towin=towin,
1233 outstr.append(self.printhunklinesbefore(item, selected, towin=towin,
1210 ignorefolding=ignorefolding))
1234 ignorefolding=ignorefolding))
1211 if recursechildren:
1235 if recursechildren:
1212 for l in item.changedlines:
1236 for l in item.changedlines:
1213 self.__printitem(l, ignorefolding,
1237 self.__printitem(l, ignorefolding,
1214 recursechildren, outstr, towin)
1238 recursechildren, outstr, towin)
1215 outstr.append(self.printhunklinesafter(item, towin=towin,
1239 outstr.append(self.printhunklinesafter(item, towin=towin,
1216 ignorefolding=ignorefolding))
1240 ignorefolding=ignorefolding))
1217 elif (isinstance(item, uihunkline) and
1241 elif (isinstance(item, uihunkline) and
1218 ((not item.hunk.folded) or ignorefolding)):
1242 ((not item.hunk.folded) or ignorefolding)):
1219 outstr.append(self.printhunkchangedline(item, selected,
1243 outstr.append(self.printhunkchangedline(item, selected,
1220 towin=towin))
1244 towin=towin))
1221
1245
1222 return outstr
1246 return outstr
1223
1247
1224 def getnumlinesdisplayed(self, item=None, ignorefolding=False,
1248 def getnumlinesdisplayed(self, item=None, ignorefolding=False,
1225 recursechildren=True):
1249 recursechildren=True):
1226 """
1250 """
1227 return the number of lines which would be displayed if the item were
1251 return the number of lines which would be displayed if the item were
1228 to be printed to the display. the item will not be printed to the
1252 to be printed to the display. the item will not be printed to the
1229 display (pad).
1253 display (pad).
1230 if no item is given, assume the entire patch.
1254 if no item is given, assume the entire patch.
1231 if ignorefolding is True, folded items will be unfolded when counting
1255 if ignorefolding is True, folded items will be unfolded when counting
1232 the number of lines.
1256 the number of lines.
1233 """
1257 """
1234
1258
1235 # temporarily disable printing to windows by printstring
1259 # temporarily disable printing to windows by printstring
1236 patchdisplaystring = self.printitem(item, ignorefolding,
1260 patchdisplaystring = self.printitem(item, ignorefolding,
1237 recursechildren, towin=False)
1261 recursechildren, towin=False)
1238 numlines = len(patchdisplaystring) / self.xscreensize
1262 numlines = len(patchdisplaystring) / self.xscreensize
1239 return numlines
1263 return numlines
1240
1264
1241 def sigwinchhandler(self, n, frame):
1265 def sigwinchhandler(self, n, frame):
1242 "handle window resizing"
1266 "handle window resizing"
1243 try:
1267 try:
1244 curses.endwin()
1268 curses.endwin()
1245 self.xscreensize, self.yscreensize = scmutil.termsize(self.ui)
1269 self.xscreensize, self.yscreensize = scmutil.termsize(self.ui)
1246 self.statuswin.resize(self.numstatuslines, self.xscreensize)
1270 self.statuswin.resize(self.numstatuslines, self.xscreensize)
1247 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
1271 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
1248 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
1272 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
1249 except curses.error:
1273 except curses.error:
1250 pass
1274 pass
1251
1275
1252 def getcolorpair(self, fgcolor=None, bgcolor=None, name=None,
1276 def getcolorpair(self, fgcolor=None, bgcolor=None, name=None,
1253 attrlist=None):
1277 attrlist=None):
1254 """
1278 """
1255 get a curses color pair, adding it to self.colorpairs if it is not
1279 get a curses color pair, adding it to self.colorpairs if it is not
1256 already defined. an optional string, name, can be passed as a shortcut
1280 already defined. an optional string, name, can be passed as a shortcut
1257 for referring to the color-pair. by default, if no arguments are
1281 for referring to the color-pair. by default, if no arguments are
1258 specified, the white foreground / black background color-pair is
1282 specified, the white foreground / black background color-pair is
1259 returned.
1283 returned.
1260
1284
1261 it is expected that this function will be used exclusively for
1285 it is expected that this function will be used exclusively for
1262 initializing color pairs, and not curses.init_pair().
1286 initializing color pairs, and not curses.init_pair().
1263
1287
1264 attrlist is used to 'flavor' the returned color-pair. this information
1288 attrlist is used to 'flavor' the returned color-pair. this information
1265 is not stored in self.colorpairs. it contains attribute values like
1289 is not stored in self.colorpairs. it contains attribute values like
1266 curses.A_BOLD.
1290 curses.A_BOLD.
1267 """
1291 """
1268
1292
1269 if (name is not None) and name in self.colorpairnames:
1293 if (name is not None) and name in self.colorpairnames:
1270 # then get the associated color pair and return it
1294 # then get the associated color pair and return it
1271 colorpair = self.colorpairnames[name]
1295 colorpair = self.colorpairnames[name]
1272 else:
1296 else:
1273 if fgcolor is None:
1297 if fgcolor is None:
1274 fgcolor = -1
1298 fgcolor = -1
1275 if bgcolor is None:
1299 if bgcolor is None:
1276 bgcolor = -1
1300 bgcolor = -1
1277 if (fgcolor, bgcolor) in self.colorpairs:
1301 if (fgcolor, bgcolor) in self.colorpairs:
1278 colorpair = self.colorpairs[(fgcolor, bgcolor)]
1302 colorpair = self.colorpairs[(fgcolor, bgcolor)]
1279 else:
1303 else:
1280 pairindex = len(self.colorpairs) + 1
1304 pairindex = len(self.colorpairs) + 1
1281 curses.init_pair(pairindex, fgcolor, bgcolor)
1305 curses.init_pair(pairindex, fgcolor, bgcolor)
1282 colorpair = self.colorpairs[(fgcolor, bgcolor)] = (
1306 colorpair = self.colorpairs[(fgcolor, bgcolor)] = (
1283 curses.color_pair(pairindex))
1307 curses.color_pair(pairindex))
1284 if name is not None:
1308 if name is not None:
1285 self.colorpairnames[name] = curses.color_pair(pairindex)
1309 self.colorpairnames[name] = curses.color_pair(pairindex)
1286
1310
1287 # add attributes if possible
1311 # add attributes if possible
1288 if attrlist is None:
1312 if attrlist is None:
1289 attrlist = []
1313 attrlist = []
1290 if colorpair < 256:
1314 if colorpair < 256:
1291 # then it is safe to apply all attributes
1315 # then it is safe to apply all attributes
1292 for textattr in attrlist:
1316 for textattr in attrlist:
1293 colorpair |= textattr
1317 colorpair |= textattr
1294 else:
1318 else:
1295 # just apply a select few (safe?) attributes
1319 # just apply a select few (safe?) attributes
1296 for textattrib in (curses.A_UNDERLINE, curses.A_BOLD):
1320 for textattrib in (curses.A_UNDERLINE, curses.A_BOLD):
1297 if textattrib in attrlist:
1321 if textattrib in attrlist:
1298 colorpair |= textattrib
1322 colorpair |= textattrib
1299 return colorpair
1323 return colorpair
1300
1324
1301 def initcolorpair(self, *args, **kwargs):
1325 def initcolorpair(self, *args, **kwargs):
1302 "same as getcolorpair."
1326 "same as getcolorpair."
1303 self.getcolorpair(*args, **kwargs)
1327 self.getcolorpair(*args, **kwargs)
1304
1328
1305 def helpwindow(self):
1329 def helpwindow(self):
1306 "print a help window to the screen. exit after any keypress."
1330 "print a help window to the screen. exit after any keypress."
1307 helptext = _(
1331 helptext = _(
1308 """ [press any key to return to the patch-display]
1332 """ [press any key to return to the patch-display]
1309
1333
1310 crecord allows you to interactively choose among the changes you have made,
1334 crecord allows you to interactively choose among the changes you have made,
1311 and confirm only those changes you select for further processing by the command
1335 and confirm only those changes you select for further processing by the command
1312 you are running (commit/shelve/revert), after confirming the selected
1336 you are running (commit/shelve/revert), after confirming the selected
1313 changes, the unselected changes are still present in your working copy, so you
1337 changes, the unselected changes are still present in your working copy, so you
1314 can use crecord multiple times to split large changes into smaller changesets.
1338 can use crecord multiple times to split large changes into smaller changesets.
1315 the following are valid keystrokes:
1339 the following are valid keystrokes:
1316
1340
1317 [space] : (un-)select item ([~]/[x] = partly/fully applied)
1341 [space] : (un-)select item ([~]/[x] = partly/fully applied)
1318 A : (un-)select all items
1342 A : (un-)select all items
1319 up/down-arrow [k/j] : go to previous/next unfolded item
1343 up/down-arrow [k/j] : go to previous/next unfolded item
1320 pgup/pgdn [K/J] : go to previous/next item of same type
1344 pgup/pgdn [K/J] : go to previous/next item of same type
1321 right/left-arrow [l/h] : go to child item / parent item
1345 right/left-arrow [l/h] : go to child item / parent item
1322 shift-left-arrow [H] : go to parent header / fold selected header
1346 shift-left-arrow [H] : go to parent header / fold selected header
1323 f : fold / unfold item, hiding/revealing its children
1347 f : fold / unfold item, hiding/revealing its children
1324 F : fold / unfold parent item and all of its ancestors
1348 F : fold / unfold parent item and all of its ancestors
1325 ctrl-l : scroll the selected line to the top of the screen
1349 ctrl-l : scroll the selected line to the top of the screen
1326 m : edit / resume editing the commit message
1350 m : edit / resume editing the commit message
1327 e : edit the currently selected hunk
1351 e : edit the currently selected hunk
1328 a : toggle amend mode, only with commit -i
1352 a : toggle amend mode, only with commit -i
1329 c : confirm selected changes
1353 c : confirm selected changes
1330 r : review/edit and confirm selected changes
1354 r : review/edit and confirm selected changes
1331 q : quit without confirming (no changes will be made)
1355 q : quit without confirming (no changes will be made)
1332 ? : help (what you're currently reading)""")
1356 ? : help (what you're currently reading)""")
1333
1357
1334 helpwin = curses.newwin(self.yscreensize, 0, 0, 0)
1358 helpwin = curses.newwin(self.yscreensize, 0, 0, 0)
1335 helplines = helptext.split("\n")
1359 helplines = helptext.split("\n")
1336 helplines = helplines + [" "]*(
1360 helplines = helplines + [" "]*(
1337 self.yscreensize - self.numstatuslines - len(helplines) - 1)
1361 self.yscreensize - self.numstatuslines - len(helplines) - 1)
1338 try:
1362 try:
1339 for line in helplines:
1363 for line in helplines:
1340 self.printstring(helpwin, line, pairname="legend")
1364 self.printstring(helpwin, line, pairname="legend")
1341 except curses.error:
1365 except curses.error:
1342 pass
1366 pass
1343 helpwin.refresh()
1367 helpwin.refresh()
1344 try:
1368 try:
1345 helpwin.getkey()
1369 helpwin.getkey()
1346 except curses.error:
1370 except curses.error:
1347 pass
1371 pass
1348
1372
1349 def confirmationwindow(self, windowtext):
1373 def confirmationwindow(self, windowtext):
1350 "display an informational window, then wait for and return a keypress."
1374 "display an informational window, then wait for and return a keypress."
1351
1375
1352 confirmwin = curses.newwin(self.yscreensize, 0, 0, 0)
1376 confirmwin = curses.newwin(self.yscreensize, 0, 0, 0)
1353 try:
1377 try:
1354 lines = windowtext.split("\n")
1378 lines = windowtext.split("\n")
1355 for line in lines:
1379 for line in lines:
1356 self.printstring(confirmwin, line, pairname="selected")
1380 self.printstring(confirmwin, line, pairname="selected")
1357 except curses.error:
1381 except curses.error:
1358 pass
1382 pass
1359 self.stdscr.refresh()
1383 self.stdscr.refresh()
1360 confirmwin.refresh()
1384 confirmwin.refresh()
1361 try:
1385 try:
1362 response = chr(self.stdscr.getch())
1386 response = chr(self.stdscr.getch())
1363 except ValueError:
1387 except ValueError:
1364 response = None
1388 response = None
1365
1389
1366 return response
1390 return response
1367
1391
1368 def reviewcommit(self):
1392 def reviewcommit(self):
1369 """ask for 'y' to be pressed to confirm selected. return True if
1393 """ask for 'y' to be pressed to confirm selected. return True if
1370 confirmed."""
1394 confirmed."""
1371 confirmtext = _(
1395 confirmtext = _(
1372 """if you answer yes to the following, the your currently chosen patch chunks
1396 """if you answer yes to the following, the your currently chosen patch chunks
1373 will be loaded into an editor. you may modify the patch from the editor, and
1397 will be loaded into an editor. you may modify the patch from the editor, and
1374 save the changes if you wish to change the patch. otherwise, you can just
1398 save the changes if you wish to change the patch. otherwise, you can just
1375 close the editor without saving to accept the current patch as-is.
1399 close the editor without saving to accept the current patch as-is.
1376
1400
1377 note: don't add/remove lines unless you also modify the range information.
1401 note: don't add/remove lines unless you also modify the range information.
1378 failing to follow this rule will result in the commit aborting.
1402 failing to follow this rule will result in the commit aborting.
1379
1403
1380 are you sure you want to review/edit and confirm the selected changes [yn]?
1404 are you sure you want to review/edit and confirm the selected changes [yn]?
1381 """)
1405 """)
1382 response = self.confirmationwindow(confirmtext)
1406 response = self.confirmationwindow(confirmtext)
1383 if response is None:
1407 if response is None:
1384 response = "n"
1408 response = "n"
1385 if response.lower().startswith("y"):
1409 if response.lower().startswith("y"):
1386 return True
1410 return True
1387 else:
1411 else:
1388 return False
1412 return False
1389
1413
1390 def toggleamend(self, opts, test):
1414 def toggleamend(self, opts, test):
1391 """Toggle the amend flag.
1415 """Toggle the amend flag.
1392
1416
1393 When the amend flag is set, a commit will modify the most recently
1417 When the amend flag is set, a commit will modify the most recently
1394 committed changeset, instead of creating a new changeset. Otherwise, a
1418 committed changeset, instead of creating a new changeset. Otherwise, a
1395 new changeset will be created (the normal commit behavior).
1419 new changeset will be created (the normal commit behavior).
1396 """
1420 """
1397
1421
1398 try:
1422 try:
1399 ver = float(util.version()[:3])
1423 ver = float(util.version()[:3])
1400 except ValueError:
1424 except ValueError:
1401 ver = 1
1425 ver = 1
1402 if ver < 2.19:
1426 if ver < 2.19:
1403 msg = _("The amend option is unavailable with hg versions < 2.2\n\n"
1427 msg = _("The amend option is unavailable with hg versions < 2.2\n\n"
1404 "Press any key to continue.")
1428 "Press any key to continue.")
1405 elif opts.get('amend') is None:
1429 elif opts.get('amend') is None:
1406 opts['amend'] = True
1430 opts['amend'] = True
1407 msg = _("Amend option is turned on -- committing the currently "
1431 msg = _("Amend option is turned on -- committing the currently "
1408 "selected changes will not create a new changeset, but "
1432 "selected changes will not create a new changeset, but "
1409 "instead update the most recently committed changeset.\n\n"
1433 "instead update the most recently committed changeset.\n\n"
1410 "Press any key to continue.")
1434 "Press any key to continue.")
1411 elif opts.get('amend') is True:
1435 elif opts.get('amend') is True:
1412 opts['amend'] = None
1436 opts['amend'] = None
1413 msg = _("Amend option is turned off -- committing the currently "
1437 msg = _("Amend option is turned off -- committing the currently "
1414 "selected changes will create a new changeset.\n\n"
1438 "selected changes will create a new changeset.\n\n"
1415 "Press any key to continue.")
1439 "Press any key to continue.")
1416 if not test:
1440 if not test:
1417 self.confirmationwindow(msg)
1441 self.confirmationwindow(msg)
1418
1442
1419 def recenterdisplayedarea(self):
1443 def recenterdisplayedarea(self):
1420 """
1444 """
1421 once we scrolled with pg up pg down we can be pointing outside of the
1445 once we scrolled with pg up pg down we can be pointing outside of the
1422 display zone. we print the patch with towin=False to compute the
1446 display zone. we print the patch with towin=False to compute the
1423 location of the selected item even though it is outside of the displayed
1447 location of the selected item even though it is outside of the displayed
1424 zone and then update the scroll.
1448 zone and then update the scroll.
1425 """
1449 """
1426 self.printitem(towin=False)
1450 self.printitem(towin=False)
1427 self.updatescroll()
1451 self.updatescroll()
1428
1452
1429 def toggleedit(self, item=None, test=False):
1453 def toggleedit(self, item=None, test=False):
1430 """
1454 """
1431 edit the currently selected chunk
1455 edit the currently selected chunk
1432 """
1456 """
1433 def updateui(self):
1457 def updateui(self):
1434 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
1458 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
1435 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
1459 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
1436 self.updatescroll()
1460 self.updatescroll()
1437 self.stdscr.refresh()
1461 self.stdscr.refresh()
1438 self.statuswin.refresh()
1462 self.statuswin.refresh()
1439 self.stdscr.keypad(1)
1463 self.stdscr.keypad(1)
1440
1464
1441 def editpatchwitheditor(self, chunk):
1465 def editpatchwitheditor(self, chunk):
1442 if chunk is None:
1466 if chunk is None:
1443 self.ui.write(_('cannot edit patch for whole file'))
1467 self.ui.write(_('cannot edit patch for whole file'))
1444 self.ui.write("\n")
1468 self.ui.write("\n")
1445 return None
1469 return None
1446 if chunk.header.binary():
1470 if chunk.header.binary():
1447 self.ui.write(_('cannot edit patch for binary file'))
1471 self.ui.write(_('cannot edit patch for binary file'))
1448 self.ui.write("\n")
1472 self.ui.write("\n")
1449 return None
1473 return None
1450
1474
1451 # write the initial patch
1475 # write the initial patch
1452 patch = stringio()
1476 patch = stringio()
1453 patch.write(diffhelptext + hunkhelptext)
1477 patch.write(diffhelptext + hunkhelptext)
1454 chunk.header.write(patch)
1478 chunk.header.write(patch)
1455 chunk.write(patch)
1479 chunk.write(patch)
1456
1480
1457 # start the editor and wait for it to complete
1481 # start the editor and wait for it to complete
1458 try:
1482 try:
1459 patch = self.ui.edit(patch.getvalue(), "",
1483 patch = self.ui.edit(patch.getvalue(), "",
1460 extra={"suffix": ".diff"})
1484 extra={"suffix": ".diff"})
1461 except error.Abort as exc:
1485 except error.Abort as exc:
1462 self.errorstr = str(exc)
1486 self.errorstr = str(exc)
1463 return None
1487 return None
1464
1488
1465 # remove comment lines
1489 # remove comment lines
1466 patch = [line + '\n' for line in patch.splitlines()
1490 patch = [line + '\n' for line in patch.splitlines()
1467 if not line.startswith('#')]
1491 if not line.startswith('#')]
1468 return patchmod.parsepatch(patch)
1492 return patchmod.parsepatch(patch)
1469
1493
1470 if item is None:
1494 if item is None:
1471 item = self.currentselecteditem
1495 item = self.currentselecteditem
1472 if isinstance(item, uiheader):
1496 if isinstance(item, uiheader):
1473 return
1497 return
1474 if isinstance(item, uihunkline):
1498 if isinstance(item, uihunkline):
1475 item = item.parentitem()
1499 item = item.parentitem()
1476 if not isinstance(item, uihunk):
1500 if not isinstance(item, uihunk):
1477 return
1501 return
1478
1502
1479 # To go back to that hunk or its replacement at the end of the edit
1503 # To go back to that hunk or its replacement at the end of the edit
1480 itemindex = item.parentitem().hunks.index(item)
1504 itemindex = item.parentitem().hunks.index(item)
1481
1505
1482 beforeadded, beforeremoved = item.added, item.removed
1506 beforeadded, beforeremoved = item.added, item.removed
1483 newpatches = editpatchwitheditor(self, item)
1507 newpatches = editpatchwitheditor(self, item)
1484 if newpatches is None:
1508 if newpatches is None:
1485 if not test:
1509 if not test:
1486 updateui(self)
1510 updateui(self)
1487 return
1511 return
1488 header = item.header
1512 header = item.header
1489 editedhunkindex = header.hunks.index(item)
1513 editedhunkindex = header.hunks.index(item)
1490 hunksbefore = header.hunks[:editedhunkindex]
1514 hunksbefore = header.hunks[:editedhunkindex]
1491 hunksafter = header.hunks[editedhunkindex + 1:]
1515 hunksafter = header.hunks[editedhunkindex + 1:]
1492 newpatchheader = newpatches[0]
1516 newpatchheader = newpatches[0]
1493 newhunks = [uihunk(h, header) for h in newpatchheader.hunks]
1517 newhunks = [uihunk(h, header) for h in newpatchheader.hunks]
1494 newadded = sum([h.added for h in newhunks])
1518 newadded = sum([h.added for h in newhunks])
1495 newremoved = sum([h.removed for h in newhunks])
1519 newremoved = sum([h.removed for h in newhunks])
1496 offset = (newadded - beforeadded) - (newremoved - beforeremoved)
1520 offset = (newadded - beforeadded) - (newremoved - beforeremoved)
1497
1521
1498 for h in hunksafter:
1522 for h in hunksafter:
1499 h.toline += offset
1523 h.toline += offset
1500 for h in newhunks:
1524 for h in newhunks:
1501 h.folded = False
1525 h.folded = False
1502 header.hunks = hunksbefore + newhunks + hunksafter
1526 header.hunks = hunksbefore + newhunks + hunksafter
1503 if self.emptypatch():
1527 if self.emptypatch():
1504 header.hunks = hunksbefore + [item] + hunksafter
1528 header.hunks = hunksbefore + [item] + hunksafter
1505 self.currentselecteditem = header
1529 self.currentselecteditem = header
1506 if len(header.hunks) > itemindex:
1530 if len(header.hunks) > itemindex:
1507 self.currentselecteditem = header.hunks[itemindex]
1531 self.currentselecteditem = header.hunks[itemindex]
1508
1532
1509 if not test:
1533 if not test:
1510 updateui(self)
1534 updateui(self)
1511
1535
1512 def emptypatch(self):
1536 def emptypatch(self):
1513 item = self.headerlist
1537 item = self.headerlist
1514 if not item:
1538 if not item:
1515 return True
1539 return True
1516 for header in item:
1540 for header in item:
1517 if header.hunks:
1541 if header.hunks:
1518 return False
1542 return False
1519 return True
1543 return True
1520
1544
1521 def handlekeypressed(self, keypressed, test=False):
1545 def handlekeypressed(self, keypressed, test=False):
1522 """
1546 """
1523 Perform actions based on pressed keys.
1547 Perform actions based on pressed keys.
1524
1548
1525 Return true to exit the main loop.
1549 Return true to exit the main loop.
1526 """
1550 """
1527 if keypressed in ["k", "KEY_UP"]:
1551 if keypressed in ["k", "KEY_UP"]:
1528 self.uparrowevent()
1552 self.uparrowevent()
1529 if keypressed in ["K", "KEY_PPAGE"]:
1553 if keypressed in ["K", "KEY_PPAGE"]:
1530 self.uparrowshiftevent()
1554 self.uparrowshiftevent()
1531 elif keypressed in ["j", "KEY_DOWN"]:
1555 elif keypressed in ["j", "KEY_DOWN"]:
1532 self.downarrowevent()
1556 self.downarrowevent()
1533 elif keypressed in ["J", "KEY_NPAGE"]:
1557 elif keypressed in ["J", "KEY_NPAGE"]:
1534 self.downarrowshiftevent()
1558 self.downarrowshiftevent()
1535 elif keypressed in ["l", "KEY_RIGHT"]:
1559 elif keypressed in ["l", "KEY_RIGHT"]:
1536 self.rightarrowevent()
1560 self.rightarrowevent()
1537 elif keypressed in ["h", "KEY_LEFT"]:
1561 elif keypressed in ["h", "KEY_LEFT"]:
1538 self.leftarrowevent()
1562 self.leftarrowevent()
1539 elif keypressed in ["H", "KEY_SLEFT"]:
1563 elif keypressed in ["H", "KEY_SLEFT"]:
1540 self.leftarrowshiftevent()
1564 self.leftarrowshiftevent()
1541 elif keypressed in ["q"]:
1565 elif keypressed in ["q"]:
1542 raise error.Abort(_('user quit'))
1566 raise error.Abort(_('user quit'))
1543 elif keypressed in ['a']:
1567 elif keypressed in ['a']:
1544 self.toggleamend(self.opts, test)
1568 self.toggleamend(self.opts, test)
1545 elif keypressed in ["c"]:
1569 elif keypressed in ["c"]:
1546 return True
1570 return True
1547 elif test and keypressed in ['X']:
1571 elif test and keypressed in ['X']:
1548 return True
1572 return True
1549 elif keypressed in ["r"]:
1573 elif keypressed in ["r"]:
1550 if self.reviewcommit():
1574 if self.reviewcommit():
1551 self.opts['review'] = True
1575 self.opts['review'] = True
1552 return True
1576 return True
1553 elif test and keypressed in ['R']:
1577 elif test and keypressed in ['R']:
1554 self.opts['review'] = True
1578 self.opts['review'] = True
1555 return True
1579 return True
1556 elif keypressed in [' '] or (test and keypressed in ["TOGGLE"]):
1580 elif keypressed in [' '] or (test and keypressed in ["TOGGLE"]):
1557 self.toggleapply()
1581 self.toggleapply()
1558 elif keypressed in ['A']:
1582 elif keypressed in ['A']:
1559 self.toggleall()
1583 self.toggleall()
1560 elif keypressed in ['e']:
1584 elif keypressed in ['e']:
1561 self.toggleedit(test=test)
1585 self.toggleedit(test=test)
1562 elif keypressed in ["f"]:
1586 elif keypressed in ["f"]:
1563 self.togglefolded()
1587 self.togglefolded()
1564 elif keypressed in ["F"]:
1588 elif keypressed in ["F"]:
1565 self.togglefolded(foldparent=True)
1589 self.togglefolded(foldparent=True)
1566 elif keypressed in ["?"]:
1590 elif keypressed in ["?"]:
1567 self.helpwindow()
1591 self.helpwindow()
1568 self.stdscr.clear()
1592 self.stdscr.clear()
1569 self.stdscr.refresh()
1593 self.stdscr.refresh()
1570 elif curses.unctrl(keypressed) in ["^L"]:
1594 elif curses.unctrl(keypressed) in ["^L"]:
1571 # scroll the current line to the top of the screen
1595 # scroll the current line to the top of the screen
1572 self.scrolllines(self.selecteditemstartline)
1596 self.scrolllines(self.selecteditemstartline)
1573
1597
1574 def main(self, stdscr):
1598 def main(self, stdscr):
1575 """
1599 """
1576 method to be wrapped by curses.wrapper() for selecting chunks.
1600 method to be wrapped by curses.wrapper() for selecting chunks.
1577 """
1601 """
1578
1602
1579 origsigwinchhandler = signal.signal(signal.SIGWINCH,
1603 origsigwinchhandler = signal.signal(signal.SIGWINCH,
1580 self.sigwinchhandler)
1604 self.sigwinchhandler)
1581 self.stdscr = stdscr
1605 self.stdscr = stdscr
1582 # error during initialization, cannot be printed in the curses
1606 # error during initialization, cannot be printed in the curses
1583 # interface, it should be printed by the calling code
1607 # interface, it should be printed by the calling code
1584 self.initerr = None
1608 self.initerr = None
1585 self.yscreensize, self.xscreensize = self.stdscr.getmaxyx()
1609 self.yscreensize, self.xscreensize = self.stdscr.getmaxyx()
1586
1610
1587 curses.start_color()
1611 curses.start_color()
1588 curses.use_default_colors()
1612 curses.use_default_colors()
1589
1613
1590 # available colors: black, blue, cyan, green, magenta, white, yellow
1614 # available colors: black, blue, cyan, green, magenta, white, yellow
1591 # init_pair(color_id, foreground_color, background_color)
1615 # init_pair(color_id, foreground_color, background_color)
1592 self.initcolorpair(None, None, name="normal")
1616 self.initcolorpair(None, None, name="normal")
1593 self.initcolorpair(curses.COLOR_WHITE, curses.COLOR_MAGENTA,
1617 self.initcolorpair(curses.COLOR_WHITE, curses.COLOR_MAGENTA,
1594 name="selected")
1618 name="selected")
1595 self.initcolorpair(curses.COLOR_RED, None, name="deletion")
1619 self.initcolorpair(curses.COLOR_RED, None, name="deletion")
1596 self.initcolorpair(curses.COLOR_GREEN, None, name="addition")
1620 self.initcolorpair(curses.COLOR_GREEN, None, name="addition")
1597 self.initcolorpair(curses.COLOR_WHITE, curses.COLOR_BLUE, name="legend")
1621 self.initcolorpair(curses.COLOR_WHITE, curses.COLOR_BLUE, name="legend")
1598 # newwin([height, width,] begin_y, begin_x)
1622 # newwin([height, width,] begin_y, begin_x)
1599 self.statuswin = curses.newwin(self.numstatuslines, 0, 0, 0)
1623 self.statuswin = curses.newwin(self.numstatuslines, 0, 0, 0)
1600 self.statuswin.keypad(1) # interpret arrow-key, etc. esc sequences
1624 self.statuswin.keypad(1) # interpret arrow-key, etc. esc sequences
1601
1625
1602 # figure out how much space to allocate for the chunk-pad which is
1626 # figure out how much space to allocate for the chunk-pad which is
1603 # used for displaying the patch
1627 # used for displaying the patch
1604
1628
1605 # stupid hack to prevent getnumlinesdisplayed from failing
1629 # stupid hack to prevent getnumlinesdisplayed from failing
1606 self.chunkpad = curses.newpad(1, self.xscreensize)
1630 self.chunkpad = curses.newpad(1, self.xscreensize)
1607
1631
1608 # add 1 so to account for last line text reaching end of line
1632 # add 1 so to account for last line text reaching end of line
1609 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
1633 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
1610
1634
1611 try:
1635 try:
1612 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
1636 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
1613 except curses.error:
1637 except curses.error:
1614 self.initerr = _('this diff is too large to be displayed')
1638 self.initerr = _('this diff is too large to be displayed')
1615 return
1639 return
1616 # initialize selecteditemendline (initial start-line is 0)
1640 # initialize selecteditemendline (initial start-line is 0)
1617 self.selecteditemendline = self.getnumlinesdisplayed(
1641 self.selecteditemendline = self.getnumlinesdisplayed(
1618 self.currentselecteditem, recursechildren=False)
1642 self.currentselecteditem, recursechildren=False)
1619
1643
1620 while True:
1644 while True:
1621 self.updatescreen()
1645 self.updatescreen()
1622 try:
1646 try:
1623 keypressed = self.statuswin.getkey()
1647 keypressed = self.statuswin.getkey()
1624 if self.errorstr is not None:
1648 if self.errorstr is not None:
1625 self.errorstr = None
1649 self.errorstr = None
1626 continue
1650 continue
1627 except curses.error:
1651 except curses.error:
1628 keypressed = "foobar"
1652 keypressed = "foobar"
1629 if self.handlekeypressed(keypressed):
1653 if self.handlekeypressed(keypressed):
1630 break
1654 break
1631 signal.signal(signal.SIGWINCH, origsigwinchhandler)
1655 signal.signal(signal.SIGWINCH, origsigwinchhandler)
General Comments 0
You need to be logged in to leave comments. Login now