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

stable hgignore: fix UnboundLocalError in refresh function (closes #576)

Changeset 7562f0e8dc7b…

Parent 57224ab9877c…

by André Sintzoff

Changes to one file · Browse files at 7562f0e8dc7b Showing diff from parent 57224ab9877c Diff from another changeset...

Change 1 of 1 Show Changes Only tortoisehg/​hgqt/​hgignore.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
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
 # hgignore.py - TortoiseHg's dialog for editing .hgignore  #  # 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 re    from PyQt4.QtCore import *  from PyQt4.QtGui import *    from mercurial import match, util, error    from tortoisehg.hgqt.i18n import _  from tortoisehg.util import shlib, hglib    from tortoisehg.hgqt import qtlib, qscilib    class HgignoreDialog(QDialog):   'Edit a repository .hgignore file'     ignoreFilterUpdated = pyqtSignal()     contextmenu = None     def __init__(self, repo, parent=None, *pats):   'Initialize the Dialog'   QDialog.__init__(self, parent)   self.setWindowFlags(self.windowFlags() &   ~Qt.WindowContextHelpButtonHint)     self.repo = repo   self.pats = pats   self.setWindowTitle(_('Ignore filter - %s') % repo.displayname)   self.setWindowIcon(qtlib.geticon('ignore'))     vbox = QVBoxLayout()   self.setLayout(vbox)     # layer 1   hbox = QHBoxLayout()   vbox.addLayout(hbox)   recombo = QComboBox()   recombo.addItems([_('Glob'), _('Regexp')])   hbox.addWidget(recombo)     le = QLineEdit()   hbox.addWidget(le, 1)   le.returnPressed.connect(self.addEntry)     add = QPushButton(_('Add'))   add.clicked.connect(self.addEntry)   hbox.addWidget(add, 0)     # layer 2   hbox = QHBoxLayout()   vbox.addLayout(hbox)   ignorefiles = [repo.wjoin('.hgignore')]   for name, value in repo.ui.configitems('ui'):   if name == 'ignore' or name.startswith('ignore.'):   ignorefiles.append(os.path.expanduser(value))     filecombo = QComboBox()   hbox.addWidget(filecombo)   for f in ignorefiles:   filecombo.addItem(hglib.tounicode(f))   filecombo.currentIndexChanged.connect(self.fileselect)   self.ignorefile = ignorefiles[0]     edit = QPushButton(_('Edit File'))   edit.clicked.connect(self.editClicked)   hbox.addWidget(edit)   hbox.addStretch(1)     # layer 3 - main widgets   split = QSplitter()   vbox.addWidget(split, 1)     ignoregb = QFrame()   ignoregb.setFrameStyle(QFrame.Panel|QFrame.Raised)   ivbox = QVBoxLayout()   ignoregb.setLayout(ivbox)   lbl = QLabel(_('<b>Ignore Filter</b>'))   ivbox.addWidget(lbl)   split.addWidget(ignoregb)     unknowngb = QFrame()   unknowngb.setFrameStyle(QFrame.Panel|QFrame.Raised)   uvbox = QVBoxLayout()   unknowngb.setLayout(uvbox)   lbl = QLabel(_('<b>Untracked Files</b>'))   uvbox.addWidget(lbl)   split.addWidget(unknowngb)     ignorelist = QListWidget()   ivbox.addWidget(ignorelist)   unknownlist = QListWidget()   uvbox.addWidget(unknownlist)   unknownlist.currentTextChanged.connect(self.setGlobFilter)   unknownlist.setContextMenuPolicy(Qt.CustomContextMenu)   unknownlist.customContextMenuRequested.connect(self.menuRequest)   lbl = QLabel(_('Backspace or Del to remove a row'))   ivbox.addWidget(lbl)     # layer 4 - dialog buttons   BB = QDialogButtonBox   bb = QDialogButtonBox(BB.Close)   bb.accepted.connect(self.accept)   bb.rejected.connect(self.reject)   vbox.addWidget(bb)   self.bb = bb     le.setFocus()   self.le, self.recombo, self.filecombo = le, recombo, filecombo   self.ignorelist, self.unknownlist = ignorelist, unknownlist   ignorelist.installEventFilter(self)   QTimer.singleShot(0, self.refresh)     s = QSettings()   self.restoreGeometry(s.value('hgignore/geom').toByteArray())     def eventFilter(self, obj, event):   if obj != self.ignorelist:   return False   if event.type() != QEvent.KeyPress:   return False   elif event.key() not in (Qt.Key_Backspace, Qt.Key_Delete):   return False   row = obj.currentRow()   if row < 0:   return False   self.ignorelines.pop(row)   self.writeIgnoreFile()   self.refresh()   return True     def menuRequest(self, point):   'context menu request for unknown list'   point = self.unknownlist.mapToGlobal(point)   row = self.unknownlist.currentRow()   if row < 0:   return   local = self.lclunknowns[row]   if not self.contextmenu:   self.contextmenu = QMenu(self)   self.contextmenu.setTitle(_('Add ignore filter...'))   else:   self.contextmenu.clear()   filters = [local]   base, ext = os.path.splitext(local)   if ext:   filters.append('*'+ext)   dirname = os.path.dirname(local)   while dirname:   filters.append(dirname)   dirname = os.path.dirname(dirname)   for f in filters:   a = self.contextmenu.addAction(_('Ignore ') + hglib.tounicode(f))   a._pattern = f   a.triggered.connect(self.insertFilter)   self.contextmenu.exec_(point)     def insertFilter(self, pat=False, isregexp=False):   if pat is False:   pat = self.sender()._pattern   h = isregexp and 'syntax: regexp' or 'syntax: glob'   if h in self.ignorelines:   l = self.ignorelines.index(h)   for i, line in enumerate(self.ignorelines[l+1:]):   if line.startswith('syntax:'):   self.ignorelines.insert(l+i+1, pat)   break   else:   self.ignorelines.append(pat)   else:   self.ignorelines.append(h)   self.ignorelines.append(pat)   self.writeIgnoreFile()   self.refresh()     def setGlobFilter(self, qstr):   'user selected an unknown file; prep a glob filter'   self.recombo.setCurrentIndex(0)   self.le.setText(qstr)     def fileselect(self):   'user selected another ignore file'   self.ignorefile = hglib.fromunicode(self.filecombo.currentText())   self.refresh()     def editClicked(self):   if qscilib.fileEditor(self.ignorefile) == QDialog.Accepted:   self.refresh()     def addEntry(self):   newfilter = hglib.fromunicode(self.le.text()).strip()   if newfilter == '':   return   if self.recombo.currentIndex() == 0:   test = 'glob:' + newfilter   try:   match.match(self.repo.root, '', [], [test])   self.insertFilter(newfilter, False)   except util.Abort, inst:   qtlib.WarningMsgBox(_('Invalid glob expression'), str(inst),   parent=self)   return   else:   test = 'relre:' + newfilter   try:   match.match(self.repo.root, '', [], [test])   re.compile(test)   self.insertFilter(newfilter, True)   except (util.Abort, re.error), inst:   qtlib.WarningMsgBox(_('Invalid regexp expression'), str(inst),   parent=self)   return   self.le.clear()     def refresh(self):   try:   l = open(self.ignorefile, 'rb').readlines()   self.doseoln = l[0].endswith('\r\n')   except (IOError, ValueError, IndexError):   self.doseoln = os.name == 'nt'   l = []   self.ignorelines = [line.strip() for line in l]   self.ignorelist.clear() + + uni = hglib.tounicode +   self.ignorelist.addItems([uni(l) for l in self.ignorelines])   - uni = hglib.tounicode   try:   self.repo.thginvalidate()   wctx = self.repo[None]   wctx.status(unknown=True)   except (EnvironmentError, error.RepoError), e:   qtlib.WarningMsgBox(_('Unable to read repository status'),   uni(str(e)), parent=self)   except util.Abort, e:   if e.hint:   err = _('%s (hint: %s)') % (uni(str(e)), uni(e.hint))   else:   err = uni(str(e))   qtlib.WarningMsgBox(_('Unable to read repository status'),   err, parent=self)   self.lclunknowns = []   return     self.lclunknowns = wctx.unknown()   self.unknownlist.clear()   self.unknownlist.addItems([uni(u) for u in self.lclunknowns])   for i, u in enumerate(self.lclunknowns):   if u in self.pats:   item = self.unknownlist.item(i)   self.unknownlist.setItemSelected(item, True)   self.unknownlist.setCurrentItem(item)   # single selection only   break     def writeIgnoreFile(self):   eol = self.doseoln and '\r\n' or '\n'   out = eol.join(self.ignorelines) + eol     try:   f = util.atomictempfile(self.ignorefile, 'wb', createmode=None)   f.write(out)   f.rename()   shlib.shell_notify([self.ignorefile])   self.ignoreFilterUpdated.emit()   except EnvironmentError, e:   qtlib.WarningMsgBox(_('Unable to write .hgignore file'),   hglib.tounicode(str(e)), parent=self)     def accept(self):   s = QSettings()   s.setValue('hgignore/geom', self.saveGeometry())   QDialog.accept(self)     def reject(self):   s = QSettings()   s.setValue('hgignore/geom', self.saveGeometry())   QDialog.reject(self)    def run(_ui, *pats, **opts):   from tortoisehg.util import paths   from tortoisehg.hgqt import thgrepo   repo = thgrepo.repository(_ui, path=paths.find_root())   if pats and pats[0].endswith('.hgignore'):   pats = []   return HgignoreDialog(repo, None, *pats)