Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.3rc1, 0.3, and 0.4rc1

hggtk/synch: add --rev entry, move most options to expander

Changeset 16c5dac129ef…

Parent 1854c0c18bb9…

by Steve Borho

Changes to one file · Browse files at 16c5dac129ef Showing diff from parent 1854c0c18bb9 Diff from another changeset...

Change 1 of 6 Show Entire File hggtk/​synch.py Stacked
 
48
49
50
51
52
53
54
 
61
62
63
64
65
66
67
68
69
70
71
72
73
 
128
129
130
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
131
132
133
 
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
 
261
262
263
264
 
265
266
267
268
269
270
 
271
272
273
 
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
 
48
49
50
 
51
52
53
 
60
61
62
 
63
64
65
66
67
 
68
69
70
 
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
 
163
164
165
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
166
167
168
 
228
229
230
 
231
232
233
234
235
236
 
237
238
239
240
 
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
@@ -48,7 +48,6 @@
  self._toolbutton(gtk.STOCK_GO_DOWN,   'incoming',   self._incoming_clicked, - self._incoming_menu(),   tip='Display changes that can be pulled'   ' from selected repository'),   self._toolbutton(gtk.STOCK_GOTO_BOTTOM, @@ -61,13 +60,11 @@
  self._toolbutton(gtk.STOCK_GO_UP,   'outgoing',   self._outgoing_clicked, - self._outgoing_menu(),   tip='Display local changes that will be pushed'   ' to selected repository'),   self._toolbutton(gtk.STOCK_GOTO_TOP,   'push',   self._push_clicked, - self._push_menu(),   tip='Push local changes to selected'   ' repository'),   self._toolbutton(gtk.STOCK_GOTO_LAST, @@ -128,6 +125,24 @@
  revbox.pack_start(self._pathbox, True, True)   vbox.pack_start(revbox, False, False, 2)   + expander = gtk.Expander('Advanced Options') + expander.set_expanded(False) + hbox = gtk.HBox() + self._reventry = gtk.Entry() + self._force = gtk.CheckButton('Force') + self._showpatch = gtk.CheckButton('Show Patches') + self._newestfirst = gtk.CheckButton('Show Newest First') + self._nomerge = gtk.CheckButton('Show No Merges') + + hbox.pack_start(gtk.Label('Rev:')) + hbox.pack_start(self._reventry) + hbox.pack_start(self._force) + hbox.pack_start(self._showpatch) + hbox.pack_start(self._newestfirst) + hbox.pack_start(self._nomerge) + expander.add(hbox) + vbox.pack_start(expander, False, False, 2) +   # hg output window   scrolledwindow = gtk.ScrolledWindow()   scrolledwindow.set_shadow_type(gtk.SHADOW_ETCHED_IN) @@ -148,54 +163,6 @@
    self._pull_update = gtk.CheckMenuItem("Update to new tip")   menu.append(self._pull_update) - - self._pull_force = gtk.CheckMenuItem("Force pull") - menu.append(self._pull_force) - - menu.show_all() - return menu - - def _push_menu(self): - menu = gtk.Menu() - - self._push_force = gtk.CheckMenuItem("Force push") - menu.append(self._push_force) - - menu.show_all() - return menu - - def _incoming_menu(self): - menu = gtk.Menu() - - self._incoming_show_patch = gtk.CheckMenuItem("Show patch") - menu.append(self._incoming_show_patch) - - self._incoming_no_merges = gtk.CheckMenuItem("Do not show merges") - menu.append(self._incoming_no_merges) - - self._incoming_newest = gtk.CheckMenuItem("Show newest record first") - menu.append(self._incoming_newest) - - self._incoming_force = gtk.CheckMenuItem("Force incoming") - menu.append(self._incoming_force) - - menu.show_all() - return menu - - def _outgoing_menu(self): - menu = gtk.Menu() - - self._outgoing_show_patch = gtk.CheckMenuItem("Show patch") - menu.append(self._outgoing_show_patch) - - self._outgoing_no_merges = gtk.CheckMenuItem("Do not show merges") - menu.append(self._outgoing_no_merges) - - self._outgoing_newest = gtk.CheckMenuItem("Show newest record first") - menu.append(self._outgoing_newest) - - self._outgoing_force = gtk.CheckMenuItem("Force incoming") - menu.append(self._outgoing_force)     menu.show_all()   return menu @@ -261,13 +228,13 @@
  cmd = ['pull']   if self._pull_update.get_active():   cmd.append('--update') - if self._pull_force.get_active(): + if self._force.get_active():   cmd.append('--force')   self._exec_cmd(cmd)     def _push_clicked(self, toolbutton, data=None):   cmd = ['push'] - if self._push_force.get_active(): + if self._force.get_active():   cmd.append('--force')   self._exec_cmd(cmd)   @@ -306,25 +273,25 @@
    def _incoming_clicked(self, toolbutton, data=None):   cmd = ['incoming'] - if self._incoming_show_patch.get_active(): + if self._showpatch.get_active():   cmd.append('--patch') - if self._incoming_no_merges.get_active(): + if self._nomerge.get_active():   cmd.append('--no-merges') - if self._incoming_force.get_active(): + if self._force.get_active():   cmd.append('--force') - if self._incoming_newest.get_active(): + if self._newestfirst.get_active():   cmd.append('--newest-first')   self._exec_cmd(cmd)     def _outgoing_clicked(self, toolbutton, data=None):   cmd = ['outgoing'] - if self._outgoing_show_patch.get_active(): + if self._showpatch.get_active():   cmd.append('--patch') - if self._outgoing_no_merges.get_active(): + if self._nomerge.get_active():   cmd.append('--no-merges') - if self._outgoing_force.get_active(): + if self._force.get_active():   cmd.append('--force') - if self._outgoing_newest.get_active(): + if self._newestfirst.get_active():   cmd.append('--newest-first')   self._exec_cmd(cmd)