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 Entire File tortoisehg/​hgqt/​qfold.py Stacked
 
16
17
18
19
20
 
21
22
23
 
36
37
38
39
 
40
41
42
 
16
17
18
 
 
19
20
21
22
 
35
36
37
 
38
39
40
41
@@ -16,8 +16,7 @@
   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):   @@ -36,7 +35,7 @@
    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)