5
from userinteractor import UserInteractor, UserOption
7
def __init__(self, char, action, help, default=False):
10
self.default = default
14
Option('n', 'shelve', 'shelve this change for the moment.',
16
Option('y', 'keep', 'keep this change in your tree.'),
17
Option('d', 'done', 'done, skip to the end.'),
18
Option('i', 'invert', 'invert the current selection of all hunks.'),
19
Option('s', 'status', 'show status of hunks.'),
20
Option('q', 'quit', 'quit')
24
Option('y', 'continue', 'proceed to shelve selected changes.',
26
Option('r', 'restart', 'restart the hunk selection loop.'),
27
Option('s', 'status', 'show status of hunks.'),
28
Option('i', 'invert', 'invert the current selection of all hunks.'),
29
Option('q', 'quit', 'quit')
11
32
def __init__(self, patches):
13
from colordiff import DiffWriter
14
from terminal import has_ansi_colors
16
self.diff_stream = DiffWriter(sys.stdout)
18
self.diff_stream = sys.stdout
20
self.diff_stream = sys.stdout
21
self.standard_options = [
22
UserOption('y', self._selected, self.strings['select_desc'],
24
UserOption('n', self._unselected, self.strings['unselect_desc']),
25
UserOption('d', UserInteractor.FINISH, 'done, skip to the end.'),
26
UserOption('i', self._invert,
27
'invert the current selection status of all hunks.'),
28
UserOption('s', self._status,
29
'show selection status of all hunks.'),
30
UserOption('q', UserInteractor.QUIT, 'quit')
34
UserOption('y', UserInteractor.FINISH, self.strings['finish_desc'],
36
UserOption('r', UserInteractor.RESTART,
37
'restart the hunk selection loop.'),
38
UserOption('s', self._status,
39
'show selection status of all hunks.'),
40
UserOption('i', self._invert,
41
'invert the current selection status of all hunks.'),
42
UserOption('q', UserInteractor.QUIT, 'quit')
45
33
self.patches = patches
46
34
self.total_hunks = 0
48
self.interactor = UserInteractor()
49
self.interactor.set_item_callback(self._hunk_callback)
50
self.interactor.set_start_callback(self._start_callback)
51
self.interactor.set_end_callback(self._end_callback)
53
35
for patch in patches:
54
36
for hunk in patch.hunks:
55
# everything's selected by default
37
# everything's shelved by default
56
38
hunk.selected = True
57
39
self.total_hunks += 1
58
# we need a back pointer in the callbacks
60
self.interactor.add_item(hunk)
62
# Called at the start of the main loop
63
def _start_callback(self):
64
self.last_printed = -1
65
self.interactor.set_prompt(self.strings['prompt'])
66
self.interactor.set_options(self.standard_options)
68
# Called at the end of the item loop, return False to indicate that the
69
# interaction isn't finished and the confirmation prompt should be displayed
70
def _end_callback(self):
72
self.interactor.set_prompt(self.strings['end_prompt'])
73
self.interactor.set_options(self.end_options)
76
# Called once for each hunk
77
def _hunk_callback(self, hunk, count):
78
if self.last_printed != count:
79
self.diff_stream.write(str(hunk.patch.get_header()))
80
self.diff_stream.write(str(hunk))
81
self.last_printed = count
84
self.interactor.get_option('y').default = True
85
self.interactor.get_option('n').default = False
87
self.interactor.get_option('y').default = False
88
self.interactor.get_option('n').default = True
90
# The user chooses to (un)shelve a hunk
91
def _selected(self, hunk):
95
# The user chooses to keep a hunk
96
def _unselected(self, hunk):
100
# The user chooses to invert the selection
101
def _invert(self, hunk):
41
def __get_option(self, char):
42
for opt in self.standard_options:
45
raise Exception('Option "%s" not found!' % char)
47
def __select_loop(self):
49
for patch in self.patches:
52
while i < len(patch.hunks):
55
print patch.get_header(), hunk
59
prompt = 'Keep this change? (%d of %d)' \
60
% (j, self.total_hunks)
63
self.__get_option('n').default = True
64
self.__get_option('y').default = False
66
self.__get_option('n').default = False
67
self.__get_option('y').default = True
69
action = self.__ask_user(prompt, self.standard_options)
73
elif action == 'shelve':
75
elif action == 'done':
77
elif action == 'invert':
78
self.__invert_selection()
81
elif action == 'status':
84
elif action == 'quit':
91
if self.total_hunks == 0:
96
if not self.__select_loop():
101
prompt = "Shelve these changes, or restart?"
102
action = self.__ask_user(prompt, self.end_options)
104
if action == 'continue':
107
elif action == 'quit':
109
elif action == 'status':
111
elif action == 'invert':
112
self.__invert_selection()
113
elif action == 'restart':
117
for patch in self.patches:
119
for hunk in patch.hunks:
125
for patch in self.patches:
132
def __invert_selection(self):
102
133
for patch in self.patches:
103
134
for hunk in patch.hunks:
104
135
if hunk.__dict__.has_key('selected'):
105
136
hunk.selected = not hunk.selected
107
138
hunk.selected = True
111
# The user wants to see the status
112
def _status(self, hunk=None):
140
def __show_status(self):
113
141
print '\nStatus:'
114
142
for patch in self.patches:
115
143
print ' %s' % patch.oldname
118
146
for hunk in patch.hunks:
119
147
if hunk.selected:
124
print ' ', self.strings['status_selected'] % selected
125
print ' ', self.strings['status_unselected'] % unselected
152
print ' %d hunks to be shelved' % shelve
153
print ' %d hunks to be kept' % keep
128
# Tell the interactor we're not done with this item
132
if self.total_hunks == 0 or not self.interactor.interact():
133
# False from interact means they chose to quit
136
# Go through each patch and collect all selected/unselected hunks
137
for patch in self.patches:
139
patch.unselected = []
140
for hunk in patch.hunks:
142
patch.selected.append(hunk)
144
patch.unselected.append(hunk)
146
# Now build two lists, one of selected patches the other unselected
147
selected_patches = []
148
unselected_patches = []
150
for patch in self.patches:
151
if len(patch.selected):
152
tmp = copy.copy(patch)
153
tmp.hunks = tmp.selected
156
selected_patches.append(tmp)
158
if len(patch.unselected):
159
tmp = copy.copy(patch)
160
tmp.hunks = tmp.unselected
163
unselected_patches.append(tmp)
165
return (selected_patches, unselected_patches)
167
class ShelveHunkSelector(HunkSelector):
168
def __init__(self, patches):
170
self.strings['status_selected'] = '%d hunks to be shelved'
171
self.strings['status_unselected'] = '%d hunks to be kept'
172
self.strings['select_desc'] = 'shelve this change.'
173
self.strings['unselect_desc'] = 'keep this change in your tree.'
174
self.strings['finish_desc'] = 'shelve selected changes.'
175
self.strings['prompt'] = 'Shelve this change? (%(count)d of %(total)d)'
176
self.strings['end_prompt'] = 'Shelve these changes?'
177
HunkSelector.__init__(self, patches)
179
class UnshelveHunkSelector(HunkSelector):
180
def __init__(self, patches):
182
self.strings['status_selected'] = '%d hunks to be unshelved'
183
self.strings['status_unselected'] = '%d hunks left on shelf'
184
self.strings['select_desc'] = 'unshelve this change.'
185
self.strings['unselect_desc'] = 'leave this change on the shelf.'
186
self.strings['finish_desc'] = 'unshelve selected changes.'
187
self.strings['prompt'] = 'Unshelve this change? ' \
188
'(%(count)d of %(total)d)'
189
self.strings['end_prompt'] = 'Unshelve these changes?'
190
HunkSelector.__init__(self, patches)
156
if sys.platform == "win32":
159
return msvcrt.getche()
164
fd = sys.stdin.fileno()
165
settings = termios.tcgetattr(fd)
168
ch = sys.stdin.read(1)
170
termios.tcsetattr(fd, termios.TCSADRAIN, settings)
173
def __ask_user(self, prompt, options):
175
sys.stdout.write(prompt)
176
sys.stdout.write(' [')
180
sys.stdout.write(opt.char)
181
sys.stdout.write('?] (%s): ' % default.char)
183
response = self.__getchar()
185
# default, which we see as newline, is 'n'
186
if response in ['\n', '\r', '\r\n']:
187
response = default.char
189
print response # because echo is off
192
if opt.char == response:
196
print ' %s - %s' % (opt.char, opt.help)
added
removed
hunk_selector.py
