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

merge with crew

Changeset 07e16bac7dba…

Parents 6496ec605e82…

Parents 2b7f2f918a8c…

by Simon Heimberg

Changes to 5 files · Browse files at 07e16bac7dba Showing diff from parent 6496ec605e82 2b7f2f918a8c Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​history.py Stacked
 
132
133
134
135
 
136
137
138
139
140
141
 
142
143
144
145
146
147
 
148
149
150
 
218
219
220
221
 
 
 
 
222
223
224
 
253
254
255
 
 
 
256
257
258
259
260
261
 
262
263
264
265
 
 
 
266
267
268
 
132
133
134
 
135
136
137
138
139
140
 
141
142
143
144
145
146
 
147
148
149
150
 
218
219
220
 
221
222
223
224
225
226
227
 
256
257
258
259
260
261
262
263
264
265
 
 
266
267
 
 
 
268
269
270
271
272
273
@@ -132,19 +132,19 @@
  button = gtk.CheckMenuItem("Show Rev")   button.connect("toggled", self.toggle_view_column,   'rev-column-visible') - button.set_active(True) + button.set_active(self._show_rev)   button.set_draw_as_radio(True)   menu.append(button)   button = gtk.CheckMenuItem("Show ID")   button.connect("toggled", self.toggle_view_column,   'id-column-visible') - button.set_active(False) + button.set_active(self._show_id)   button.set_draw_as_radio(True)   menu.append(button)   button = gtk.CheckMenuItem("Show Date")   button.connect("toggled", self.toggle_view_column,   'date-column-visible') - button.set_active(True) + button.set_active(self._show_date)   button.set_draw_as_radio(True)   menu.append(button)   menu.show_all() @@ -218,7 +218,10 @@
  def save_settings(self):   settings = GDialog.save_settings(self)   settings['glog'] = (self._vpaned.get_position(), - self._hpaned.get_position()) + self._hpaned.get_position(), + self.graphview.get_property('rev-column-visible'), + self.graphview.get_property('date-column-visible'), + self.graphview.get_property('id-column-visible'))   return settings     def get_graphlimit(self, suggestion): @@ -253,16 +256,18 @@
  self.changeview.glog_parent = self     GDialog.load_settings(self, settings) + self._setting_vpos = -1 + self._setting_hpos = -1 + self._show_rev, self._show_date, self._show_id = True, True, False   if settings:   data = settings['glog']   if type(data) == int:   self._setting_vpos = data - self._setting_hpos = -1 - else: + elif len(data) == 2:   (self._setting_vpos, self._setting_hpos) = data - else: - self._setting_vpos = -1 - self._setting_hpos = -1 + elif len(data) == 5: + (self._setting_vpos, self._setting_hpos, + self._show_rev, self._show_date, self._show_id) = data     def reload_log(self, filteropts={}):   """Send refresh event to treeview object"""
Change 1 of 1 Show Entire File hggtk/​shlib.py Stacked
 
7
8
9
 
 
 
10
11
12
 
