Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

merge

Changeset c24ea27f9b21…

Parents 4833809e1016…

Parents 7a747b414310…

by Steve Borho

Changes to 15 files · Browse files at c24ea27f9b21 Showing diff from parent 4833809e1016 7a747b414310 Diff from another changeset...

Change 1 of 1 Show Entire File ReleaseNotes.txt Stacked
 
77
78
79
80
 
81
82
83
 
77
78
79
 
80
81
82
83
@@ -77,7 +77,7 @@
  header.   - Add preliminary support for moving, renaming and copying of clean   (managed) files. - - Ignored files can not be added. + - Ignored files can now be added.     * Datamining (grep and annotate) window:   - Add source line numbers to annotate lines.
Change 1 of 2 Show Entire File hggtk/​backout.py Stacked
 
34
35
36
37
38
39
40
41
 
42
43
44
 
76
77
78
79
80
81
82
83
84
 
34
35
36
 
 
 
 
 
37
38
39
40
 
72
73
74
 
 
 
75
76
77
@@ -34,11 +34,7 @@
  tbuttons = [   self._toolbutton(gtk.STOCK_GO_BACK, 'Backout',   self._backout_clicked, - 'Backout selected changeset'), - sep, - self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, - 'Close Window') + 'Backout selected changeset')   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -76,9 +72,6 @@
  ' effect of the change being backed out.')   vbox.pack_start(frame, True, True, 4)   - def _close_clicked(self, toolbutton, data=None): - self.destroy() -   def set_notify_func(self, func, *args):   self.notify_func = func   self.notify_args = args
Change 1 of 2 Show Entire File hggtk/​clone.py Stacked
 
68
69
70
71
72
73
74
75
76
77
78
79
80
 
185
186
187
188
189
190
191
192
193
 
68
69
70
 
 
 
 
 
 
 
71
72
73
 
178
179
180
 
 
 
181
182
183
@@ -68,13 +68,6 @@
  ]   for btn in tbuttons:   self.tbar.insert(btn, -1) - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self.tbar.insert(sep, -1) - button = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, tip='Close Application') - self.tbar.insert(button, -1)   vbox = gtk.VBox()   self.add(vbox)   vbox.pack_start(self.tbar, False, False, 2) @@ -185,9 +178,6 @@
  vbox.pack_end(self._remote_cmd, False, False, 1)   vbox.pack_end(lbl, False, False, 1)   - def _close_clicked(self, toolbutton, data=None): - gtk.main_quit() -   def _toolbutton(self, stock, label, handler,   menu=None, userdata=None, tip=None):   if menu:
Change 1 of 2 Show Entire File hggtk/​gdialog.py Stacked
 
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
 
318
319
320
321
322
323
324
325
326
327
328
329
 
283
284
285
 
 
 
 
 
 
 
 
 
 
 
 
 
286
287
288
 
 
 
 
 
 
289
290
291
 
299
300
301
 
 
 
 
 
 
302
303
304
@@ -283,28 +283,9 @@
  tbuttons = self.get_tbbuttons()   for tbutton in tbuttons:   toolbar.insert(tbutton, -1) - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - toolbar.insert(sep, -1) - if self.main: - name = 'Quit' - tip = 'Close Application' - else: - name = 'Close' - tip = 'Close Window' - button = self.make_toolbutton(gtk.STOCK_CLOSE, name, - self._quit_clicked, tip=tip) - toolbar.insert(button, -1)   self.toolbar = toolbar   vbox.pack_start(toolbar, False, False, 0)   - # ctrl-Q quits - accel_group = gtk.AccelGroup() - self.add_accel_group(accel_group) - button.add_accelerator("clicked", accel_group, ord("q"), - gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) -   # Subclass returns the main body   body = self.get_body()   vbox.pack_start(body, True, True, 0) @@ -318,12 +299,6 @@
  self.connect('delete_event', self.should_live)     - - def _quit_clicked(self, button, data=None): - if not self.should_live(): - self.destroy() - -   def _destroying(self, gtkobj):   try:   settings = self.save_settings()
Change 1 of 1 Show Entire File hggtk/​hgcmd.py Stacked
 
44
45
46
47
48
49
50
51
52
53
54
55
 
44
45
46
 
 
 
 
 
 
47
48
49
@@ -44,12 +44,6 @@
  self.connect('delete-event', self._delete)   self.connect('response', self._response)   - # ctrl-Q quits - accel_group = gtk.AccelGroup() - self.add_accel_group(accel_group) - self._button_ok.add_accelerator("clicked", accel_group, ord("q"), - gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) -   self.pbar = None   if progressbar:   self.last_pbar_update = 0
Change 1 of 3 Show Entire File hggtk/​hgemail.py Stacked
 
31
32
33
34
35
36
37
38
39
40
41
42
 
44
45
46
47
48
49
 
50
51
52
 
174
175
176
177
178
179
180
181
182
 
31
32
33
 
 
 
 
 
 
34
35
36
 
38
39
40
 
 
 
41
42
43
44
 
166
167
168
 
 
 
