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

hggtk: cleanup/simplify dialog state save/restore

Changeset 0850fac729cb…

Parent ed62fe66d79e…

by Steve Borho

Changes to 10 files · Browse files at 0850fac729cb Showing diff from parent ed62fe66d79e Diff from another changeset...

Change 1 of 4 Show Entire File hggtk/​clone.py Stacked
 
19
20
21
22
 
23
24
25
 
27
28
29
30
31
32
33
34
35
 
38
39
40
41
42
43
44
45
46
47
48
 
76
77
78
 
79
80
81
 
82
83
84
 
19
20
21
 
22
23
24
25
 
27
28
29
 
 
 
30
31
32
 
35
36
37
 
 
 
 
 
38
39
40
 
68
69
70
71
72
73
 
74
75
76
77
@@ -19,7 +19,7 @@
  gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   shlib.set_tortoise_icon(self, 'menuclone.ico')   shlib.set_tortoise_keys(self) - + self.set_default_size(520, 180)   self.set_title(_('TortoiseHg Clone'))     self.ui = ui.ui() @@ -27,9 +27,6 @@
  self._recent_src = self._settings.mrul('src_paths')   self._recent_dest = self._settings.mrul('dest_paths')   - sync_settings = shlib.Settings('synch') - self._sync_src = sync_settings.mrul('src_paths') -   self._src_path = os.getcwd()   self._dest_path = self._src_path   if len(repos) > 1: @@ -38,11 +35,6 @@
  elif len(repos):   self._src_path = repos[0]   - # build dialog - self._create() - - def _create(self): - self.set_default_size(520, 180)   ewidth = 18     vbox = gtk.VBox() @@ -76,9 +68,10 @@
  vbox.pack_start(srcbox, False, False, 2)     # add pre-defined src paths to pull-down list + sync_src = shlib.Settings('synch').mrul('src_paths')   sympaths = [x[1] for x in self.ui.configitems('paths')]   recent = [x for x in self._recent_src] - syncsrc = [x for x in self._sync_src] + syncsrc = [x for x in sync_src]   paths = list(set(sympaths + recent + syncsrc))   paths.sort()   for p in paths:
Change 1 of 1 Show Entire File hggtk/​commit.py Stacked
 
133
134
135
136
 
137
138
139
140
141
142
143
144
145
 
 
 
 
 
146
147
148
 
133
134
135
 
136
137
138
139
140
141
 
 
 
 
142
143
144
145
146
147
148
149
@@ -133,16 +133,17 @@
    def save_settings(self):   settings = GStatus.save_settings(self) - settings['gcommit'] = self._vpaned.get_position() + settings['commit-vpane'] = self._vpaned.get_position()   return settings       def load_settings(self, settings):   GStatus.load_settings(self, settings) - if settings: - self._setting_vpos = settings['gcommit'] - else: - self._setting_vpos = -1 + self._setting_vpos = -1 + try: + self._setting_vpos = settings['commit-vpane'] + except KeyError: + pass       def get_tbbuttons(self):
Change 1 of 3 Show Entire File hggtk/​gdialog.py Stacked
 
115
116
117
118
119
120
121
122
 
187
188
189
190
 
191
192
193
194
 
195
196
197
198
199
 
 
200
201
202
 
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
 
361
362
363
 
115
116
117
 
 
118
119
120
 
185
186
187
 
188
189
190
191
 
192
193
 
194
 
195
196
197
198
199
200
 
341
342
343
 
344
345
346
347
 