7
8
9
10
11
12
13
14
15
@@ -7,6 +7,9 @@
   """   +import dumbdbm, anydbm +anydbm._defaultmod = dumbdbm +  import os  import gtk  import shelve
Change 1 of 3 Show Entire File hggtk/​status.py Stacked
 
413
414
415
416
 
 
417
418
419
 
955
956
957
958
959
960
961
962
963
 
1285
1286
1287
 
1288
1289
1290
 
413
414
415
 
416
417
418
419
420
 
956
957
958
 
 
 
959
960
961
 
1283
1284
1285
1286
1287
1288
1289
@@ -413,7 +413,8 @@
  def copy_to_clipboard(self, treeview):   'Write highlighted hunks to the clipboard'   if not treeview.is_focus(): - # ignore ctrl-c not directed at treeview + w = self.get_focus() + w.emit('copy-clipboard')   return False   model, paths = treeview.get_selection().get_selected_rows()   cids = [ model[row][DM_CHUNK_ID] for row, in paths ] @@ -955,9 +956,6 @@
  return   self._hg_call_wrapper('Diff', dohgdiff)   - def _has_shelve_file(self): - return os.path.exists(self.repo.join('shelve')) -   def _showdiff_toggled(self, togglebutton, data=None):   # prevent movement events while setting position   self._diffpane.handler_block(self._diffpane_moved_id) @@ -1285,6 +1283,7 @@
    selection = self.filetree.get_selection()   selection.selected_foreach(toggler) + self._update_check_count()   return True   return False  
Change 1 of 3 Show Entire File hggtk/​thgconfig.py Stacked
 
195
196
197
 
198
199
200
 
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
 
422
423
424
425
426
 
 
427
428
429
 
 
 
 
 
 
 
 
 
 
 
 
430
431
432
433
434
 
 
 
 
435
436
437
438
439
 
 
440
441
442
 
195
196
197
198
199
200
201
 
222
223
224
 
 
 
 
 
 
 
 
 
 
225
226
227
 
413
414
415
 
 
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
 
 
434
435
436
437
438
439
440
441
442
443
 
444
445
446
447
448
@@ -195,6 +195,7 @@
  self.response(gtk.RESPONSE_CANCEL)     # Catch close events + self.set_default_size(700, 300)   self.connect('delete-event', self._delete)   self.connect('response', self._response)   @@ -221,16 +222,6 @@
  self.show_tabs = True   self.show_border = True   - descframe = gtk.Frame('Description') - vbox = gtk.VBox() - self.desctext = gtk.TextView() - self.desctext.set_wrap_mode(gtk.WRAP_WORD) - self.desctext.set_editable(False) - vbox.pack_start(self.desctext, False, False) - vbox.set_border_width(10) - descframe.add(vbox) - self.vbox.pack_start(descframe, True, True) -   self._btn_apply = gtk.Button("Apply")   self._btn_apply.connect('clicked', self._apply_clicked)   self.action_area.pack_end(self._btn_apply) @@ -422,21 +413,36 @@
  self._delpathbutton.set_sensitive(path_selected)   self._testpathbutton.set_sensitive(repo_available and path_selected)   - def set_help(self, widget, event, tooltip): - self.desctext.get_buffer().set_text(tooltip) + def set_help(self, widget, event, label, tooltip): + label.set_text(tooltip)     def fill_frame(self, frame, info):   widgets = [] + + descframe = gtk.Frame('Description') + fvbox = gtk.VBox() + desclabel = gtk.Label() + desclabel.set_line_wrap(True) + desclabel.set_alignment(0.0, 0.0) + fvbox.pack_start(desclabel, True, True, 2) + fvbox.set_border_width(5) + descframe.add(fvbox) + + hbox = gtk.HBox() + vbox = gtk.VBox()   table = gtk.Table(len(info), 2, False) - vbox = gtk.VBox() - frame.add(vbox)   vbox.pack_start(table, False, False, 2)   + hbox.pack_start(vbox, False, False, 2) + hbox.pack_start(descframe, True, True, 2) + frame.add(hbox) +   for row, (label, cpath, values, tooltip) in enumerate(info):   vlist = gtk.ListStore(str, bool)   combo = gtk.ComboBoxEntry(vlist, 0)   combo.connect("changed", self.dirty_event) - combo.child.connect("focus-in-event", self.set_help, tooltip) + combo.child.connect("focus-in-event", self.set_help, + desclabel, tooltip)   combo.set_row_separator_func(lambda model, path: model[path][1])   widgets.append(combo)  
Change 1 of 3 Show Changes Only hggtk/​thgshelve.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
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
 #  # thgshelve.py - commit dialog for TortoiseHg  #  # Copyright 2007 Brad Schick, brad at gmail . com  # Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>  # Copyright (C) 2009 Steve Borho <steve@borho.org>  #    import os  import pygtk  pygtk.require('2.0')  import gtk  import cStringIO    from mercurial.i18n import _  from mercurial import ui, hg  from shlib import shell_notify  from gdialog import *  from status import *  from hgcmd import CmdDialog  from hglib import fromutf  import hgshelve    class GShelve(GStatus):   """GTK+ based dialog for displaying repository status and shelving changes.     Also provides related operations like add, delete, remove, revert, refresh,   ignore, diff, and edit.   """     ### Overrides of base class methods ###     def init(self):   GStatus.init(self)     def parse_opts(self):   GStatus.parse_opts(self)   if not self.test_opt('rev'):   self.opts['rev'] = ''     def get_title(self):   root = os.path.basename(self.repo.root)   return ' '.join([root, 'shelve'])     def get_icon(self):   return 'shelve.ico'     def auto_check(self):   if self.test_opt('check'):   for entry in self.filemodel :   if entry[FM_STATUS] in 'MAR':   entry[FM_CHECKED] = True   self._update_check_count()       def save_settings(self):   settings = GStatus.save_settings(self)   settings['gshelve'] = self._vpaned.get_position()   return settings       def load_settings(self, settings):   GStatus.load_settings(self, settings)   if settings:   self._setting_vpos = settings['gshelve']   else:   self._setting_vpos = -1       def get_tbbuttons(self):   tbbuttons = GStatus.get_tbbuttons(self)   tbbuttons.insert(2, gtk.SeparatorToolItem())   self.shelve_btn = self.make_toolbutton(gtk.STOCK_FILE, 'Shelve',   self._shelve_clicked, tip='set aside selected changes')   self.unshelve_btn = self.make_toolbutton(gtk.STOCK_EDIT, 'Unshelve',   self._unshelve_clicked, tip='restore shelved changes')   tbbuttons.insert(2, self.unshelve_btn)   tbbuttons.insert(2, self.shelve_btn)   return tbbuttons     def get_body(self):   status_body = GStatus.get_body(self)   vbox = gtk.VBox() # For named shelf collection   self._vpaned = gtk.VPaned()   self._vpaned.add1(vbox)   self._vpaned.add2(status_body)   self._vpaned.set_position(self._setting_vpos)   self._activate_shelve_buttons(True) - - #self.selectlabel.set_text( - # _('toggle change hunks to leave them in your working directory'))   return self._vpaned       def get_menu_info(self):   """   Returns menu info in this order:   merge, addrem, unknown, clean, ignored, deleted   """   merge, addrem, unknown, clean, ignored, deleted, unresolved, resolved \   = GStatus.get_menu_info(self)   return (merge + (('_shelve', self._shelve_file),),   addrem + (('_shelve', self._shelve_file),),   unknown + (('_shelve', self._shelve_file),),   clean,   ignored,   deleted + (('_shelve', self._shelve_file),),   unresolved,   resolved,   )       def should_live(self, widget=None, event=None):   return False       def reload_status(self):   if not self._ready: return False   success = GStatus.reload_status(self)   return success     ### End of overridable methods ###   + def _has_shelve_file(self): + return os.path.exists(self.repo.join('shelve')) +   def _activate_shelve_buttons(self, status):   if status:   self.shelve_btn.set_sensitive(True)   self.unshelve_btn.set_sensitive(self._has_shelve_file())   else:   self.shelve_btn.set_sensitive(False)   self.unshelve_btn.set_sensitive(False)     def _shelve_selected(self, file=None):   # get list of hunks that have not been rejected   chunks = self._shelve_chunks   hlist = [x[DM_CHUNK_ID] for x in self.diff_model if not x[DM_REJECTED]]   if file:   hlist = [cid for cid in hlist if chunks[cid].filename() == file]   if not hlist:   Prompt('Shelve', 'Please select diff chunks to shelve',   self).run()   return     doforce = False   doappend = False   if self._has_shelve_file():   from gtklib import MessageDialog   dialog = MessageDialog(flags=gtk.DIALOG_MODAL)   dialog.set_title('Shelve')   dialog.set_markup('<b>Shelve file exists!</b>')   dialog.add_buttons('Overwrite', 1, 'Append', 2, 'Cancel', -1)   dialog.set_transient_for(self)   rval = dialog.run()   dialog.destroy() - if rval == -1: - return   if rval == 1:   doforce = True - if rval == 2: + elif rval == 2:   doappend = True + else: + return     # capture the selected hunks to shelve   fc = []   sc = []   for n, c in enumerate(chunks):   if isinstance(c, hgshelve.header):   if len(fc) > 1 or (len(fc) == 1 and fc[0].binary()):   sc += fc   fc = [c]   elif n in hlist:   fc.append(c)   if len(fc) > 1 or (len(fc) == 1 and fc[0].binary()):   sc += fc     def filter_patch(ui, chunks):   return sc     # shelve them!   self.ui.interactive = True # hgshelve only works 'interactively'   opts = {'addremove': None, 'include': [], 'force': doforce,   'append': doappend, 'exclude': []}   hgshelve.filterpatch = filter_patch   hgshelve.shelve(self.ui, self.repo, **opts)   self.reload_status()     def _unshelve(self):   opts = {'addremove': None, 'include': [], 'force': None,   'append': None, 'exclude': [], 'inspect': None}   try:   self.ui.quiet = True   hgshelve.unshelve(self.ui, self.repo, **opts)   self.ui.quiet = False   self.reload_status()   except:   pass     def _shelve_clicked(self, toolbutton, data=None):   self._shelve_selected()   self._activate_shelve_buttons(True)     def _unshelve_clicked(self, toolbutton, data=None):   self._unshelve()   self._activate_shelve_buttons(True)     def _shelve_file(self, stat, file):   self._shelve_selected(file)   self._activate_shelve_buttons(True)   return True      def launch(root='', files=[], cwd='', main=True):   u = ui.ui()   u.updateopts(debug=False, traceback=False)   repo = hg.repository(u, path=root)     cmdoptions = {   'user':'', 'date':'',   'modified':True, 'added':True, 'removed':True, 'deleted':True,   'unknown':False, 'ignored':False,   'exclude':[], 'include':[],   'check': True, 'git':False, 'logfile':'', 'addremove':False,   }     dialog = GShelve(u, repo, cwd, files, cmdoptions, main)   dialog.display()   return dialog    def run(root='', files=[], cwd='', **opts):   # If no files or directories were selected, take current dir   # TODO: Not clear if this is best; user may expect repo wide   if not files and cwd:   files = [cwd]   if launch(root, files, cwd, True):   gtk.gdk.threads_init()   gtk.gdk.threads_enter()   gtk.main()   gtk.gdk.threads_leave()    if __name__ == "__main__":   import sys   from hglib import rootpath     opts = {}   opts['cwd'] = len(sys.argv) > 1 and sys.argv[1] or os.getcwd()   opts['root'] = rootpath(opts['cwd'])   run(**opts)