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

stable archive: connect cancel button to slot

Also fixed missing self of cancel_clicked.

Changeset 3d43a37b08d3…

Parent 9cf3cfd917d9…

by Yuya Nishihara

Changes to one file · Browse files at 3d43a37b08d3 Showing diff from parent 9cf3cfd917d9 Diff from another changeset...

Change 1 of 2 Show Changes Only tortoisehg/​hgqt/​archive.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
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
 # archive.py - TortoiseHg's dialog for archiving a repo revision  #  # Copyright 2009 Emmanuel Rosa <goaway1000@gmail.com>  # Copyright 2010 Johan Samyn <johan.samyn@gmail.com>  #  # 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    from PyQt4.QtCore import *  from PyQt4.QtGui import *    from mercurial import hg, error    from tortoisehg.hgqt.i18n import _  from tortoisehg.util import hglib, paths  from tortoisehg.hgqt import cmdui, qtlib, thgrepo    WD_PARENT = _('= Working Directory Parent =')    class ArchiveDialog(QDialog):   """ Dialog to archive a particular Mercurial revision """     output = pyqtSignal(QString, QString)   makeLogVisible = pyqtSignal(bool)   progress = pyqtSignal(QString, object, QString, QString, object)     def __init__(self, ui, repo, rev=None, parent=None):   super(ArchiveDialog, self).__init__(parent)     # main layout   self.vbox = QVBoxLayout()   self.vbox.setSpacing(6)   self.grid = QGridLayout()   self.grid.setSpacing(6)   self.vbox.addLayout(self.grid)     # content selection   self.rev_lbl = QLabel(_('Revision:'))   self.rev_lbl.setAlignment(Qt.AlignRight|Qt.AlignVCenter)   self.rev_combo = QComboBox()   self.rev_combo.setEditable(True)   self.rev_combo.setSizeAdjustPolicy(QComboBox.AdjustToContents)   self.files_in_rev_chk = QCheckBox(   _('Only files modified/created in this revision'))   self.subrepos_chk = QCheckBox(_('Recurse into subrepositories'))   self.grid.addWidget(self.rev_lbl, 0, 0)   self.grid.addWidget(self.rev_combo, 0, 1)   self.grid.addWidget(self.files_in_rev_chk, 1, 1)   self.grid.addWidget(self.subrepos_chk, 2, 1)     # selecting a destination   self.dest_lbl = QLabel(_('Destination path:'))   self.dest_lbl.setAlignment(Qt.AlignRight|Qt.AlignVCenter)   self.dest_edit = QLineEdit()   self.dest_edit.setMinimumWidth(300)   self.dest_btn = QPushButton(_('Browse...'))   self.dest_btn.setAutoDefault(False)   self.grid.addWidget(self.dest_lbl, 3, 0)   self.grid.addWidget(self.dest_edit, 3, 1)   self.grid.addWidget(self.dest_btn, 3, 2)     # archive type selection   self.types_lbl = QLabel(_('Archive types:'))   self.types_lbl.setAlignment(Qt.AlignRight|Qt.AlignVCenter)   def radio(label):   return QRadioButton(label, None)   self.filesradio = radio(_('Directory of files'))   self.tarradio = radio(_('Uncompressed tar archive'))   self.tbz2radio = radio(_('Tar archive compressed using bzip2'))   self.tgzradio = radio(_('Tar archive compressed using gzip'))   self.uzipradio = radio(_('Uncompressed zip archive'))   self.zipradio = radio(_('Zip archive compressed using deflate'))   self.grid.addWidget(self.types_lbl, 4, 0)   self.grid.addWidget(self.filesradio, 4, 1)   self.grid.addWidget(self.tarradio, 5, 1)   self.grid.addWidget(self.tbz2radio, 6, 1)   self.grid.addWidget(self.tgzradio, 7, 1)   self.grid.addWidget(self.uzipradio, 8, 1)   self.grid.addWidget(self.zipradio, 9, 1)     # some extras   self.hgcmd_lbl = QLabel(_('Hg command:'))   self.hgcmd_lbl.setAlignment(Qt.AlignRight|Qt.AlignVCenter)   self.hgcmd_txt = QLineEdit()   self.hgcmd_txt.setReadOnly(True)   self.keep_open_chk = QCheckBox(_('Always show output'))   self.grid.addWidget(self.hgcmd_lbl, 10, 0)   self.grid.addWidget(self.hgcmd_txt, 10, 1)   self.grid.addWidget(self.keep_open_chk, 11, 1)     # command widget   self.cmd = cmdui.Widget(True, True, self)   self.cmd.commandStarted.connect(self.command_started)   self.cmd.commandFinished.connect(self.command_finished)   self.cmd.commandCanceling.connect(self.command_canceling)   self.cmd.output.connect(self.output)   self.cmd.makeLogVisible.connect(self.makeLogVisible)   self.cmd.progress.connect(self.progress)   self.cmd.setHidden(True)   self.vbox.addWidget(self.cmd)     # bottom buttons   self.hbox = QHBoxLayout()   self.arch_btn = QPushButton(_('&Archive'))   self.arch_btn.setDefault(True)   self.close_btn = QPushButton(_('&Close'))   self.close_btn.setAutoDefault(False)   self.close_btn.setFocus()   self.detail_btn = QPushButton(_('&Detail'))   self.detail_btn.setAutoDefault(False)   self.detail_btn.setHidden(True)   self.cancel_btn = QPushButton(_('Cancel'))   self.cancel_btn.setAutoDefault(False)   self.cancel_btn.setHidden(True)   self.hbox.addWidget(self.detail_btn)   self.hbox.addStretch(0)   self.hbox.addWidget(self.arch_btn)   self.hbox.addWidget(self.close_btn)   self.hbox.addWidget(self.cancel_btn)   self.vbox.addLayout(self.hbox)     # set default values   self.ui = ui   self.repo = repo   self.initrev = rev   self.prevtarget = None   self.rev_combo.addItem(WD_PARENT)   for b in self.repo.branchtags():   self.rev_combo.addItem(b)   tags = list(self.repo.tags())   tags.sort()   tags.reverse()   for t in tags:   self.rev_combo.addItem(t)   if self.initrev:   text = str(self.initrev)   if self.rev_combo.findText(text, Qt.MatchFlags(Qt.MatchExactly)) == -1:   self.rev_combo.insertItems(0, [text])   self.rev_combo.setMaxVisibleItems(self.rev_combo.count())   self.rev_combo.setCurrentIndex(0)   self.subrepos_chk.setChecked(self.get_subrepos_present())   self.dest_edit.setText(self.repo.root)   self.filesradio.setChecked(True)   self.update_path()     # connecting slots   self.dest_edit.textEdited.connect(self.dest_edited)   self.connect(self.rev_combo, SIGNAL('currentIndexChanged(int)'),   self.rev_combo_changed)   self.connect(self.rev_combo, SIGNAL('editTextChanged(QString)'),   self.rev_combo_changed)   self.dest_btn.clicked.connect(self.browse_clicked)   self.files_in_rev_chk.stateChanged.connect(self.dest_edited)   self.subrepos_chk.toggled.connect(self.onSubreposToggled)   self.filesradio.toggled.connect(self.update_path)   self.tarradio.toggled.connect(self.update_path)   self.tbz2radio.toggled.connect(self.update_path)   self.tgzradio.toggled.connect(self.update_path)   self.uzipradio.toggled.connect(self.update_path)   self.zipradio.toggled.connect(self.update_path)   self.arch_btn.clicked.connect(self.archive)   self.detail_btn.clicked.connect(self.detail_clicked)   self.close_btn.clicked.connect(self.close) + self.cancel_btn.clicked.connect(self.cancel_clicked)     # dialog setting   self.setWindowTitle(_('Archive - %s') % self.repo.displayname)   self.setWindowIcon(qtlib.geticon('hg-archive'))   self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)   self.setLayout(self.vbox)   self.layout().setSizeConstraint(QLayout.SetFixedSize)   self.rev_combo.setFocus()   self._readsettings()     def rev_combo_changed(self, index):   self.subrepos_chk.setChecked(self.get_subrepos_present())   self.update_path()     def dest_edited(self):   path = hglib.fromunicode(self.dest_edit.text())   type = self.get_selected_archive_type()['type']   self.compose_command(path, type)     def browse_clicked(self):   """Select the destination directory or file"""   dest = hglib.fromunicode(self.dest_edit.text())   if not os.path.exists(dest):   dest = os.path.dirname(dest)   select = self.get_selected_archive_type()   FD = QFileDialog   if select['type'] == 'files':   caption = _('Select Destination Folder')   response = FD.getExistingDirectory(parent=self, caption=caption,   directory=dest, options=FD.ShowDirsOnly | FD.ReadOnly)   else:   caption = _('Open File')   ext = '*' + select['ext']   filter = '%s (%s)\nAll Files (*.*)' % (select['label'], ext)   response = FD.getOpenFileName(parent=self, caption=caption,   directory=dest, filter=filter, options=FD.ReadOnly)   if response:   self.dest_edit.setText(response)   self.update_path()     def onSubreposToggled(self):   path = hglib.fromunicode(self.dest_edit.text())   type = self.get_selected_archive_type()['type']   self.compose_command(path, type)     def get_subrepos_present(self):   rev = self.get_selected_rev()   ctx = self.repo[rev]   return '.hgsubstate' in ctx.files() or '.hgsubstate' in ctx.manifest()     def get_selected_rev(self):   rev = self.rev_combo.currentText()   if rev == WD_PARENT:   rev = '.'   else:   rev = hglib.fromunicode(rev)   return rev     def get_selected_archive_type(self):   """Return a dictionary describing the selected archive type"""   if self.tarradio.isChecked():   return {'type': 'tar', 'ext': '.tar', 'label': _('Tar archives')}   elif self.tbz2radio.isChecked():   return {'type': 'tbz2', 'ext': '.tar.bz2',   'label': _('Bzip2 tar archives')}   elif self.tgzradio.isChecked():   return {'type': 'tgz', 'ext': '.tar.gz',   'label': _('Gzip tar archives')}   elif self.uzipradio.isChecked():   return {'type': 'uzip', 'ext': '.zip',   'label': _('Zip archives')}   elif self.zipradio.isChecked():   return {'type': 'zip', 'ext': '.zip',   'label': _('Zip archives')}   return {'type': 'files', 'ext': '', 'label': _('Directory of files')}     def update_path(self):   def remove_ext(path):   for ext in ('.tar', '.tar.bz2', '.tar.gz', '.zip'):   if path.endswith(ext):   return path.replace(ext, '')   return path   def remove_rev(path):   l = ''   for i in xrange(self.rev_combo.count() - 1):   l += hglib.fromunicode(self.rev_combo.itemText(i))   revs = [rev[0] for rev in l]   revs.append(wdrev)   if not self.prevtarget is None:   revs.append(self.prevtarget)   for rev in ['_' + rev for rev in revs]:   if path.endswith(rev):   return path.replace(rev, '')   return path   def add_rev(path, rev):   return '%s_%s' % (path, rev)   def add_ext(path):   select = self.get_selected_archive_type()   if select['type'] != 'files':   path += select['ext']   return path   text = self.rev_combo.currentText()   if len(text) == 0:   return   wdrev = str(self.repo['.'].rev())   if text == WD_PARENT:   text = wdrev   else:   try:   self.repo[hglib.fromunicode(text)]   except (error.RepoError, error.LookupError):   return   path = hglib.fromunicode(self.dest_edit.text())   path = remove_ext(path)   path = remove_rev(path)   path = add_rev(path, hglib.fromunicode(text))   path = add_ext(path)   self.dest_edit.setText(path)   self.prevtarget = text   type = self.get_selected_archive_type()['type']   self.compose_command(path, type)     def compose_command(self, dest, type):   cmdline = ['archive', '--repository', self.repo.root]   rev = self.get_selected_rev()   cmdline.append('-r')   cmdline.append(rev)   if self.subrepos_chk.isChecked():   cmdline.append('-S')   cmdline.append('-t')   cmdline.append(type)   if self.files_in_rev_chk.isChecked():   ctx = self.repo[rev]   for f in ctx.files():   cmdline.append('-I')   cmdline.append(f)   cmdline.append('--')   cmdline.append(hglib.fromunicode(dest))   self.hgcmd_txt.setText('hg ' + ' '.join(cmdline))   return cmdline     def archive(self):   # verify input   type = self.get_selected_archive_type()['type']   dest = self.dest_edit.text()   if os.path.exists(dest):   if type == 'files':   if os.path.isfile(dest):   qtlib.WarningMsgBox(_('Duplicate Name'),   _('The destination "%s" already exists as '   'a file!') % dest)   return False   elif os.listdir(dest):   if not qtlib.QuestionMsgBox(_('Confirm Overwrite'),   _('The directory "%s" is not empty!\n\n'   'Do you want to overwrite it?') % dest,   parent=self):   return False   else:   if os.path.isfile(dest):   if not qtlib.QuestionMsgBox(_('Confirm Overwrite'),   _('The file "%s" already exists!\n\n'   'Do you want to overwrite it?') % dest,   parent=self):   return False   else:   qtlib.WarningMsgBox(_('Duplicate Name'),   _('The destination "%s" already exists as '   'a folder!') % dest)   return False     # prepare command line   cmdline = self.compose_command(dest, type)     if self.files_in_rev_chk.isChecked():   self.savedcwd = os.getcwd()   os.chdir(self.repo.root)     # start archiving   self.cmd.run(cmdline)     def detail_clicked(self):   if self.cmd.outputShown():   self.cmd.setShowOutput(False)   else:   self.cmd.setShowOutput(True)   - def cancel_clicked(): + def cancel_clicked(self):   self.cmd.cancel()     def command_started(self):   self.dest_edit.setEnabled(False)   self.rev_combo.setEnabled(False)   self.dest_btn.setEnabled(False)   self.files_in_rev_chk.setEnabled(False)   self.filesradio.setEnabled(False)   self.tarradio.setEnabled(False)   self.tbz2radio.setEnabled(False)   self.tgzradio.setEnabled(False)   self.uzipradio.setEnabled(False)   self.zipradio.setEnabled(False)   self.cmd.setShown(True)   self.arch_btn.setHidden(True)   self.close_btn.setHidden(True)   self.cancel_btn.setShown(True)   self.detail_btn.setShown(True)     def command_finished(self, ret):   if self.files_in_rev_chk.isChecked():   os.chdir(self.savedcwd)   if ret is not 0 or self.cmd.outputShown()\   or self.keep_open_chk.isChecked():   if not self.cmd.outputShown():   self.detail_btn.click()   self.cancel_btn.setHidden(True)   self.close_btn.setShown(True)   self.close_btn.setAutoDefault(True)   self.close_btn.setFocus()   else:   self.reject()     def command_canceling(self):   self.cancel_btn.setDisabled(True)     def closeEvent(self, event):   self._writesettings()   super(ArchiveDialog, self).closeEvent(event)     def _readsettings(self):   s = QSettings()   self.restoreGeometry(s.value('archive/geom').toByteArray())     def _writesettings(self):   s = QSettings()   s.setValue('archive/geom', self.saveGeometry())    def run(ui, *revs, **opts):   rev = opts.get('rev')   repo = thgrepo.repository(ui, paths.find_root())   return ArchiveDialog(repo.ui, repo, rev)