Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1.1, 2.1.2, and tip

stable merge, backout, qfold: use MessageEntry from its new location

Changeset 4172a81623d1…

Parent f2a7dd4999d8…

by Steve Borho

Changes to 3 files · Browse files at 4172a81623d1 Showing diff from parent f2a7dd4999d8 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​backout.py Stacked
 
10
11
12
13
 
14
15
16
 
232
233
234
 
235
236
237
 
419
420
421
422
 
423
424
425
 
10
11
12
 
13
14
15
16
 
232
233
234
235
236
237
238
 
420
421
422
 
423
424
425
426
@@ -10,7 +10,7 @@
 from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, csinfo, i18n, cmdui, status, resolve -from tortoisehg.hgqt import commit, qscilib, thgrepo +from tortoisehg.hgqt import qscilib, thgrepo, messageentry    from PyQt4.QtCore import *  from PyQt4.QtGui import * @@ -232,6 +232,7 @@
  cmd = hglib.fromunicode(cmd)   repo = self.repo   if cmd == 'commit': + from tortoisehg.hgqt import commit   dlg = commit.CommitDialog(repo, [], {}, self.wizard())   dlg.finished.connect(dlg.deleteLater)   dlg.exec_() @@ -419,7 +420,7 @@
  # commit message area   msg_sep = qtlib.LabeledSeparator(_('Commit message'))   self.layout().addWidget(msg_sep) - msgEntry = commit.MessageEntry(self) + msgEntry = messageentry.MessageEntry(self)   msgEntry.installEventFilter(qscilib.KeyPressInterceptor(self))   msgEntry.refresh(repo)   msgEntry.loadSettings(QSettings(), 'backout/message')
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
10
11
12
13
14
 
 
15
16
17
 
295
296
297
 
298
299
300
 
496
497
498
499
 
500
501
502
 
10
11
12
 
 
13
14
15
16
17
 
295
296
297
298
299
300
301
 
497
498
499
 
500
501
502
503
@@ -10,8 +10,8 @@
   from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import qtlib, csinfo, i18n, cmdui, status, commit, resolve -from tortoisehg.hgqt import qscilib, thgrepo +from tortoisehg.hgqt import qtlib, csinfo, i18n, cmdui, status, resolve +from tortoisehg.hgqt import qscilib, thgrepo, messageentry    from PyQt4.QtCore import *  from PyQt4.QtGui import * @@ -295,6 +295,7 @@
  cmd = hglib.fromunicode(cmd)   repo = self.repo   if cmd == 'commit': + from tortoisehg.hgqt import commit   dlg = commit.CommitDialog(repo, [], {}, self)   dlg.finished.connect(dlg.deleteLater)   dlg.exec_() @@ -496,7 +497,7 @@
  # commit message area   msg_sep = qtlib.LabeledSeparator(_('Commit message'))   self.layout().addWidget(msg_sep) - msgEntry = commit.MessageEntry(self) + msgEntry = messageentry.MessageEntry(self)   msgEntry.installEventFilter(qscilib.KeyPressInterceptor(self))   msgEntry.refresh(repo)   msgEntry.loadSettings(QSettings(), 'merge/message')
