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

Merge with stable

Changeset c0110bb1099f…

Parents 059e9f79d6c7…

Parents ee3883c13dd6…

by Steve Borho

Changes to 3 files · Browse files at c0110bb1099f Showing diff from parent 059e9f79d6c7 ee3883c13dd6 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
524
525
526
527
528
529
530
 
 
 
 
 
 
 
 
 
 
531
532
533
 
524
525
526
 
527
 
 
528
529
530
531
532
533
534
535
536
537
538
539
540
@@ -524,10 +524,17 @@
  QSettings().setValue('merge/skiplast', self.skiplast.isChecked())     def currentPage(self): - # TODO: add other branch name, when appropriate   engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False) - msgset = i18n.keepgettext()._('Merge ') - self.msgEntry.setText(engmsg and msgset['id'] or msgset['str']) + wctx = self.repo[None] + if wctx.p1().branch() == wctx.p2().branch(): + msgset = i18n.keepgettext()._('Merge') + text = engmsg and msgset['id'] or msgset['str'] + text = unicode(text) + else: + msgset = i18n.keepgettext()._('Merge with %s') + text = engmsg and msgset['id'] or msgset['str'] + text = unicode(text) % hglib.tounicode(wctx.p2().branch()) + self.msgEntry.setText(text)   self.msgEntry.moveCursorToEnd()     @pyqtSlot(QString)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repoview.py Stacked
 
84
85
86
87
 
88
89
 
90
91
92
 
84
85
86
 
87
88
 
89
90
91
92
@@ -84,9 +84,9 @@
  self._in_history = False   model.layoutChanged.connect(self.resetDelegate)   - def resetBrowseHistory(self, revs): + def resetBrowseHistory(self, revs, rev_pos=0):   self._rev_history = revs[:] - self._rev_pos = -1 + self._rev_pos = rev_pos-1   self.forward()     def resetDelegate(self):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
365
366
367
368
369
 
 
 
370
371
372
 
365
366
367
 
 
368
369
370
371
372
373
@@ -365,8 +365,9 @@
  if self.revset:   self.repomodel.filterbyrevset = checked   self.reload() - self.repoview.resetBrowseHistory(self.revset) - self._reload_rev = self.revset[0] + selected_rev = self.rev + selected_rev_pos = self.revset.index(selected_rev) + self.repoview.resetBrowseHistory(self.revset, selected_rev_pos)     def setOutgoingNodes(self, nodes):   self.filterbar.revsetle.setText('outgoing()')