##// END OF EJS Templates
crecord: honor "ui.color = no" config option...
Elmar Bartel -
r35545:f43dc62c default
parent child Browse files
Show More
@@ -1,1755 +1,1770 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 reversehunk(self):
430 def reversehunk(self):
431 """return a recordhunk which is the reverse of the hunk
431 """return a recordhunk which is the reverse of the hunk
432
432
433 Assuming the displayed patch is diff(A, B) result. The returned hunk is
433 Assuming the displayed patch is diff(A, B) result. The returned hunk is
434 intended to be applied to B, instead of A.
434 intended to be applied to B, instead of A.
435
435
436 For example, when A is "0\n1\n2\n6\n" and B is "0\n3\n4\n5\n6\n", and
436 For example, when A is "0\n1\n2\n6\n" and B is "0\n3\n4\n5\n6\n", and
437 the user made the following selection:
437 the user made the following selection:
438
438
439 0
439 0
440 [x] -1 [x]: selected
440 [x] -1 [x]: selected
441 [ ] -2 [ ]: not selected
441 [ ] -2 [ ]: not selected
442 [x] +3
442 [x] +3
443 [ ] +4
443 [ ] +4
444 [x] +5
444 [x] +5
445 6
445 6
446
446
447 This function returns a hunk like:
447 This function returns a hunk like:
448
448
449 0
449 0
450 -3
450 -3
451 -4
451 -4
452 -5
452 -5
453 +1
453 +1
454 +4
454 +4
455 6
455 6
456
456
457 Note "4" was first deleted then added. That's because "4" exists in B
457 Note "4" was first deleted then added. That's because "4" exists in B
458 side and "-4" must exist between "-3" and "-5" to make the patch
458 side and "-4" must exist between "-3" and "-5" to make the patch
459 applicable to B.
459 applicable to B.
460 """
460 """
461 dels = []
461 dels = []
462 adds = []
462 adds = []
463 for line in self.changedlines:
463 for line in self.changedlines:
464 text = line.linetext
464 text = line.linetext
465 if line.applied:
465 if line.applied:
466 if text[0] == '+':
466 if text[0] == '+':
467 dels.append(text[1:])
467 dels.append(text[1:])
468 elif text[0] == '-':
468 elif text[0] == '-':
469 adds.append(text[1:])
469 adds.append(text[1:])
470 elif text[0] == '+':
470 elif text[0] == '+':
471 dels.append(text[1:])
471 dels.append(text[1:])
472 adds.append(text[1:])
472 adds.append(text[1:])
473 hunk = ['-%s' % l for l in dels] + ['+%s' % l for l in adds]
473 hunk = ['-%s' % l for l in dels] + ['+%s' % l for l in adds]
474 h = self._hunk
474 h = self._hunk
475 return patchmod.recordhunk(h.header, h.toline, h.fromline, h.proc,
475 return patchmod.recordhunk(h.header, h.toline, h.fromline, h.proc,
476 h.before, hunk, h.after)
476 h.before, hunk, h.after)
477
477
478 def __getattr__(self, name):
478 def __getattr__(self, name):
479 return getattr(self._hunk, name)
479 return getattr(self._hunk, name)
480
480
481 def __repr__(self):
481 def __repr__(self):
482 return '<hunk %r@%d>' % (self.filename(), self.fromline)
482 return '<hunk %r@%d>' % (self.filename(), self.fromline)
483
483
484 def filterpatch(ui, chunks, chunkselector, operation=None):
484 def filterpatch(ui, chunks, chunkselector, operation=None):
485 """interactively filter patch chunks into applied-only chunks"""
485 """interactively filter patch chunks into applied-only chunks"""
486 chunks = list(chunks)
486 chunks = list(chunks)
487 # convert chunks list into structure suitable for displaying/modifying
487 # convert chunks list into structure suitable for displaying/modifying
488 # with curses. create a list of headers only.
488 # with curses. create a list of headers only.
489 headers = [c for c in chunks if isinstance(c, patchmod.header)]
489 headers = [c for c in chunks if isinstance(c, patchmod.header)]
490
490
491 # if there are no changed files
491 # if there are no changed files
492 if len(headers) == 0:
492 if len(headers) == 0:
493 return [], {}
493 return [], {}
494 uiheaders = [uiheader(h) for h in headers]
494 uiheaders = [uiheader(h) for h in headers]
495 # let user choose headers/hunks/lines, and mark their applied flags
495 # let user choose headers/hunks/lines, and mark their applied flags
496 # accordingly
496 # accordingly
497 ret = chunkselector(ui, uiheaders, operation=operation)
497 ret = chunkselector(ui, uiheaders, operation=operation)
498 appliedhunklist = []
498 appliedhunklist = []
499 for hdr in uiheaders:
499 for hdr in uiheaders:
500 if (hdr.applied and
500 if (hdr.applied and
501 (hdr.special() or len([h for h in hdr.hunks if h.applied]) > 0)):
501 (hdr.special() or len([h for h in hdr.hunks if h.applied]) > 0)):
502 appliedhunklist.append(hdr)
502 appliedhunklist.append(hdr)
503 fixoffset = 0
503 fixoffset = 0
504 for hnk in hdr.hunks:
504 for hnk in hdr.hunks:
505 if hnk.applied:
505 if hnk.applied:
506 appliedhunklist.append(hnk)
506 appliedhunklist.append(hnk)
507 # adjust the 'to'-line offset of the hunk to be correct
507 # adjust the 'to'-line offset of the hunk to be correct
508 # after de-activating some of the other hunks for this file
508 # after de-activating some of the other hunks for this file
509 if fixoffset:
509 if fixoffset:
510 #hnk = copy.copy(hnk) # necessary??
510 #hnk = copy.copy(hnk) # necessary??
511 hnk.toline += fixoffset
511 hnk.toline += fixoffset
512 else:
512 else:
513 fixoffset += hnk.removed - hnk.added
513 fixoffset += hnk.removed - hnk.added
514
514
515 return (appliedhunklist, ret)
515 return (appliedhunklist, ret)
516
516
517 def chunkselector(ui, headerlist, operation=None):
517 def chunkselector(ui, headerlist, operation=None):
518 """
518 """
519 curses interface to get selection of chunks, and mark the applied flags
519 curses interface to get selection of chunks, and mark the applied flags
520 of the chosen chunks.
520 of the chosen chunks.
521 """
521 """
522 ui.write(_('starting interactive selection\n'))
522 ui.write(_('starting interactive selection\n'))
523 chunkselector = curseschunkselector(headerlist, ui, operation)
523 chunkselector = curseschunkselector(headerlist, ui, operation)
524 origsigtstp = sentinel = object()
524 origsigtstp = sentinel = object()
525 if util.safehasattr(signal, 'SIGTSTP'):
525 if util.safehasattr(signal, 'SIGTSTP'):
526 origsigtstp = signal.getsignal(signal.SIGTSTP)
526 origsigtstp = signal.getsignal(signal.SIGTSTP)
527 try:
527 try:
528 curses.wrapper(chunkselector.main)
528 curses.wrapper(chunkselector.main)
529 if chunkselector.initerr is not None:
529 if chunkselector.initerr is not None:
530 raise error.Abort(chunkselector.initerr)
530 raise error.Abort(chunkselector.initerr)
531 # ncurses does not restore signal handler for SIGTSTP
531 # ncurses does not restore signal handler for SIGTSTP
532 finally:
532 finally:
533 if origsigtstp is not sentinel:
533 if origsigtstp is not sentinel:
534 signal.signal(signal.SIGTSTP, origsigtstp)
534 signal.signal(signal.SIGTSTP, origsigtstp)
535 return chunkselector.opts
535 return chunkselector.opts
536
536
537 def testdecorator(testfn, f):
537 def testdecorator(testfn, f):
538 def u(*args, **kwargs):
538 def u(*args, **kwargs):
539 return f(testfn, *args, **kwargs)
539 return f(testfn, *args, **kwargs)
540 return u
540 return u
541
541
542 def testchunkselector(testfn, ui, headerlist, operation=None):
542 def testchunkselector(testfn, ui, headerlist, operation=None):
543 """
543 """
544 test interface to get selection of chunks, and mark the applied flags
544 test interface to get selection of chunks, and mark the applied flags
545 of the chosen chunks.
545 of the chosen chunks.
546 """
546 """
547 chunkselector = curseschunkselector(headerlist, ui, operation)
547 chunkselector = curseschunkselector(headerlist, ui, operation)
548 if testfn and os.path.exists(testfn):
548 if testfn and os.path.exists(testfn):
549 testf = open(testfn)
549 testf = open(testfn)
550 testcommands = map(lambda x: x.rstrip('\n'), testf.readlines())
550 testcommands = map(lambda x: x.rstrip('\n'), testf.readlines())
551 testf.close()
551 testf.close()
552 while True:
552 while True:
553 if chunkselector.handlekeypressed(testcommands.pop(0), test=True):
553 if chunkselector.handlekeypressed(testcommands.pop(0), test=True):
554 break
554 break
555 return chunkselector.opts
555 return chunkselector.opts
556
556
557 _headermessages = { # {operation: text}
557 _headermessages = { # {operation: text}
558 'apply': _('Select hunks to apply'),
558 'apply': _('Select hunks to apply'),
559 'discard': _('Select hunks to discard'),
559 'discard': _('Select hunks to discard'),
560 None: _('Select hunks to record'),
560 None: _('Select hunks to record'),
561 }
561 }
562
562
563 class curseschunkselector(object):
563 class curseschunkselector(object):
564 def __init__(self, headerlist, ui, operation=None):
564 def __init__(self, headerlist, ui, operation=None):
565 # put the headers into a patch object
565 # put the headers into a patch object
566 self.headerlist = patch(headerlist)
566 self.headerlist = patch(headerlist)
567
567
568 self.ui = ui
568 self.ui = ui
569 self.opts = {}
569 self.opts = {}
570
570
571 self.errorstr = None
571 self.errorstr = None
572 # list of all chunks
572 # list of all chunks
573 self.chunklist = []
573 self.chunklist = []
574 for h in headerlist:
574 for h in headerlist:
575 self.chunklist.append(h)
575 self.chunklist.append(h)
576 self.chunklist.extend(h.hunks)
576 self.chunklist.extend(h.hunks)
577
577
578 # dictionary mapping (fgcolor, bgcolor) pairs to the
578 # dictionary mapping (fgcolor, bgcolor) pairs to the
579 # corresponding curses color-pair value.
579 # corresponding curses color-pair value.
580 self.colorpairs = {}
580 self.colorpairs = {}
581 # maps custom nicknames of color-pairs to curses color-pair values
581 # maps custom nicknames of color-pairs to curses color-pair values
582 self.colorpairnames = {}
582 self.colorpairnames = {}
583
583
584 # Honor color setting of ui section. Keep colored setup as
585 # long as not explicitly set to a falsy value - especially,
586 # when not set at all. This is to stay most compatible with
587 # previous (color only) behaviour.
588 uicolor = util.parsebool(self.ui.config('ui', 'color'))
589 self.usecolor = uicolor is not False
590
584 # the currently selected header, hunk, or hunk-line
591 # the currently selected header, hunk, or hunk-line
585 self.currentselecteditem = self.headerlist[0]
592 self.currentselecteditem = self.headerlist[0]
586
593
587 # updated when printing out patch-display -- the 'lines' here are the
594 # updated when printing out patch-display -- the 'lines' here are the
588 # line positions *in the pad*, not on the screen.
595 # line positions *in the pad*, not on the screen.
589 self.selecteditemstartline = 0
596 self.selecteditemstartline = 0
590 self.selecteditemendline = None
597 self.selecteditemendline = None
591
598
592 # define indentation levels
599 # define indentation levels
593 self.headerindentnumchars = 0
600 self.headerindentnumchars = 0
594 self.hunkindentnumchars = 3
601 self.hunkindentnumchars = 3
595 self.hunklineindentnumchars = 6
602 self.hunklineindentnumchars = 6
596
603
597 # the first line of the pad to print to the screen
604 # the first line of the pad to print to the screen
598 self.firstlineofpadtoprint = 0
605 self.firstlineofpadtoprint = 0
599
606
600 # keeps track of the number of lines in the pad
607 # keeps track of the number of lines in the pad
601 self.numpadlines = None
608 self.numpadlines = None
602
609
603 self.numstatuslines = 1
610 self.numstatuslines = 1
604
611
605 # keep a running count of the number of lines printed to the pad
612 # keep a running count of the number of lines printed to the pad
606 # (used for determining when the selected item begins/ends)
613 # (used for determining when the selected item begins/ends)
607 self.linesprintedtopadsofar = 0
614 self.linesprintedtopadsofar = 0
608
615
609 # the first line of the pad which is visible on the screen
616 # the first line of the pad which is visible on the screen
610 self.firstlineofpadtoprint = 0
617 self.firstlineofpadtoprint = 0
611
618
612 # stores optional text for a commit comment provided by the user
619 # stores optional text for a commit comment provided by the user
613 self.commenttext = ""
620 self.commenttext = ""
614
621
615 # if the last 'toggle all' command caused all changes to be applied
622 # if the last 'toggle all' command caused all changes to be applied
616 self.waslasttoggleallapplied = True
623 self.waslasttoggleallapplied = True
617
624
618 # affects some ui text
625 # affects some ui text
619 if operation not in _headermessages:
626 if operation not in _headermessages:
620 raise error.ProgrammingError('unexpected operation: %s' % operation)
627 raise error.ProgrammingError('unexpected operation: %s' % operation)
621 self.operation = operation
628 self.operation = operation
622
629
623 def uparrowevent(self):
630 def uparrowevent(self):
624 """
631 """
625 try to select the previous item to the current item that has the
632 try to select the previous item to the current item that has the
626 most-indented level. for example, if a hunk is selected, try to select
633 most-indented level. for example, if a hunk is selected, try to select
627 the last hunkline of the hunk prior to the selected hunk. or, if
634 the last hunkline of the hunk prior to the selected hunk. or, if
628 the first hunkline of a hunk is currently selected, then select the
635 the first hunkline of a hunk is currently selected, then select the
629 hunk itself.
636 hunk itself.
630 """
637 """
631 currentitem = self.currentselecteditem
638 currentitem = self.currentselecteditem
632
639
633 nextitem = currentitem.previtem()
640 nextitem = currentitem.previtem()
634
641
635 if nextitem is None:
642 if nextitem is None:
636 # if no parent item (i.e. currentitem is the first header), then
643 # if no parent item (i.e. currentitem is the first header), then
637 # no change...
644 # no change...
638 nextitem = currentitem
645 nextitem = currentitem
639
646
640 self.currentselecteditem = nextitem
647 self.currentselecteditem = nextitem
641
648
642 def uparrowshiftevent(self):
649 def uparrowshiftevent(self):
643 """
650 """
644 select (if possible) the previous item on the same level as the
651 select (if possible) the previous item on the same level as the
645 currently selected item. otherwise, select (if possible) the
652 currently selected item. otherwise, select (if possible) the
646 parent-item of the currently selected item.
653 parent-item of the currently selected item.
647 """
654 """
648 currentitem = self.currentselecteditem
655 currentitem = self.currentselecteditem
649 nextitem = currentitem.prevsibling()
656 nextitem = currentitem.prevsibling()
650 # if there's no previous sibling, try choosing the parent
657 # if there's no previous sibling, try choosing the parent
651 if nextitem is None:
658 if nextitem is None:
652 nextitem = currentitem.parentitem()
659 nextitem = currentitem.parentitem()
653 if nextitem is None:
660 if nextitem is None:
654 # if no parent item (i.e. currentitem is the first header), then
661 # if no parent item (i.e. currentitem is the first header), then
655 # no change...
662 # no change...
656 nextitem = currentitem
663 nextitem = currentitem
657
664
658 self.currentselecteditem = nextitem
665 self.currentselecteditem = nextitem
659
666
660 def downarrowevent(self):
667 def downarrowevent(self):
661 """
668 """
662 try to select the next item to the current item that has the
669 try to select the next item to the current item that has the
663 most-indented level. for example, if a hunk is selected, select
670 most-indented level. for example, if a hunk is selected, select
664 the first hunkline of the selected hunk. or, if the last hunkline of
671 the first hunkline of the selected hunk. or, if the last hunkline of
665 a hunk is currently selected, then select the next hunk, if one exists,
672 a hunk is currently selected, then select the next hunk, if one exists,
666 or if not, the next header if one exists.
673 or if not, the next header if one exists.
667 """
674 """
668 #self.startprintline += 1 #debug
675 #self.startprintline += 1 #debug
669 currentitem = self.currentselecteditem
676 currentitem = self.currentselecteditem
670
677
671 nextitem = currentitem.nextitem()
678 nextitem = currentitem.nextitem()
672 # if there's no next item, keep the selection as-is
679 # if there's no next item, keep the selection as-is
673 if nextitem is None:
680 if nextitem is None:
674 nextitem = currentitem
681 nextitem = currentitem
675
682
676 self.currentselecteditem = nextitem
683 self.currentselecteditem = nextitem
677
684
678 def downarrowshiftevent(self):
685 def downarrowshiftevent(self):
679 """
686 """
680 select (if possible) the next item on the same level as the currently
687 select (if possible) the next item on the same level as the currently
681 selected item. otherwise, select (if possible) the next item on the
688 selected item. otherwise, select (if possible) the next item on the
682 same level as the parent item of the currently selected item.
689 same level as the parent item of the currently selected item.
683 """
690 """
684 currentitem = self.currentselecteditem
691 currentitem = self.currentselecteditem
685 nextitem = currentitem.nextsibling()
692 nextitem = currentitem.nextsibling()
686 # if there's no next sibling, try choosing the parent's nextsibling
693 # if there's no next sibling, try choosing the parent's nextsibling
687 if nextitem is None:
694 if nextitem is None:
688 try:
695 try:
689 nextitem = currentitem.parentitem().nextsibling()
696 nextitem = currentitem.parentitem().nextsibling()
690 except AttributeError:
697 except AttributeError:
691 # parentitem returned None, so nextsibling() can't be called
698 # parentitem returned None, so nextsibling() can't be called
692 nextitem = None
699 nextitem = None
693 if nextitem is None:
700 if nextitem is None:
694 # if parent has no next sibling, then no change...
701 # if parent has no next sibling, then no change...
695 nextitem = currentitem
702 nextitem = currentitem
696
703
697 self.currentselecteditem = nextitem
704 self.currentselecteditem = nextitem
698
705
699 def rightarrowevent(self):
706 def rightarrowevent(self):
700 """
707 """
701 select (if possible) the first of this item's child-items.
708 select (if possible) the first of this item's child-items.
702 """
709 """
703 currentitem = self.currentselecteditem
710 currentitem = self.currentselecteditem
704 nextitem = currentitem.firstchild()
711 nextitem = currentitem.firstchild()
705
712
706 # turn off folding if we want to show a child-item
713 # turn off folding if we want to show a child-item
707 if currentitem.folded:
714 if currentitem.folded:
708 self.togglefolded(currentitem)
715 self.togglefolded(currentitem)
709
716
710 if nextitem is None:
717 if nextitem is None:
711 # if no next item on parent-level, then no change...
718 # if no next item on parent-level, then no change...
712 nextitem = currentitem
719 nextitem = currentitem
713
720
714 self.currentselecteditem = nextitem
721 self.currentselecteditem = nextitem
715
722
716 def leftarrowevent(self):
723 def leftarrowevent(self):
717 """
724 """
718 if the current item can be folded (i.e. it is an unfolded header or
725 if the current item can be folded (i.e. it is an unfolded header or
719 hunk), then fold it. otherwise try select (if possible) the parent
726 hunk), then fold it. otherwise try select (if possible) the parent
720 of this item.
727 of this item.
721 """
728 """
722 currentitem = self.currentselecteditem
729 currentitem = self.currentselecteditem
723
730
724 # try to fold the item
731 # try to fold the item
725 if not isinstance(currentitem, uihunkline):
732 if not isinstance(currentitem, uihunkline):
726 if not currentitem.folded:
733 if not currentitem.folded:
727 self.togglefolded(item=currentitem)
734 self.togglefolded(item=currentitem)
728 return
735 return
729
736
730 # if it can't be folded, try to select the parent item
737 # if it can't be folded, try to select the parent item
731 nextitem = currentitem.parentitem()
738 nextitem = currentitem.parentitem()
732
739
733 if nextitem is None:
740 if nextitem is None:
734 # if no item on parent-level, then no change...
741 # if no item on parent-level, then no change...
735 nextitem = currentitem
742 nextitem = currentitem
736 if not nextitem.folded:
743 if not nextitem.folded:
737 self.togglefolded(item=nextitem)
744 self.togglefolded(item=nextitem)
738
745
739 self.currentselecteditem = nextitem
746 self.currentselecteditem = nextitem
740
747
741 def leftarrowshiftevent(self):
748 def leftarrowshiftevent(self):
742 """
749 """
743 select the header of the current item (or fold current item if the
750 select the header of the current item (or fold current item if the
744 current item is already a header).
751 current item is already a header).
745 """
752 """
746 currentitem = self.currentselecteditem
753 currentitem = self.currentselecteditem
747
754
748 if isinstance(currentitem, uiheader):
755 if isinstance(currentitem, uiheader):
749 if not currentitem.folded:
756 if not currentitem.folded:
750 self.togglefolded(item=currentitem)
757 self.togglefolded(item=currentitem)
751 return
758 return
752
759
753 # select the parent item recursively until we're at a header
760 # select the parent item recursively until we're at a header
754 while True:
761 while True:
755 nextitem = currentitem.parentitem()
762 nextitem = currentitem.parentitem()
756 if nextitem is None:
763 if nextitem is None:
757 break
764 break
758 else:
765 else:
759 currentitem = nextitem
766 currentitem = nextitem
760
767
761 self.currentselecteditem = currentitem
768 self.currentselecteditem = currentitem
762
769
763 def updatescroll(self):
770 def updatescroll(self):
764 "scroll the screen to fully show the currently-selected"
771 "scroll the screen to fully show the currently-selected"
765 selstart = self.selecteditemstartline
772 selstart = self.selecteditemstartline
766 selend = self.selecteditemendline
773 selend = self.selecteditemendline
767
774
768 padstart = self.firstlineofpadtoprint
775 padstart = self.firstlineofpadtoprint
769 padend = padstart + self.yscreensize - self.numstatuslines - 1
776 padend = padstart + self.yscreensize - self.numstatuslines - 1
770 # 'buffered' pad start/end values which scroll with a certain
777 # 'buffered' pad start/end values which scroll with a certain
771 # top/bottom context margin
778 # top/bottom context margin
772 padstartbuffered = padstart + 3
779 padstartbuffered = padstart + 3
773 padendbuffered = padend - 3
780 padendbuffered = padend - 3
774
781
775 if selend > padendbuffered:
782 if selend > padendbuffered:
776 self.scrolllines(selend - padendbuffered)
783 self.scrolllines(selend - padendbuffered)
777 elif selstart < padstartbuffered:
784 elif selstart < padstartbuffered:
778 # negative values scroll in pgup direction
785 # negative values scroll in pgup direction
779 self.scrolllines(selstart - padstartbuffered)
786 self.scrolllines(selstart - padstartbuffered)
780
787
781 def scrolllines(self, numlines):
788 def scrolllines(self, numlines):
782 "scroll the screen up (down) by numlines when numlines >0 (<0)."
789 "scroll the screen up (down) by numlines when numlines >0 (<0)."
783 self.firstlineofpadtoprint += numlines
790 self.firstlineofpadtoprint += numlines
784 if self.firstlineofpadtoprint < 0:
791 if self.firstlineofpadtoprint < 0:
785 self.firstlineofpadtoprint = 0
792 self.firstlineofpadtoprint = 0
786 if self.firstlineofpadtoprint > self.numpadlines - 1:
793 if self.firstlineofpadtoprint > self.numpadlines - 1:
787 self.firstlineofpadtoprint = self.numpadlines - 1
794 self.firstlineofpadtoprint = self.numpadlines - 1
788
795
789 def toggleapply(self, item=None):
796 def toggleapply(self, item=None):
790 """
797 """
791 toggle the applied flag of the specified item. if no item is specified,
798 toggle the applied flag of the specified item. if no item is specified,
792 toggle the flag of the currently selected item.
799 toggle the flag of the currently selected item.
793 """
800 """
794 if item is None:
801 if item is None:
795 item = self.currentselecteditem
802 item = self.currentselecteditem
796
803
797 item.applied = not item.applied
804 item.applied = not item.applied
798
805
799 if isinstance(item, uiheader):
806 if isinstance(item, uiheader):
800 item.partial = False
807 item.partial = False
801 if item.applied:
808 if item.applied:
802 # apply all its hunks
809 # apply all its hunks
803 for hnk in item.hunks:
810 for hnk in item.hunks:
804 hnk.applied = True
811 hnk.applied = True
805 # apply all their hunklines
812 # apply all their hunklines
806 for hunkline in hnk.changedlines:
813 for hunkline in hnk.changedlines:
807 hunkline.applied = True
814 hunkline.applied = True
808 else:
815 else:
809 # un-apply all its hunks
816 # un-apply all its hunks
810 for hnk in item.hunks:
817 for hnk in item.hunks:
811 hnk.applied = False
818 hnk.applied = False
812 hnk.partial = False
819 hnk.partial = False
813 # un-apply all their hunklines
820 # un-apply all their hunklines
814 for hunkline in hnk.changedlines:
821 for hunkline in hnk.changedlines:
815 hunkline.applied = False
822 hunkline.applied = False
816 elif isinstance(item, uihunk):
823 elif isinstance(item, uihunk):
817 item.partial = False
824 item.partial = False
818 # apply all it's hunklines
825 # apply all it's hunklines
819 for hunkline in item.changedlines:
826 for hunkline in item.changedlines:
820 hunkline.applied = item.applied
827 hunkline.applied = item.applied
821
828
822 siblingappliedstatus = [hnk.applied for hnk in item.header.hunks]
829 siblingappliedstatus = [hnk.applied for hnk in item.header.hunks]
823 allsiblingsapplied = not (False in siblingappliedstatus)
830 allsiblingsapplied = not (False in siblingappliedstatus)
824 nosiblingsapplied = not (True in siblingappliedstatus)
831 nosiblingsapplied = not (True in siblingappliedstatus)
825
832
826 siblingspartialstatus = [hnk.partial for hnk in item.header.hunks]
833 siblingspartialstatus = [hnk.partial for hnk in item.header.hunks]
827 somesiblingspartial = (True in siblingspartialstatus)
834 somesiblingspartial = (True in siblingspartialstatus)
828
835
829 #cases where applied or partial should be removed from header
836 #cases where applied or partial should be removed from header
830
837
831 # if no 'sibling' hunks are applied (including this hunk)
838 # if no 'sibling' hunks are applied (including this hunk)
832 if nosiblingsapplied:
839 if nosiblingsapplied:
833 if not item.header.special():
840 if not item.header.special():
834 item.header.applied = False
841 item.header.applied = False
835 item.header.partial = False
842 item.header.partial = False
836 else: # some/all parent siblings are applied
843 else: # some/all parent siblings are applied
837 item.header.applied = True
844 item.header.applied = True
838 item.header.partial = (somesiblingspartial or
845 item.header.partial = (somesiblingspartial or
839 not allsiblingsapplied)
846 not allsiblingsapplied)
840
847
841 elif isinstance(item, uihunkline):
848 elif isinstance(item, uihunkline):
842 siblingappliedstatus = [ln.applied for ln in item.hunk.changedlines]
849 siblingappliedstatus = [ln.applied for ln in item.hunk.changedlines]
843 allsiblingsapplied = not (False in siblingappliedstatus)
850 allsiblingsapplied = not (False in siblingappliedstatus)
844 nosiblingsapplied = not (True in siblingappliedstatus)
851 nosiblingsapplied = not (True in siblingappliedstatus)
845
852
846 # if no 'sibling' lines are applied
853 # if no 'sibling' lines are applied
847 if nosiblingsapplied:
854 if nosiblingsapplied:
848 item.hunk.applied = False
855 item.hunk.applied = False
849 item.hunk.partial = False
856 item.hunk.partial = False
850 elif allsiblingsapplied:
857 elif allsiblingsapplied:
851 item.hunk.applied = True
858 item.hunk.applied = True
852 item.hunk.partial = False
859 item.hunk.partial = False
853 else: # some siblings applied
860 else: # some siblings applied
854 item.hunk.applied = True
861 item.hunk.applied = True
855 item.hunk.partial = True
862 item.hunk.partial = True
856
863
857 parentsiblingsapplied = [hnk.applied for hnk
864 parentsiblingsapplied = [hnk.applied for hnk
858 in item.hunk.header.hunks]
865 in item.hunk.header.hunks]
859 noparentsiblingsapplied = not (True in parentsiblingsapplied)
866 noparentsiblingsapplied = not (True in parentsiblingsapplied)
860 allparentsiblingsapplied = not (False in parentsiblingsapplied)
867 allparentsiblingsapplied = not (False in parentsiblingsapplied)
861
868
862 parentsiblingspartial = [hnk.partial for hnk
869 parentsiblingspartial = [hnk.partial for hnk
863 in item.hunk.header.hunks]
870 in item.hunk.header.hunks]
864 someparentsiblingspartial = (True in parentsiblingspartial)
871 someparentsiblingspartial = (True in parentsiblingspartial)
865
872
866 # if all parent hunks are not applied, un-apply header
873 # if all parent hunks are not applied, un-apply header
867 if noparentsiblingsapplied:
874 if noparentsiblingsapplied:
868 if not item.hunk.header.special():
875 if not item.hunk.header.special():
869 item.hunk.header.applied = False
876 item.hunk.header.applied = False
870 item.hunk.header.partial = False
877 item.hunk.header.partial = False
871 # set the applied and partial status of the header if needed
878 # set the applied and partial status of the header if needed
872 else: # some/all parent siblings are applied
879 else: # some/all parent siblings are applied
873 item.hunk.header.applied = True
880 item.hunk.header.applied = True
874 item.hunk.header.partial = (someparentsiblingspartial or
881 item.hunk.header.partial = (someparentsiblingspartial or
875 not allparentsiblingsapplied)
882 not allparentsiblingsapplied)
876
883
877 def toggleall(self):
884 def toggleall(self):
878 "toggle the applied flag of all items."
885 "toggle the applied flag of all items."
879 if self.waslasttoggleallapplied: # then unapply them this time
886 if self.waslasttoggleallapplied: # then unapply them this time
880 for item in self.headerlist:
887 for item in self.headerlist:
881 if item.applied:
888 if item.applied:
882 self.toggleapply(item)
889 self.toggleapply(item)
883 else:
890 else:
884 for item in self.headerlist:
891 for item in self.headerlist:
885 if not item.applied:
892 if not item.applied:
886 self.toggleapply(item)
893 self.toggleapply(item)
887 self.waslasttoggleallapplied = not self.waslasttoggleallapplied
894 self.waslasttoggleallapplied = not self.waslasttoggleallapplied
888
895
889 def togglefolded(self, item=None, foldparent=False):
896 def togglefolded(self, item=None, foldparent=False):
890 "toggle folded flag of specified item (defaults to currently selected)"
897 "toggle folded flag of specified item (defaults to currently selected)"
891 if item is None:
898 if item is None:
892 item = self.currentselecteditem
899 item = self.currentselecteditem
893 if foldparent or (isinstance(item, uiheader) and item.neverunfolded):
900 if foldparent or (isinstance(item, uiheader) and item.neverunfolded):
894 if not isinstance(item, uiheader):
901 if not isinstance(item, uiheader):
895 # we need to select the parent item in this case
902 # we need to select the parent item in this case
896 self.currentselecteditem = item = item.parentitem()
903 self.currentselecteditem = item = item.parentitem()
897 elif item.neverunfolded:
904 elif item.neverunfolded:
898 item.neverunfolded = False
905 item.neverunfolded = False
899
906
900 # also fold any foldable children of the parent/current item
907 # also fold any foldable children of the parent/current item
901 if isinstance(item, uiheader): # the original or 'new' item
908 if isinstance(item, uiheader): # the original or 'new' item
902 for child in item.allchildren():
909 for child in item.allchildren():
903 child.folded = not item.folded
910 child.folded = not item.folded
904
911
905 if isinstance(item, (uiheader, uihunk)):
912 if isinstance(item, (uiheader, uihunk)):
906 item.folded = not item.folded
913 item.folded = not item.folded
907
914
908 def alignstring(self, instr, window):
915 def alignstring(self, instr, window):
909 """
916 """
910 add whitespace to the end of a string in order to make it fill
917 add whitespace to the end of a string in order to make it fill
911 the screen in the x direction. the current cursor position is
918 the screen in the x direction. the current cursor position is
912 taken into account when making this calculation. the string can span
919 taken into account when making this calculation. the string can span
913 multiple lines.
920 multiple lines.
914 """
921 """
915 y, xstart = window.getyx()
922 y, xstart = window.getyx()
916 width = self.xscreensize
923 width = self.xscreensize
917 # turn tabs into spaces
924 # turn tabs into spaces
918 instr = instr.expandtabs(4)
925 instr = instr.expandtabs(4)
919 strwidth = encoding.colwidth(instr)
926 strwidth = encoding.colwidth(instr)
920 numspaces = (width - ((strwidth + xstart) % width) - 1)
927 numspaces = (width - ((strwidth + xstart) % width) - 1)
921 return instr + " " * numspaces + "\n"
928 return instr + " " * numspaces + "\n"
922
929
923 def printstring(self, window, text, fgcolor=None, bgcolor=None, pair=None,
930 def printstring(self, window, text, fgcolor=None, bgcolor=None, pair=None,
924 pairname=None, attrlist=None, towin=True, align=True, showwhtspc=False):
931 pairname=None, attrlist=None, towin=True, align=True, showwhtspc=False):
925 """
932 """
926 print the string, text, with the specified colors and attributes, to
933 print the string, text, with the specified colors and attributes, to
927 the specified curses window object.
934 the specified curses window object.
928
935
929 the foreground and background colors are of the form
936 the foreground and background colors are of the form
930 curses.color_xxxx, where xxxx is one of: [black, blue, cyan, green,
937 curses.color_xxxx, where xxxx is one of: [black, blue, cyan, green,
931 magenta, red, white, yellow]. if pairname is provided, a color
938 magenta, red, white, yellow]. if pairname is provided, a color
932 pair will be looked up in the self.colorpairnames dictionary.
939 pair will be looked up in the self.colorpairnames dictionary.
933
940
934 attrlist is a list containing text attributes in the form of
941 attrlist is a list containing text attributes in the form of
935 curses.a_xxxx, where xxxx can be: [bold, dim, normal, standout,
942 curses.a_xxxx, where xxxx can be: [bold, dim, normal, standout,
936 underline].
943 underline].
937
944
938 if align == True, whitespace is added to the printed string such that
945 if align == True, whitespace is added to the printed string such that
939 the string stretches to the right border of the window.
946 the string stretches to the right border of the window.
940
947
941 if showwhtspc == True, trailing whitespace of a string is highlighted.
948 if showwhtspc == True, trailing whitespace of a string is highlighted.
942 """
949 """
943 # preprocess the text, converting tabs to spaces
950 # preprocess the text, converting tabs to spaces
944 text = text.expandtabs(4)
951 text = text.expandtabs(4)
945 # strip \n, and convert control characters to ^[char] representation
952 # strip \n, and convert control characters to ^[char] representation
946 text = re.sub(r'[\x00-\x08\x0a-\x1f]',
953 text = re.sub(r'[\x00-\x08\x0a-\x1f]',
947 lambda m:'^' + chr(ord(m.group()) + 64), text.strip('\n'))
954 lambda m:'^' + chr(ord(m.group()) + 64), text.strip('\n'))
948
955
949 if pair is not None:
956 if pair is not None:
950 colorpair = pair
957 colorpair = pair
951 elif pairname is not None:
958 elif pairname is not None:
952 colorpair = self.colorpairnames[pairname]
959 colorpair = self.colorpairnames[pairname]
953 else:
960 else:
954 if fgcolor is None:
961 if fgcolor is None:
955 fgcolor = -1
962 fgcolor = -1
956 if bgcolor is None:
963 if bgcolor is None:
957 bgcolor = -1
964 bgcolor = -1
958 if (fgcolor, bgcolor) in self.colorpairs:
965 if (fgcolor, bgcolor) in self.colorpairs:
959 colorpair = self.colorpairs[(fgcolor, bgcolor)]
966 colorpair = self.colorpairs[(fgcolor, bgcolor)]
960 else:
967 else:
961 colorpair = self.getcolorpair(fgcolor, bgcolor)
968 colorpair = self.getcolorpair(fgcolor, bgcolor)
962 # add attributes if possible
969 # add attributes if possible
963 if attrlist is None:
970 if attrlist is None:
964 attrlist = []
971 attrlist = []
965 if colorpair < 256:
972 if colorpair < 256:
966 # then it is safe to apply all attributes
973 # then it is safe to apply all attributes
967 for textattr in attrlist:
974 for textattr in attrlist:
968 colorpair |= textattr
975 colorpair |= textattr
969 else:
976 else:
970 # just apply a select few (safe?) attributes
977 # just apply a select few (safe?) attributes
971 for textattr in (curses.A_UNDERLINE, curses.A_BOLD):
978 for textattr in (curses.A_UNDERLINE, curses.A_BOLD):
972 if textattr in attrlist:
979 if textattr in attrlist:
973 colorpair |= textattr
980 colorpair |= textattr
974
981
975 y, xstart = self.chunkpad.getyx()
982 y, xstart = self.chunkpad.getyx()
976 t = "" # variable for counting lines printed
983 t = "" # variable for counting lines printed
977 # if requested, show trailing whitespace
984 # if requested, show trailing whitespace
978 if showwhtspc:
985 if showwhtspc:
979 origlen = len(text)
986 origlen = len(text)
980 text = text.rstrip(' \n') # tabs have already been expanded
987 text = text.rstrip(' \n') # tabs have already been expanded
981 strippedlen = len(text)
988 strippedlen = len(text)
982 numtrailingspaces = origlen - strippedlen
989 numtrailingspaces = origlen - strippedlen
983
990
984 if towin:
991 if towin:
985 window.addstr(text, colorpair)
992 window.addstr(text, colorpair)
986 t += text
993 t += text
987
994
988 if showwhtspc:
995 if showwhtspc:
989 wscolorpair = colorpair | curses.A_REVERSE
996 wscolorpair = colorpair | curses.A_REVERSE
990 if towin:
997 if towin:
991 for i in range(numtrailingspaces):
998 for i in range(numtrailingspaces):
992 window.addch(curses.ACS_CKBOARD, wscolorpair)
999 window.addch(curses.ACS_CKBOARD, wscolorpair)
993 t += " " * numtrailingspaces
1000 t += " " * numtrailingspaces
994
1001
995 if align:
1002 if align:
996 if towin:
1003 if towin:
997 extrawhitespace = self.alignstring("", window)
1004 extrawhitespace = self.alignstring("", window)
998 window.addstr(extrawhitespace, colorpair)
1005 window.addstr(extrawhitespace, colorpair)
999 else:
1006 else:
1000 # need to use t, since the x position hasn't incremented
1007 # need to use t, since the x position hasn't incremented
1001 extrawhitespace = self.alignstring(t, window)
1008 extrawhitespace = self.alignstring(t, window)
1002 t += extrawhitespace
1009 t += extrawhitespace
1003
1010
1004 # is reset to 0 at the beginning of printitem()
1011 # is reset to 0 at the beginning of printitem()
1005
1012
1006 linesprinted = (xstart + len(t)) / self.xscreensize
1013 linesprinted = (xstart + len(t)) / self.xscreensize
1007 self.linesprintedtopadsofar += linesprinted
1014 self.linesprintedtopadsofar += linesprinted
1008 return t
1015 return t
1009
1016
1010 def _getstatuslinesegments(self):
1017 def _getstatuslinesegments(self):
1011 """-> [str]. return segments"""
1018 """-> [str]. return segments"""
1012 selected = self.currentselecteditem.applied
1019 selected = self.currentselecteditem.applied
1013 spaceselect = _('space: select')
1020 spaceselect = _('space: select')
1014 spacedeselect = _('space: deselect')
1021 spacedeselect = _('space: deselect')
1015 # Format the selected label into a place as long as the longer of the
1022 # Format the selected label into a place as long as the longer of the
1016 # two possible labels. This may vary by language.
1023 # two possible labels. This may vary by language.
1017 spacelen = max(len(spaceselect), len(spacedeselect))
1024 spacelen = max(len(spaceselect), len(spacedeselect))
1018 selectedlabel = '%-*s' % (spacelen,
1025 selectedlabel = '%-*s' % (spacelen,
1019 spacedeselect if selected else spaceselect)
1026 spacedeselect if selected else spaceselect)
1020 segments = [
1027 segments = [
1021 _headermessages[self.operation],
1028 _headermessages[self.operation],
1022 '-',
1029 '-',
1023 _('[x]=selected **=collapsed'),
1030 _('[x]=selected **=collapsed'),
1024 _('c: confirm'),
1031 _('c: confirm'),
1025 _('q: abort'),
1032 _('q: abort'),
1026 _('arrow keys: move/expand/collapse'),
1033 _('arrow keys: move/expand/collapse'),
1027 selectedlabel,
1034 selectedlabel,
1028 _('?: help'),
1035 _('?: help'),
1029 ]
1036 ]
1030 return segments
1037 return segments
1031
1038
1032 def _getstatuslines(self):
1039 def _getstatuslines(self):
1033 """() -> [str]. return short help used in the top status window"""
1040 """() -> [str]. return short help used in the top status window"""
1034 if self.errorstr is not None:
1041 if self.errorstr is not None:
1035 lines = [self.errorstr, _('Press any key to continue')]
1042 lines = [self.errorstr, _('Press any key to continue')]
1036 else:
1043 else:
1037 # wrap segments to lines
1044 # wrap segments to lines
1038 segments = self._getstatuslinesegments()
1045 segments = self._getstatuslinesegments()
1039 width = self.xscreensize
1046 width = self.xscreensize
1040 lines = []
1047 lines = []
1041 lastwidth = width
1048 lastwidth = width
1042 for s in segments:
1049 for s in segments:
1043 w = encoding.colwidth(s)
1050 w = encoding.colwidth(s)
1044 sep = ' ' * (1 + (s and s[0] not in '-['))
1051 sep = ' ' * (1 + (s and s[0] not in '-['))
1045 if lastwidth + w + len(sep) >= width:
1052 if lastwidth + w + len(sep) >= width:
1046 lines.append(s)
1053 lines.append(s)
1047 lastwidth = w
1054 lastwidth = w
1048 else:
1055 else:
1049 lines[-1] += sep + s
1056 lines[-1] += sep + s
1050 lastwidth += w + len(sep)
1057 lastwidth += w + len(sep)
1051 if len(lines) != self.numstatuslines:
1058 if len(lines) != self.numstatuslines:
1052 self.numstatuslines = len(lines)
1059 self.numstatuslines = len(lines)
1053 self.statuswin.resize(self.numstatuslines, self.xscreensize)
1060 self.statuswin.resize(self.numstatuslines, self.xscreensize)
1054 return [util.ellipsis(l, self.xscreensize - 1) for l in lines]
1061 return [util.ellipsis(l, self.xscreensize - 1) for l in lines]
1055
1062
1056 def updatescreen(self):
1063 def updatescreen(self):
1057 self.statuswin.erase()
1064 self.statuswin.erase()
1058 self.chunkpad.erase()
1065 self.chunkpad.erase()
1059
1066
1060 printstring = self.printstring
1067 printstring = self.printstring
1061
1068
1062 # print out the status lines at the top
1069 # print out the status lines at the top
1063 try:
1070 try:
1064 for line in self._getstatuslines():
1071 for line in self._getstatuslines():
1065 printstring(self.statuswin, line, pairname="legend")
1072 printstring(self.statuswin, line, pairname="legend")
1066 self.statuswin.refresh()
1073 self.statuswin.refresh()
1067 except curses.error:
1074 except curses.error:
1068 pass
1075 pass
1069 if self.errorstr is not None:
1076 if self.errorstr is not None:
1070 return
1077 return
1071
1078
1072 # print out the patch in the remaining part of the window
1079 # print out the patch in the remaining part of the window
1073 try:
1080 try:
1074 self.printitem()
1081 self.printitem()
1075 self.updatescroll()
1082 self.updatescroll()
1076 self.chunkpad.refresh(self.firstlineofpadtoprint, 0,
1083 self.chunkpad.refresh(self.firstlineofpadtoprint, 0,
1077 self.numstatuslines, 0,
1084 self.numstatuslines, 0,
1078 self.yscreensize - self.numstatuslines,
1085 self.yscreensize - self.numstatuslines,
1079 self.xscreensize)
1086 self.xscreensize)
1080 except curses.error:
1087 except curses.error:
1081 pass
1088 pass
1082
1089
1083 def getstatusprefixstring(self, item):
1090 def getstatusprefixstring(self, item):
1084 """
1091 """
1085 create a string to prefix a line with which indicates whether 'item'
1092 create a string to prefix a line with which indicates whether 'item'
1086 is applied and/or folded.
1093 is applied and/or folded.
1087 """
1094 """
1088
1095
1089 # create checkbox string
1096 # create checkbox string
1090 if item.applied:
1097 if item.applied:
1091 if not isinstance(item, uihunkline) and item.partial:
1098 if not isinstance(item, uihunkline) and item.partial:
1092 checkbox = "[~]"
1099 checkbox = "[~]"
1093 else:
1100 else:
1094 checkbox = "[x]"
1101 checkbox = "[x]"
1095 else:
1102 else:
1096 checkbox = "[ ]"
1103 checkbox = "[ ]"
1097
1104
1098 try:
1105 try:
1099 if item.folded:
1106 if item.folded:
1100 checkbox += "**"
1107 checkbox += "**"
1101 if isinstance(item, uiheader):
1108 if isinstance(item, uiheader):
1102 # one of "m", "a", or "d" (modified, added, deleted)
1109 # one of "m", "a", or "d" (modified, added, deleted)
1103 filestatus = item.changetype
1110 filestatus = item.changetype
1104
1111
1105 checkbox += filestatus + " "
1112 checkbox += filestatus + " "
1106 else:
1113 else:
1107 checkbox += " "
1114 checkbox += " "
1108 if isinstance(item, uiheader):
1115 if isinstance(item, uiheader):
1109 # add two more spaces for headers
1116 # add two more spaces for headers
1110 checkbox += " "
1117 checkbox += " "
1111 except AttributeError: # not foldable
1118 except AttributeError: # not foldable
1112 checkbox += " "
1119 checkbox += " "
1113
1120
1114 return checkbox
1121 return checkbox
1115
1122
1116 def printheader(self, header, selected=False, towin=True,
1123 def printheader(self, header, selected=False, towin=True,
1117 ignorefolding=False):
1124 ignorefolding=False):
1118 """
1125 """
1119 print the header to the pad. if countlines is True, don't print
1126 print the header to the pad. if countlines is True, don't print
1120 anything, but just count the number of lines which would be printed.
1127 anything, but just count the number of lines which would be printed.
1121 """
1128 """
1122
1129
1123 outstr = ""
1130 outstr = ""
1124 text = header.prettystr()
1131 text = header.prettystr()
1125 chunkindex = self.chunklist.index(header)
1132 chunkindex = self.chunklist.index(header)
1126
1133
1127 if chunkindex != 0 and not header.folded:
1134 if chunkindex != 0 and not header.folded:
1128 # add separating line before headers
1135 # add separating line before headers
1129 outstr += self.printstring(self.chunkpad, '_' * self.xscreensize,
1136 outstr += self.printstring(self.chunkpad, '_' * self.xscreensize,
1130 towin=towin, align=False)
1137 towin=towin, align=False)
1131 # select color-pair based on if the header is selected
1138 # select color-pair based on if the header is selected
1132 colorpair = self.getcolorpair(name=selected and "selected" or "normal",
1139 colorpair = self.getcolorpair(name=selected and "selected" or "normal",
1133 attrlist=[curses.A_BOLD])
1140 attrlist=[curses.A_BOLD])
1134
1141
1135 # print out each line of the chunk, expanding it to screen width
1142 # print out each line of the chunk, expanding it to screen width
1136
1143
1137 # number of characters to indent lines on this level by
1144 # number of characters to indent lines on this level by
1138 indentnumchars = 0
1145 indentnumchars = 0
1139 checkbox = self.getstatusprefixstring(header)
1146 checkbox = self.getstatusprefixstring(header)
1140 if not header.folded or ignorefolding:
1147 if not header.folded or ignorefolding:
1141 textlist = text.split("\n")
1148 textlist = text.split("\n")
1142 linestr = checkbox + textlist[0]
1149 linestr = checkbox + textlist[0]
1143 else:
1150 else:
1144 linestr = checkbox + header.filename()
1151 linestr = checkbox + header.filename()
1145 outstr += self.printstring(self.chunkpad, linestr, pair=colorpair,
1152 outstr += self.printstring(self.chunkpad, linestr, pair=colorpair,
1146 towin=towin)
1153 towin=towin)
1147 if not header.folded or ignorefolding:
1154 if not header.folded or ignorefolding:
1148 if len(textlist) > 1:
1155 if len(textlist) > 1:
1149 for line in textlist[1:]:
1156 for line in textlist[1:]:
1150 linestr = " "*(indentnumchars + len(checkbox)) + line
1157 linestr = " "*(indentnumchars + len(checkbox)) + line
1151 outstr += self.printstring(self.chunkpad, linestr,
1158 outstr += self.printstring(self.chunkpad, linestr,
1152 pair=colorpair, towin=towin)
1159 pair=colorpair, towin=towin)
1153
1160
1154 return outstr
1161 return outstr
1155
1162
1156 def printhunklinesbefore(self, hunk, selected=False, towin=True,
1163 def printhunklinesbefore(self, hunk, selected=False, towin=True,
1157 ignorefolding=False):
1164 ignorefolding=False):
1158 "includes start/end line indicator"
1165 "includes start/end line indicator"
1159 outstr = ""
1166 outstr = ""
1160 # where hunk is in list of siblings
1167 # where hunk is in list of siblings
1161 hunkindex = hunk.header.hunks.index(hunk)
1168 hunkindex = hunk.header.hunks.index(hunk)
1162
1169
1163 if hunkindex != 0:
1170 if hunkindex != 0:
1164 # add separating line before headers
1171 # add separating line before headers
1165 outstr += self.printstring(self.chunkpad, ' '*self.xscreensize,
1172 outstr += self.printstring(self.chunkpad, ' '*self.xscreensize,
1166 towin=towin, align=False)
1173 towin=towin, align=False)
1167
1174
1168 colorpair = self.getcolorpair(name=selected and "selected" or "normal",
1175 colorpair = self.getcolorpair(name=selected and "selected" or "normal",
1169 attrlist=[curses.A_BOLD])
1176 attrlist=[curses.A_BOLD])
1170
1177
1171 # print out from-to line with checkbox
1178 # print out from-to line with checkbox
1172 checkbox = self.getstatusprefixstring(hunk)
1179 checkbox = self.getstatusprefixstring(hunk)
1173
1180
1174 lineprefix = " "*self.hunkindentnumchars + checkbox
1181 lineprefix = " "*self.hunkindentnumchars + checkbox
1175 frtoline = " " + hunk.getfromtoline().strip("\n")
1182 frtoline = " " + hunk.getfromtoline().strip("\n")
1176
1183
1177 outstr += self.printstring(self.chunkpad, lineprefix, towin=towin,
1184 outstr += self.printstring(self.chunkpad, lineprefix, towin=towin,
1178 align=False) # add uncolored checkbox/indent
1185 align=False) # add uncolored checkbox/indent
1179 outstr += self.printstring(self.chunkpad, frtoline, pair=colorpair,
1186 outstr += self.printstring(self.chunkpad, frtoline, pair=colorpair,
1180 towin=towin)
1187 towin=towin)
1181
1188
1182 if hunk.folded and not ignorefolding:
1189 if hunk.folded and not ignorefolding:
1183 # skip remainder of output
1190 # skip remainder of output
1184 return outstr
1191 return outstr
1185
1192
1186 # print out lines of the chunk preceeding changed-lines
1193 # print out lines of the chunk preceeding changed-lines
1187 for line in hunk.before:
1194 for line in hunk.before:
1188 linestr = " "*(self.hunklineindentnumchars + len(checkbox)) + line
1195 linestr = " "*(self.hunklineindentnumchars + len(checkbox)) + line
1189 outstr += self.printstring(self.chunkpad, linestr, towin=towin)
1196 outstr += self.printstring(self.chunkpad, linestr, towin=towin)
1190
1197
1191 return outstr
1198 return outstr
1192
1199
1193 def printhunklinesafter(self, hunk, towin=True, ignorefolding=False):
1200 def printhunklinesafter(self, hunk, towin=True, ignorefolding=False):
1194 outstr = ""
1201 outstr = ""
1195 if hunk.folded and not ignorefolding:
1202 if hunk.folded and not ignorefolding:
1196 return outstr
1203 return outstr
1197
1204
1198 # a bit superfluous, but to avoid hard-coding indent amount
1205 # a bit superfluous, but to avoid hard-coding indent amount
1199 checkbox = self.getstatusprefixstring(hunk)
1206 checkbox = self.getstatusprefixstring(hunk)
1200 for line in hunk.after:
1207 for line in hunk.after:
1201 linestr = " "*(self.hunklineindentnumchars + len(checkbox)) + line
1208 linestr = " "*(self.hunklineindentnumchars + len(checkbox)) + line
1202 outstr += self.printstring(self.chunkpad, linestr, towin=towin)
1209 outstr += self.printstring(self.chunkpad, linestr, towin=towin)
1203
1210
1204 return outstr
1211 return outstr
1205
1212
1206 def printhunkchangedline(self, hunkline, selected=False, towin=True):
1213 def printhunkchangedline(self, hunkline, selected=False, towin=True):
1207 outstr = ""
1214 outstr = ""
1208 checkbox = self.getstatusprefixstring(hunkline)
1215 checkbox = self.getstatusprefixstring(hunkline)
1209
1216
1210 linestr = hunkline.prettystr().strip("\n")
1217 linestr = hunkline.prettystr().strip("\n")
1211
1218
1212 # select color-pair based on whether line is an addition/removal
1219 # select color-pair based on whether line is an addition/removal
1213 if selected:
1220 if selected:
1214 colorpair = self.getcolorpair(name="selected")
1221 colorpair = self.getcolorpair(name="selected")
1215 elif linestr.startswith("+"):
1222 elif linestr.startswith("+"):
1216 colorpair = self.getcolorpair(name="addition")
1223 colorpair = self.getcolorpair(name="addition")
1217 elif linestr.startswith("-"):
1224 elif linestr.startswith("-"):
1218 colorpair = self.getcolorpair(name="deletion")
1225 colorpair = self.getcolorpair(name="deletion")
1219 elif linestr.startswith("\\"):
1226 elif linestr.startswith("\\"):
1220 colorpair = self.getcolorpair(name="normal")
1227 colorpair = self.getcolorpair(name="normal")
1221
1228
1222 lineprefix = " "*self.hunklineindentnumchars + checkbox
1229 lineprefix = " "*self.hunklineindentnumchars + checkbox
1223 outstr += self.printstring(self.chunkpad, lineprefix, towin=towin,
1230 outstr += self.printstring(self.chunkpad, lineprefix, towin=towin,
1224 align=False) # add uncolored checkbox/indent
1231 align=False) # add uncolored checkbox/indent
1225 outstr += self.printstring(self.chunkpad, linestr, pair=colorpair,
1232 outstr += self.printstring(self.chunkpad, linestr, pair=colorpair,
1226 towin=towin, showwhtspc=True)
1233 towin=towin, showwhtspc=True)
1227 return outstr
1234 return outstr
1228
1235
1229 def printitem(self, item=None, ignorefolding=False, recursechildren=True,
1236 def printitem(self, item=None, ignorefolding=False, recursechildren=True,
1230 towin=True):
1237 towin=True):
1231 """
1238 """
1232 use __printitem() to print the the specified item.applied.
1239 use __printitem() to print the the specified item.applied.
1233 if item is not specified, then print the entire patch.
1240 if item is not specified, then print the entire patch.
1234 (hiding folded elements, etc. -- see __printitem() docstring)
1241 (hiding folded elements, etc. -- see __printitem() docstring)
1235 """
1242 """
1236
1243
1237 if item is None:
1244 if item is None:
1238 item = self.headerlist
1245 item = self.headerlist
1239 if recursechildren:
1246 if recursechildren:
1240 self.linesprintedtopadsofar = 0
1247 self.linesprintedtopadsofar = 0
1241
1248
1242 outstr = []
1249 outstr = []
1243 self.__printitem(item, ignorefolding, recursechildren, outstr,
1250 self.__printitem(item, ignorefolding, recursechildren, outstr,
1244 towin=towin)
1251 towin=towin)
1245 return ''.join(outstr)
1252 return ''.join(outstr)
1246
1253
1247 def outofdisplayedarea(self):
1254 def outofdisplayedarea(self):
1248 y, _ = self.chunkpad.getyx() # cursor location
1255 y, _ = self.chunkpad.getyx() # cursor location
1249 # * 2 here works but an optimization would be the max number of
1256 # * 2 here works but an optimization would be the max number of
1250 # consecutive non selectable lines
1257 # consecutive non selectable lines
1251 # i.e the max number of context line for any hunk in the patch
1258 # i.e the max number of context line for any hunk in the patch
1252 miny = min(0, self.firstlineofpadtoprint - self.yscreensize)
1259 miny = min(0, self.firstlineofpadtoprint - self.yscreensize)
1253 maxy = self.firstlineofpadtoprint + self.yscreensize * 2
1260 maxy = self.firstlineofpadtoprint + self.yscreensize * 2
1254 return y < miny or y > maxy
1261 return y < miny or y > maxy
1255
1262
1256 def handleselection(self, item, recursechildren):
1263 def handleselection(self, item, recursechildren):
1257 selected = (item is self.currentselecteditem)
1264 selected = (item is self.currentselecteditem)
1258 if selected and recursechildren:
1265 if selected and recursechildren:
1259 # assumes line numbering starting from line 0
1266 # assumes line numbering starting from line 0
1260 self.selecteditemstartline = self.linesprintedtopadsofar
1267 self.selecteditemstartline = self.linesprintedtopadsofar
1261 selecteditemlines = self.getnumlinesdisplayed(item,
1268 selecteditemlines = self.getnumlinesdisplayed(item,
1262 recursechildren=False)
1269 recursechildren=False)
1263 self.selecteditemendline = (self.selecteditemstartline +
1270 self.selecteditemendline = (self.selecteditemstartline +
1264 selecteditemlines - 1)
1271 selecteditemlines - 1)
1265 return selected
1272 return selected
1266
1273
1267 def __printitem(self, item, ignorefolding, recursechildren, outstr,
1274 def __printitem(self, item, ignorefolding, recursechildren, outstr,
1268 towin=True):
1275 towin=True):
1269 """
1276 """
1270 recursive method for printing out patch/header/hunk/hunk-line data to
1277 recursive method for printing out patch/header/hunk/hunk-line data to
1271 screen. also returns a string with all of the content of the displayed
1278 screen. also returns a string with all of the content of the displayed
1272 patch (not including coloring, etc.).
1279 patch (not including coloring, etc.).
1273
1280
1274 if ignorefolding is True, then folded items are printed out.
1281 if ignorefolding is True, then folded items are printed out.
1275
1282
1276 if recursechildren is False, then only print the item without its
1283 if recursechildren is False, then only print the item without its
1277 child items.
1284 child items.
1278 """
1285 """
1279
1286
1280 if towin and self.outofdisplayedarea():
1287 if towin and self.outofdisplayedarea():
1281 return
1288 return
1282
1289
1283 selected = self.handleselection(item, recursechildren)
1290 selected = self.handleselection(item, recursechildren)
1284
1291
1285 # patch object is a list of headers
1292 # patch object is a list of headers
1286 if isinstance(item, patch):
1293 if isinstance(item, patch):
1287 if recursechildren:
1294 if recursechildren:
1288 for hdr in item:
1295 for hdr in item:
1289 self.__printitem(hdr, ignorefolding,
1296 self.__printitem(hdr, ignorefolding,
1290 recursechildren, outstr, towin)
1297 recursechildren, outstr, towin)
1291 # todo: eliminate all isinstance() calls
1298 # todo: eliminate all isinstance() calls
1292 if isinstance(item, uiheader):
1299 if isinstance(item, uiheader):
1293 outstr.append(self.printheader(item, selected, towin=towin,
1300 outstr.append(self.printheader(item, selected, towin=towin,
1294 ignorefolding=ignorefolding))
1301 ignorefolding=ignorefolding))
1295 if recursechildren:
1302 if recursechildren:
1296 for hnk in item.hunks:
1303 for hnk in item.hunks:
1297 self.__printitem(hnk, ignorefolding,
1304 self.__printitem(hnk, ignorefolding,
1298 recursechildren, outstr, towin)
1305 recursechildren, outstr, towin)
1299 elif (isinstance(item, uihunk) and
1306 elif (isinstance(item, uihunk) and
1300 ((not item.header.folded) or ignorefolding)):
1307 ((not item.header.folded) or ignorefolding)):
1301 # print the hunk data which comes before the changed-lines
1308 # print the hunk data which comes before the changed-lines
1302 outstr.append(self.printhunklinesbefore(item, selected, towin=towin,
1309 outstr.append(self.printhunklinesbefore(item, selected, towin=towin,
1303 ignorefolding=ignorefolding))
1310 ignorefolding=ignorefolding))
1304 if recursechildren:
1311 if recursechildren:
1305 for l in item.changedlines:
1312 for l in item.changedlines:
1306 self.__printitem(l, ignorefolding,
1313 self.__printitem(l, ignorefolding,
1307 recursechildren, outstr, towin)
1314 recursechildren, outstr, towin)
1308 outstr.append(self.printhunklinesafter(item, towin=towin,
1315 outstr.append(self.printhunklinesafter(item, towin=towin,
1309 ignorefolding=ignorefolding))
1316 ignorefolding=ignorefolding))
1310 elif (isinstance(item, uihunkline) and
1317 elif (isinstance(item, uihunkline) and
1311 ((not item.hunk.folded) or ignorefolding)):
1318 ((not item.hunk.folded) or ignorefolding)):
1312 outstr.append(self.printhunkchangedline(item, selected,
1319 outstr.append(self.printhunkchangedline(item, selected,
1313 towin=towin))
1320 towin=towin))
1314
1321
1315 return outstr
1322 return outstr
1316
1323
1317 def getnumlinesdisplayed(self, item=None, ignorefolding=False,
1324 def getnumlinesdisplayed(self, item=None, ignorefolding=False,
1318 recursechildren=True):
1325 recursechildren=True):
1319 """
1326 """
1320 return the number of lines which would be displayed if the item were
1327 return the number of lines which would be displayed if the item were
1321 to be printed to the display. the item will not be printed to the
1328 to be printed to the display. the item will not be printed to the
1322 display (pad).
1329 display (pad).
1323 if no item is given, assume the entire patch.
1330 if no item is given, assume the entire patch.
1324 if ignorefolding is True, folded items will be unfolded when counting
1331 if ignorefolding is True, folded items will be unfolded when counting
1325 the number of lines.
1332 the number of lines.
1326 """
1333 """
1327
1334
1328 # temporarily disable printing to windows by printstring
1335 # temporarily disable printing to windows by printstring
1329 patchdisplaystring = self.printitem(item, ignorefolding,
1336 patchdisplaystring = self.printitem(item, ignorefolding,
1330 recursechildren, towin=False)
1337 recursechildren, towin=False)
1331 numlines = len(patchdisplaystring) / self.xscreensize
1338 numlines = len(patchdisplaystring) / self.xscreensize
1332 return numlines
1339 return numlines
1333
1340
1334 def sigwinchhandler(self, n, frame):
1341 def sigwinchhandler(self, n, frame):
1335 "handle window resizing"
1342 "handle window resizing"
1336 try:
1343 try:
1337 curses.endwin()
1344 curses.endwin()
1338 self.xscreensize, self.yscreensize = scmutil.termsize(self.ui)
1345 self.xscreensize, self.yscreensize = scmutil.termsize(self.ui)
1339 self.statuswin.resize(self.numstatuslines, self.xscreensize)
1346 self.statuswin.resize(self.numstatuslines, self.xscreensize)
1340 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
1347 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
1341 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
1348 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
1342 except curses.error:
1349 except curses.error:
1343 pass
1350 pass
1344
1351
1345 def getcolorpair(self, fgcolor=None, bgcolor=None, name=None,
1352 def getcolorpair(self, fgcolor=None, bgcolor=None, name=None,
1346 attrlist=None):
1353 attrlist=None):
1347 """
1354 """
1348 get a curses color pair, adding it to self.colorpairs if it is not
1355 get a curses color pair, adding it to self.colorpairs if it is not
1349 already defined. an optional string, name, can be passed as a shortcut
1356 already defined. an optional string, name, can be passed as a shortcut
1350 for referring to the color-pair. by default, if no arguments are
1357 for referring to the color-pair. by default, if no arguments are
1351 specified, the white foreground / black background color-pair is
1358 specified, the white foreground / black background color-pair is
1352 returned.
1359 returned.
1353
1360
1354 it is expected that this function will be used exclusively for
1361 it is expected that this function will be used exclusively for
1355 initializing color pairs, and not curses.init_pair().
1362 initializing color pairs, and not curses.init_pair().
1356
1363
1357 attrlist is used to 'flavor' the returned color-pair. this information
1364 attrlist is used to 'flavor' the returned color-pair. this information
1358 is not stored in self.colorpairs. it contains attribute values like
1365 is not stored in self.colorpairs. it contains attribute values like
1359 curses.A_BOLD.
1366 curses.A_BOLD.
1360 """
1367 """
1361
1368
1362 if (name is not None) and name in self.colorpairnames:
1369 if (name is not None) and name in self.colorpairnames:
1363 # then get the associated color pair and return it
1370 # then get the associated color pair and return it
1364 colorpair = self.colorpairnames[name]
1371 colorpair = self.colorpairnames[name]
1365 else:
1372 else:
1366 if fgcolor is None:
1373 if fgcolor is None:
1367 fgcolor = -1
1374 fgcolor = -1
1368 if bgcolor is None:
1375 if bgcolor is None:
1369 bgcolor = -1
1376 bgcolor = -1
1370 if (fgcolor, bgcolor) in self.colorpairs:
1377 if (fgcolor, bgcolor) in self.colorpairs:
1371 colorpair = self.colorpairs[(fgcolor, bgcolor)]
1378 colorpair = self.colorpairs[(fgcolor, bgcolor)]
1372 else:
1379 else:
1373 pairindex = len(self.colorpairs) + 1
1380 pairindex = len(self.colorpairs) + 1
1374 curses.init_pair(pairindex, fgcolor, bgcolor)
1381 if self.usecolor:
1375 colorpair = self.colorpairs[(fgcolor, bgcolor)] = (
1382 curses.init_pair(pairindex, fgcolor, bgcolor)
1376 curses.color_pair(pairindex))
1383 colorpair = self.colorpairs[(fgcolor, bgcolor)] = (
1377 if name is not None:
1384 curses.color_pair(pairindex))
1378 self.colorpairnames[name] = curses.color_pair(pairindex)
1385 if name is not None:
1386 self.colorpairnames[name] = curses.color_pair(pairindex)
1387 else:
1388 cval = 0
1389 if name is not None:
1390 if name == 'selected':
1391 cval = curses.A_REVERSE
1392 self.colorpairnames[name] = cval
1393 colorpair = self.colorpairs[(fgcolor, bgcolor)] = cval
1379
1394
1380 # add attributes if possible
1395 # add attributes if possible
1381 if attrlist is None:
1396 if attrlist is None:
1382 attrlist = []
1397 attrlist = []
1383 if colorpair < 256:
1398 if colorpair < 256:
1384 # then it is safe to apply all attributes
1399 # then it is safe to apply all attributes
1385 for textattr in attrlist:
1400 for textattr in attrlist:
1386 colorpair |= textattr
1401 colorpair |= textattr
1387 else:
1402 else:
1388 # just apply a select few (safe?) attributes
1403 # just apply a select few (safe?) attributes
1389 for textattrib in (curses.A_UNDERLINE, curses.A_BOLD):
1404 for textattrib in (curses.A_UNDERLINE, curses.A_BOLD):
1390 if textattrib in attrlist:
1405 if textattrib in attrlist:
1391 colorpair |= textattrib
1406 colorpair |= textattrib
1392 return colorpair
1407 return colorpair
1393
1408
1394 def initcolorpair(self, *args, **kwargs):
1409 def initcolorpair(self, *args, **kwargs):
1395 "same as getcolorpair."
1410 "same as getcolorpair."
1396 self.getcolorpair(*args, **kwargs)
1411 self.getcolorpair(*args, **kwargs)
1397
1412
1398 def helpwindow(self):
1413 def helpwindow(self):
1399 "print a help window to the screen. exit after any keypress."
1414 "print a help window to the screen. exit after any keypress."
1400 helptext = _(
1415 helptext = _(
1401 """ [press any key to return to the patch-display]
1416 """ [press any key to return to the patch-display]
1402
1417
1403 crecord allows you to interactively choose among the changes you have made,
1418 crecord allows you to interactively choose among the changes you have made,
1404 and confirm only those changes you select for further processing by the command
1419 and confirm only those changes you select for further processing by the command
1405 you are running (commit/shelve/revert), after confirming the selected
1420 you are running (commit/shelve/revert), after confirming the selected
1406 changes, the unselected changes are still present in your working copy, so you
1421 changes, the unselected changes are still present in your working copy, so you
1407 can use crecord multiple times to split large changes into smaller changesets.
1422 can use crecord multiple times to split large changes into smaller changesets.
1408 the following are valid keystrokes:
1423 the following are valid keystrokes:
1409
1424
1410 [space] : (un-)select item ([~]/[x] = partly/fully applied)
1425 [space] : (un-)select item ([~]/[x] = partly/fully applied)
1411 A : (un-)select all items
1426 A : (un-)select all items
1412 up/down-arrow [k/j] : go to previous/next unfolded item
1427 up/down-arrow [k/j] : go to previous/next unfolded item
1413 pgup/pgdn [K/J] : go to previous/next item of same type
1428 pgup/pgdn [K/J] : go to previous/next item of same type
1414 right/left-arrow [l/h] : go to child item / parent item
1429 right/left-arrow [l/h] : go to child item / parent item
1415 shift-left-arrow [H] : go to parent header / fold selected header
1430 shift-left-arrow [H] : go to parent header / fold selected header
1416 f : fold / unfold item, hiding/revealing its children
1431 f : fold / unfold item, hiding/revealing its children
1417 F : fold / unfold parent item and all of its ancestors
1432 F : fold / unfold parent item and all of its ancestors
1418 ctrl-l : scroll the selected line to the top of the screen
1433 ctrl-l : scroll the selected line to the top of the screen
1419 m : edit / resume editing the commit message
1434 m : edit / resume editing the commit message
1420 e : edit the currently selected hunk
1435 e : edit the currently selected hunk
1421 a : toggle amend mode, only with commit -i
1436 a : toggle amend mode, only with commit -i
1422 c : confirm selected changes
1437 c : confirm selected changes
1423 r : review/edit and confirm selected changes
1438 r : review/edit and confirm selected changes
1424 q : quit without confirming (no changes will be made)
1439 q : quit without confirming (no changes will be made)
1425 ? : help (what you're currently reading)""")
1440 ? : help (what you're currently reading)""")
1426
1441
1427 helpwin = curses.newwin(self.yscreensize, 0, 0, 0)
1442 helpwin = curses.newwin(self.yscreensize, 0, 0, 0)
1428 helplines = helptext.split("\n")
1443 helplines = helptext.split("\n")
1429 helplines = helplines + [" "]*(
1444 helplines = helplines + [" "]*(
1430 self.yscreensize - self.numstatuslines - len(helplines) - 1)
1445 self.yscreensize - self.numstatuslines - len(helplines) - 1)
1431 try:
1446 try:
1432 for line in helplines:
1447 for line in helplines:
1433 self.printstring(helpwin, line, pairname="legend")
1448 self.printstring(helpwin, line, pairname="legend")
1434 except curses.error:
1449 except curses.error:
1435 pass
1450 pass
1436 helpwin.refresh()
1451 helpwin.refresh()
1437 try:
1452 try:
1438 with self.ui.timeblockedsection('crecord'):
1453 with self.ui.timeblockedsection('crecord'):
1439 helpwin.getkey()
1454 helpwin.getkey()
1440 except curses.error:
1455 except curses.error:
1441 pass
1456 pass
1442
1457
1443 def commitMessageWindow(self):
1458 def commitMessageWindow(self):
1444 "Create a temporary commit message editing window on the screen."
1459 "Create a temporary commit message editing window on the screen."
1445
1460
1446 curses.raw()
1461 curses.raw()
1447 curses.def_prog_mode()
1462 curses.def_prog_mode()
1448 curses.endwin()
1463 curses.endwin()
1449 self.commenttext = self.ui.edit(self.commenttext, self.ui.username())
1464 self.commenttext = self.ui.edit(self.commenttext, self.ui.username())
1450 curses.cbreak()
1465 curses.cbreak()
1451 self.stdscr.refresh()
1466 self.stdscr.refresh()
1452 self.stdscr.keypad(1) # allow arrow-keys to continue to function
1467 self.stdscr.keypad(1) # allow arrow-keys to continue to function
1453
1468
1454 def confirmationwindow(self, windowtext):
1469 def confirmationwindow(self, windowtext):
1455 "display an informational window, then wait for and return a keypress."
1470 "display an informational window, then wait for and return a keypress."
1456
1471
1457 confirmwin = curses.newwin(self.yscreensize, 0, 0, 0)
1472 confirmwin = curses.newwin(self.yscreensize, 0, 0, 0)
1458 try:
1473 try:
1459 lines = windowtext.split("\n")
1474 lines = windowtext.split("\n")
1460 for line in lines:
1475 for line in lines:
1461 self.printstring(confirmwin, line, pairname="selected")
1476 self.printstring(confirmwin, line, pairname="selected")
1462 except curses.error:
1477 except curses.error:
1463 pass
1478 pass
1464 self.stdscr.refresh()
1479 self.stdscr.refresh()
1465 confirmwin.refresh()
1480 confirmwin.refresh()
1466 try:
1481 try:
1467 with self.ui.timeblockedsection('crecord'):
1482 with self.ui.timeblockedsection('crecord'):
1468 response = chr(self.stdscr.getch())
1483 response = chr(self.stdscr.getch())
1469 except ValueError:
1484 except ValueError:
1470 response = None
1485 response = None
1471
1486
1472 return response
1487 return response
1473
1488
1474 def reviewcommit(self):
1489 def reviewcommit(self):
1475 """ask for 'y' to be pressed to confirm selected. return True if
1490 """ask for 'y' to be pressed to confirm selected. return True if
1476 confirmed."""
1491 confirmed."""
1477 confirmtext = _(
1492 confirmtext = _(
1478 """if you answer yes to the following, the your currently chosen patch chunks
1493 """if you answer yes to the following, the your currently chosen patch chunks
1479 will be loaded into an editor. you may modify the patch from the editor, and
1494 will be loaded into an editor. you may modify the patch from the editor, and
1480 save the changes if you wish to change the patch. otherwise, you can just
1495 save the changes if you wish to change the patch. otherwise, you can just
1481 close the editor without saving to accept the current patch as-is.
1496 close the editor without saving to accept the current patch as-is.
1482
1497
1483 note: don't add/remove lines unless you also modify the range information.
1498 note: don't add/remove lines unless you also modify the range information.
1484 failing to follow this rule will result in the commit aborting.
1499 failing to follow this rule will result in the commit aborting.
1485
1500
1486 are you sure you want to review/edit and confirm the selected changes [yn]?
1501 are you sure you want to review/edit and confirm the selected changes [yn]?
1487 """)
1502 """)
1488 with self.ui.timeblockedsection('crecord'):
1503 with self.ui.timeblockedsection('crecord'):
1489 response = self.confirmationwindow(confirmtext)
1504 response = self.confirmationwindow(confirmtext)
1490 if response is None:
1505 if response is None:
1491 response = "n"
1506 response = "n"
1492 if response.lower().startswith("y"):
1507 if response.lower().startswith("y"):
1493 return True
1508 return True
1494 else:
1509 else:
1495 return False
1510 return False
1496
1511
1497 def toggleamend(self, opts, test):
1512 def toggleamend(self, opts, test):
1498 """Toggle the amend flag.
1513 """Toggle the amend flag.
1499
1514
1500 When the amend flag is set, a commit will modify the most recently
1515 When the amend flag is set, a commit will modify the most recently
1501 committed changeset, instead of creating a new changeset. Otherwise, a
1516 committed changeset, instead of creating a new changeset. Otherwise, a
1502 new changeset will be created (the normal commit behavior).
1517 new changeset will be created (the normal commit behavior).
1503 """
1518 """
1504
1519
1505 try:
1520 try:
1506 ver = float(util.version()[:3])
1521 ver = float(util.version()[:3])
1507 except ValueError:
1522 except ValueError:
1508 ver = 1
1523 ver = 1
1509 if ver < 2.19:
1524 if ver < 2.19:
1510 msg = _("The amend option is unavailable with hg versions < 2.2\n\n"
1525 msg = _("The amend option is unavailable with hg versions < 2.2\n\n"
1511 "Press any key to continue.")
1526 "Press any key to continue.")
1512 elif opts.get('amend') is None:
1527 elif opts.get('amend') is None:
1513 opts['amend'] = True
1528 opts['amend'] = True
1514 msg = _("Amend option is turned on -- committing the currently "
1529 msg = _("Amend option is turned on -- committing the currently "
1515 "selected changes will not create a new changeset, but "
1530 "selected changes will not create a new changeset, but "
1516 "instead update the most recently committed changeset.\n\n"
1531 "instead update the most recently committed changeset.\n\n"
1517 "Press any key to continue.")
1532 "Press any key to continue.")
1518 elif opts.get('amend') is True:
1533 elif opts.get('amend') is True:
1519 opts['amend'] = None
1534 opts['amend'] = None
1520 msg = _("Amend option is turned off -- committing the currently "
1535 msg = _("Amend option is turned off -- committing the currently "
1521 "selected changes will create a new changeset.\n\n"
1536 "selected changes will create a new changeset.\n\n"
1522 "Press any key to continue.")
1537 "Press any key to continue.")
1523 if not test:
1538 if not test:
1524 self.confirmationwindow(msg)
1539 self.confirmationwindow(msg)
1525
1540
1526 def recenterdisplayedarea(self):
1541 def recenterdisplayedarea(self):
1527 """
1542 """
1528 once we scrolled with pg up pg down we can be pointing outside of the
1543 once we scrolled with pg up pg down we can be pointing outside of the
1529 display zone. we print the patch with towin=False to compute the
1544 display zone. we print the patch with towin=False to compute the
1530 location of the selected item even though it is outside of the displayed
1545 location of the selected item even though it is outside of the displayed
1531 zone and then update the scroll.
1546 zone and then update the scroll.
1532 """
1547 """
1533 self.printitem(towin=False)
1548 self.printitem(towin=False)
1534 self.updatescroll()
1549 self.updatescroll()
1535
1550
1536 def toggleedit(self, item=None, test=False):
1551 def toggleedit(self, item=None, test=False):
1537 """
1552 """
1538 edit the currently selected chunk
1553 edit the currently selected chunk
1539 """
1554 """
1540 def updateui(self):
1555 def updateui(self):
1541 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
1556 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
1542 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
1557 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
1543 self.updatescroll()
1558 self.updatescroll()
1544 self.stdscr.refresh()
1559 self.stdscr.refresh()
1545 self.statuswin.refresh()
1560 self.statuswin.refresh()
1546 self.stdscr.keypad(1)
1561 self.stdscr.keypad(1)
1547
1562
1548 def editpatchwitheditor(self, chunk):
1563 def editpatchwitheditor(self, chunk):
1549 if chunk is None:
1564 if chunk is None:
1550 self.ui.write(_('cannot edit patch for whole file'))
1565 self.ui.write(_('cannot edit patch for whole file'))
1551 self.ui.write("\n")
1566 self.ui.write("\n")
1552 return None
1567 return None
1553 if chunk.header.binary():
1568 if chunk.header.binary():
1554 self.ui.write(_('cannot edit patch for binary file'))
1569 self.ui.write(_('cannot edit patch for binary file'))
1555 self.ui.write("\n")
1570 self.ui.write("\n")
1556 return None
1571 return None
1557
1572
1558 # write the initial patch
1573 # write the initial patch
1559 patch = stringio()
1574 patch = stringio()
1560 patch.write(diffhelptext + hunkhelptext)
1575 patch.write(diffhelptext + hunkhelptext)
1561 chunk.header.write(patch)
1576 chunk.header.write(patch)
1562 chunk.write(patch)
1577 chunk.write(patch)
1563
1578
1564 # start the editor and wait for it to complete
1579 # start the editor and wait for it to complete
1565 try:
1580 try:
1566 patch = self.ui.edit(patch.getvalue(), "", action="diff")
1581 patch = self.ui.edit(patch.getvalue(), "", action="diff")
1567 except error.Abort as exc:
1582 except error.Abort as exc:
1568 self.errorstr = str(exc)
1583 self.errorstr = str(exc)
1569 return None
1584 return None
1570
1585
1571 # remove comment lines
1586 # remove comment lines
1572 patch = [line + '\n' for line in patch.splitlines()
1587 patch = [line + '\n' for line in patch.splitlines()
1573 if not line.startswith('#')]
1588 if not line.startswith('#')]
1574 return patchmod.parsepatch(patch)
1589 return patchmod.parsepatch(patch)
1575
1590
1576 if item is None:
1591 if item is None:
1577 item = self.currentselecteditem
1592 item = self.currentselecteditem
1578 if isinstance(item, uiheader):
1593 if isinstance(item, uiheader):
1579 return
1594 return
1580 if isinstance(item, uihunkline):
1595 if isinstance(item, uihunkline):
1581 item = item.parentitem()
1596 item = item.parentitem()
1582 if not isinstance(item, uihunk):
1597 if not isinstance(item, uihunk):
1583 return
1598 return
1584
1599
1585 # To go back to that hunk or its replacement at the end of the edit
1600 # To go back to that hunk or its replacement at the end of the edit
1586 itemindex = item.parentitem().hunks.index(item)
1601 itemindex = item.parentitem().hunks.index(item)
1587
1602
1588 beforeadded, beforeremoved = item.added, item.removed
1603 beforeadded, beforeremoved = item.added, item.removed
1589 newpatches = editpatchwitheditor(self, item)
1604 newpatches = editpatchwitheditor(self, item)
1590 if newpatches is None:
1605 if newpatches is None:
1591 if not test:
1606 if not test:
1592 updateui(self)
1607 updateui(self)
1593 return
1608 return
1594 header = item.header
1609 header = item.header
1595 editedhunkindex = header.hunks.index(item)
1610 editedhunkindex = header.hunks.index(item)
1596 hunksbefore = header.hunks[:editedhunkindex]
1611 hunksbefore = header.hunks[:editedhunkindex]
1597 hunksafter = header.hunks[editedhunkindex + 1:]
1612 hunksafter = header.hunks[editedhunkindex + 1:]
1598 newpatchheader = newpatches[0]
1613 newpatchheader = newpatches[0]
1599 newhunks = [uihunk(h, header) for h in newpatchheader.hunks]
1614 newhunks = [uihunk(h, header) for h in newpatchheader.hunks]
1600 newadded = sum([h.added for h in newhunks])
1615 newadded = sum([h.added for h in newhunks])
1601 newremoved = sum([h.removed for h in newhunks])
1616 newremoved = sum([h.removed for h in newhunks])
1602 offset = (newadded - beforeadded) - (newremoved - beforeremoved)
1617 offset = (newadded - beforeadded) - (newremoved - beforeremoved)
1603
1618
1604 for h in hunksafter:
1619 for h in hunksafter:
1605 h.toline += offset
1620 h.toline += offset
1606 for h in newhunks:
1621 for h in newhunks:
1607 h.folded = False
1622 h.folded = False
1608 header.hunks = hunksbefore + newhunks + hunksafter
1623 header.hunks = hunksbefore + newhunks + hunksafter
1609 if self.emptypatch():
1624 if self.emptypatch():
1610 header.hunks = hunksbefore + [item] + hunksafter
1625 header.hunks = hunksbefore + [item] + hunksafter
1611 self.currentselecteditem = header
1626 self.currentselecteditem = header
1612 if len(header.hunks) > itemindex:
1627 if len(header.hunks) > itemindex:
1613 self.currentselecteditem = header.hunks[itemindex]
1628 self.currentselecteditem = header.hunks[itemindex]
1614
1629
1615 if not test:
1630 if not test:
1616 updateui(self)
1631 updateui(self)
1617
1632
1618 def emptypatch(self):
1633 def emptypatch(self):
1619 item = self.headerlist
1634 item = self.headerlist
1620 if not item:
1635 if not item:
1621 return True
1636 return True
1622 for header in item:
1637 for header in item:
1623 if header.hunks:
1638 if header.hunks:
1624 return False
1639 return False
1625 return True
1640 return True
1626
1641
1627 def handlekeypressed(self, keypressed, test=False):
1642 def handlekeypressed(self, keypressed, test=False):
1628 """
1643 """
1629 Perform actions based on pressed keys.
1644 Perform actions based on pressed keys.
1630
1645
1631 Return true to exit the main loop.
1646 Return true to exit the main loop.
1632 """
1647 """
1633 if keypressed in ["k", "KEY_UP"]:
1648 if keypressed in ["k", "KEY_UP"]:
1634 self.uparrowevent()
1649 self.uparrowevent()
1635 if keypressed in ["K", "KEY_PPAGE"]:
1650 if keypressed in ["K", "KEY_PPAGE"]:
1636 self.uparrowshiftevent()
1651 self.uparrowshiftevent()
1637 elif keypressed in ["j", "KEY_DOWN"]:
1652 elif keypressed in ["j", "KEY_DOWN"]:
1638 self.downarrowevent()
1653 self.downarrowevent()
1639 elif keypressed in ["J", "KEY_NPAGE"]:
1654 elif keypressed in ["J", "KEY_NPAGE"]:
1640 self.downarrowshiftevent()
1655 self.downarrowshiftevent()
1641 elif keypressed in ["l", "KEY_RIGHT"]:
1656 elif keypressed in ["l", "KEY_RIGHT"]:
1642 self.rightarrowevent()
1657 self.rightarrowevent()
1643 elif keypressed in ["h", "KEY_LEFT"]:
1658 elif keypressed in ["h", "KEY_LEFT"]:
1644 self.leftarrowevent()
1659 self.leftarrowevent()
1645 elif keypressed in ["H", "KEY_SLEFT"]:
1660 elif keypressed in ["H", "KEY_SLEFT"]:
1646 self.leftarrowshiftevent()
1661 self.leftarrowshiftevent()
1647 elif keypressed in ["q"]:
1662 elif keypressed in ["q"]:
1648 raise error.Abort(_('user quit'))
1663 raise error.Abort(_('user quit'))
1649 elif keypressed in ['a']:
1664 elif keypressed in ['a']:
1650 self.toggleamend(self.opts, test)
1665 self.toggleamend(self.opts, test)
1651 elif keypressed in ["c"]:
1666 elif keypressed in ["c"]:
1652 return True
1667 return True
1653 elif test and keypressed in ['X']:
1668 elif test and keypressed in ['X']:
1654 return True
1669 return True
1655 elif keypressed in ["r"]:
1670 elif keypressed in ["r"]:
1656 if self.reviewcommit():
1671 if self.reviewcommit():
1657 self.opts['review'] = True
1672 self.opts['review'] = True
1658 return True
1673 return True
1659 elif test and keypressed in ['R']:
1674 elif test and keypressed in ['R']:
1660 self.opts['review'] = True
1675 self.opts['review'] = True
1661 return True
1676 return True
1662 elif keypressed in [' '] or (test and keypressed in ["TOGGLE"]):
1677 elif keypressed in [' '] or (test and keypressed in ["TOGGLE"]):
1663 self.toggleapply()
1678 self.toggleapply()
1664 if self.ui.configbool('experimental', 'spacemovesdown'):
1679 if self.ui.configbool('experimental', 'spacemovesdown'):
1665 self.downarrowevent()
1680 self.downarrowevent()
1666 elif keypressed in ['A']:
1681 elif keypressed in ['A']:
1667 self.toggleall()
1682 self.toggleall()
1668 elif keypressed in ['e']:
1683 elif keypressed in ['e']:
1669 self.toggleedit(test=test)
1684 self.toggleedit(test=test)
1670 elif keypressed in ["f"]:
1685 elif keypressed in ["f"]:
1671 self.togglefolded()
1686 self.togglefolded()
1672 elif keypressed in ["F"]:
1687 elif keypressed in ["F"]:
1673 self.togglefolded(foldparent=True)
1688 self.togglefolded(foldparent=True)
1674 elif keypressed in ["m"]:
1689 elif keypressed in ["m"]:
1675 self.commitMessageWindow()
1690 self.commitMessageWindow()
1676 elif keypressed in ["?"]:
1691 elif keypressed in ["?"]:
1677 self.helpwindow()
1692 self.helpwindow()
1678 self.stdscr.clear()
1693 self.stdscr.clear()
1679 self.stdscr.refresh()
1694 self.stdscr.refresh()
1680 elif curses.unctrl(keypressed) in ["^L"]:
1695 elif curses.unctrl(keypressed) in ["^L"]:
1681 # scroll the current line to the top of the screen
1696 # scroll the current line to the top of the screen
1682 self.scrolllines(self.selecteditemstartline)
1697 self.scrolllines(self.selecteditemstartline)
1683
1698
1684 def main(self, stdscr):
1699 def main(self, stdscr):
1685 """
1700 """
1686 method to be wrapped by curses.wrapper() for selecting chunks.
1701 method to be wrapped by curses.wrapper() for selecting chunks.
1687 """
1702 """
1688
1703
1689 origsigwinch = sentinel = object()
1704 origsigwinch = sentinel = object()
1690 if util.safehasattr(signal, 'SIGWINCH'):
1705 if util.safehasattr(signal, 'SIGWINCH'):
1691 origsigwinch = signal.signal(signal.SIGWINCH,
1706 origsigwinch = signal.signal(signal.SIGWINCH,
1692 self.sigwinchhandler)
1707 self.sigwinchhandler)
1693 try:
1708 try:
1694 return self._main(stdscr)
1709 return self._main(stdscr)
1695 finally:
1710 finally:
1696 if origsigwinch is not sentinel:
1711 if origsigwinch is not sentinel:
1697 signal.signal(signal.SIGWINCH, origsigwinch)
1712 signal.signal(signal.SIGWINCH, origsigwinch)
1698
1713
1699 def _main(self, stdscr):
1714 def _main(self, stdscr):
1700 self.stdscr = stdscr
1715 self.stdscr = stdscr
1701 # error during initialization, cannot be printed in the curses
1716 # error during initialization, cannot be printed in the curses
1702 # interface, it should be printed by the calling code
1717 # interface, it should be printed by the calling code
1703 self.initerr = None
1718 self.initerr = None
1704 self.yscreensize, self.xscreensize = self.stdscr.getmaxyx()
1719 self.yscreensize, self.xscreensize = self.stdscr.getmaxyx()
1705
1720
1706 curses.start_color()
1721 curses.start_color()
1707 curses.use_default_colors()
1722 curses.use_default_colors()
1708
1723
1709 # available colors: black, blue, cyan, green, magenta, white, yellow
1724 # available colors: black, blue, cyan, green, magenta, white, yellow
1710 # init_pair(color_id, foreground_color, background_color)
1725 # init_pair(color_id, foreground_color, background_color)
1711 self.initcolorpair(None, None, name="normal")
1726 self.initcolorpair(None, None, name="normal")
1712 self.initcolorpair(curses.COLOR_WHITE, curses.COLOR_MAGENTA,
1727 self.initcolorpair(curses.COLOR_WHITE, curses.COLOR_MAGENTA,
1713 name="selected")
1728 name="selected")
1714 self.initcolorpair(curses.COLOR_RED, None, name="deletion")
1729 self.initcolorpair(curses.COLOR_RED, None, name="deletion")
1715 self.initcolorpair(curses.COLOR_GREEN, None, name="addition")
1730 self.initcolorpair(curses.COLOR_GREEN, None, name="addition")
1716 self.initcolorpair(curses.COLOR_WHITE, curses.COLOR_BLUE, name="legend")
1731 self.initcolorpair(curses.COLOR_WHITE, curses.COLOR_BLUE, name="legend")
1717 # newwin([height, width,] begin_y, begin_x)
1732 # newwin([height, width,] begin_y, begin_x)
1718 self.statuswin = curses.newwin(self.numstatuslines, 0, 0, 0)
1733 self.statuswin = curses.newwin(self.numstatuslines, 0, 0, 0)
1719 self.statuswin.keypad(1) # interpret arrow-key, etc. esc sequences
1734 self.statuswin.keypad(1) # interpret arrow-key, etc. esc sequences
1720
1735
1721 # figure out how much space to allocate for the chunk-pad which is
1736 # figure out how much space to allocate for the chunk-pad which is
1722 # used for displaying the patch
1737 # used for displaying the patch
1723
1738
1724 # stupid hack to prevent getnumlinesdisplayed from failing
1739 # stupid hack to prevent getnumlinesdisplayed from failing
1725 self.chunkpad = curses.newpad(1, self.xscreensize)
1740 self.chunkpad = curses.newpad(1, self.xscreensize)
1726
1741
1727 # add 1 so to account for last line text reaching end of line
1742 # add 1 so to account for last line text reaching end of line
1728 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
1743 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
1729
1744
1730 try:
1745 try:
1731 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
1746 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
1732 except curses.error:
1747 except curses.error:
1733 self.initerr = _('this diff is too large to be displayed')
1748 self.initerr = _('this diff is too large to be displayed')
1734 return
1749 return
1735 # initialize selecteditemendline (initial start-line is 0)
1750 # initialize selecteditemendline (initial start-line is 0)
1736 self.selecteditemendline = self.getnumlinesdisplayed(
1751 self.selecteditemendline = self.getnumlinesdisplayed(
1737 self.currentselecteditem, recursechildren=False)
1752 self.currentselecteditem, recursechildren=False)
1738
1753
1739 while True:
1754 while True:
1740 self.updatescreen()
1755 self.updatescreen()
1741 try:
1756 try:
1742 with self.ui.timeblockedsection('crecord'):
1757 with self.ui.timeblockedsection('crecord'):
1743 keypressed = self.statuswin.getkey()
1758 keypressed = self.statuswin.getkey()
1744 if self.errorstr is not None:
1759 if self.errorstr is not None:
1745 self.errorstr = None
1760 self.errorstr = None
1746 continue
1761 continue
1747 except curses.error:
1762 except curses.error:
1748 keypressed = "foobar"
1763 keypressed = "foobar"
1749 if self.handlekeypressed(keypressed):
1764 if self.handlekeypressed(keypressed):
1750 break
1765 break
1751
1766
1752 if self.commenttext != "":
1767 if self.commenttext != "":
1753 whitespaceremoved = re.sub("(?m)^\s.*(\n|$)", "", self.commenttext)
1768 whitespaceremoved = re.sub("(?m)^\s.*(\n|$)", "", self.commenttext)
1754 if whitespaceremoved != "":
1769 if whitespaceremoved != "":
1755 self.opts['message'] = self.commenttext
1770 self.opts['message'] = self.commenttext
General Comments 0
You need to be logged in to leave comments. Login now