Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

backout: use csinfo panel

Changeset 0940acb2c755…

Parent 05faacea65ac…

by Yuki KODAMA

Changes to one file · Browse files at 0940acb2c755 Showing diff from parent 05faacea65ac Diff from another changeset...

Change 1 of 1 Show Changes Only tortoisehg/​hgtk/​backout.py Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
 
 
 
 
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
 
 
 
 
 
 
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
 # backout.py - TortoiseHg's dialog for backing out changeset  #  # Copyright 2008 TK Soh <teekaysoh@gmail.com>  # Copyright 2008 Steve Borho <steve@borho.org>  #  # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.    import gtk  import gobject  import pango    from mercurial import hg, ui    from tortoisehg.util.i18n import _  from tortoisehg.util import hglib, paths, i18n, settings    from tortoisehg.hgtk import csinfo, gtklib, hgcmd, gdialog    keep = i18n.keepgettext()    MODE_NORMAL = 'normal'  MODE_WORKING = 'working'    class BackoutDialog(gtk.Dialog):   """ Backout effect of a changeset """   def __init__(self, rev=None):   """ Initialize the Dialog """   gtk.Dialog.__init__(self, title=_('Backout changeset - %s') % rev)   gtklib.set_tortoise_icon(self, 'menurevert.ico')   gtklib.set_tortoise_keys(self)   self.set_has_separator(False)   self.set_default_size(600, 400)   self.connect('response', self.dialog_response)   self.rev = rev     # add Backout button   self.backoutbtn = self.add_button(_('Backout'), gtk.RESPONSE_OK)   self.closebtn = self.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)     # persistent settings   self.settings = settings.Settings('backout')     try:   repo = hg.repository(ui.ui(), path=paths.find_root())   except hglib.RepoError:   gtklib.idle_add_single_call(self.destroy)   return     # message   self.msgset = keep._('Backed out changeset: ')   self.msgset['id'] += rev   self.msgset['str'] += rev     # changeset info - frame = gtk.Frame(_('Changeset Description')) - frame.set_border_width(4) - revid, desc = csinfo.create(repo, rev) - frame.add(desc) - self.vbox.pack_start(frame, False, False, 2) - self.csetframe = frame + style = csinfo.panelstyle(label=_('Changeset Description'), + margin=4, padding=2) + self.csetframe = csinfo.create(rev, style, repo) + self.vbox.pack_start(self.csetframe, False, False, 2)     # backout commit message   frame = gtk.Frame(_('Backout commit message'))   frame.set_border_width(4)   msgvbox = gtk.VBox()   msgvbox.set_border_width(4)   frame.add(msgvbox)   self.vbox.pack_start(frame, True, True, 2)   self.cmsgframe = frame     ## message text area   self.logview = gtk.TextView(buffer=None)   self.logview.set_editable(True)   self.logview.modify_font(pango.FontDescription('Monospace'))   self.buf = self.logview.get_buffer()   self.buf.set_text(self.msgset['str'])   scrolledwindow = gtk.ScrolledWindow()   scrolledwindow.set_shadow_type(gtk.SHADOW_ETCHED_IN)   scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)   scrolledwindow.add(self.logview)   msgvbox.pack_start(scrolledwindow)     ## tooltips   self.tips = gtk.Tooltips()   self.tips.set_tip(frame,   _('Commit message text for new changeset that reverses the'   ' effect of the change being backed out.'))     hbox = gtk.HBox()     ## use English backout message option   self.eng_msg = gtk.CheckButton(_('Use English backout message'))   self.eng_msg.connect('toggled', self.eng_msg_toggled)   hbox.pack_start(self.eng_msg, False, False)     ## merge after backout   self.merge_button = gtk.CheckButton(   _('Merge with old dirstate parent after backout'))   hbox.pack_start(self.merge_button, False, False, 4)   msgvbox.pack_start(hbox, False, False)     # prepare to show   self.load_settings()   self.backoutbtn.grab_focus()   gtklib.idle_add_single_call(self.after_init)     def after_init(self):   # CmdWidget   self.cmd = hgcmd.CmdWidget()   self.cmd.show_all()   self.cmd.hide()   self.vbox.pack_start(self.cmd, False, False, 6)     # abort button   self.abortbtn = self.add_button(_('Abort'), gtk.RESPONSE_CANCEL)   self.abortbtn.hide()     def load_settings(self):   checked = self.settings.get_value('english', False, True)   self.eng_msg.set_active(checked)   checked = self.settings.get_value('merge', True, True)   self.merge_button.set_active(checked)     def store_settings(self):   checked = self.eng_msg.get_active()   self.settings.set_value('english', checked)   checked = self.merge_button.get_active()   self.settings.set_value('merge', checked)   self.settings.write()     def dialog_response(self, dialog, response_id):   def abort():   self.cmd.stop()   self.cmd.show_log()   self.switch_to(MODE_NORMAL, cmd=False)   # Backout button   if response_id == gtk.RESPONSE_OK:   self.backout()   # Close button or dialog closing by the user   elif response_id in (gtk.RESPONSE_CLOSE, gtk.RESPONSE_DELETE_EVENT):   if self.cmd.is_alive():   ret = gdialog.Confirm(_('Confirm Abort'), [], self,   _('Do you want to abort?')).run()   if ret == gtk.RESPONSE_YES:   abort()   else:   self.store_settings()   self.destroy()   return # close dialog   # Abort button   elif response_id == gtk.RESPONSE_CANCEL:   abort()   else:   raise _('unexpected response id: %s') % response_id     self.run() # don't close dialog     def eng_msg_toggled(self, checkbutton):   start, end = self.buf.get_bounds()   msg = self.buf.get_text(start, end)   state = checkbutton.get_active()   origmsg = (state and self.msgset['str'] or self.msgset['id'])   if msg != origmsg:   res = gdialog.Confirm(_('Confirm Discard Message'),   [], self, _('Discard current backout message?')).run()   if res != gtk.RESPONSE_YES:   checkbutton.handler_block_by_func(self.eng_msg_toggled)   checkbutton.set_active(not state)   checkbutton.handler_unblock_by_func(self.eng_msg_toggled)   return   newmsg = (state and self.msgset['id'] or self.msgset['str'])   self.buf.set_text(newmsg)     def switch_to(self, mode, cmd=True):   if mode == MODE_NORMAL:   normal = True   self.closebtn.grab_focus()   elif mode == MODE_WORKING:   normal = False   self.abortbtn.grab_focus()   else:   raise _('unknown mode name: %s') % mode   working = not normal     self.csetframe.set_sensitive(normal)   self.cmsgframe.set_sensitive(normal)   self.backoutbtn.set_property('visible', normal)   self.closebtn.set_property('visible', normal)   if cmd:   self.cmd.set_property('visible', working)   self.abortbtn.set_property('visible', working)     def backout(self):   start, end = self.buf.get_bounds()   msg = self.buf.get_text(start, end)   cmdline = ['hg', 'backout', '--rev', self.rev]   if self.merge_button.get_active():   cmdline += ['--merge']   cmdline += ['--message', hglib.fromutf(msg)]     def cmd_done(returncode, useraborted):   self.switch_to(MODE_NORMAL, cmd=False)   if returncode == 0:   if not self.cmd.is_show_log():   self.response(gtk.RESPONSE_CLOSE)   self.cmd.set_result(_('Backed out successfully'), style='ok')   elif useraborted:   self.cmd.set_result(_('Canceled backout'), style='error')   else:   self.cmd.set_result(_('Failed to backout'), style='error')   self.switch_to(MODE_WORKING)   self.cmd.execute(cmdline, cmd_done)