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

merge: tweaks for finish page

Changeset 2555db019001…

Parent 9bee113af9bd…

by Steve Borho

Changes to one file · Browse files at 2555db019001 Showing diff from parent 9bee113af9bd Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
32
33
34
 
35
36
37
 
551
552
553
554
555
 
 
 
556
557
 
 
 
 
558
559
560
 
32
33
34
35
36
37
38
 
552
553
554
 
 
555
556
557
558
559
560
561
562
563
564
565
566
@@ -32,6 +32,7 @@
  self.setWindowTitle(_('Merge - %s') % self.repo.displayname)   self.setWindowIcon(qtlib.geticon('hg-merge'))   self.setOption(QWizard.NoBackButtonOnStartPage, True) + self.setOption(QWizard.NoBackButtonOnLastPage, True)   self.setOption(QWizard.IndependentPages, True)     # set pages @@ -551,10 +552,15 @@
  self.setLayout(QVBoxLayout())   merge_sep = qtlib.LabeledSeparator(_('Merge changeset'))   self.layout().addWidget(merge_sep) - merge_info = csinfo.create(self.repo, 'tip', withupdate=True) - self.layout().addWidget(merge_info) + mergeCsInfo = csinfo.create(self.repo, 'tip', withupdate=True) + self.layout().addWidget(mergeCsInfo) + self.mergeCsInfo = mergeCsInfo   self.layout().addStretch(1)   + def currentPage(self): + self.mergeCsInfo.update(self.repo['tip']) + self.setOption(QWizard.NoCancelButton, True) +    class CheckThread(QThread):   def __init__(self, repo, parent):