Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

update: encode revision string to unicode

Changeset c4212d1cf1d2…

Parent 83cef2b74947…

by Yuki KODAMA

Changes to one file · Browse files at c4212d1cf1d2 Showing diff from parent 83cef2b74947 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
7
8
9
10
 
11
12
13
 
49
50
51
52
 
53
54
 
 
55
56
57
 
7
8
9
 
10
11
12
13
 
49
50
51
 
52
53
 
54
55
56
57
58
@@ -7,7 +7,7 @@
 # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.   -from PyQt4.QtCore import QString, Qt +from PyQt4.QtCore import Qt  from PyQt4.QtGui import QDialog, QDialogButtonBox, QVBoxLayout, QGridLayout  from PyQt4.QtGui import QComboBox, QLabel, QLayout, QCheckBox, QMessageBox   @@ -49,9 +49,10 @@
  grid.addWidget(combo, 0, 1)     if rev is None: - combo.addItem(self.repo.dirstate.branch()) + rev = self.repo.dirstate.branch()   else: - combo.addItem(QString(rev)) + rev = str(rev) + combo.addItem(hglib.tounicode(rev))   combo.setCurrentIndex(0)   for name in hglib.getlivebranch(self.repo):   combo.addItem(name)