348
349
350
351
352
 
 
 
 
353
354
355
356
@@ -115,8 +115,6 @@
  """     # "Constants" - settings_version = 1 -   def __init__(self, ui, repo, cwd, pats, opts):   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   self.cwd = cwd or os.getcwd() @@ -187,16 +185,16 @@
  return settings     - def load_settings(self, settings={}): + def load_settings(self, settings):   self._setting_defsize = (678, 585)   self._setting_winpos = (0, 0)   self._setting_wasmax = False - if 'gdialog-rect' in settings: + try:   self._setting_defsize = settings['gdialog-rect'] - if 'gdialog-pos' in settings:   self._setting_winpos = settings['gdialog-pos'] - if 'gdialog-ismax' in settings:   self._setting_wasmax = settings['gdialog-ismax'] + except KeyError: + pass     ### End of overridable methods ###   @@ -343,21 +341,16 @@
  vbox.pack_end(extras, False, False, 0)     self.connect('destroy', self._destroying) - #self.connect('delete_event', self.should_live)       def _destroying(self, gtkobj):   settings = self.save_settings() - self.settings.set_value('settings_version', GDialog.settings_version)   self.settings.set_value('dialogs', settings)   self.settings.write()       def _load_settings(self): - settings = {} - version = self.settings.get_value('settings_version', None) - if version == GDialog.settings_version: - settings = self.settings.get_value('dialogs', {}) + settings = self.settings.get_value('dialogs', {})   self.load_settings(settings)    
Change 1 of 1 Show Entire File hggtk/​guess.py Stacked
 
46
47
48
49
 
50
51
52
 
46
47
48
 
49
50
51
52
@@ -46,7 +46,7 @@
  self.notify_func = None   path = toutf(os.path.basename(self.root))   self.set_title(_('Detect Copies/Renames in ') + path) - settings = shlib.Settings('rename') + settings = shlib.Settings('guess')   dims = settings.get_value('dims', (800, 600))   self.set_default_size(dims[0], dims[1])  
Change 1 of 1 Show Entire File hggtk/​hgemail.py Stacked
 
205
206
207
208
 
209
210
211
 
205
206
207
 
208
209
210
211
@@ -205,7 +205,7 @@
  for v in history.get_value(cpath):   vlist.append([v])   - history = shlib.Settings('config_history') + history = shlib.Settings('email')   try:   repo = hg.repository(ui.ui(), path=self.root)   self.repo = repo
Change 1 of 4 Show Entire File hggtk/​history.py Stacked
 
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
 
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
 
259
260
261
 
 
 
 
 
 
 
 
 
262
263
264
 
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
 
 
 
 
 
 
 
 
 
299
300
301
 
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
 
237
238
239
 
 
 
 
 
 
 
 
 
 
240
241
242
 
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
 
280
281
282
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
283
284
285
286
287
288
289
290
291
292
293
294
@@ -145,25 +145,25 @@
  button = gtk.CheckMenuItem(_('Show Rev'))   button.connect("toggled", self.toggle_view_column,   'rev-column-visible') - button.set_active(self._show_rev) + button.set_active(self.showcol.get('rev', True))   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(self._show_id) + button.set_active(self.showcol.get('id', False))   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(self._show_date) + button.set_active(self.showcol.get('date', True))   button.set_draw_as_radio(True)   menu.append(button)   button = gtk.CheckMenuItem(_("Show Branch"))   button.connect("toggled", self.toggle_view_column,   'branch-column-visible') - button.set_active(self._show_branch) + button.set_active(self.showcol.get('branch', False))   button.set_draw_as_radio(True)   menu.append(button)   menu.show_all() @@ -237,16 +237,6 @@
  else:   self.reload_log()   - def save_settings(self): - settings = GDialog.save_settings(self) - settings['glog'] = (self._vpaned.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'), - self.graphview.get_property('branch-column-visible')) - return settings -   def get_graphlimit(self, suggestion):   limit_opt = self.repo.ui.config('tortoisehg', 'graphlimit', '500')   l = 0 @@ -259,6 +249,15 @@
  pass   return l or 500   + def save_settings(self): + settings = GDialog.save_settings(self) + settings['glog-vpane'] = self._vpaned.get_position() + settings['glog-hpane'] = self._hpaned.get_position() + for col in ('rev', 'date', 'id', 'branch'): + vis = self.graphview.get_property(col+'-column-visible') + settings['glog-vis-'+col] = vis + return settings +   def load_settings(self, settings):   '''Called at beginning of display() method'''   @@ -281,21 +280,15 @@
  GDialog.load_settings(self, settings)   self._setting_vpos = -1   self._setting_hpos = -1 - (self._show_rev, self._show_date, self._show_id, - self._show_branch) = True, True, False, False - if settings: - data = settings['glog'] - if type(data) == int: - self._setting_vpos = data - elif len(data) == 2: - (self._setting_vpos, self._setting_hpos) = data - elif len(data) == 5: - (self._setting_vpos, self._setting_hpos, - self._show_rev, self._show_date, self._show_id) = data - elif len(data) == 6: - (self._setting_vpos, self._setting_hpos, - self._show_rev, self._show_date, self._show_id, - self._show_branch) = data + self.showcol = {} + try: + self._setting_vpos = settings['glog-vpane'] + self._setting_hpos = settings['glog-hpane'] + for col in ('rev', 'date', 'id', 'branch'): + vis = settings['glog-vis-'+col] + self.showcol[col] = vis + except KeyError: + pass     def reload_log(self, filteropts={}):   """Send refresh event to treeview object"""
Change 1 of 1 Show Changes Only hggtk/​shlib.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
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
 """  shlib.py - TortoiseHg shell utilities   Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>    This software may be used and distributed according to the terms  of the GNU General Public License, incorporated herein by reference.    """    import os  import sys  import gtk  import cPickle  import time  import hgtk  import gobject  from mercurial.i18n import _  from mercurial import util    class SimpleMRUList(object):   def __init__(self, size=10, reflist=[], compact=True):   self._size = size   self._list = reflist   if compact:   self.compact()     def __iter__(self):   for elem in self._list:   yield elem     def add(self, val):   if val in self._list:   self._list.remove(val)   self._list.insert(0, val)   self.flush()     def get_size(self):   return self._size     def set_size(self, size):   self._size = size   self.flush()     def flush(self):   while len(self._list) > self._size:   del self._list[-1]     def compact(self):   ''' remove duplicate in list '''   newlist = []   for v in self._list:   if v not in newlist:   newlist.append(v)   self._list[:] = newlist      class Settings(object): - version = 1.0 -   def __init__(self, appname, path=None):   self._appname = appname   self._data = {}   self._path = path and path or self._get_path(appname)   self._audit()   self.read()     def get_value(self, key, default=None, create=False):   if key in self._data:   return self._data[key]   elif create:   self._data[key] = default   return default     def set_value(self, key, value):   self._data[key] = value     def mrul(self, key, size=10):   ''' wrapper method to create a most-recently-used (MRU) list '''   ls = self.get_value(key, [], True)   ml = SimpleMRUList(size=size, reflist=ls)   return ml     def get_keys(self):   return self._data.keys()     def get_appname(self):   return self._appname     def read(self):   self._data.clear()   if os.path.exists(self._path):   try:   f = file(self._path, 'rb')   self._data = cPickle.loads(f.read())   f.close()   except Exception:   pass     def write(self):   self._write(self._path, self._data)     def _write(self, appname, data):   s = cPickle.dumps(data)   f = util.atomictempfile(appname, 'wb', None)   f.write(s)   f.rename()     def _get_path(self, appname):   if os.name == 'nt':   return os.path.join(os.environ.get('APPDATA'), 'TortoiseHg',   appname)   else:   return os.path.join(os.path.expanduser('~'), '.tortoisehg',   appname)     def _audit(self):   if os.path.exists(os.path.dirname(self._path)):   return   os.makedirs(os.path.dirname(self._path))    def get_system_times():   t = os.times()   if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()   t = (t[0], t[1], t[2], t[3], time.clock())   return t    def set_tortoise_icon(window, thgicon):   ico = get_tortoise_icon(thgicon)   if ico: window.set_icon_from_file(ico)    def get_thg_modifier():   if sys.platform == 'darwin':   return '<Mod1>'   else:   return '<Control>'    def set_tortoise_keys(window):   'Set default TortoiseHg keyboard accelerators'   if sys.platform == 'darwin':   mask = gtk.accelerator_get_default_mod_mask()   mask |= gtk.gdk.MOD1_MASK;   gtk.accelerator_set_default_mod_mask(mask)   mod = get_thg_modifier()   accelgroup = gtk.AccelGroup()   window.add_accel_group(accelgroup)   key, modifier = gtk.accelerator_parse(mod+'w')   window.add_accelerator('thg-close', accelgroup, key, modifier,   gtk.ACCEL_VISIBLE)   key, modifier = gtk.accelerator_parse(mod+'q')   window.add_accelerator('thg-exit', accelgroup, key, modifier,   gtk.ACCEL_VISIBLE)   key, modifier = gtk.accelerator_parse('F5')   window.add_accelerator('thg-refresh', accelgroup, key, modifier,   gtk.ACCEL_VISIBLE)   key, modifier = gtk.accelerator_parse(mod+'Return')   window.add_accelerator('thg-accept', accelgroup, key, modifier,   gtk.ACCEL_VISIBLE)     # connect ctrl-w and ctrl-q to every window   window.connect('thg-close', thgclose)   window.connect('thg-exit', thgexit)    def thgexit(window):   if thgclose(window):   gobject.idle_add(hgtk.thgexit, window)    def thgclose(window):   if hasattr(window, 'should_live'):   if window.should_live():   return False   window.destroy()   return True    def get_tortoise_icon(thgicon):   '''Find a tortoise icon, apply to PyGtk window'''   # The context menu should set this variable   var = os.environ.get('THG_ICON_PATH', None)   paths = var and [ var ] or []   try:   # Else try relative paths from hggtk, the repository layout   fdir = os.path.dirname(__file__)   paths.append(os.path.join(fdir, '..', 'icons'))   # ... or the unix installer layout   paths.append(os.path.join(fdir, '..', '..', '..',   'share', 'pixmaps', 'tortoisehg', 'icons'))   paths.append(os.path.join(fdir, '..', '..', '..', '..',   'share', 'pixmaps', 'tortoisehg', 'icons'))   except NameError: # __file__ is not always available   pass   for p in paths:   path = os.path.join(p, 'tortoise', thgicon)   if os.path.isfile(path):   return path   else:   print _('icon not found'), thgicon   return None    def version():   try:   import __version__   return __version__.version   except ImportError:   return _('unknown')    if os.name == 'nt':   def shell_notify(paths):   try:   from win32com.shell import shell, shellcon   import pywintypes   except ImportError:   return   dirs = []   for path in paths:   abspath = os.path.abspath(path)   if not os.path.isdir(abspath):   abspath = os.path.dirname(abspath)   if abspath not in dirs:   dirs.append(abspath)   # send notifications to deepest directories first   dirs.sort(lambda x, y: len(y) - len(x))   for dir in dirs:   try:   pidl, ignore = shell.SHILCreateFromPath(dir, 0)   except pywintypes.com_error:   return   if pidl is None:   continue   shell.SHChangeNotify(shellcon.SHCNE_UPDATEITEM,   shellcon.SHCNF_IDLIST | shellcon.SHCNF_FLUSH,   pidl, None)  else:   def shell_notify(paths):   pass
Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
194
195
196
197
198
 
 
199
200
201
202
203
204
205
206
207
208
209
210
 
 
 
 
 
 
 
211
212
213
 
194
195
196
 
 
197
198
199
200
201
202
203
 
 
 
 
 
 
 
204
205
206
207
208
209
210
211
212
213
@@ -194,20 +194,20 @@
    def save_settings(self):   settings = GDialog.save_settings(self) - settings['gstatus'] = (self._diffpane.get_position(), - self._setting_lastpos) + settings['gstatus-hpane'] = self._diffpane.get_position() + settings['gstatus-lastpos'] = self._setting_lastpos   return settings       def load_settings(self, settings):   GDialog.load_settings(self, settings) - if settings: - mysettings = settings['gstatus'] - self._setting_pos = mysettings[0] - self._setting_lastpos = mysettings[1] - else: - self._setting_pos = 270 - self._setting_lastpos = 64000 + self._setting_pos = 270 + self._setting_lastpos = 64000 + try: + self._setting_pos = settings['gstatus-hpane'] + self._setting_lastpos = settings['gstatus-lastpos'] + except KeyError: + pass   self.mqmode = None   if hasattr(self.repo, 'mq') and self.repo.mq.applied:   self.mqmode = True
Change 1 of 2 Show Entire File hggtk/​synch.py Stacked
 
32
33
34
35
36
37
38
 
555
556
557
558
559
 
 
560
561
562
 
32
33
34
 
35
36
37
 
554
555
556
 
 
557
558
559
560
561
@@ -32,7 +32,6 @@
    # persistent app data   self._settings = shlib.Settings('synch') - self._recent_src = self._settings.mrul('src_paths')     self.set_default_size(655, 552)   @@ -555,8 +554,8 @@
  if os.path.exists(src):   src = os.path.abspath(src)   - # save path to recent list in history - self._recent_src.add(src) + # save src path to recent list in history (read by clone tool) + self._settings.mrul('src_paths').add(src)   self._settings.write()     # update drop-down list
Change 1 of 1 Show Entire File hggtk/​thgconfig.py Stacked
 
408
409
410
411
 
412
413
414
 
408
409
410
 
411
412
413
414
@@ -408,7 +408,7 @@
  self.dirty = False   self.pages = []   self.tooltips = gtk.Tooltips() - self.history = shlib.Settings('config_history') + self.history = shlib.Settings('thgconfig')     # create pages for each section of configuration file   self.tortoise_frame = self.add_page(notebook, 'TortoiseHG')