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