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

add support for forget command

Changeset b0e1975e145a…

Parent 4ec8fe686d32…

by Emmanuel Rosa

Changes to 2 files · Browse files at b0e1975e145a Showing diff from parent 4ec8fe686d32 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​hgtk.py Stacked
 
370
371
372
 
 
 
 
 
373
374
375
 
658
659
660
 
661
662
663
 
370
371
372
373
374
375
376
377
378
379
380
 
663
664
665
666
667
668
669
@@ -370,6 +370,11 @@
  from hggtk.status import run   gtkrun(run, ui, *pats, **opts)   +def forget(ui, *pats, **opts): + """file status viewer in forget mode""" + from hggtk.status import run + gtkrun(run, ui, *pats, **opts) +  def serve(ui, *pats, **opts):   """web server"""   from hggtk.serve import run @@ -658,6 +663,7 @@
  "^remove|rm": (revert, [], _('hgtk remove [FILE]...')),   "^rename|mv": (rename, [], _('hgtk rename SOURCE [DEST]')),   "^revert": (revert, [], _('hgtk revert [FILE]...')), + "^forget": (forget, [], _('hgtk forget [FILE]...')),   "^serve":   (serve,   [('', 'webdir-conf', '', _('name of the webdir config file'))],
Change 1 of 7 Show Entire File hggtk/​status.py Stacked
 
3
4
5
 
6
7
8
 
105
106
107
108
 
 
109
110
111
 
122
123
124
125
 
 
126
127
128
 
212
213
214
 
 
 
215
216
217
 
1095
1096
1097
 
 
 
1098
1099
1100
 
1140
1141
1142
 
 
 
 
 
1143
1144
1145
 
1205
1206
1207
 
 
 
 
 
 
 
 
1208
1209
1210
 
3
4
5
6
7
8
9
 
106
107
108
 
109
110
111
112
113
 
124
125
126
 
127
128
129
130
131
 
215
216
217
218
219
220
221
222
223
 
1101
1102
1103
1104
1105
1106
1107
1108
1109
 
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
 
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
@@ -3,6 +3,7 @@
 # Copyright 2007 Brad Schick, brad at gmail . com  # Copyright 2007 TK Soh <teekaysoh@gmail.com>  # Copyright 2008 Steve Borho <steve@borho.org> +# Copyright 2008 Emmanuel Rosa <goaway1000@gmail.com>  #  # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference. @@ -105,7 +106,8 @@
  (_('edit'), self._view_file),   (_('view other'), self.view_left_file),   (_('_revert'), self.revert_file), - (_('l_og'), self.log_file)), + (_('l_og'), self.log_file), + (_('_forget'), self.forget_file)),   # addrem   ((_('_difference'), self._diff_file),   (_('_view'), self._view_file), @@ -122,7 +124,8 @@
  (_('re_move'), self.remove_file),   (_('re_name'), self.rename_file),   (_('_copy'), self.copy_file), - (_('l_og'), self.log_file)), + (_('l_og'), self.log_file), + (_('_forget'), self.forget_file)),   # ignored   ((_('_view'), self._view_file),   (_('_delete'), self.delete_file)), @@ -212,6 +215,9 @@
  tip=_('move selected files to other directory')),   self.make_toolbutton(gtk.STOCK_DELETE, _('_Remove'),   self.remove_clicked, tip=_('remove')), + self.make_toolbutton(gtk.STOCK_CLEAR, _('_Forget'), + self.forget_clicked, + tip=_('forget file(s) on next commit')),   gtk.SeparatorToolItem()]   return tbuttons   @@ -1095,6 +1101,9 @@
  dlg.display()   return True   + def forget_file(self, stat, wfile): + self.hg_forget([wfile]) + return True     def hg_revert(self, files):   wfiles = [self.repo.wjoin(x) for x in files] @@ -1140,6 +1149,11 @@
  shlib.shell_notify(wfiles)   self.reload_status()   + def hg_forget(self, files): + wfiles = [self.repo.wjoin(x) for x in files] + commands.forget(self.ui, self.repo, *wfiles) + self.reload_status() +   def add_clicked(self, toolbutton, data=None):   add_list = self.relevant_files('?I')   if len(add_list) > 0: @@ -1205,6 +1219,14 @@
  'Note: only clean files can be moved.'), self).run()   return True   + def forget_clicked(self, toolbutton, data=None): + forget_list = self.relevant_files('CM') + if len(forget_list) > 0: + self.hg_forget(forget_list) + else: + gdialog.Prompt(_('Nothing Forgotten'), + _('No clean files selected'), self).run() +   def delete_file(self, stat, wfile):   self.delete_files([wfile])