hgext/absorb.py
changeset 41260 c146651a78e1
parent 40951 e993a86cfcb8
child 41365 876494fd967d
equal deleted inserted replaced
41259:194e43c2bac9 41260:c146651a78e1
   487             if l.startswith('HG:'):
   487             if l.startswith('HG:'):
   488                 continue
   488                 continue
   489             if l[colonpos - 1:colonpos + 2] != ' : ':
   489             if l[colonpos - 1:colonpos + 2] != ' : ':
   490                 raise error.Abort(_('malformed line: %s') % l)
   490                 raise error.Abort(_('malformed line: %s') % l)
   491             linecontent = l[colonpos + 2:]
   491             linecontent = l[colonpos + 2:]
   492             for i, ch in enumerate(l[leftpadpos:colonpos - 1]):
   492             for i, ch in enumerate(
       
   493                     pycompat.bytestr(l[leftpadpos:colonpos - 1])):
   493                 if ch == 'y':
   494                 if ch == 'y':
   494                     contents[visiblefctxs[i][0]] += linecontent
   495                     contents[visiblefctxs[i][0]] += linecontent
   495         # chunkstats is hard to calculate if anything changes, therefore
   496         # chunkstats is hard to calculate if anything changes, therefore
   496         # set them to just a simple value (1, 1).
   497         # set them to just a simple value (1, 1).
   497         if editedtext != editortext:
   498         if editedtext != editortext: