Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 0f97b1641f2a…

Parents 2d753defe42e…

Parents 3b07cb23c6ab…

by Steve Borho

Changes to 36 files · Browse files at 0f97b1641f2a Showing diff from parent 2d753defe42e 3b07cb23c6ab Diff from another changeset...

Change 1 of 1 Show Entire File .hgtags Stacked
 
54
55
56
 
 
54
55
56
57
@@ -54,3 +54,4 @@
 ee531052f78b11dafe1d8c7ab9cfb95b4854be38 2.0.1  5333ccf1184864720c1d3690df94fa47df80bf02 2.0.2  d5cd872f61fde0c1d1b279af4f3b90ff6ade3161 2.0.3 +26a8187ef879c83c2055044fa2080a640145d542 2.0.4
Change 1 of 1 Show Entire File doc/​source/​conf.py Stacked
 
51
52
53
54
 
55
56
57
 
51
52
53
 
54
55
56
57
@@ -51,7 +51,7 @@
 # The short X.Y version.  version = '2.0'  # The full version, including alpha/beta/rc tags. -release = '2.0.3' +release = '2.0.4'    # The language for content autogenerated by Sphinx. Refer to documentation  # for a list of supported languages.
Show Entire File i18n/​tortoisehg/​ca.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​cs.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​da.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​de.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_AU.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_GB.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​es.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​et.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fa.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​he.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hu.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​it.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ja.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ko.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nb.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nn.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​oc.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt_BR.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ru.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sv.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​tr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​uk.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_CN.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_TW.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 1 Show Entire File setup.py Stacked
 
79
80
81
 
 
82
83
84
 
79
80
81
82
83
84
85
86
@@ -79,6 +79,8 @@
  'contrib/win32',   'tortoisehg',   'tortoisehg/hgqt', + 'tortoisehg/hgtk', + 'tortoisehg/hgtk/logview',   'tortoisehg/util',   'tortoisehg/thgutil/iniparse',   ]
Show Entire File tortoisehg/​hgqt/​backout.py Stacked
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
236
237
238
 
239
240
241
242
 
 
243
244
245
246
247
248
 
249
250
251
252
 
253
254
255
256
 
 
257
258
 
 
259
260
261
 
236
237
238
239
240
241
 
 
242
243
244
245
246
247
248
 
249
250
 
 
 
251
252
 
 
 
253
254
255
 
256
257
258
259
260
@@ -236,26 +236,25 @@
  if isinstance(ctx, patchctx):   repo.thgbackup(ctx._path)   fp = util.atomictempfile(ctx._path, 'wb') + buf = cStringIO.StringIO()   try:   if ctx._ph.comments: - fp.write('\n'.join(ctx._ph.comments)) - fp.write('\n\n') + buf.write('\n'.join(ctx._ph.comments)) + buf.write('\n\n')   needsnewline = False   for wfile in ctx._fileorder:   if wfile == self.currentFile:   if revertall:   continue - chunks[0].write(fp) + chunks[0].write(buf)   for chunk in kchunks: - chunk.write(fp) - if not chunks[-1].selected: - needsnewline = True + chunk.write(buf)   else: - if needsnewline: - fp.write('\n') - needsnewline = False + if buf.tell() and buf.getvalue()[-1] != '\n': + buf.write('\n')   for chunk in ctx._files[wfile]: - chunk.write(fp) + chunk.write(buf) + fp.write(buf.getvalue())   fp.rename()   finally:   del fp
