Mercurial > hg > gcmultimerge

comparison multimerge.py @ 44:e30f4647913d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix configuration reading to encode input into UTF-8
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 05 Jul 2016 14:20:53 +0300
parents a331209e24fc
children 035be8a9e982
comparison
equal deleted inserted replaced
43:a331209e24fc 44:e30f4647913d
161 return None 161 return None
162 162
163 def mread(self, cfgparser, sect): 163 def mread(self, cfgparser, sect):
164 for name in self.m_saveable: 164 for name in self.m_saveable:
165 if cfgparser.has_option(sect, name): 165 if cfgparser.has_option(sect, name):
166 value = cfgparser.get(sect, name) 166 value = cfgparser.get(sect, name).encode("UTF-8")
167 self.mset(name, value) 167 self.mset(name, value)
168 gcm_debug(u"{0} -> '{1}' == {2}".format(name, value, self.mget(name))) 168 gcm_debug(u"{0} -> '{1}' == {2}".format(name, value, self.mget(name)))
169 169
170 def is_str(self, mvalue): 170 def is_str(self, mvalue):
171 return isinstance(mvalue, basestring) 171 return isinstance(mvalue, basestring)