Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

hgignore: add 'repo' as member variable

Changeset fa2b730e3d96…

Parent 4db467fcd3eb…

by Yuki KODAMA

Changes to one file · Browse files at fa2b730e3d96 Showing diff from parent 4db467fcd3eb Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgtk/​hgignore.py Stacked
 
24
25
26
 
27
28
29
 
 
 
 
 
 
 
30
31
32
33
34
 
67
68
69
70
71
72
73
74
 
188
189
190
191
 
192
193
194
195
196
 
197
198
199
200
201
202
203
 
204
205
206
 
208
209
210
211
 
212
213
214
 
223
224
225
226
227
228
229
230
 
 
 
231
232
233
 
246
247
248
249
250
251
252
 
24
25
26
27
28
 
 
29
30
31
32
33
34
35
36
 
37
38
39
 
72
73
74
 
 
75
76
77
 
191
192
193
 
194
195
196
197
198
 
199
200
201
202
203
204
205
 
206
207
208
209
 
211
212
213
 
214
215
216
217
 
226
227
228
 
 
 
 
 
229
230
231
232
233
234
 
247
248
249
 
250
251
252
@@ -24,11 +24,16 @@
  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)   - self.root = paths.find_root() - base = os.path.basename(self.root) + try: + repo = hg.repository(ui.ui(), path=paths.find_root()) + except hglib.RepoError: + gobject.idle_add(self.destroy) + return + self.repo = repo + base = os.path.basename(repo.root)   self.set_title(_('Ignore filter for ') + hglib.toutf(base)) - self.set_default_size(630, 400)   self.notify_func = None     # vbox for dialog main @@ -67,8 +72,6 @@
  regexp_entry.connect('activate', self.add_regexp)   self.regexp_entry = regexp_entry   - try: repo = hg.repository(ui.ui(), path=self.root) - except: self.destroy()   ignorefiles = [repo.wjoin('.hgignore')]   for name, value in repo.ui.configitems('ui'):   if name == 'ignore' or name.startswith('ignore.'): @@ -188,19 +191,19 @@
  self.glob_entry.set_text(model[upaths][0])     def add_glob(self, widget): - newglob = hglib.fromutf(glob_entry.get_text()) + newglob = hglib.fromutf(self.glob_entry.get_text())   if newglob == '':   return   newglob = 'glob:' + newglob   try: - match.match(self.root, '', [], [newglob]) + 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() - glob_entry.set_text('') + self.glob_entry.set_text('')   self.refresh()     def add_regexp(self, widget): @@ -208,7 +211,7 @@
  if newregexp == '':   return   try: - match.match(self.root, '', [], ['relre:' + newregexp]) + match.match(self.repo.root, '', [], ['relre:' + newregexp])   re.compile(newregexp)   except (util.Abort, re.error), inst:   gdialog.Prompt(_('Invalid regexp expression'), str(inst), @@ -223,11 +226,9 @@
  self.notify_func = func     def refresh(self): - try: repo = hg.repository(ui.ui(), path=self.root) - except: self.destroy() - matcher = match.always(repo.root, repo.root) - changes = repo.dirstate.status(matcher, ignored=False, clean=False, - unknown=True) + matcher = match.always(self.repo.root, self.repo.root) + changes = self.repo.dirstate.status(matcher, ignored=False, + clean=False, unknown=True)   (lookup, modified, added, removed,   deleted, unknown, ignored, clean) = changes   self.unkmodel.clear() @@ -246,7 +247,6 @@
  model.append([hglib.toutf(line.strip())])   self.ignorelines.append(line.strip())   self.pattree.set_model(model) - self.repo = repo     def write_ignore_lines(self):   if self.doseoln: