Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

status: use new hgignore dialog to add new ignore masks

Changeset 47ab9a26d6a0…

Parent b0f04e627847…

by Steve Borho

Changes to 2 files · Browse files at 47ab9a26d6a0 Showing diff from parent b0f04e627847 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​hgignore.py Stacked
 
12
13
14
15
 
16
17
18
 
54
55
56
 
57
58
59
 
12
13
14
 
15
16
17
18
 
54
55
56
57
58
59
60
@@ -12,7 +12,7 @@
   class HgIgnoreDialog(gtk.Window):   """ Edit a reposiory .hgignore file """ - def __init__(self, root=''): + def __init__(self, root='', fileglob=''):   """ Initialize the Dialog """   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   @@ -54,6 +54,7 @@
  hbox.pack_start(glob_button, False, False, 4)   glob_button.connect('clicked', self.add_glob, glob_entry)   glob_entry.connect('activate', self.add_glob, glob_entry) + glob_entry.set_text(fileglob)   self.glob_entry = glob_entry   mainvbox.pack_start(hbox, False, False)  
Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
 
 
 
1076
1077
1078
 
1064
1065
1066
 
 
 
 
 
 
 
 
 
1067
1068
1069
1070
1071
1072
@@ -1064,15 +1064,9 @@
      def _ignore_file(self, stat, file): - ignore = open(self.repo.wjoin('.hgignore'), 'a') - try: - try: - ignore.write('glob:' + util.pconvert(file) + '\n') - except IOError: - Prompt('Ignore Failed', 'Could not update .hgignore', self).run() - finally: - ignore.close() - self.reload_status() + import hgignore + dialog = hgignore.HgIgnoreDialog(self.repo.root, util.pconvert(file)) + dialog.show_all()   return True     def _mark_resolved(self, stat, file):