Kiln » TortoiseHg » TortoiseHg
Clone URL:  
commit.py
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
# commit.py - TortoiseHg's commit widget and standalone dialog # # Copyright 2010 Steve Borho <steve@borho.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 os from mercurial import hg, ui, cmdutil, util from PyQt4.QtCore import * from PyQt4.QtGui import * from tortoisehg.hgqt.i18n import _ from tortoisehg.util import hglib, shlib, paths from tortoisehg.hgqt import qtlib, status, cmdui class CommitWidget(QWidget): '''A widget that encompasses a StatusWidget and commit extras SIGNALS: loadBegin() - for progress bar loadComplete() - for progress bar errorMessage(QString) - for status bar titleTextChanged(QString) - for window title commitComplete(QString) - refresh notification ''' def __init__(self, pats, opts, root=None, parent=None): QWidget.__init__(self, parent) self.opts = opts # user, date self.stwidget = status.StatusWidget(pats, opts, root, self) layout = QVBoxLayout() layout.addWidget(self.stwidget) self.setLayout(layout) form = QFormLayout() userle = QLineEdit() form.addRow(_('Changeset:'), QLabel(_('Working Copy'))) form.addRow(_('User:'), userle) form.addRow(_('Parent:'), QLabel('Description of ' + str(self.stwidget.repo['.']))) frame = QFrame() frame.setLayout(form) frame.setFrameStyle(QFrame.StyledPanel) vbox = QVBoxLayout() vbox.addWidget(frame, 0) vbox.setMargin(0) msgcombo = QComboBox() msgcombo.addItem('Recent commit messages...') vbox.addWidget(msgcombo, 0) msgte = QTextEdit() msgte.setAcceptRichText(False) vbox.addWidget(msgte, 1) upperframe = QFrame() upperframe.setLayout(vbox) self.split = QSplitter(Qt.Vertical) # Add our widgets to the top of our splitter self.split.addWidget(upperframe) # Add status widget document frame below our splitter # this reparents the docf from the status splitter self.split.addWidget(self.stwidget.docf) h = self.split.sizeHint().height() mh = upperframe.minimumSizeHint().height() self.split.setSizes([mh, h-mh]) # add our splitter where the docf used to be self.stwidget.split.addWidget(self.split) msgte.setFocus() # TODO add commit widgets # branchop dialog # Yuki's Mockup: http://bitbucket.org/kuy/thg-qt/wiki/Home def restoreState(self, data): return self.stwidget.restoreState(data) def saveState(self): return self.stwidget.saveState() def getChecked(self): return self.stwidget.getChecked() class CommitDialog(QDialog): 'Standalone commit tool, a wrapper for CommitWidget' def __init__(self, pats, opts, parent=None): QDialog.__init__(self, parent) self.pats = pats self.opts = opts layout = QVBoxLayout() self.setLayout(layout) commit = CommitWidget(pats, opts, None, self) layout.addWidget(commit, 1) BB = QDialogButtonBox bb = QDialogButtonBox(BB.Ok|BB.Cancel) self.connect(bb, SIGNAL("accepted()"), self, SLOT("accept()")) self.connect(bb, SIGNAL("rejected()"), self, SLOT("reject()")) bb.button(BB.Ok).setDefault(True) bb.button(BB.Ok).setText('Commit') layout.addWidget(bb) self.bb = bb cmd = cmdui.Widget() cmd.commandStarted.connect(self.commandStarted) cmd.commandFinished.connect(self.commandFinished) cmd.commandCanceling.connect(self.commandCanceled) layout.addWidget(cmd) cmd.setHidden(True) self.cmd = cmd s = QSettings() commit.restoreState(s.value('commit/state').toByteArray()) self.restoreGeometry(s.value('commit/geom').toByteArray()) self.commit = commit self.connect(self.commit, SIGNAL('errorMessage'), self.errorMessage) def errorMessage(self, msg): # TODO: Does not appear to work self.cmd.pmon.set_text(msg) def keyPressEvent(self, event): if event.key() in (Qt.Key_Return, Qt.Key_Enter): if event.modifiers() == Qt.ControlModifier: self.accept() # Ctrl+Enter return elif event.key() == Qt.Key_Escape: self.reject() return return super(QDialog, self).keyPressEvent(event) def commandStarted(self): self.cmd.setShown(True) self.bb.button(QDialogButtonBox.Ok).setEnabled(False) def commandFinished(self, wrapper): self.bb.button(QDialogButtonBox.Ok).setEnabled(True) if wrapper.data is not 0: self.cmd.show_output(True) else: self.reject() def commandCanceled(self): self.bb.button(QDialogButtonBox.Ok).setEnabled(True) def accept(self): cmdline = ['commit'] files = self.stwidget.getChecked() if files: cmdline.extend(files) else: qtlib.WarningMsgBox(_('No files selected'), _('No operation to perform'), parent=self) return print cmdline #self.cmd.run(cmdline) def reject(self): if self.cmd.core.is_running(): self.cmd.core.cancel() else: s = QSettings() s.setValue('commit/state', self.commit.saveState()) s.setValue('commit/geom', self.saveGeometry()) QDialog.reject(self) def run(ui, *pats, **opts): return CommitDialog(hglib.canonpaths(pats), opts)