Change 1 of 1 Show Changes Only tortoisehg/​hgqt/​shelve.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
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
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
298
299
300
301
302
303
304
305
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
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
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
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
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
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
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
298
299
300
301
302
303
304
305
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
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
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
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
 # shelve.py - TortoiseHg shelve and patch tool  #  # Copyright 2011 Steve Borho <steve@borho.org>  #  # This software may be used and distributed according to the terms  # of the GNU General Public License, incorporated herein by reference.    import os  import time    from mercurial import commands, error    from tortoisehg.util import hglib  from tortoisehg.util.patchctx import patchctx  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, cmdui, chunks    from PyQt4.QtCore import *  from PyQt4.QtGui import *    class ShelveDialog(QDialog):     finished = pyqtSignal(int)   wdir = _('Working Directory')     def __init__(self, repo, parent):   QDialog.__init__(self, parent)   self.setWindowFlags(Qt.Window)     self.setWindowIcon(qtlib.geticon('shelve'))     self.repo = repo   self.shelves = []   self.patches = []     layout = QVBoxLayout()   layout.setContentsMargins(2, 2, 2, 2)   layout.setSpacing(0)   self.setLayout(layout)     self.tbarhbox = hbox = QHBoxLayout()   hbox.setContentsMargins(0, 0, 0, 0)   hbox.setSpacing(0)   self.layout().addLayout(self.tbarhbox)     self.splitter = QSplitter(self)   self.splitter.setOrientation(Qt.Horizontal)   self.splitter.setChildrenCollapsible(False)   self.splitter.setObjectName('splitter')   self.layout().addWidget(self.splitter, 1)     aframe = QFrame(self.splitter)   avbox = QVBoxLayout()   avbox.setSpacing(2)   avbox.setMargin(2)   avbox.setContentsMargins(2, 2, 2, 2)   aframe.setLayout(avbox)   ahbox = QHBoxLayout()   ahbox.setSpacing(2)   ahbox.setMargin(2)   ahbox.setContentsMargins(2, 2, 2, 2)   avbox.addLayout(ahbox)   self.comboa = QComboBox(self)   self.comboa.currentIndexChanged.connect(self.comboAChanged)   self.clearShelfButtonA = QPushButton(_('Clear'))   self.clearShelfButtonA.setToolTip(_('Clear the current shelf file'))   self.clearShelfButtonA.clicked.connect(self.clearShelfA)   self.delShelfButtonA = QPushButton(_('Delete'))   self.delShelfButtonA.setToolTip(_('Delete the current shelf file'))   self.delShelfButtonA.clicked.connect(self.deleteShelfA)   ahbox.addWidget(self.comboa, 1)   ahbox.addWidget(self.clearShelfButtonA)   ahbox.addWidget(self.delShelfButtonA)     self.browsea = chunks.ChunksWidget(repo, self, True)   self.browsea.splitter.splitterMoved.connect(self.linkSplitters)   self.browsea.linkActivated.connect(self.linkActivated)   self.browsea.showMessage.connect(self.showMessage)   avbox.addWidget(self.browsea)     bframe = QFrame(self.splitter)   bvbox = QVBoxLayout()   bvbox.setSpacing(2)   bvbox.setMargin(2)   bvbox.setContentsMargins(2, 2, 2, 2)   bframe.setLayout(bvbox)   bhbox = QHBoxLayout()   bhbox.setSpacing(2)   bhbox.setMargin(2)   bhbox.setContentsMargins(2, 2, 2, 2)   bvbox.addLayout(bhbox)   self.combob = QComboBox(self)   self.combob.currentIndexChanged.connect(self.comboBChanged)   self.clearShelfButtonB = QPushButton(_('Clear'))   self.clearShelfButtonB.setToolTip(_('Clear the current shelf file'))   self.clearShelfButtonB.clicked.connect(self.clearShelfB)   self.delShelfButtonB = QPushButton(_('Delete'))   self.delShelfButtonB.setToolTip(_('Delete the current shelf file'))   self.delShelfButtonB.clicked.connect(self.deleteShelfB)   bhbox.addWidget(self.combob, 1)   bhbox.addWidget(self.clearShelfButtonB)   bhbox.addWidget(self.delShelfButtonB)     self.browseb = chunks.ChunksWidget(repo, self, True)   self.browseb.splitter.splitterMoved.connect(self.linkSplitters)   self.browseb.linkActivated.connect(self.linkActivated)   self.browseb.showMessage.connect(self.showMessage)   bvbox.addWidget(self.browseb)     self.lefttbar = QToolBar(_('Left Toolbar'), objectName='lefttbar')   self.tbarhbox.addWidget(self.lefttbar)   self.deletea = a = QAction(_('Delete selected chunks'), self)   self.deletea.triggered.connect(self.browsea.deleteSelectedChunks)   a.setIcon(qtlib.geticon('thg-shelve-delete-left'))   self.lefttbar.addAction(self.deletea)   self.allright = a = QAction(_('Move all files right'), self)   self.allright.triggered.connect(self.moveFilesRight)   a.setIcon(qtlib.geticon('thg-shelve-move-right-all'))   self.lefttbar.addAction(self.allright)   self.fileright = a = QAction(_('Move selected file right'), self)   self.fileright.triggered.connect(self.moveFileRight)   a.setIcon(qtlib.geticon('thg-shelve-move-right-file'))   self.lefttbar.addAction(self.fileright)   self.editfilea = a = QAction(_('Edit file'), self)   a.setIcon(qtlib.geticon('edit-find'))   self.lefttbar.addAction(self.editfilea)   self.chunksright = a = QAction(_('Move selected chunks right'), self)   self.chunksright.triggered.connect(self.moveChunksRight)   a.setIcon(qtlib.geticon('thg-shelve-move-right-chunks'))   self.lefttbar.addAction(self.chunksright)     self.rbar = QToolBar(_('Refresh Toolbar'), objectName='rbar')   self.tbarhbox.addStretch(1)   self.tbarhbox.addWidget(self.rbar)   self.refreshAction = a = QAction(_('Refresh'), self)   a.setIcon(qtlib.geticon('view-refresh'))   a.setShortcut(QKeySequence.Refresh)   a.triggered.connect(self.refreshCombos)   self.rbar.addAction(self.refreshAction)   self.actionNew = a = QAction(_('New Shelf'), self)   a.setIcon(qtlib.geticon('document-new'))   a.triggered.connect(self.newShelfPressed)   self.rbar.addAction(self.actionNew)     self.righttbar = QToolBar(_('Right Toolbar'), objectName='righttbar')   self.tbarhbox.addStretch(1)   self.tbarhbox.addWidget(self.righttbar)   self.chunksleft = a = QAction(_('Move selected chunks left'), self)   self.chunksleft.triggered.connect(self.moveChunksLeft)   a.setIcon(qtlib.geticon('thg-shelve-move-left-chunks'))   self.righttbar.addAction(self.chunksleft)   self.editfileb = a = QAction(_('Edit file'), self)   a.setIcon(qtlib.geticon('edit-find'))   self.righttbar.addAction(self.editfileb)   self.fileleft = a = QAction(_('Move selected file left'), self)   self.fileleft.triggered.connect(self.moveFileLeft)   a.setIcon(qtlib.geticon('thg-shelve-move-left-file'))   self.righttbar.addAction(self.fileleft)   self.allleft = a = QAction(_('Move all files left'), self)   self.allleft.triggered.connect(self.moveFilesLeft)   a.setIcon(qtlib.geticon('thg-shelve-move-left-all'))   self.righttbar.addAction(self.allleft)   self.deleteb = a = QAction(_('Delete selected chunks'), self)   self.deleteb.triggered.connect(self.browseb.deleteSelectedChunks)   a.setIcon(qtlib.geticon('thg-shelve-delete-right'))   self.righttbar.addAction(self.deleteb)     self.editfilea.triggered.connect(self.browsea.editCurrentFile)   self.editfileb.triggered.connect(self.browseb.editCurrentFile)     self.browsea.chunksSelected.connect(self.chunksright.setEnabled)   self.browsea.chunksSelected.connect(self.deletea.setEnabled)   self.browsea.fileSelected.connect(self.fileright.setEnabled)   self.browsea.fileSelected.connect(self.editfilea.setEnabled)   self.browsea.fileModified.connect(self.refreshCombos)   self.browsea.fileModelEmpty.connect(self.allright.setDisabled)   self.browseb.chunksSelected.connect(self.chunksleft.setEnabled)   self.browseb.chunksSelected.connect(self.deleteb.setEnabled)   self.browseb.fileSelected.connect(self.fileleft.setEnabled)   self.browseb.fileSelected.connect(self.editfileb.setEnabled)   self.browseb.fileModified.connect(self.refreshCombos)   self.browseb.fileModelEmpty.connect(self.allleft.setDisabled)     self.statusbar = cmdui.ThgStatusBar(self)   self.layout().addWidget(self.statusbar) + self.showMessage(_('Backup copies of modified files can be found ' + 'in .hg/Trashcan/'))     self.refreshCombos()   repo.repositoryChanged.connect(self.refreshCombos)     self.setWindowTitle(_('TortoiseHg Shelve - %s') % repo.displayname)   self.restoreSettings()     def done(self, ret):   self.repo.repositoryChanged.disconnect(self.refreshCombos)   super(ShelveDialog, self).done(ret)     @pyqtSlot()   def moveFileRight(self):   if self.combob.currentIndex() == -1:   self.newShelf(False)   for file in self.browsea.getSelectedFiles():   chunks = self.browsea.getChunksForFile(file)   if self.browseb.mergeChunks(file, chunks):   self.browsea.removeFile(file)     @pyqtSlot()   def moveFileLeft(self):   for file in self.browseb.getSelectedFiles():   chunks = self.browseb.getChunksForFile(file)   if self.browsea.mergeChunks(file, chunks):   self.browseb.removeFile(file)     @pyqtSlot()   def moveFilesRight(self):   if self.combob.currentIndex() == -1:   self.newShelf(False)   for file in self.browsea.getFileList():   chunks = self.browsea.getChunksForFile(file)   if self.browseb.mergeChunks(file, chunks):   self.browsea.removeFile(file)     @pyqtSlot()   def moveFilesLeft(self):   for file in self.browseb.getFileList():   chunks = self.browseb.getChunksForFile(file)   if self.browsea.mergeChunks(file, chunks):   self.browseb.removeFile(file)     @pyqtSlot()   def moveChunksRight(self):   if self.combob.currentIndex() == -1:   self.newShelf(False)   file, chunks = self.browsea.getSelectedFileAndChunks()   if self.browseb.mergeChunks(file, chunks):   self.browsea.deleteSelectedChunks()     @pyqtSlot()   def moveChunksLeft(self):   file, chunks = self.browseb.getSelectedFileAndChunks()   if self.browsea.mergeChunks(file, chunks):   self.browseb.deleteSelectedChunks()     @pyqtSlot()   def newShelfPressed(self):   self.newShelf(True)     def newShelf(self, interactive):   shelve = time.strftime('%Y-%m-%d_%H-%M-%S') + \   '_parent_rev_%d' % self.repo['.'].rev()   if interactive:   dlg = QInputDialog(self, Qt.Sheet)   dlg.setWindowModality(Qt.WindowModal)   dlg.setWindowTitle(_('TortoiseHg New Shelf Name'))   dlg.setLabelText(_('Specify name of new shelf'))   dlg.setTextValue(shelve)   if not dlg.exec_():   return   shelve = hglib.fromunicode(dlg.textValue())   try:   fn = os.path.join('shelves', shelve)   shelfpath = self.repo.join(fn)   if os.path.exists(shelfpath):   qtlib.ErrorMsgBox(_('File already exists'),   _('A shelf file of that name already exists'))   return   self.repo.opener(fn, 'wb').write('')   self.showMessage(_('New shelf created'))   self.refreshCombos()   if shelfpath in self.shelves:   self.combob.setCurrentIndex(self.shelves.index(shelfpath))   except EnvironmentError, e:   self.showMessage(hglib.tounicode(str(e)))     @pyqtSlot()   def deleteShelfA(self):   shelf = self.currentPatchA()   ushelf = hglib.tounicode(os.path.basename(shelf))   if not qtlib.QuestionMsgBox(_('Are you sure?'),   _('Delete shelf file %s?') % ushelf):   return   try:   os.unlink(shelf)   self.showMessage(_('Shelf deleted'))   except EnvironmentError, e:   self.showMessage(hglib.tounicode(str(e)))   self.refreshCombos()     @pyqtSlot()   def clearShelfA(self):   if self.comboa.currentIndex() == 0:   if not qtlib.QuestionMsgBox(_('Are you sure?'),   _('Revert all working copy changes?')):   return   try:   self.repo.ui.quiet = True   commands.revert(self.repo.ui, self.repo, all=True)   self.repo.ui.quiet = False   except (EnvironmentError, error.Abort), e:   self.showMessage(hglib.tounicode(str(e)))   self.refreshCombos()   return   shelf = self.currentPatchA()   ushelf = hglib.tounicode(os.path.basename(shelf))   if not qtlib.QuestionMsgBox(_('Are you sure?'),   _('Clear contents of shelf file %s?') % ushelf):   return   try:   f = open(shelf, "w")   f.close()   self.showMessage(_('Shelf cleared'))   except EnvironmentError, e:   self.showMessage(hglib.tounicode(str(e)))   self.refreshCombos()     @pyqtSlot()   def deleteShelfB(self):   shelf = self.currentPatchB()   ushelf = hglib.tounicode(os.path.basename(shelf))   if not qtlib.QuestionMsgBox(_('Are you sure?'),   _('Delete shelf file %s?') % ushelf):   return   try:   os.unlink(shelf)   self.showMessage(_('Shelf deleted'))   except EnvironmentError, e:   self.showMessage(hglib.tounicode(str(e)))   self.refreshCombos()     @pyqtSlot()   def clearShelfB(self):   shelf = self.currentPatchB()   ushelf = hglib.tounicode(os.path.basename(shelf))   if not qtlib.QuestionMsgBox(_('Are you sure?'),   _('Clear contents of shelf file %s?') % ushelf):   return   try:   f = open(shelf, "w")   f.close()   self.showMessage(_('Shelf cleared'))   except EnvironmentError, e:   self.showMessage(hglib.tounicode(str(e)))   self.refreshCombos()     def currentPatchA(self):   idx = self.comboa.currentIndex()   if idx == -1:   return None   if idx == 0:   return self.wdir   idx -= 1   if idx < len(self.shelves):   return self.shelves[idx]   idx -= len(self.shelves)   if idx < len(self.patches):   return self.patches[idx]   return None     def currentPatchB(self):   idx = self.combob.currentIndex()   if idx == -1:   return None   if idx < len(self.shelves):   return self.shelves[idx]   idx -= len(self.shelves)   if idx < len(self.patches):   return self.patches[idx]   return None     @pyqtSlot()   def refreshCombos(self):   shelvea, shelveb = self.currentPatchA(), self.currentPatchB()     shelves = self.repo.thgshelves()   disp = [_('Shelf: %s') % hglib.tounicode(s) for s in shelves]     patches = self.repo.thgmqunappliedpatches   disp += [_('Patch: %s') % hglib.tounicode(p) for p in patches]     # store fully qualified paths   self.shelves = [os.path.join(self.repo.shelfdir, s) for s in shelves]   self.patches = [self.repo.mq.join(p) for p in patches]     self.comboRefreshInProgress = True   self.comboa.clear()   self.combob.clear()   self.comboa.addItems([self.wdir] + disp)   self.combob.addItems(disp)     # attempt to restore selection   if shelvea == self.wdir:   idxa = 0   elif shelvea in self.shelves:   idxa = self.shelves.index(shelvea) + 1   elif shelvea in self.patches:   idxa = len(self.shelves) + self.patches.index(shelvea) + 1   else:   idxa = 0   self.comboa.setCurrentIndex(idxa)     if shelveb in self.shelves:   idxb = self.shelves.index(shelveb)   elif shelveb in self.patches:   idxb = len(self.shelves) + self.patches.index(shelveb)   else:   idxb = 0   self.combob.setCurrentIndex(idxb)   self.comboRefreshInProgress = False     self.comboAChanged(idxa)   self.comboBChanged(idxb)   if not patches and not shelves:   self.delShelfButtonB.setEnabled(False)   self.clearShelfButtonB.setEnabled(False)   self.browseb.setContext(patchctx('', self.repo, None))     @pyqtSlot(int)   def comboAChanged(self, index):   if self.comboRefreshInProgress:   return   if index == 0:   rev = None   self.delShelfButtonA.setEnabled(False)   self.clearShelfButtonA.setEnabled(True)   else:   rev = self.currentPatchA()   self.delShelfButtonA.setEnabled(index <= len(self.shelves))   self.clearShelfButtonA.setEnabled(index <= len(self.shelves))   self.browsea.setContext(self.repo.changectx(rev))     @pyqtSlot(int)   def comboBChanged(self, index):   if self.comboRefreshInProgress:   return   rev = self.currentPatchB()   self.delShelfButtonB.setEnabled(index < len(self.shelves))   self.clearShelfButtonB.setEnabled(index < len(self.shelves))   self.browseb.setContext(self.repo.changectx(rev))     @pyqtSlot(int, int)   def linkSplitters(self, pos, index):   if self.browsea.splitter.sizes()[0] != pos:   self.browsea.splitter.moveSplitter(pos, index)   if self.browseb.splitter.sizes()[0] != pos:   self.browseb.splitter.moveSplitter(pos, index)     @pyqtSlot(QString)   def linkActivated(self, linktext):   pass     @pyqtSlot(QString)   def showMessage(self, message):   self.statusbar.showMessage(message)     def storeSettings(self):   s = QSettings()   wb = "shelve/"   s.setValue(wb + 'geometry', self.saveGeometry())   s.setValue(wb + 'panesplitter', self.splitter.saveState())   s.setValue(wb + 'filesplitter', self.browsea.splitter.saveState())   self.browsea.saveSettings(s, wb + 'fileviewa')   self.browseb.saveSettings(s, wb + 'fileviewb')     def restoreSettings(self):   s = QSettings()   wb = "shelve/"   self.restoreGeometry(s.value(wb + 'geometry').toByteArray())   self.splitter.restoreState(s.value(wb + 'panesplitter').toByteArray())   self.browsea.splitter.restoreState(   s.value(wb + 'filesplitter').toByteArray())   self.browseb.splitter.restoreState(   s.value(wb + 'filesplitter').toByteArray())   self.browsea.loadSettings(s, wb + 'fileviewa')   self.browseb.loadSettings(s, wb + 'fileviewb')     def reject(self):   self.storeSettings()   super(ShelveDialog, self).reject()    def run(ui, *pats, **opts):   if 'repo' in opts:   repo = opts['repo']   else:   from tortoisehg.util import paths   from tortoisehg.hgqt import thgrepo   repo = thgrepo.repository(ui, path=paths.find_root())   return ShelveDialog(repo, None)