Change 1 of 2 Show Changes Only tortoisehg/​hgqt/​qfold.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
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
 # qfold.py - QFold dialog for TortoiseHg  #  # Copyright 2010 Steve Borho <steve@borho.org>  # Copyright 2010 Johan Samyn <johan.samyn@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.    import os    from PyQt4.QtCore import *  from PyQt4.QtGui import *  from PyQt4.Qsci import QsciScintilla, QsciAPIs, QsciLexerMakefile    from hgext import mq    from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import cmdui, qscilib, qtlib -from tortoisehg.hgqt.commit import MessageEntry +from tortoisehg.hgqt import cmdui, qscilib, qtlib, messageentry    class QFoldDialog(QDialog):     output = pyqtSignal(QString, QString)   makeLogVisible = pyqtSignal(bool)     def __init__(self, repo, patches, parent):   super(QFoldDialog, self).__init__(parent)   self.setWindowTitle(_('Patch fold - %s') % repo.displayname)   self.setWindowIcon(qtlib.geticon('hg-qfold'))     f = self.windowFlags()   self.setWindowFlags(f & ~Qt.WindowContextHelpButtonHint)     self.setLayout(QVBoxLayout())     mlbl = QLabel(_('New patch message:'))   self.layout().addWidget(mlbl) - self.msgte = MessageEntry(self) + self.msgte = messageentry.MessageEntry(self)   self.msgte.installEventFilter(qscilib.KeyPressInterceptor(self))   self.layout().addWidget(self.msgte)     self.keepchk = QCheckBox(_('Keep patch files'))   self.keepchk.setChecked(True)   self.layout().addWidget(self.keepchk)     self.repo = repo   q = self.repo.mq   q.parseseries()   self.patches = [p for p in q.series if p in patches]     class PatchListWidget(QListWidget):   def __init__(self, parent):   QListWidget.__init__(self, parent)   self.setCurrentRow(0)   def focusInEvent(self, event):   i = self.item(self.currentRow())   if i:   self.parent().parent().showSummary(i)   QListWidget.focusInEvent(self, event)   def dropEvent(self, event):   QListWidget.dropEvent(self, event)   spp = self.parent().parent()   spp.msgte.setText(spp.composeMsg(self.getPatchList()))   def getPatchList(self):   return [hglib.fromunicode(self.item(i).text()) \   for i in xrange(0, self.count())]     ugb = QGroupBox(_('Patches to fold'))   ugb.setLayout(QVBoxLayout())   ugb.layout().setContentsMargins(*(0,)*4)   self.ulw = PatchListWidget(self)   self.ulw.setDragDropMode(QListView.InternalMove)   ugb.layout().addWidget(self.ulw)   self.ulw.currentItemChanged.connect(lambda:   self.showSummary(self.ulw.item(self.ulw.currentRow())))   self.layout().addWidget(ugb)     for p in self.patches:   item = QListWidgetItem(hglib.tounicode(p))   item.setFlags(Qt.ItemIsSelectable |   Qt.ItemIsEnabled |   Qt.ItemIsDragEnabled)   self.ulw.addItem(item)     slbl = QLabel(_('Summary:'))   self.layout().addWidget(slbl)   self.summ = QTextEdit()   self.summ.setFont(qtlib.getfont('fontcomment').font())   self.summ.setMaximumHeight(80)   self.summ.setReadOnly(True)   self.summ.setFocusPolicy(Qt.NoFocus)   self.layout().addWidget(self.summ)     self.cmd = cmdui.Runner(False, self)   self.cmd.output.connect(self.output)   self.cmd.makeLogVisible.connect(self.makeLogVisible)     BB = QDialogButtonBox   bbox = QDialogButtonBox(BB.Ok|BB.Cancel)   bbox.accepted.connect(self.accept)   bbox.rejected.connect(self.reject)   self.layout().addWidget(bbox)   self.bbox = bbox     self.repo.configChanged.connect(self.configChanged)     self._readsettings()     self.msgte.setText(self.composeMsg(self.patches))   self.msgte.refresh(self.repo)   self.focus = self.msgte     def showSummary(self, item):   patchname = hglib.fromunicode(item.text())   txt = '\n'.join(mq.patchheader(self.repo.mq.join(patchname)).message)   self.summ.setText(hglib.tounicode(txt))     def composeMsg(self, patches):   return u'\n* * *\n'.join(   [hglib.tounicode(self.repo.changectx(p).description())   for p in ['qtip'] + patches])     def getMessage(self):   text = self.msgte.text()   try:   text = hglib.fromunicode(text, 'strict')   except UnicodeEncodeError:   pass # TODO (see commit.py)   return text     def configChanged(self):   '''Repository is reporting its config files have changed'''   self.msgte.refresh(self.repo)     def accept(self):   self._writesettings()   self.bbox.setDisabled(True)   cmdline = ['qfold', '--repository', self.repo.root]   if self.keepchk.isChecked():   cmdline += ['--keep']   cmdline += ['--message', self.getMessage()]   cmdline += ['--']   cmdline += self.ulw.getPatchList()   def finished():   self.repo.decrementBusyCount()   QDialog.accept(self)   self.repo.incrementBusyCount()   self.cmd.commandFinished.connect(finished)   self.cmd.run(cmdline)     def closeEvent(self, event):   self._writesettings()   super(QFoldDialog, self).closeEvent(event)     def _readsettings(self):   s = QSettings()   self.restoreGeometry(s.value('qfold/geom').toByteArray())     def _writesettings(self):   s = QSettings()   s.setValue('qfold/geom', self.saveGeometry())