mercurial/manifest.py
changeset 17428 72803c8edaa4
parent 17426 9724f8f8850b
child 17983 c64e646af81e
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