Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

commit/thgshelve: check if the shown state is up to date

Check if the parents have changed since the last refresh of the display before
doing commit or (un)shelve. If they have, ask the user if he wants to continue.

Fixes #277

Changeset 5b54efceb405…

Parent 4d53aac5f184…

by Simon Heimberg

Changes to 3 files · Browse files at 5b54efceb405 Showing diff from parent 4d53aac5f184 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​commit.py Stacked
 
307
308
309
310
 
311
312
313
 
421
422
423
424
 
425
426
427
 
307
308
309
 
310
311
312
313
 
421
422
423
 
424
425
426
427
@@ -307,7 +307,7 @@
    def get_custom_menus(self):   def commit(menuitem, files): - if self.ready_message(): + if self.ready_message() and self.isuptodate():   self.hg_commit(files)   self.reload_status()   abs = [self.repo.wjoin(file) for file in files] @@ -421,7 +421,7 @@
  self.branchbutton.set_sensitive(not (self.mqmode or self.qnew))     def commit_clicked(self, toolbutton, data=None): - if not self.ready_message(): + if not (self.ready_message() or self.isupdodate()):   return     commitable = 'MAR'
Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
1338
1339
1340
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1341
1342
1343
 
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
@@ -1338,6 +1338,21 @@
  self._do_diff(files, self.opts)   return True   + def isuptodate(self): + oldparents = self.repo.dirstate.parents() + self.repo.dirstate.invalidate() + if oldparents == self.repo.dirstate.parents(): + return True + response = gdialog.CustomPrompt(_('not up to date'), + _('The parents have changed since the last refresh.\n' + 'Continue anyway?'), + self, (_('&Yes'), _('&Refresh'), _('&Cancel')), 1, 2).run() + if response == 0: # Yes + return True + if response == 1: + self.reload_status() + return False +  def run(ui, *pats, **opts):   showclean = pats and True or False   rev = opts.get('rev', [])
Change 1 of 1 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
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
 # thgshelve.py - commit dialog for TortoiseHg  #  # Copyright 2007 Brad Schick, brad at gmail . com  # Copyright 2007 TK Soh <teekaysoh@gmail.com>  # Copyright 2007 Steve Borho <steve@borho.org>  #  # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.    import os  import gtk    from mercurial import util    from thgutil.i18n import _  from thgutil import hglib    from hggtk.status import GStatus, FM_STATUS, FM_CHECKED  from hggtk import hgshelve, gdialog, gtklib    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)   self.mode = 'shelve'     def parse_opts(self):   GStatus.parse_opts(self)   if not self.test_opt('rev'):   self.opts['rev'] = ''     def get_title(self):   root = hglib.toutf(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()   self.opts['check'] = False       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(0, 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(0, self.unshelve_btn)   tbbuttons.insert(0, 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)   return self.vpaned     def get_custom_menus(self):   def shelve(menuitem, files):   self.shelve_selected(files)   self.activate_shelve_buttons(True)   if self.merging:   return []   else:   return (_('_shelve'), commit, 'MAR')       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)   self.activate_shelve_buttons(True)   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(len(self.filemodel) > 0)   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, files=[]):   if len(self.filemodel) < 1:   gdialog.Prompt(_('Shelve'),   _('No changes to shelve'), self).run()   return     wfiles = files or self.relevant_checked_files('MAR')   if not wfiles:   gdialog.Prompt(_('Shelve'),   _('Please select diff chunks to shelve'), self).run()   return     doforce = False   doappend = False   if self.has_shelve_file():   dialog = gtklib.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:   doforce = True   elif rval == 2:   doappend = True   else:   return     def filter_patch(ui, chunks):   accepted = []   for chunk in chunks:   file = util.localpath(chunk.filename())   if file not in wfiles:   # file was not selected for inclusion   continue   if file not in self.filechunks:   # file was never filtered, accept all chunks   accepted.append(chunk)   continue   schunks = self.filechunks[file]   for i, c in enumerate(schunks):   if chunk != c:   continue   if i == 0 or c.active:   # take header and active chunks   accepted.append(chunk)   break   return accepted     # hgshelve only works 'interactively'   self.ui.setconfig('ui', 'interactive', 'on')   opts = {'addremove': None, 'include': [], 'force': doforce,   'append': doappend, 'exclude': []}   hgshelve.filterpatch = filter_patch   # shelve them!   hgshelve.shelve(self.ui, self.repo, **opts)   self.opts['check'] = True # recheck MAR after commit   self.filechunks = {} # do not keep chunks   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): + if not self.isuptodate(): + return   self.shelve_selected()   self.activate_shelve_buttons(True)     def unshelve_clicked(self, toolbutton, data=None): + if not self.isuptodate(): + return   self.unshelve()   self.activate_shelve_buttons(True)    def run(_ui, *pats, **opts):   cmdoptions = {   'user':opts.get('user', ''), 'date':opts.get('date', ''),   'modified':True, 'added':True, 'removed':True, 'deleted':True,   'unknown':True, 'ignored':False,   'exclude':[], 'include':[],   'check': True, 'git':False, 'addremove':False,   }   return GShelve(_ui, None, None, pats, cmdoptions)