Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

serve: initial port of web server functionality to PyQt

This utilizes cmdui than implementing original thread.

Changeset 45b4be294429…

Parent c44381498274…

by Yuya Nishihara

Changes to 3 files · Browse files at 45b4be294429 Showing diff from parent c44381498274 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​run.py Stacked
 
413
414
415
 
 
 
 
 
416
417
418
 
723
724
725
 
726
727
728
 
413
414
415
416
417
418
419
420
421
422
423
 
728
729
730
731
732
733
734
@@ -413,6 +413,11 @@
  from tortoisehg.hgqt.hgignore import run   qtrun(run, ui, *pats, **opts)   +def serve(ui, *pats, **opts): + """start stand-alone webserver""" + from tortoisehg.hgqt.serve import run + qtrun(run, ui, *pats, **opts) +  def shellconfig(ui, *pats, **opts):   """explorer extension configuration editor"""   from tortoisehg.hgqt.shellconf import run @@ -723,6 +728,7 @@
  "remove|rm": (remove, [], _('thg remove [FILE]...')),   "revert": (revert, [], _('thg revert [FILE]...')),   "forget": (forget, [], _('thg forget [FILE]...')), + "^serve": (serve, [], _('thg serve [OPTION]')),   "^status": (status,   [('c', 'clean', False, _('show files without changes')),   ('i', 'ignored', False, _('show ignored files'))],
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​serve.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
@@ -0,0 +1,174 @@
+# serve.py - TortoiseHg dialog to start web server +# +# Copyright 2010 Yuya Nishihara <yuya@tcha.org> +# +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. + +import sys, os, httplib, socket +from PyQt4.QtCore import Qt, pyqtSlot +from PyQt4.QtGui import QDialog +from mercurial import extensions, hgweb +from tortoisehg.hgqt import cmdui, qtlib +from tortoisehg.hgqt.i18n import _ + +try: + from tortoisehg.hgqt.ui_serve import Ui_ServeDialog +except ImportError: + from PyQt4 import uic + Ui_ServeDialog = uic.loadUiType(os.path.join(os.path.dirname(__file__), + 'serve.ui'))[0] + +class ServeDialog(QDialog): + """Dialog for serving repositories via web""" + def __init__(self, parent=None): + super(ServeDialog, self).__init__(parent) + self.setWindowFlags((self.windowFlags() | Qt.WindowMinimizeButtonHint) + & ~Qt.WindowContextHelpButtonHint) + # TODO: choose appropriate icon + self.setWindowIcon(qtlib.geticon('proxy')) + + self._qui = Ui_ServeDialog() + self._qui.setupUi(self) + + self._initcmd() + self._initactions() + # TODO: webconf tab (multi-repo support) + self._updateform() + + def _initcmd(self): + self._cmd = cmdui.Widget() + # TODO: forget old logs? + self._log_edit = self._cmd.core.output_text + self._qui.details_tabs.addTab(self._log_edit, _('Log')) + self._cmd.hide() + self._cmd.commandStarted.connect(self._updateform) + self._cmd.commandFinished.connect(self._updateform) + + def _initactions(self): + self._qui.start_button.clicked.connect(self.start) + self._qui.stop_button.clicked.connect(self.stop) + + @pyqtSlot() + def _updateform(self): + """update form availability and status text""" + self._updatestatus() + self._qui.start_button.setEnabled(not self.isstarted()) + self._qui.stop_button.setEnabled(self.isstarted()) + self._qui.settings_button.setEnabled(not self.isstarted()) + self._qui.port_edit.setEnabled(not self.isstarted()) + + def _updatestatus(self): + def statustext(): + if self.isstarted(): + # TODO: escape special chars + link = '<a href="%s">%s</a>' % (self.rooturl, self.rooturl) + return _('Running at %s') % link + else: + return _('Stopped') + + self._qui.status_edit.setText(statustext()) + + @pyqtSlot() + def start(self): + """Start web server""" + if self.isstarted(): + return + + _setupwrapper() + self._cmd.run(['serve', '--port', str(self.port)]) + + @pyqtSlot() + def stop(self): + """Stop web server""" + if not self.isstarted(): + return + + self._cmd.cancel() + self._fake_request() + # TODO: sometimes it doesn't release the port + + def _fake_request(self): + """Send fake request for server to run python code""" + TIMEOUT = 0.5 # [sec] + conn = httplib.HTTPConnection('localhost:%d' % self.port) + origtimeout = socket.getdefaulttimeout() + socket.setdefaulttimeout(TIMEOUT) + try: + conn.request('GET', '/') + res = conn.getresponse() + res.read() + except (socket.error, httplib.HTTPException): + pass + finally: + socket.setdefaulttimeout(origtimeout) + conn.close() + + def reject(self): + self.stop() + super(ServeDialog, self).reject() + + def isstarted(self): + """Is the web server running?""" + return self._cmd.core.is_running() + + @property + def rooturl(self): + """Returns the root URL of the web server""" + # TODO: scheme, hostname ? + return 'http://localhost:%d' % self.port + + @property + def port(self): + """Port number of the web server""" + return int(self._qui.port_edit.value()) + + def keyPressEvent(self, event): + if self.isstarted() and event.key() == Qt.Key_Escape: + self.stop() + return + + return super(ServeDialog, self).keyPressEvent(event) + + @pyqtSlot() + def on_settings_button_clicked(self): + from tortoisehg.hgqt import settings + settings.SettingsDialog(parent=self, focus='web.name').exec_() + +def _create_server(orig, ui, app): + """wrapper for hgweb.server.create_server to be interruptable""" + server = orig(ui, app) + server.accesslog = ui + server.errorlog = ui # TODO: ui.warn + server._serving = False + + def serve_forever(orig): + server._serving = True + while server._serving: + server.handle_request() + + def handle_error(orig, request, client_address): + type = sys.exc_info()[0] + if issubclass(type, KeyboardInterrupt): + server._serving = False + else: + orig(request, client_address) + + extensions.wrapfunction(server, 'serve_forever', serve_forever) + extensions.wrapfunction(server, 'handle_error', handle_error) + return server + +_setupwrapper_done = False +def _setupwrapper(): + """Wrap hgweb.server.create_server to get along with thg""" + global _setupwrapper_done + if not _setupwrapper_done: + extensions.wrapfunction(hgweb.server, 'create_server', + _create_server) + _setupwrapper_done = True + +def run(ui, *pats, **opts): + # TODO: handle --web-conf + dlg = ServeDialog() + dlg.start() + return dlg
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​serve.ui 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
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ServeDialog</class> + <widget class="QDialog" name="ServeDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>500</width> + <height>400</height> + </rect> + </property> + <property name="windowTitle"> + <string>Serve</string> + </property> + <layout class="QVBoxLayout" name="dialog_layout" stretch="0,1"> + <item> + <layout class="QHBoxLayout" name="top_layout" stretch="1,0"> + <item> + <layout class="QFormLayout" name="opts_layout"> + <property name="fieldGrowthPolicy"> + <enum>QFormLayout::FieldsStayAtSizeHint</enum> + </property> + <item row="0" column="0"> + <widget class="QLabel" name="port_label"> + <property name="text"> + <string>Port:</string> + </property> + <property name="buddy"> + <cstring>port_edit</cstring> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="port_edit"> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>65535</number> + </property> + <property name="value"> + <number>8000</number> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="status_label"> + <property name="text"> + <string>Status:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="status_edit"> + <property name="text"> + <string/> + </property> + <property name="textFormat"> + <enum>Qt::RichText</enum> + </property> + <property name="openExternalLinks"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QVBoxLayout" name="actions_layout"> + <item> + <widget class="QPushButton" name="start_button"> + <property name="text"> + <string>Start</string> + </property> + <property name="default"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="stop_button"> + <property name="text"> + <string>Stop</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <spacer name="actions_spacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>5</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="settings_button"> + <property name="text"> + <string>Settings</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </item> + <item> + <widget class="QTabWidget" name="details_tabs"> + <property name="currentIndex"> + <number>-1</number> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>port_edit</tabstop> + <tabstop>start_button</tabstop> + <tabstop>stop_button</tabstop> + <tabstop>settings_button</tabstop> + <tabstop>details_tabs</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>