Mercurial > hg > gcmultimerge

comparison multimerge.py @ 46:51c87abe5a1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
This Unicode conversion here is probably redundant.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 05 Jul 2016 16:45:35 +0300
parents 035be8a9e982
children a8fdecd4be61
comparison
equal deleted inserted replaced
45:035be8a9e982 46:51c87abe5a1e
162 return None 162 return None
163 163
164 def mread(self, cfgparser, sect): 164 def mread(self, cfgparser, sect):
165 for name in self.m_saveable: 165 for name in self.m_saveable:
166 if cfgparser.has_option(sect, name): 166 if cfgparser.has_option(sect, name):
167 value = cfgparser.get(sect, name).encode("UTF-8") 167 value = cfgparser.get(sect, name)
168 self.mset(name, value) 168 self.mset(name, value)
169 gcm_debug(u"{0} -> '{1}' == {2}".format(name, value, self.mget(name))) 169 gcm_debug(u"{0} -> '{1}' == {2}".format(name, value, self.mget(name)))
170 170
171 def is_str(self, mvalue): 171 def is_str(self, mvalue):
172 return isinstance(mvalue, basestring) 172 return isinstance(mvalue, basestring)