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 059e9f79d6c7…

Parents fa4af62c8e59…

Parents d572bfb39e7d…

by Steve Borho

Changes to 3 files · Browse files at 059e9f79d6c7 Showing diff from parent fa4af62c8e59 d572bfb39e7d Diff from another changeset...

Change 1 of 6 Show Changes Only tortoisehg/​hgqt/​purge.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
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
 # purge.py - working copy purge dialog, based on Mercurial purge extension  #  # Copyright 2010 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 stat  import shutil   -from mercurial import cmdutil +from mercurial import cmdutil, hg, ui    from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, cmdui    from PyQt4.QtCore import *  from PyQt4.QtGui import *    class PurgeDialog(QDialog):     progress = pyqtSignal(QString, object, QString, QString, object)   showMessage = pyqtSignal(QString)     def __init__(self, repo, parent):   QDialog.__init__(self, parent)   f = self.windowFlags()   self.setWindowFlags(f & ~Qt.WindowContextHelpButtonHint)   self.setLayout(QVBoxLayout())     cb = QCheckBox(_('No unknown files found'))   cb.setChecked(False)   cb.setEnabled(False)   self.layout().addWidget(cb)   self.ucb = cb     cb = QCheckBox(_('No ignored files found'))   cb.setChecked(False)   cb.setEnabled(False)   self.layout().addWidget(cb)   self.icb = cb     cb = QCheckBox(_('No trash files found'))   cb.setChecked(False)   cb.setEnabled(False)   self.layout().addWidget(cb)   self.tcb = cb     self.foldercb = QCheckBox(_('Delete empty folders'))   self.foldercb.setChecked(True)   self.layout().addWidget(self.foldercb)   self.hgfilecb = QCheckBox(_('Preserve files beginning with .hg'))   self.hgfilecb.setChecked(True)   self.layout().addWidget(self.hgfilecb)     self.stbar = cmdui.ThgStatusBar(self)   self.stbar.setSizeGripEnabled(False)   self.progress.connect(self.stbar.progress)   self.showMessage.connect(self.stbar.showMessage)   self.layout().addWidget(self.stbar)     BB = QDialogButtonBox   bb = QDialogButtonBox(BB.Ok|BB.Cancel)   bb.accepted.connect(self.accept)   bb.rejected.connect(self.reject)   self.bb = bb   self.layout().addWidget(bb)     self.setWindowTitle('%s - purge' % repo.displayname)   self.setWindowIcon(qtlib.geticon('hg-purge'))   self.repo = repo     self.bb.setEnabled(False)   self.progress.emit(*cmdui.startProgress(_('Checking'), '...'))   s = QSettings()   desktopgeom = qApp.desktop().availableGeometry()   self.resize(desktopgeom.size() * 0.25)   self.restoreGeometry(s.value('purge/geom').toByteArray())   QTimer.singleShot(0, self.checkStatus)     def checkStatus(self):   repo = self.repo   class CheckThread(QThread):   def __init__(self, parent):   QThread.__init__(self, parent)   self.files = (None, None)   self.error = None     def run(self):   try:   wctx = repo[None]   wctx.status(ignored=True, unknown=True)   trashcan = repo.join('Trashcan')   if os.path.isdir(trashcan):   trash = os.listdir(trashcan)   else:   trash = []   self.files = wctx.unknown(), wctx.ignored(), trash   except Exception, e:   self.error = str(e)     def completed():   self.th.wait()   self.files = self.th.files   self.bb.setEnabled(True)   self.progress.emit(*cmdui.stopProgress(_('Checking')))   if self.th.error:   self.showMessage.emit(hglib.tounicode(self.th.error))   else:   self.showMessage.emit(_('Ready to purge.'))   U, I, T = self.files   if U:   self.ucb.setText(_('Delete %d unknown files') % len(U))   self.ucb.setChecked(True)   self.ucb.setEnabled(True)   if I:   self.icb.setText(_('Delete %d ignored files') % len(I))   self.icb.setChecked(True)   self.icb.setEnabled(True)   if T:   self.tcb.setText(_('Delete %d files in .hg/Trashcan') %   len(T))   self.tcb.setChecked(True)   self.tcb.setEnabled(True)     self.th = CheckThread(self)   self.th.finished.connect(completed)   self.th.start()     def reject(self):   s = QSettings()   s.setValue('purge/geom', self.saveGeometry())   super(PurgeDialog, self).reject()     def accept(self):   unknown = self.ucb.isChecked()   ignored = self.icb.isChecked()   trash = self.tcb.isChecked() - delf = self.foldercb.isChecked() - keep = self.hgfilecb.isChecked() + delfolders = self.foldercb.isChecked() + keephg = self.hgfilecb.isChecked()   - if not (unknown or ignored or trash or delf): + if not (unknown or ignored or trash or delfolders):   QDialog.accept(self)   return   if not qtlib.QuestionMsgBox(_('Confirm file deletions'),   _('Are you sure you want to delete these files and/or folders?')):   return     def completed():   self.th.wait()   if self.th.failures:   qtlib.InfoMsgBox(_('Deletion failures'),   _('Unable to delete %d files or folders') %   len(self.th.failures), parent=self) - self.reject() + if self.th.failures is not None: + self.reject()   - self.th = PurgeThread(self.repo, ignored, unknown, trash, delf, keep, self) + opts = dict(unknown=unknown, ignored=ignored, trash=trash, + delfolders=delfolders, keephg=keephg) + + self.th = PurgeThread(self.repo, opts, self)   self.th.progress.connect(self.progress)   self.th.showMessage.connect(self.showMessage)   self.th.finished.connect(completed)   self.th.start()    class PurgeThread(QThread):   progress = pyqtSignal(QString, object, QString, QString, object)   showMessage = pyqtSignal(QString)   - def __init__(self, repo, ignored, unknown, trash, delf, keephg, parent): + def __init__(self, repo, opts, parent):   super(PurgeThread, self).__init__(parent)   self.failures = 0 - self.repo = repo - self.ignored = ignored - self.unknown = unknown - self.trash = trash - self.delfolders = delf - self.keephg = keephg + self.root = repo.root + self.opts = opts     def run(self): - self.failures = self.purge(self.repo, self.ignored, self.unknown, - self.trash, self.delfolders, self.keephg) + try: + self.failures = self.purge(self.root, self.opts) + except Exception, e: + self.failures = None + self.showMessage.emit(hglib.tounicode(str(e)))   - def purge(self, repo, ignored, unknown, trash, delfolders, keephg): + def purge(self, root, opts): + repo = hg.repository(ui.ui(), self.root) + keephg = opts['keephg']   directories = []   failures = []   - if trash: + if opts['trash']:   self.showMessage.emit(_('Deleting trash folder...')) - trashcan = self.repo.join('Trashcan') + trashcan = repo.join('Trashcan')   try:   shutil.rmtree(trashcan)   except EnvironmentError:   failures.append(trashcan)     self.showMessage.emit('')   match = cmdutil.match(repo, [], {})   match.dir = directories.append - status = repo.status(match=match, ignored=ignored, unknown=unknown) + status = repo.status(match=match, ignored=opts['ignored'], + unknown=opts['unknown'], clean=False)   files = status[4] + status[5]     def remove(remove_func, name):   try:   if keephg and name.startswith('.hg'):   return   remove_func(repo.wjoin(name))   except EnvironmentError:   failures.append(name)     def removefile(path):   try:   os.remove(path)   except OSError:   # read-only files cannot be unlinked under Windows   s = os.stat(path)   if (s.st_mode & stat.S_IWRITE) != 0:   raise   os.chmod(path, stat.S_IMODE(s.st_mode) | stat.S_IWRITE)   os.remove(path)     for i, f in enumerate(sorted(files)):   data = ('deleting', i, f, '', len(files))   self.progress.emit(*data)   remove(removefile, f)   data = ('deleting', None, '', '', len(files))   self.progress.emit(*data)   self.showMessage.emit(_('Deleted %d files') % len(files))   - if delfolders: + if opts['delfolders']:   for i, f in enumerate(sorted(directories, reverse=True)):   if not os.listdir(repo.wjoin(f)):   data = ('rmdir', i, f, '', len(directories))   self.progress.emit(*data)   remove(os.rmdir, f)   data = ('rmdir', None, f, '', len(directories))   self.progress.emit(*data)   self.showMessage.emit(_('Deleted %d files and %d folders') % (   len(files), len(directories)))   return failures    def run(ui, *pats, **opts):   from tortoisehg.hgqt import thgrepo   from tortoisehg.util import paths   repo = thgrepo.repository(ui, path=paths.find_root())   return PurgeDialog(repo, None)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​qscilib.py Stacked
 
