by
Changes to 3 files · Browse files at 8d156068184d Showing diff from parent a801a826a50a f1ffb56159cb Diff from another changeset...
@@ -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)
|
@@ -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>') % (
|
Loading...