Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

hggtk: make 'Confirm' in dialog title explicit

this makes things simpler for translations, and is less surprising

Changeset ed62fe66d79e…

Parent c83cb8c15230…

by Steve Borho

Changes to 9 files · Browse files at ed62fe66d79e Showing diff from parent c83cb8c15230 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​changeset.py Stacked
 
721
722
723
724
 
725
726
727
 
721
722
723
 
724
725
726
727
@@ -721,7 +721,7 @@
  def _revert_file(self, menuitem):   '''User selected file revert from the file list context menu'''   rev = self.currev - dialog = Confirm(_('revert file to old revision'), [], self, + dialog = Confirm(_('Confirm revert file to old revision'), [], self,   _('Revert %s to contents at revision %d?') % (self.curfile, rev))   if dialog.run() == gtk.RESPONSE_NO:   return
Change 1 of 8 Show Entire File hggtk/​commit.py Stacked
 
163
164
165
166
 
167
168
169
 
280
281
282
283
 
284
285
286
 
505
506
507
508
 
 
509
510
511
 
529
530
531
532
 
533
534
535
 
559
560
561
562
 
563
564
565
 
567
568
569
570
 
571
572
573
 
579
580
581
582
 
583
584
585
 
618
619
620
621
 
622
623
624
625
626
627
 
628
629
630
 
163
164
165
 
166
167
168
169
 
280
281
282
 
283
284
285
286
 
505
506
507
 
508
509
510
511
512
 
530
531
532
 
533
534
535
536
 
560
561
562
 
563
564
565
566
 
568
569
570
 
571
572
573
574
 
580
581
582
 
583
584
585
586
 
619
620
621
 
622
623
624
625
626
627
 
628
629
630
631
@@ -163,7 +163,7 @@
  if index >= 0:   buf = self.text.get_buffer()   if buf.get_char_count() and buf.get_modified(): - response = Confirm(_('Discard Message'), [], self, + response = Confirm(_('Confirm Discard Message'), [], self,   _('Discard current commit message?')).run()   if response != gtk.RESPONSE_YES:   combobox.set_active(-1) @@ -280,7 +280,7 @@
  live = False   buf = self.text.get_buffer()   if buf.get_char_count() > 10 and buf.get_modified(): - dialog = Confirm(_('Exit'), [], self, + dialog = Confirm(_('Confirm Exit'), [], self,   _('Save commit message at exit?'))   res = dialog.run()   if res == gtk.RESPONSE_YES: @@ -505,7 +505,8 @@
      def _undo_clicked(self, toolbutton, data=None): - response = Confirm(_('Undo commit'), [], self, _('Undo last commit')).run() + response = Confirm(_('Confirm Undo commit'), + [], self, _('Undo last commit')).run()   if response != gtk.RESPONSE_YES:   return   @@ -529,7 +530,7 @@
  if self.test_opt('addremove'):   return True   else: - response = Confirm(_('Add/Remove'), files, self).run() + response = Confirm(_('Confirm Add/Remove'), files, self).run()   if response == gtk.RESPONSE_YES:   # This will stay set for further commits (meaning no more prompts). Problem?   self.opts['addremove'] = True @@ -559,7 +560,7 @@
  buf.get_end_iter()).splitlines()     if sumlen and len(lines[0].rstrip()) > sumlen: - resp = Confirm(_('Commit'), [], self, + resp = Confirm(_('Confirm Commit'), [], self,   _('The summary line length of %i is greater than'   ' %i.\n\nIgnore format policy and continue'   ' commit?') % @@ -567,7 +568,7 @@
  if resp != gtk.RESPONSE_YES:   return False   if sumlen and len(lines) > 1 and len(lines[1].strip()): - resp = Confirm(_('Commit'), [], self, + resp = Confirm(_('Confirm Commit'), [], self,   _('The summary line is not followed by a blank'   ' line.\n\nIgnore format policy and continue'   ' commit?')).run() @@ -579,7 +580,7 @@
  errs = [str(x[1]+start+1) for x in zip(tmp, range(len(tmp)))   if x[0]]   if errs: - resp = Confirm(_('Commit'), [], self, + resp = Confirm(_('Confirm Commit'), [], self,   _('The following lines are over the %i-'   'character limit: %s.\n\nIgnore format'   ' policy and continue commit?') % @@ -618,13 +619,13 @@
  newbranch = fromutf(self.nextbranch)   if newbranch in self.repo.branchtags():   if newbranch not in [p.branch() for p in self.repo.parents()]: - response = Confirm(_('Override Branch'), [], self, + response = Confirm(_('Confirm Override Branch'), [], self,   _('A branch named "%s" already exists,\n'   'override?') % newbranch).run()   else:   response = gtk.RESPONSE_YES   else: - response = Confirm(_('New Branch'), [], self, + response = Confirm(_('Confirm New Branch'), [], self,   _('Create new named branch "%s"?') % newbranch).run()   if response == gtk.RESPONSE_YES:   self.repo.dirstate.setbranch(newbranch)
Change 1 of 1 Show Entire File hggtk/​gdialog.py Stacked
 
74
75
76
77
 
78
79
80
 
74
75
76
 
77
78
79
80
@@ -74,7 +74,7 @@
  def __init__(self, title, files, parent, primary=None):   SimpleMessage.__init__(self, parent, gtk.DIALOG_MODAL,   gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO) - self.set_title(hglib.toutf(_('Confirm ') + title)) + self.set_title(hglib.toutf(title))   if primary is None:   primary = title + ' file' + ((len(files) > 1 and 's') or '') + '?'   primary = '<b>' + primary + '</b>'
Change 1 of 2 Show Entire File hggtk/​history.py Stacked
 
483
484
485
486
 
487
488
489
 
510
511
512
513
 
514
515
516
 
483
484
485
 
486
487
488
489
 
510
511
512
 
513
514
515
516
@@ -483,7 +483,7 @@
    def _strip_rev(self, menuitem):   rev = self.currow[treemodel.REVID] - res = Confirm(_('Strip Revision(s)'), [], self, + res = Confirm(_('Confirm Strip Revision(s)'), [], self,   _('Remove revision %d and all descendants?') % rev).run()   if res != gtk.RESPONSE_YES:   return @@ -510,7 +510,7 @@
    def _revert(self, menuitem):   rev = self.currow[treemodel.REVID] - res = Confirm(_('Revert Revision(s)'), [], self, + res = Confirm(_('Confirm Revert Revision(s)'), [], self,   _('Revert all files to revision %d?\nThis will overwrite your '   'local changes') % rev).run()  
Change 1 of 1 Show Entire File hggtk/​merge.py Stacked
 
152
153
154
155
 
156
157
158
 
152
153
154
 
155
156
157
158
@@ -152,7 +152,7 @@
  gobject.idle_add(dlg.destroy)     def undo(self, button, local, merge, commit): - response = gdialog.Confirm(_('undo merge'), [], self, + response = gdialog.Confirm(_('Confirm undo merge'), [], self,   _('Clean checkout of original revision?')).run()   if response != gtk.RESPONSE_YES:   return
Change 1 of 2 Show Entire File hggtk/​recovery.py Stacked
 
114
115
116
117
 
118
119
120
 
133
134
135
136
 
137
138
139
 
114
115
116
 
117
118
119
120
 
133
134
135
 
136
137
138
139
@@ -114,7 +114,7 @@
  return tbutton     def _clean_clicked(self, toolbutton, data=None): - response = gdialog.Confirm(_('Clean repository'), [], self, + response = gdialog.Confirm(_('Confirm clean repository'), [], self,   "%s ?" % os.path.basename(self.root)).run()   if response != gtk.RESPONSE_YES:   return @@ -133,7 +133,7 @@
  shlib.shell_notify([self.root])     def _rollback_clicked(self, toolbutton, data=None): - response = gdialog.Confirm(_('Rollback repository'), [], self, + response = gdialog.Confirm(_('Confirm rollback repository'), [], self,   "%s ?" % os.path.basename(self.root)).run()   if response != gtk.RESPONSE_YES:   return
Change 1 of 1 Show Changes Only hggtk/​serve.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
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
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
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
 #  # TortoiseHg dialog to start web server  #  # Copyright (C) 2007 Steve Borho <steve@borho.org>  # Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>  #    import gtk  import gobject  import httplib  import os  import pango  import Queue  import socket  import sys  import threading  import time  import hglib  import shlib  import gdialog  from dialog import error_dialog  from mercurial.i18n import _  from mercurial import hg, ui, commands, cmdutil, util  from mercurial.hgweb import server  from mercurial.i18n import _    gservice = None  class ServeDialog(gtk.Window):   """ Dialog to run web server"""   def __init__(self, webdir_conf):   """ Initialize the Dialog """   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   shlib.set_tortoise_icon(self, 'proxy.ico')   shlib.set_tortoise_keys(self)     self.connect('delete-event', self._delete)     # Pipe stderr, stdout to self.write   self._queue = Queue.Queue()   sys.stdout = self   sys.stderr = self     # Override mercurial.commands.serve() with our own version   # that supports being stopped   commands.table.update(thg_serve_cmd)     self._url = None   self._root = hglib.rootpath()   self._webdirconf = webdir_conf   self._get_config()   self.set_default_size(500, 300)     # toolbar   self.tbar = gtk.Toolbar()   self.tooltips = gtk.Tooltips()   self._button_start = self._toolbutton(gtk.STOCK_MEDIA_PLAY,   _('Start'),   self._on_start_clicked,   tip=_('Start server'))   self._button_stop = self._toolbutton(gtk.STOCK_MEDIA_STOP,   _('Stop'),   self._on_stop_clicked,   tip=_('Stop server'))   self._button_browse = self._toolbutton(gtk.STOCK_HOME,   _('Browse'),   self._on_browse_clicked,   tip=_('Launch browser to view repository'))   self._button_conf = self._toolbutton(gtk.STOCK_PREFERENCES,   _('Configure'),   self._on_conf_clicked,   tip=_('Configure web settings'))     tbuttons = [   self._button_start,   self._button_stop,   gtk.SeparatorToolItem(),   self._button_browse,   gtk.SeparatorToolItem(),   self._button_conf,   ]   for btn in tbuttons:   self.tbar.insert(btn, -1)     vbox = gtk.VBox()   self.add(vbox)   vbox.pack_start(self.tbar, False, False, 2)     # revision input   revbox = gtk.HBox()   lbl = gtk.Label(_('HTTP Port:'))   lbl.set_property('width-chars', 16)   lbl.set_alignment(0, 0.5)   self._port_input = gtk.Entry()   self._port_input.set_text(self.defport)   revbox.pack_start(lbl, False, False)   revbox.pack_start(self._port_input, False, False)   vbox.pack_start(revbox, False, False, 2)     scrolledwindow = gtk.ScrolledWindow()   scrolledwindow.set_shadow_type(gtk.SHADOW_ETCHED_IN)   scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)   self.textview = gtk.TextView(buffer=None)   self.textview.set_editable(False)   self.textview.modify_font(pango.FontDescription('Monospace'))   scrolledwindow.add(self.textview)   self.textview.set_editable(False)   self.textbuffer = self.textview.get_buffer()   vbox.pack_start(scrolledwindow, True, True)   self._set_button_states()     def _get_config(self):   try:   repo = hg.repository(ui.ui(), path=self._root)   except hglib.RepoError:   self.destroy()   self.defport = repo.ui.config('web', 'port') or '8000'   self.webname = repo.ui.config('web', 'name') or \   os.path.basename(self._root)   if self._webdirconf:   self.set_title(_('Serve %s - %s') %   (self._webdirconf, self.webname))   else:   self.set_title(_('Serve - ') + self.webname)     def _toolbutton(self, stock, label, handler, menu=None,   userdata=None, tip=None):   if menu:   tbutton = gtk.MenuToolButton(stock)   tbutton.set_menu(menu)   else:   tbutton = gtk.ToolButton(stock)     if tip:   tbutton.set_tooltip(self.tooltips, tip)     tbutton.set_label(label)   tbutton.connect('clicked', handler, userdata)   return tbutton     def _delete(self, widget, event):   if not self.should_live():   self.destroy()   else:   return True     def should_live(self):   return not self._server_stopped()     def _server_stopped(self):   '''   check if server is running, or to terminate if running   '''   if gservice and not gservice.stopped: - ret = gdialog.Confirm(_('Really Exit?'), [], self, + ret = gdialog.Confirm(_('Confirm Really Exit?'), [], self,   _('Server process is still running\n'   'Exiting will stop the server.')).run()   if ret == gtk.RESPONSE_YES:   self._stop_server()   return True   else:   return False   else:   return True     def _set_button_states(self):   if gservice and not gservice.stopped:   self._button_start.set_sensitive(False)   self._button_stop.set_sensitive(True)   self._button_browse.set_sensitive(True)   self._button_conf.set_sensitive(False)   else:   self._button_start.set_sensitive(True)   self._button_stop.set_sensitive(False)   self._button_browse.set_sensitive(False)   self._button_conf.set_sensitive(True)     def _on_start_clicked(self, *args):   self._start_server()   self._set_button_states()     def _on_stop_clicked(self, *args):   self._stop_server()     def _on_browse_clicked(self, *args):   ''' launch default browser to view repo '''   if self._url:   def start_browser():   if os.name == 'nt':   try:   import win32api, win32con   win32api.ShellExecute(0, "open", self._url, None, "",   win32con.SW_SHOW)   except:   # Firefox likes to create exceptions at launch,   # the user doesn't need to be bothered by them   pass   else:   import gconf   client = gconf.client_get_default()   browser = client.get_string(   '/desktop/gnome/url-handlers/http/command') + '&'   os.system(browser % self._url)   threading.Thread(target=start_browser).start()     def _on_conf_clicked(self, *args):   from thgconfig import ConfigDialog   dlg = ConfigDialog(True)   dlg.show_all()   dlg.focus_field('web.name')   dlg.run()   dlg.hide()   self._get_config()     def _start_server(self):   # gather input data   try:   port = int(self._port_input.get_text())   except:   try: port = int(self.defport)   except: port = 8000   error_dialog(self, _('Invalid port 2048..65535'),   _('Defaulting to ') + self.defport)     global gservice   gservice = None     args = [self._root, self._queue, 'serve', '--port', str(port)]   if self._webdirconf:   args.append('--webdir-conf=' + self._webdirconf)   else:   args.append('--name')   args.append(self.webname)   thread = threading.Thread(target=hglib.hgcmd_toq, args=args)   thread.start()     while not gservice or not hasattr(gservice, 'httpd'):   time.sleep(0.1)   # gservice.httpd.fqaddr turned out to be unreliable, so use   # loopback addr directly   self._url = 'http://127.0.0.1:%d/' % (port)   gobject.timeout_add(10, self.process_queue)     def _stop_server(self):   if gservice and not gservice.stopped:   gservice.stop()     def flush(self, *args):   pass     def write(self, msg):   self._queue.put(msg)     def _write(self, msg, append=True):   msg = hglib.toutf(msg)   if append:   enditer = self.textbuffer.get_end_iter()   self.textbuffer.insert(enditer, msg)   else:   self.textbuffer.set_text(msg)     def process_queue(self):   """   Handle all the messages currently in the queue (if any).   """   while self._queue.qsize():   try:   msg = self._queue.get(0)   self._write(msg)   except Queue.Empty:   pass     if gservice and gservice.stopped:   self._set_button_states()   return False # Stop polling this function   else:   return True    def thg_serve(ui, repo, **opts):   class service:   def init(self):   self.stopped = True   util.set_signal_handler()   try:   baseui = (getattr(repo, 'baseui', None) or   getattr(ui, 'parentui', None) or ui)   repoui = repo and repo.ui != baseui and repo.ui or None   optlist = ("name templates style address port prefix ipv6"   " accesslog errorlog webdir_conf certificate")   for o in optlist.split():   if opts[o]:   baseui.setconfig("web", o, str(opts[o]))   if repoui:   repoui.setconfig("web", o, str(opts[o]))   self.httpd = server.create_server(ui, repo)   except socket.error, inst:   raise util.Abort(_('cannot start server: ') + inst.args[1])     if self.httpd.prefix:   prefix = self.httpd.prefix.strip('/') + '/'   else:   prefix = ''     port = ':%d' % self.httpd.port   if port == ':80':   port = ''     ui.status(_('listening at http://%s%s/%s (%s:%d)\n') %   (self.httpd.fqaddr, port, prefix, self.httpd.addr, self.httpd.port))     def stop(self):   self.stopped = True   # issue request to trigger handle_request() and quit   addr = '%s:%d' % (self.httpd.fqaddr, self.httpd.port)   conn = httplib.HTTPConnection(addr)   conn.request("GET", "/")   res = conn.getresponse()   res.read()   conn.close()     def run(self):   self.stopped = False   while not self.stopped:   self.httpd.handle_request()   self.httpd.server_close() # release port     global gservice   gservice = service()   cmdutil.service(opts, initfn=gservice.init, runfn=gservice.run)    thg_serve_cmd = {"^serve":   (thg_serve,   [('A', 'accesslog', '', _('name of access log file to write to')),   ('d', 'daemon', None, _('run server in background')),   ('', 'daemon-pipefds', '', _('used internally by daemon mode')),   ('E', 'errorlog', '', _('name of error log file to write to')),   ('p', 'port', 0, _('port to use (default: 8000)')),   ('a', 'address', '', _('address to use')),   ('', 'prefix', '', _('prefix path to serve from (default: server root)')),   ('n', 'name', '',   _('name to show in web pages (default: working dir)')),   ('', 'webdir-conf', '', _('name of the webdir config file'   ' (serve more than one repo)')),   ('', 'pid-file', '', _('name of file to write process ID to')),   ('', 'stdio', None, _('for remote clients')),   ('t', 'templates', '', _('web templates to use')),   ('', 'style', '', _('template style to use')),   ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),   ('', 'certificate', '', _('SSL certificate file'))],   _('hg serve [OPTION]...'))}    def run(ui, *pats, **opts):   return ServeDialog(opts.get('webdir_conf'))
Change 1 of 2 Show Entire File hggtk/​status.py Stacked
 
1090
1091
1092
1093
 
1094
1095
1096
1097
1098
1099
 
1100
1101
1102
 
1177
1178
1179
1180
 
1181
1182
1183
 
1090
1091
1092
 
1093
1094
1095
1096
1097
1098
 
1099
1100
1101
1102
 
1177
1178
1179
 
1180
1181
1182
1183
@@ -1090,13 +1090,13 @@
  # rev options needs extra tweaking since is not an array for   # revert command   revertopts['rev'] = revertopts['rev'][0] - dialog = Confirm(_('Revert'), files, self, + dialog = Confirm(_('Confirm Revert'), files, self,   _('Revert files to revision ') + revertopts['rev'] + '?')   else:   # rev options needs extra tweaking since it must be an empty   # string when unspecified for revert command   revertopts['rev'] = '' - dialog = Confirm('Revert', files, self) + dialog = Confirm('Confirm Revert', files, self)   if dialog.run() == gtk.RESPONSE_YES:   success, outtext = self._hg_call_wrapper('Revert', dohgrevert)   if success: @@ -1177,7 +1177,7 @@
  self._delete_files([wfile])     def _delete_files(self, files): - dialog = Confirm(_('Delete unrevisioned'), files, self) + dialog = Confirm(_('Confirm Delete Unrevisioned'), files, self)   if dialog.run() == gtk.RESPONSE_YES :   errors = ''   for wfile in files:
Change 1 of 1 Show Entire File hggtk/​thgconfig.py Stacked
 
448
449
450
451
 
452
453
454
 
448
449
450
 
451
452
453
454
@@ -448,7 +448,7 @@
    def should_live(self, *args):   if self.dirty: - ret = gdialog.Confirm(_('quit without saving?'), [], self, + ret = gdialog.Confirm(_('Confirm quit without saving?'), [], self,   _('Yes to abandon changes, No to continue')).run()   if ret != gtk.RESPONSE_YES:   self.emit_stop_by_name('response')