210
211
212
 
 
 
 
 
 
 
 
 
213
214
 
215
216
217
218
219
 
220
221
222
223
 
224
225
226
 
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
@@ -210,17 +210,29 @@
  a.setChecked(self.whitespaceVisibility() == m)   a.triggered.connect(lambda: self.setWhitespaceVisibility(m))   mkaction(name, mode) + vsmenu = QMenu(_('EolnVisibility'), self) + for name, mode in ((_('Visible'), True), + (_('Invisible'), False)): + def mkaction(n, m): + a = vsmenu.addAction(n) + a.setCheckable(True) + a.setChecked(self.eolVisibility() == m) + a.triggered.connect(lambda: self.setEolVisibility(m)) + mkaction(name, mode)   self._stdMenu.addMenu(wrapmenu)   self._stdMenu.addMenu(wsmenu) + self._stdMenu.addMenu(vsmenu)   return self._stdMenu     def saveSettings(self, qs, prefix):   qs.setValue(prefix+'/wrap', self.wrapMode())   qs.setValue(prefix+'/whitespace', self.whitespaceVisibility()) + qs.setValue(prefix+'/eol', self.eolVisibility())     def loadSettings(self, qs, prefix):   self.setWrapMode(qs.value(prefix+'/wrap').toInt()[0])   self.setWhitespaceVisibility(qs.value(prefix+'/whitespace').toInt()[0]) + self.setEolVisibility(qs.value(prefix+'/eol').toBool())     @pyqtSlot(unicode, bool, bool, bool)   def find(self, exp, icase=True, wrap=False, forward=True):
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​rejects.py Stacked
 
