Mercurial > hg > gcmultimerge

comparison multimerge.py @ 108:7677c4992381

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 18 Oct 2016 12:24:44 +0300
parents f3949e4aca4b 205767356d2c
children 8cf20367a372
comparison
equal deleted inserted replaced
107:f3949e4aca4b 108:7677c4992381
183 self.g = src.g 183 self.g = src.g
184 self.b = src.b 184 self.b = src.b
185 else: 185 else:
186 gcm_fatal(u"Invalid initializer for GCMColor() object.") 186 gcm_fatal(u"Invalid initializer for GCMColor() object.")
187 187
188 def to_hexrgb():
189 return "{0:02X}{1:02X}{2:02X}".format(self.r, self.g, self.b)
190
191 def to_hexrgb_lc():
192 return "{0:02x}{1:02x}{2:02x}".format(self.r, self.g, self.b)
193
188 def delta(self, other): 194 def delta(self, other):
189 ctmp = GCMColor() 195 ctmp = GCMColor()
190 ctmp.r = other.r - self.r 196 ctmp.r = other.r - self.r
191 ctmp.g = other.g - self.g 197 ctmp.g = other.g - self.g
192 ctmp.b = other.b - self.b 198 ctmp.b = other.b - self.b