169
170
171
@@ -31,12 +31,6 @@
  self.tbar = gtk.Toolbar()   self.tips = gtk.Tooltips()   - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, 'Close Window') -   tbuttons = [   self._toolbutton(gtk.STOCK_GOTO_LAST, 'Send',   self._on_send_clicked, @@ -44,9 +38,7 @@
  gtk.SeparatorToolItem(),   self._toolbutton(gtk.STOCK_PREFERENCES, 'configure',   self._on_conf_clicked, - 'Configure email settings'), - sep, - self._btn_close + 'Configure email settings')   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -174,9 +166,6 @@
    self.connect('map_event', self._on_window_map_event)   - def _close_clicked(self, toolbutton, data=None): - self.destroy() -   def _toolbutton(self, stock, label, handler, tip):   tbutton = gtk.ToolButton(stock)   tbutton.set_label(label)
Change 1 of 2 Show Entire File hggtk/​hgignore.py Stacked
 
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
 
40
41
42
 
194
195
196
197
198
199
200
201
202
 
24
25
26
 
 
 
 
 
 
27
28
29
30
 
 
 
31
32
33
34
 
186
187
188
 
 
 
189
190
191
@@ -24,19 +24,11 @@
  self.tbar = gtk.Toolbar()   self.tips = gtk.Tooltips()   - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, 'Close Window') -   tbuttons = [   self._toolbutton(gtk.STOCK_REFRESH,   'Refresh',   self._refresh_clicked, - tip='Reload hgignore'), - sep, - self._btn_close + tip='Reload hgignore')   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -194,9 +186,6 @@
  shell_notify(self.repo.wjoin('.hgignore'))   if self.notify_func: self.notify_func()   - def _close_clicked(self, toolbutton, data=None): - self.destroy() -   def _toolbutton(self, stock, label, handler, tip):   tbutton = gtk.ToolButton(stock)   tbutton.set_label(label)
Change 1 of 3 Show Entire File hggtk/​histselect.py Stacked
 
124
125
126
127
128
129
 
 
 
130
131
132
 
142
143
144
145
 
146
147
148
 
176
177
178
179
 
180
181
182
 
124
125
126
 
 
 
127
128
129
130
131
132
 
142
143
144
 
145
146
147
148
 
176
177
178
 
179
180
181
182
@@ -124,9 +124,9 @@
    def _get_hg_history(self, rev=None, limit=10):   # get history - options = {} - if rev: options['rev'] = [rev] - if limit: options['limit'] = limit + options = [] + if rev: options += ['--rev', rev] + if limit: options += ['--limit', str(limit)]   self._do_hg_cmd('log', options)     # parse log output @@ -142,7 +142,7 @@
  name, value = re.split(':\s+', x, 1)   if name not in cs:   cs[name] = [] - cs[name].append(value) + cs[name].append(hglib.toutf(value))   if cs:   histlist.append(cs)   @@ -176,7 +176,7 @@
    try:   q = Queue.Queue() - args = [cmd] + [os.path.join(self.root, x) for x in self.files] + args = [cmd] + options + [os.path.join(self.root, x) for x in self.files]   hglib.hgcmd_toq(self.root, q, *args, **{})   out = ''   while q.qsize(): out += q.get(0)
Change 1 of 2 Show Entire File hggtk/​merge.py Stacked
 
59
60
61
62
63
64
65
66
67
68
69
70
71
72
 
73
74
75
 
113
114
115
116
117
118
119
120
121
 
59
60
61
 
 
 
 
 
62
63
64
 
 
 
65
66
67
68
 
106
107
108
 
 
 
109
110
111
@@ -59,17 +59,10 @@
  self._btn_unmerge_clicked,   tip='Undo merging and return working directory to'   ' one of it parent revision') - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, tip='Close Application')   tbuttons = [   self._btn_merge,   gtk.SeparatorToolItem(), - self._btn_unmerge, - sep, - self._btn_close + self._btn_unmerge   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -113,9 +106,6 @@
  # show them all   self._refresh()   - def _close_clicked(self, toolbutton, data=None): - self.destroy() -   def _toolbutton(self, stock, label, handler,   menu=None, userdata=None, tip=None):   if menu:
Change 1 of 2 Show Entire File hggtk/​recovery.py Stacked
 
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
 
105
106
107
108
109
110
111
112
113
 
73
74
75
 
 
 
 
 
 
 
76
77
78
79
 
 
 
 
 
 
80
81
82
 
92
93
94
 
 
 
95
96
97
@@ -73,23 +73,10 @@
  ]   for btn in tbuttons:   self.tbar.insert(btn, -1) - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self.tbar.insert(sep, -1) - button = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, tip='Close Application') - self.tbar.insert(button, -1)   vbox = gtk.VBox()   self.add(vbox)   vbox.pack_start(self.tbar, False, False, 2)   - # ctrl-Q quits - accel_group = gtk.AccelGroup() - self.add_accel_group(accel_group) - button.add_accelerator("clicked", accel_group, ord("q"), - gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) -   # hg output window   scrolledwindow = gtk.ScrolledWindow()   scrolledwindow.set_shadow_type(gtk.SHADOW_ETCHED_IN) @@ -105,9 +92,6 @@
  self.stbar = gtklib.StatusBar()   vbox.pack_start(self.stbar, False, False, 2)   - def _close_clicked(self, *args): - self._do_close() -   def _delete(self, widget, event):   self._do_close()   return True