93
94
95
 
 
 
 
 
 
 
 
 
96
97
98
 
99
100
101
 
103
104
105
106
 
107
108
109
 
163
164
165
166
 
167
168
169
 
253
254
255
256
 
257
258
259
 
93
94
95
96
97
98
99
100
101
102
103
104
105
106
 
107
108
109
110
 
112
113
114
 
115
116
117
118
 
172
173
174
 
175
176
177
178
 
262
263
264
 
265
266
267
268
@@ -93,9 +93,18 @@
    f = QFile(path)   f.open(QIODevice.ReadOnly) + earlybytes = f.readData(4096) + if '\0' in earlybytes: + qtlib.ErrorMsgBox(_('Unable to merge rejects'), + _('This appears to be a binary file')) + self.hide() + QTimer.singleShot(0, self.reject) + return + + f.seek(0)   editor.read(f)   editor.setModified(False) - lexer = lexers.get_lexer(path, f.readData(1024), self) + lexer = lexers.get_lexer(path, earlybytes, self)   editor.setLexer(lexer)   editor.setMarginLineNumbers(1, True)   editor.setMarginWidth(1, str(editor.lines())+'X') @@ -103,7 +112,7 @@
  buf = cStringIO.StringIO()   try:   buf.write('diff -r aaaaaaaaaaaa -r bbbbbbbbbbb %s\n' % path) - buf.write(open(path + '.rej', 'r').read()) + buf.write(open(path + '.rej', 'rb').read())   buf.seek(0)   except IOError, e:   pass @@ -163,7 +172,7 @@
  buf = cStringIO.StringIO()   chunk = self.chunks[row]   chunk.write(buf) - self.rejectbrowser.showChunk(buf.getvalue().splitlines()[1:]) + self.rejectbrowser.showChunk(buf.getvalue().splitlines(True)[1:])   self.editor.setCursorPosition(chunk.fromline-1, 0)   self.editor.ensureLineVisible(chunk.fromline-1)   self.editor.markerDeleteAll(-1) @@ -253,7 +262,7 @@
  elif line[0] == '-':   removed.append(i)   self.markerDeleteAll(-1) - self.setText(u'\n'.join(utext)) + self.setText(u''.join(utext))   for i in added:   self.markerAdd(i, self.addedMark)   self.markerAdd(i, self.addedColor)