Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge with crew

Changeset c2d6a90e94e4…

Parents fafbf685a635…

Parents c1232aee254b…

by Adrian Buehlmann

Changes to 10 files · Browse files at c2d6a90e94e4 Showing diff from parent fafbf685a635 c1232aee254b Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​bugreport.py Stacked
 
44
45
46
47
 
 
48
49
50
 
54
55
56
 
57
58
59
 
44
45
46
 
47
48
49
50
51
 
55
56
57
58
59
60
61
@@ -44,7 +44,8 @@
  close.connect('clicked', gtk.main_quit)   hbbox.add(close)   - text = _('\n** Please report this bug to' + text = '\n{{{\n' # Wrap in Bitbucket wiki preformat markers + text += _('** Please report this bug to'   ' tortoisehg-discuss@lists.sourceforge.net or'   ' http://bitbucket.org/tortoisehg/stable/issues\n')   text += _('** Mercurial version (%s). TortoiseHg version (%s)\n') % ( @@ -54,6 +55,7 @@
  extlist = [x[0] for x in extensions.extensions()]   text += _('** Extensions loaded: %s\n') % ', '.join(extlist)   text += self.opts['error'] + text += '\n}}}\n'   textview.get_buffer().set_text(text)   return vbox  
Change 1 of 2 Show Entire File hggtk/​changeset.py Stacked
 
489
490
491
492
 
493
494
495
 
505
506
507
508
 
509
510
511
 
489
490
491
 
492
493
494
495
 
505
506
507
 
508
509
510
511
@@ -489,7 +489,7 @@
  def diff_to_local(self, menuitem):   if not self.curfile:   return - self.opts['rev'] = [str(self.currev), '.'] + self.opts['rev'] = [str(self.currev)]   self._diff_file('M', self.curfile)     def diff_file_rev(self, menuitem): @@ -505,7 +505,7 @@
  if not self.curfile:   return   rev = self.currev - parents = self.parents + parents = [x.rev() for x in self.repo[rev].parents()]   if len(parents) == 0:   parent = rev-1   else:
Change 1 of 2 Show Entire File hggtk/​gtklib.py Stacked
 
186
187
188
189
 
190
191
192
193
194
195
 
196
197
198
 
205
206
207
208
 
209
210
211
 
186
187
188
 
189
190
191
192
193
194
 
195
196
197
198
 
205
206
207
 
208
209
210
211
@@ -186,13 +186,13 @@
  """run the file dialog, either return a file name, or False if   the user aborted the dialog"""   try: - import win32gui, win32con + import win32gui, win32con, pywintypes   return self.runWindows()   except ImportError:   return self.runCompatible()     def runWindows(self): - import win32gui, win32con + import win32gui, win32con, pywintypes   try:   fname, customfilter, flags=win32gui.GetSaveFileNameW(   InitialDir=self.InitialDir, @@ -205,7 +205,7 @@
  FilterIndex=1)   if fname:   return fname - except: + except pywintypes.error:   pass   return False  
Change 1 of 1 Show Entire File hggtk/​history.py Stacked
 
560
561
562
563
 
564
565
566
 
560
561
562
 
563
564
565
566
@@ -560,7 +560,7 @@
    def vdiff_local(self, menuitem, pats=[]):   rev = self.currow[treemodel.REVID] - opts = {'rev' : ["%s:." % rev]} + opts = {'rev' : ["%s" % rev]}   self._do_diff(pats, opts, modal=True)     def diff_revs(self, menuitem):
Change 1 of 1 Show Changes Only hggtk/​recovery.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
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
 #  # Repository recovery dialog for TortoiseHg  #  # Copyright (C) 2007 Steve Borho <steve@borho.org>  # Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>  #    import gtk  import gobject  import pango  import Queue  import os  import time    from mercurial import hg, ui    from thgutil.i18n import _  from thgutil import hglib, shlib, paths    from hggtk import gdialog, dialog, gtklib, hgthread    class RecoveryDialog(gtk.Window):   def __init__(self):   """ Initialize the Dialog. """   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   gtklib.set_tortoise_icon(self, 'general.ico')   gtklib.set_tortoise_keys(self)     self.root = paths.find_root()   self.selected_path = None   self.hgthread = None   self.connect('delete-event', self._delete)     self.set_default_size(600, 400)     name = os.path.basename(os.path.abspath(self.root))   self.set_title(_('TortoiseHg Recovery - ') + name)     # toolbar   self.tbar = gtk.Toolbar()   self.tips = gtk.Tooltips()   self._stop_button = self._toolbutton(gtk.STOCK_STOP,   _('Stop'), self._stop_clicked, tip=_('Stop the hg operation'))   self._stop_button.set_sensitive(False)   tbuttons = [   self._toolbutton(gtk.STOCK_CLEAR,   _('clean'),   self._clean_clicked,   tip=_('Clean checkout, undo all changes')),   gtk.SeparatorToolItem(),   self._toolbutton(gtk.STOCK_UNDO,   _('rollback'),   self._rollback_clicked,   tip=_('Rollback (undo) last transaction to'   ' repository (pull, commit, etc)')),   gtk.SeparatorToolItem(),   self._toolbutton(gtk.STOCK_CLEAR,   _('recover'),   self._recover_clicked,   tip=_('Recover from interrupted operation')),   gtk.SeparatorToolItem(),   self._toolbutton(gtk.STOCK_APPLY,   _('verify'),   self._verify_clicked,   tip=_('Validate repository consistency')),   gtk.SeparatorToolItem(),   self._stop_button,   gtk.SeparatorToolItem(),   ]   for btn in tbuttons:   self.tbar.insert(btn, -1)   vbox = gtk.VBox()   self.add(vbox)   vbox.pack_start(self.tbar, False, False, 2)     # hg output window   scrolledwindow = gtk.ScrolledWindow()   scrolledwindow.set_shadow_type(gtk.SHADOW_ETCHED_IN)   scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)   self.textview = gtk.TextView(buffer=None)   self.textview.set_editable(False)   self.textview.modify_font(pango.FontDescription('Monospace'))   scrolledwindow.add(self.textview) - self.textview.set_editable(False)   self.textbuffer = self.textview.get_buffer()   self.textbuffer.create_tag('error', weight=pango.WEIGHT_HEAVY,   foreground='#900000')   vbox.pack_start(scrolledwindow, True, True)     self.stbar = gtklib.StatusBar()   vbox.pack_start(self.stbar, False, False, 2)     def _delete(self, widget, event):   if not self.should_live():   self.destroy()   return True     def should_live(self):   if self._cmd_running():   dialog.error_dialog(self, _('Cannot close now'),   _('command is running'))   return True   return False     def _toolbutton(self, stock, label, handler,   menu=None, userdata=None, tip=None):   if menu:   tbutton = gtk.MenuToolButton(stock)   tbutton.set_menu(menu)   else:   tbutton = gtk.ToolButton(stock)     tbutton.set_label(label)   if tip:   tbutton.set_tooltip(self.tips, tip)   tbutton.connect('clicked', handler, userdata)   return tbutton     def _clean_clicked(self, toolbutton, data=None):   response = gdialog.Confirm(_('Confirm clean repository'), [], self,   "%s ?" % os.path.basename(self.root)).run()   if response != gtk.RESPONSE_YES:   return   try:   repo = hg.repository(ui.ui(), path=self.root)   except hglib.RepoError:   self.write(_('Unable to find repo at %s\n') % (self.root), False)   return   pl = repo.parents()   cmd = ['update', '--clean', '--rev', str(pl[0].rev())]   self._exec_cmd(cmd, postfunc=self._notify)     def _notify(self, ret, *args):   time.sleep(0.5) # give fs some time to pick up changes   shlib.shell_notify([self.root])     def _rollback_clicked(self, toolbutton, data=None):   response = gdialog.Confirm(_('Confirm rollback repository'), [], self,   "%s ?" % os.path.basename(self.root)).run()   if response != gtk.RESPONSE_YES:   return   cmd = ['rollback']   self._exec_cmd(cmd, postfunc=self._notify)     def _recover_clicked(self, toolbutton, data=None):   cmd = ['recover']   self._exec_cmd(cmd)     def _verify_clicked(self, toolbutton, data=None):   cmd = ['verify']   self._exec_cmd(cmd)     def _stop_clicked(self, toolbutton, data=None):   if self.hgthread and self.hgthread.isAlive():   self.hgthread.terminate()   self._stop_button.set_sensitive(False)     def _exec_cmd(self, cmd, postfunc=None):   if self._cmd_running():   dialog.error_dialog(self, _('Cannot run now'),   _('Please try again after the previous command is completed'))   return     self._stop_button.set_sensitive(True)   cmdline = cmd   cmdline.append('--verbose')   cmdline.append('--repository')   cmdline.append(self.root)     # show command to be executed   self.write("", False)     # execute command and show output on text widget   gobject.timeout_add(10, self.process_queue)   self.hgthread = hgthread.HgThread(cmdline, postfunc)   self.hgthread.start()   self.stbar.begin()   self.stbar.set_status_text('hg ' + ' '.join(cmdline))     def _cmd_running(self):   if self.hgthread and self.hgthread.isAlive():   return True   else:   return False     def write(self, msg, append=True):   msg = hglib.toutf(msg)   if append:   enditer = self.textbuffer.get_end_iter()   self.textbuffer.insert(enditer, msg)   else:   self.textbuffer.set_text(msg)     def write_err(self, msg):   enditer = self.textbuffer.get_end_iter()   self.textbuffer.insert_with_tags_by_name(enditer, msg, 'error')   self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0)     def process_queue(self):   """   Handle all the messages currently in the queue (if any).   """   self.hgthread.process_dialogs()   while self.hgthread.getqueue().qsize():   try:   msg = self.hgthread.getqueue().get(0)   self.write(msg)   except Queue.Empty:   pass   while self.hgthread.geterrqueue().qsize():   try:   msg = self.hgthread.geterrqueue().get(0)   self.write_err(msg)   except Queue.Empty:   pass     if self._cmd_running():   return True   else:   self.stbar.end()   self._stop_button.set_sensitive(False)   if self.hgthread.return_code() is None:   self.write_err(_('[command interrupted]'))   return False # Stop polling this function    def run(ui, *pats, **opts):   return RecoveryDialog()
Change 1 of 3 Show Entire File hggtk/​serve.py Stacked
 
103
104
105
106
107
108
109
 
211
212
213
 
 
 
 
 
 
214
215
216
 
229
230
231
232
 
 
233
234
235
 
236
 
 
 
 
 
237
238
239
 
103
104
105
 
106
107
108
 
210
211
212
213
214
215
216
217
218
219
220
221
 
234
235
236
 
237
238
239
240
 
241
242
243
244
245
246
247
248
249
250
@@ -103,7 +103,6 @@
  self.textview.set_editable(False)   self.textview.modify_font(pango.FontDescription('Monospace'))   scrolledwindow.add(self.textview) - self.textview.set_editable(False)   self.textbuffer = self.textview.get_buffer()   vbox.pack_start(scrolledwindow, True, True)   self._set_button_states() @@ -211,6 +210,12 @@
  self._get_config()     def _start_server(self): + def threadfunc(path, q, *args): + try: + hglib.hgcmd_toq(path, q, *args) + except util.Abort, e: + self._write(_('Abort: %s\n') % str(e)) +   # gather input data   try:   port = int(self._port_input.get_text()) @@ -229,11 +234,17 @@
  else:   args.append('--name')   args.append(self.webname) - thread = threading.Thread(target=hglib.hgcmd_toq, args=args) + + thread = threading.Thread(target=threadfunc, args=args)   thread.start()   - while not gservice or not hasattr(gservice, 'httpd'): + while True:   time.sleep(0.1) + if gservice and hasattr(gservice, 'httpd'): + break + if not thread.isAlive(): + return +   # gservice.httpd.fqaddr turned out to be unreliable, so use   # loopback addr directly   self._url = 'http://127.0.0.1:%d/' % (port)
Change 1 of 1 Show Entire File hggtk/​synch.py Stacked
 
226
227
228
229
230
231
232
 
226
227
228
 
229
230
231
@@ -226,7 +226,6 @@
  self.textview.set_editable(False)   self.textview.modify_font(pango.FontDescription('Monospace'))   scrolledwindow.add(self.textview) - self.textview.set_editable(False)   self.textview.connect('populate-popup', self.add_to_popup)   self.textbuffer = self.textview.get_buffer()   self.textbuffer.create_tag('error', weight=pango.WEIGHT_HEAVY,
Change 1 of 1 Show Entire File hggtk/​thgshelve.py Stacked
 
155
156
157
158
 
159
160
161
 
155
156
157
 
158
159
160
161
@@ -155,7 +155,7 @@
  def filter_patch(ui, chunks):   accepted = []   for chunk in chunks: - file = util.pconvert(chunk.files()[0]) + file = util.pconvert(chunk.filename())   if file not in wfiles:   # file was not selected for inclusion   continue
Change 1 of 1 Show Entire File thgutil/​settings.py Stacked
 
94
95
96
97
 
 
 
 
98
99
100
 
94
95
96
 
97
98
99
100
101
102
103
@@ -94,7 +94,10 @@
  s = cPickle.dumps(data)   f = util.atomictempfile(appname, 'wb', None)   f.write(s) - f.rename() + try: + f.rename() + except WindowsError: + pass # silently ignore these errors     def _get_path(self, appname):   if os.name == 'nt':
Change 1 of 3 Show Entire File win32/​shellext/​ContextMenu.cpp Stacked
 
71
72
73
 
 
 
74
75
76
 
82
83
84
85
 
86
87
88
89
90
91
 
92
93
94
 
97
98
99
100
 
101
102
103
 
71
72
73
74
75
76
77
78
79
 
85
86
87
 
88
89
90
91
92
93
 
94
95
96
97
 
100
101
102
 
103
104
105
106
@@ -71,6 +71,9 @@
  {"datamine", "Annotate Files",   "Show changeset information per file line",   "menublame.ico", 0}, + {"vdiff", "Visual Diff", + "View changes using GUI diff tool", + "TortoiseMerge.ico", 0},     /* Add new items here */   @@ -82,13 +85,13 @@
 enum menuDescListEntries {   Commit, Init, Clone, Status, Shelve, Add, Revert, Remove, Rename,   Log, Synch, Serve, Update, Recover, Thgstatus, Userconf, Repoconf, - About, Datamine, + About, Datamine, VDiff,   /* Add new items here */   Separator, EndOfList  };    menuDescListEntries RepoNoFilesMenu[] = { - Commit, Status, Shelve, Separator, + Commit, Status, Shelve, VDiff, Separator,   Log, Separator,   Update, Separator,   Synch, Clone, Recover, Serve, Thgstatus, Separator, @@ -97,7 +100,7 @@
 };    menuDescListEntries RepoFilesMenu[] = { - Commit, Status, Add, Revert, Rename, Remove, Separator, + Commit, Status, VDiff, Add, Revert, Rename, Remove, Separator,   Log, Datamine, Separator,   About, EndOfList  };