comparison mercurial/manifest.py @ 17428:72803c8edaa4

avoid using abbreviations that look like spelling errors
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 27 Aug 2012 23:14:27 +0200
parents 9724f8f8850b
children c64e646af81e
comparison
equal deleted inserted replaced
17427:57c6c24b9bc4 17428:72803c8edaa4
152 152
153 checkforbidden(added) 153 checkforbidden(added)
154 # combine the changed lists into one list for sorting 154 # combine the changed lists into one list for sorting
155 work = [(x, False) for x in added] 155 work = [(x, False) for x in added]
156 work.extend((x, True) for x in removed) 156 work.extend((x, True) for x in removed)
157 # this could use heapq.merge() (from python2.6+) or equivalent 157 # this could use heapq.merge() (from Python 2.6+) or equivalent
158 # since the lists are already sorted 158 # since the lists are already sorted
159 work.sort() 159 work.sort()
160 160
161 delta = [] 161 delta = []
162 dstart = None 162 dstart = None