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: fix handling of dialog responses

Changeset ffb4e9c2a447…

Parent cf387ff33853…

by Yuki KODAMA

Changes to one file · Browse files at ffb4e9c2a447 Showing diff from parent cf387ff33853 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​backout.py Stacked
 
23
24
25
26
27
 
28
29
30
31
32
 
33
34
35
36
37
 
 
38
39
40
 
98
99
100
101
 
102
103
104
 
115
116
117
118
119
120
 
 
 
121
122
123
 
135
136
137
138
 
139
140
141
 
142
143
144
 
23
24
25
 
 
26
27
28
29
30
31
32
33
34
 
 
 
35
36
37
38
39
 
97
98
99
 
100
101
102
103
 
114
115
116
 
 
 
117
118
119
120
121
122
 
134
135
136
 
137
138
139
 
140
141
142
143
@@ -23,18 +23,17 @@
  """ Backout effect of a changeset """   def __init__(self, rev=None):   """ Initialize the Dialog """ - gtk.Dialog.__init__(self, title=_('Backout changeset - %s') % rev, - buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)) + 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 - backoutbutton = gtk.Button(_('Backout')) - backoutbutton.connect('clicked', self.backout, rev) - self.action_area.pack_end(backoutbutton) + 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') @@ -98,7 +97,7 @@
    # prepare to show   self.load_settings() - backoutbutton.grab_focus() + self.backoutbtn.grab_focus()     def load_settings(self):   checked = self.settings.get_value('english', False, True) @@ -115,9 +114,9 @@
    def dialog_response(self, dialog, response_id):   self.store_settings() - if response_id == gtk.RESPONSE_CLOSE \ - or response_id == gtk.RESPONSE_DELETE_EVENT: - self.destroy() + # Backout button + if response_id == gtk.RESPONSE_OK: + self.backout()     def eng_msg_toggled(self, checkbutton):   start, end = self.buf.get_bounds() @@ -135,10 +134,10 @@
  newmsg = (state and self.msgset['id'] or self.msgset['str'])   self.buf.set_text(newmsg)   - def backout(self, button, revstr): + def backout(self):   start, end = self.buf.get_bounds()   msg = self.buf.get_text(start, end) - cmdline = ['hg', 'backout', '--rev', revstr] + cmdline = ['hg', 'backout', '--rev', self.rev]   if self.merge_button.get_active():   cmdline += ['--merge']   cmdline += ['--message', hglib.fromutf(msg)]