Change 1 of 3 Show Entire File hggtk/​serve.py Stacked
 
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
 
93
94
95
96
97
98
99
100
 
151
152
153
154
155
156
157
158
159
160
 
74
75
76
 
 
 
 
 
 
 
 
 
 
 
77
78
79
 
82
83
84
 
 
85
86
87
 
138
139
140
 
 
 
 
141
142
143
@@ -74,17 +74,6 @@
  'Configure',   self._on_conf_clicked,   None) - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self._button_close = self._toolbutton(gtk.STOCK_CLOSE, 'Quit', - self._close_clicked) - - # ctrl-Q quits - accel_group = gtk.AccelGroup() - self.add_accel_group(accel_group) - self._button_close.add_accelerator("clicked", accel_group, ord("q"), - gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)     tbuttons = [   self._button_start, @@ -93,8 +82,6 @@
  self._button_browse,   gtk.SeparatorToolItem(),   self._button_conf, - sep, - self._button_close,   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -151,10 +138,6 @@
  tbutton.connect('clicked', handler, userdata)   return tbutton   - def _close_clicked(self, *args): - if self._server_stopped() == True: - gtk.main_quit() -   def _delete(self, widget, event):   if self._server_stopped() == True:   gtk.main_quit()
Change 1 of 2 Show Entire File hggtk/​shlib.py Stacked
 
8
9
10
 
11
12
13
 
129
130
131
 
 
 
 
 
 
 
132
133
134
 
8
9
10
11
12
13
14
 
130
131
132
133
134
135
136
137
138
139
140
141
142
@@ -8,6 +8,7 @@
 """    import os +import gtk  import shelve  import time   @@ -129,6 +130,13 @@
   def set_tortoise_icon(window, icon):   window.set_icon_from_file(get_tortoise_icon(icon)) + # Global keybindings for TortoiseHg + window.connect('key-press-event', window_key) + +def window_key(window, event): + if event.keyval == ord('q') and (event.state & gtk.gdk.CONTROL_MASK): + devent = gtk.gdk.Event(gtk.gdk.DELETE) + window.emit('delete_event', devent)    def get_tortoise_icon(icon):   '''Find a tortoise icon, apply to PyGtk window'''
Change 1 of 1 Show Entire File hggtk/​synch.py Stacked
 
97
98
99
100
101
102
103
104
105
106
107
108
109
 
97
98
99
 
 
 
 
 
 
 
100
101
102
@@ -97,13 +97,6 @@
  ]   for btn in tbuttons:   self.tbar.insert(btn, -1) - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self.tbar.insert(sep, -1) - button = self._toolbutton(gtk.STOCK_CLOSE, 'Quit', - self._close_clicked, tip='Quit Application') - self.tbar.insert(button, -1)   vbox = gtk.VBox()   self.add(vbox)   vbox.pack_start(self.tbar, False, False, 2)
Change 1 of 3 Show Entire File hggtk/​tagadd.py Stacked
 
48
49
50
51
52
53
54
55
56
57
58
59
 
66
67
68
69
70
71
 
72
73
74
 
149
150
151
152
153
154
155
156
157
 
48
49
50
 
 
 
 
 
 
51
52
53
 
60
61
62
 
 
 
63
64
65
66
 
141
142
143
 
 
 
144
145
146
@@ -48,12 +48,6 @@
  self.tbar = gtk.Toolbar()   self.tips = gtk.Tooltips()   - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, tip='Close Application') -   self._btn_addtag = self._toolbutton(   gtk.STOCK_ADD,   'Add', @@ -66,9 +60,7 @@
  tip='Remove tag from repository')   tbuttons = [   self._btn_addtag, - self._btn_rmtag, - sep, - self._btn_close, + self._btn_rmtag   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -149,9 +141,6 @@
  continue   self._tagslist.append([tagname])   - def _close_clicked(self, toolbutton, data=None): - self.destroy() -   def _btn_tag_clicked(self, button):   """ select tag from tags dialog """   import tags
Change 1 of 2 Show Entire File hggtk/​update.py Stacked
 
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
 
112
113
114
115
116
117
118
119
120
 
55
56
57
 
 
 
 
 
58
59
 
 
60
61
62
 
105
106
107
 
 
 
108
109
110
@@ -55,15 +55,8 @@
  'Update',   self._btn_update_clicked,   tip='Update working directory to selected revision') - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, tip='Close Application')   tbuttons = [   self._btn_update, - sep, - self._btn_close,   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -112,9 +105,6 @@
  # show them all   self._refresh()   - def _close_clicked(self, toolbutton, data=None): - self.destroy() -   def _toolbutton(self, stock, label, handler,   menu=None, userdata=None, tip=None):   if menu: