We are currently indexing your data, so search results may be incomplete until we finish.
merge with Adrian
by
Changes to 5 files · Browse files at 467ad3fa71d1 Showing diff from parent 1c9faadf11e3 ab987be207ae Diff from another changeset...
|
|
|
@@ -1,142 +0,0 @@ - #
-# A PyGtk-based Python Trace Collector window
-#
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
-#
-
-import pygtk
-pygtk.require("2.0")
-import gtk
-import gobject
-import pango
-import threading
-import Queue
-import win32trace
-import time
-
-try:
- from hggtk.hglib import toutf
-except ImportError:
- import locale
- _encoding = locale.getpreferredencoding()
- def toutf(s):
- return s.decode(_encoding, 'replace').encode('utf-8')
-
-class TraceLog():
- def __init__(self):
- self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
- self.window.set_title("Python Trace Collector")
-
- # construct window
- self.window.set_default_size(700, 400)
- self.main_area = gtk.VBox()
- self.window.add(self.main_area)
-
- # mimic standard dialog widgets
- self.action_area = gtk.HBox()
- self.main_area.pack_end(self.action_area, False, False, 5)
- sep = gtk.HSeparator()
- self.main_area.pack_end(sep, False, False, 0)
- self.vbox = gtk.VBox()
- self.main_area.pack_end(self.vbox)
-
- # add python trace ouput window
- scrolledwindow = gtk.ScrolledWindow()
- 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.vbox.pack_start(scrolledwindow, True, True)
- self.vbox.show_all()
-
- # add buttons
- self._button_quit = gtk.Button("Quit")
- self._button_quit.connect('clicked', self._on_ok_clicked)
- self.action_area.pack_end(self._button_quit, False, False, 5)
-
- self._button_clear = gtk.Button("Clear")
- self._button_clear.connect('clicked', self._on_clear_clicked)
- self.action_area.pack_end(self._button_clear, False, False, 5)
-
- # add assorted window event handlers
- self.window.connect('map_event', self._on_window_map_event)
- self.window.connect('delete_event', self._on_window_close_clicked)
-
- def _on_ok_clicked(self, button):
- self._stop_read_thread()
- gtk.main_quit()
-
- def _on_clear_clicked(self, button):
- self.write("", False)
-
- def _on_window_close_clicked(self, event, param):
- self._stop_read_thread()
- gtk.main_quit()
-
- def _on_window_map_event(self, event, param):
- self._begin_trace()
-
- def _begin_trace(self):
- self.queue = Queue.Queue()
- win32trace.InitRead()
- self.write("Collecting Python Trace Output...\n")
- gobject.timeout_add(10, self._process_queue)
- self._start_read_thread()
-
- def _start_read_thread(self):
- self._read_trace = True
- self.thread1 = threading.Thread(target=self._do_read_trace)
- self.thread1.start()
-
- def _stop_read_thread(self):
- self._read_trace = False
-
- # wait for worker thread to to fix Unhandled exception in thread
- self.thread1.join()
-
- def _process_queue(self):
- """
- Handle all the messages currently in the queue (if any).
- """
- while self.queue.qsize():
- try:
- msg = self.queue.get(0)
- ts = '[%s] ' % time.strftime('%c')
- for line in msg.splitlines(True):
- self.write(ts + line)
- except Queue.Empty:
- pass
-
- return True
-
- def _do_read_trace(self):
- """
- print buffer collected in win32trace
- """
- while self._read_trace:
- msg = win32trace.read()
- if msg:
- self.queue.put(msg)
-
- def write(self, msg, append=True):
- msg = toutf(msg)
- if append:
- enditer = self.textbuffer.get_end_iter()
- self.textbuffer.insert(enditer, msg)
- else:
- self.textbuffer.set_text(msg)
-
- def main(self):
- self.window.show_all()
- gtk.main()
-
-def run():
- dlg = TraceLog()
- dlg.main()
-
-if __name__ == "__main__":
- run()
-
|
|
@@ -4,17 +4,17 @@ [Setup]
AppCopyright=Copyright 2005-2009 Matt Mackall and others
AppName=TortoiseHg
-AppVerName=TortoiseHg-0.7
+AppVerName=TortoiseHg-0.8
InfoAfterFile=contrib/win32/postinstall.txt
LicenseFile=COPYING.txt
ShowLanguageDialog=yes
-AppPublisher=TK Soh and others
+AppPublisher=Steve Borho and others
AppPublisherURL=http://bitbucket.org/tortoisehg/stable/
AppSupportURL=http://bitbucket.org/tortoisehg/stable/
AppUpdatesURL=http://bitbucket.org/tortoisehg/stable/
AppID=TortoiseHg
AppContact=teekaysoh@gmail.com
-OutputBaseFilename=TortoiseHg-0.7
+OutputBaseFilename=TortoiseHg-0.8
DefaultDirName={pf}\TortoiseHg
SourceDir=..\..
VersionInfoDescription=Mercurial distributed SCM
@@ -36,18 +36,17 @@
[Files]
Source: contrib\mercurial.el; DestDir: {app}/contrib
-Source: contrib\vim\*.*; DestDir: {app}/contrib/Vim
+Source: contrib\vim\*.*; DestDir: {app}/contrib/vim
Source: contrib\zsh_completion; DestDir: {app}/contrib
Source: contrib\hgk; DestDir: {app}/contrib
Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
Source: {app}\Mercurial.ini; DestDir: {app}\backup; Flags: external skipifsourcedoesntexist uninsneveruninstall
Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; AfterInstall: FileExpandString('{app}\Mercurial.ini')
-Source: ..\stable.snap; DestDir: {app}; DestName: ReleaseNotes.txt
+Source: ReleaseNotes.txt; DestDir: {app}; DestName: ReleaseNotes.txt
Source: ..\contrib\*.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete
Source: ..\contrib\TortoiseOverlays\*.*; DestDir: {app}/TortoiseOverlays;
Source: dist\*.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete
Source: dist\*.dll; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete
-Source: dist\*.pyd; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete
Source: dist\library.zip; DestDir: {app}
Source: doc\*.html; DestDir: {app}\docs
Source: icons\*; DestDir: {app}\icons; Flags: ignoreversion recursesubdirs createallsubdirs
@@ -70,7 +69,6 @@Name: {group}\TortoiseHg Web Site; Filename: {app}\TortoiseHg.url
Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url
Name: {group}\Mercurial Command Reference; Filename: {app}\docs\hg.1.html
-Name: {group}\Python Trace Collector; Filename: {app}\tracelog.exe
Name: {group}\Uninstall TortoiseHg; Filename: {uninstallexe}
[Run]
|
||
|
@@ -1,7 +1,7 @@ [py2exe]
excludes=pywin, pywin.dialogs, pywin.dialogs.list, PyQt, PyQt4.QtCode, PyQt4.QtGui
includes=cairo, pango, pangocairo, atk, gobject, dbhash
-packages=email, hgext, hgext.convert, encodings, hggtk, hggtk.vis, hggtk.iniparse, tortoise
+packages=email, hgext, hgext.convert, encodings, hggtk, thgutil
# Disabled for 0.7 release
#dll_excludes=iconv.dll, intl.dll, libatk-1.0-0.dll, libgdk_pixbuf-2.0-0.dll, libgdk-win32-2.0-0.dll, libglib-2.0-0.dll, libgmodule-2.0-0.dll, libgobject-2.0-0.dll, libgthread-2.0-0.dll, libgtk-win32-2.0-0.dll, libpango-1.0-0.dll, libpangowin32-1.0-0.dll, libcairo-2.dll, libglade-2.0-0.dll, libpangocairo-1.0-0.dll, libpangoft2-1.0-0.dll
|
||
|
@@ -92,13 +92,7 @@ except ImportError:
pass
- extra['windows'] = [
- {'script':'contrib/tracelog.py',
- 'icon_resources':[(1, 'icons/tortoise/python.ico')]}
- ]
- extra['com_server'] = ['tortoisehg']
extra['console'] = ['hg', 'hgtk']
-
except ImportError:
pass
@@ -134,14 +128,17 @@ continue
pofile = join(podir, po)
modir = join('locale', po[:-3], 'LC_MESSAGES')
- mofile = join(modir, 'hg.mo')
- cmd = ['msgfmt', '-v', '-o', mofile, pofile]
- if sys.platform != 'sunos5':
- # msgfmt on Solaris does not know about -c
- cmd.append('-c')
- self.mkpath(modir)
- self.make_file([pofile], mofile, spawn, (cmd,))
- self.distribution.data_files.append((join('mercurial', modir),
+ for mf in ('hg.mo', 'tortoisehg.mo'):
+ mofile = join(modir, mf)
+ if not os.path.exist(mofile):
+ continue
+ cmd = ['msgfmt', '-v', '-o', mofile, pofile]
+ if sys.platform != 'sunos5':
+ # msgfmt on Solaris does not know about -c
+ cmd.append('-c')
+ self.mkpath(modir)
+ self.make_file([pofile], mofile, spawn, (cmd,))
+ self.distribution.data_files.append((join('mercurial', modir),
[mofile]))
build.sub_commands.append(('build_mo', None))
@@ -185,8 +182,7 @@ ]
packages = ['mercurial', 'mercurial.hgweb', 'hgext', 'hgext.convert',
- 'hgext.highlight', 'hgext.zeroconf', 'hggtk', 'hggtk.vis',
- 'hggtk.iniparse', 'tortoise']
+ 'hgext.highlight', 'hgext.zeroconf', 'hggtk', 'thgutil']
try:
import msvcrt
|
||
|
@@ -10,5 +10,5 @@ from gettext import gettext as _
import paths
-gettext.bindtextdomain("thg", paths.get_locale_path())
-gettext.textdomain("thg")
+gettext.bindtextdomain("tortoisehg", paths.get_locale_path())
+gettext.textdomain("tortoisehg")
|
||
Add a tag
Loading...