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

Merge with stable

Changeset 8d156068184d…

Parents a801a826a50a…

Parents f1ffb56159cb…

by Adrian Buehlmann

Changes to 3 files · Browse files at 8d156068184d Showing diff from parent a801a826a50a f1ffb56159cb Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​mq.py Stacked
 
111
112
113
114
 
115
116
117
 
118
119
120
 
111
112
113
 
114
115
116
 
117
118
119
120
@@ -111,10 +111,10 @@
  mainlayout.addWidget(w)     self.qpushAllAct = a = QAction( - geticon('hg-qpush-all'), _('Push all'), self) + geticon('hg-qpush-all'), _('Push all', 'MQ QPush'), self)   a.setToolTip(_('Apply all patches'))   self.qpushAct = a = QAction( - geticon('hg-qpush'), _('Push'), self) + geticon('hg-qpush'), _('Push', 'MQ QPush'), self)   a.setToolTip(_('Apply one patch'))   self.setGuardsAct = a = QAction(   geticon('hg-qguard'), _('Guards'), self)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​revdetails.py Stacked
 
200
201
202
 
203
204
205
 
200
201
202
203
204
205
206
@@ -200,6 +200,7 @@
  _('Toggle display of all files and the direction they were merged'))   self.actionShowAllMerge.setCheckable(True)   self.actionShowAllMerge.setChecked(False) + self.actionShowAllMerge.setEnabled(False)   self.filelisttbar.addAction(self.actionShowAllMerge)     self.actionNextLine = QAction('Next line', self)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​revert.py Stacked
 
24
25
26
27
 
28
29
30
 
32
33
34
35
 
36
37
38
 
24
25
26
 
27
28
29
30
 
32
33
34
 
35
36
37
38
@@ -24,7 +24,7 @@
  f = self.windowFlags()   self.setWindowFlags(f & ~Qt.WindowContextHelpButtonHint)   self.repo = repo - self.wfiles = [ repo.wjoin(wfile) for wfile in wfiles ] + self.wfiles = [repo.wjoin(wfile) for wfile in wfiles]   self.rev = str(rev)     self.setLayout(QVBoxLayout()) @@ -32,7 +32,7 @@
  if len(wfile) == 1:   lblText = _('<b>Revert %s to its contents'   ' at revision %d?</b>') % ( - wfiles[0], rev) + hglib.tounicode(wfiles[0]), rev)   else:   lblText = _('<b>Revert %d files to their contents'   ' at revision %d?</b>') % (