Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.1, 2.0.2, and 2.0.3

hgtk hgignore: catch common errors from repo.status() (closes #1767)

Changeset bc0ba038de2e

Parent 33424a62adf9

by Steve Borho

Changes to one file · Browse files at bc0ba038de2e Showing diff from parent 33424a62adf9 Diff from another changeset...

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
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
 # hgignore.py - TortoiseHg's dialog for editing .hgignore  #  # Copyright 2008 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  import re    from mercurial import hg, ui, match, util, error    from tortoisehg.util.i18n import _  from tortoisehg.util import shlib, hglib, paths    from tortoisehg.hgtk import gtklib, gdialog, dialog    class HgIgnoreDialog(gtk.Window):   'Edit a reposiory .hgignore file'   def __init__(self, fileglob='', *pats):   'Initialize the Dialog'   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   gtklib.set_tortoise_icon(self, 'ignore.ico')   gtklib.set_tortoise_keys(self)   self.set_default_size(630, 400)     try:   repo = hg.repository(ui.ui(), path=paths.find_root())   except error.RepoError:   gtklib.idle_add_single_call(self.destroy)   return   self.repo = repo   self.set_title(_('Ignore filter - %s') % hglib.get_reponame(repo))   self.notify_func = None     # vbox for dialog main   mainvbox = gtk.VBox()   self.add(mainvbox)   mainvbox.set_border_width(2)     ## layout table for top   table = gtklib.LayoutTable()   mainvbox.pack_start(table, False, False)     ### hbox for glob entry   self.glob_entry = gtk.Entry()   self.glob_entry.set_text(hglib.toutf(fileglob))   self.glob_entry.connect('activate', self.add_glob)   glob_button = gtk.Button(_('Add'))   glob_button.connect('clicked', self.add_glob)   table.add_row(_('Glob:'), self.glob_entry, 0,   glob_button, expand=0)     ### hbox for regexp entry   self.regexp_entry = gtk.Entry()   self.regexp_entry.connect('activate', self.add_regexp)   regexp_button = gtk.Button(_('Add'))   regexp_button.connect('clicked', self.add_regexp)   table.add_row(_('Regexp:'), self.regexp_entry, 0,   regexp_button, expand=0)     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))     ### ignore file combo if needs   if len(ignorefiles) > 1:   # file selector   combo = gtk.combo_box_new_text()   for f in ignorefiles:   combo.append_text(hglib.toutf(f))   combo.set_active(0)   combo.connect('changed', self.file_selected)   # edit button   edit = gtk.Button(_('Edit File'))   edit.connect('clicked', self.edit_clicked)   table.add_row(_('Apply to:'), combo, 0, edit,   padding=False, expand=0)   self.ignorefile = ignorefiles[0]     ## hbox for filter & unknown list   hbox = gtk.HBox()   mainvbox.pack_start(hbox, True, True)     ### frame for filter list & button   frame = gtk.Frame(_('Filters'))   hbox.pack_start(frame, True, True, 4)   vbox = gtk.VBox()   frame.add(vbox)   vbox.set_border_width(2)     #### filter list   scrolledwindow = gtk.ScrolledWindow()   vbox.pack_start(scrolledwindow, True, True, 2)   scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)   scrolledwindow.set_border_width(4)   pattree = gtk.TreeView()   scrolledwindow.add(pattree)   pattree.set_enable_search(False)   pattree.set_reorderable(False)   pattree.get_selection().set_mode(gtk.SELECTION_SINGLE)   col = gtk.TreeViewColumn(_('Patterns'), gtk.CellRendererText(), text=0)   pattree.append_column(col)   pattree.set_headers_visible(False)   self.pattree = pattree     #### remove button   bhbox = gtk.HBox()   vbox.pack_start(bhbox, False, False, 2)   self.removebtn = gtk.Button(_('Remove Selected'))   bhbox.pack_start(self.removebtn, False, False, 2)   self.removebtn.connect('clicked', self.remove_clicked)   self.removebtn.set_sensitive(False)     ### frame for unknown file list & button   frame = gtk.Frame(_('Unknown Files'))   hbox.pack_start(frame, True, True, 4)   vbox = gtk.VBox()   frame.add(vbox)   vbox.set_border_width(2)     #### unknown file list   scrolledwindow = gtk.ScrolledWindow()   vbox.pack_start(scrolledwindow, True, True, 2)   scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)   scrolledwindow.set_border_width(4)   unktree = gtk.TreeView()   scrolledwindow.add(unktree)   unktree.set_search_equal_func(self.unknown_search)   col = gtk.TreeViewColumn(_('Files'), gtk.CellRendererText(), text=0)   unktree.append_column(col)   model = gtk.ListStore(str, str)   unktree.set_model(model)   unktree.set_headers_visible(False)   self.unkmodel = model     #### refresh button   bhbox = gtk.HBox()   vbox.pack_start(bhbox, False, False, 2)   refresh = gtk.Button(_('Refresh'))   bhbox.pack_start(refresh, False, False, 2)   refresh.connect('pressed', lambda b: self.refresh())   self.connect('thg-refresh', lambda w: self.refresh())     # register signal handlers   pattree.get_selection().connect('changed', self.pattree_rowchanged)   unktree.get_selection().connect('changed', self.unknown_rowchanged)     # prepare to show   self.glob_entry.grab_focus()   gtklib.idle_add_single_call(self.refresh)     def file_selected(self, combo):   'select another ignore file'   self.ignorefile = hglib.fromutf(combo.get_active_text())   self.refresh()     def edit_clicked(self, button):   gtklib.open_with_editor(self.repo.ui, self.ignorefile, self)     def unknown_search(self, model, column, key, iter):   'case insensitive filename search'   key = key.lower()   if key in model.get_value(iter, 0).lower():   return False   return True     def remove_clicked(self, button):   sel = self.pattree.get_selection()   model, rows = sel.get_selected_rows()   del model[rows[0]]   del self.ignorelines[rows[0][0]]   self.write_ignore_lines()   self.refresh()     def pattree_rowchanged(self, sel):   model, ppaths = sel.get_selected()   sensitive = ppaths and True or False   self.removebtn.set_sensitive(sensitive)     def unknown_rowchanged(self, sel):   model, upaths = sel.get_selected()   if not upaths:   return   self.glob_entry.set_text(model[upaths][0])     def add_glob(self, widget):   newglob = hglib.fromutf(self.glob_entry.get_text())   if newglob == '':   return   newglob = 'glob:' + newglob   try:   match.match(self.repo.root, '', [], [newglob])   except util.Abort, inst:   gdialog.Prompt(_('Invalid glob expression'), str(inst),   self).run()   return   self.ignorelines.append(newglob)   self.write_ignore_lines()   self.glob_entry.set_text('')   self.refresh()     def add_regexp(self, widget):   newregexp = hglib.fromutf(self.regexp_entry.get_text())   if newregexp == '':   return   try:   match.match(self.repo.root, '', [], ['relre:' + newregexp])   re.compile(newregexp)   except (util.Abort, re.error), inst:   gdialog.Prompt(_('Invalid regexp expression'), str(inst),   self).run()   return   self.ignorelines.append('relre:' + newregexp)   self.write_ignore_lines()   self.regexp_entry.set_text('')   self.refresh()     def set_notify_func(self, func):   self.notify_func = func     def refresh(self):   hglib.invalidaterepo(self.repo)   matcher = match.always(self.repo.root, self.repo.root) - unknown = self.repo.status(match=matcher, unknown=True)[4] + try: + unknown = self.repo.status(match=matcher, unknown=True)[4] + except (EnvironmentError, util.Abort), inst: + gdialog.Prompt(_('Error while reading status'), + hglib.toutf(str(inst)), self).run() + return   self.unkmodel.clear()   for u in unknown:   self.unkmodel.append([hglib.toutf(u), u])   try:   l = open(self.ignorefile, 'rb').readlines()   self.doseoln = l[0].endswith('\r\n')   except (IOError, ValueError, IndexError):   self.doseoln = os.name == 'nt'   l = []     model = gtk.ListStore(str)   self.ignorelines = []   for line in l:   model.append([hglib.toutf(line.strip())])   self.ignorelines.append(line.strip())   self.pattree.set_model(model)     def write_ignore_lines(self):   if self.doseoln:   out = [line + '\r\n' for line in self.ignorelines]   else:   out = [line + '\n' for line in self.ignorelines]   try:   f = util.atomictempfile(self.ignorefile, 'wb',   createmode=None)   f.writelines(out)   f.rename()   except IOError, e:   dialog.error_dialog(self, _('Unable to write .hgignore file'),   hglib.tounicode(str(e)))   shlib.shell_notify([self.ignorefile])   if self.notify_func:   self.notify_func()    def run(_ui, *pats, **opts):   if pats and pats[0].endswith('.hgignore'):   pats = []   return HgIgnoreDialog(*pats)