mercurial/commands.py
changeset 310 273f6a01d18b
parent 309 61414da06fe5
child 312 09375250eb31
equal deleted inserted replaced
309:61414da06fe5 310:273f6a01d18b
   385 
   385 
   386         text = ""
   386         text = ""
   387         for l in file(pf):
   387         for l in file(pf):
   388             if l[:4] == "--- ": break
   388             if l[:4] == "--- ": break
   389             text += l
   389             text += l
       
   390 
       
   391         # make sure text isn't empty
       
   392         if not text: text = "imported patch %s\n" % patch
   390 
   393 
   391         f = os.popen("lsdiff --strip %d %s" % (strip, pf))
   394         f = os.popen("lsdiff --strip %d %s" % (strip, pf))
   392         files = filter(None, map(lambda x: x.rstrip(), f.read().splitlines()))
   395         files = filter(None, map(lambda x: x.rstrip(), f.read().splitlines()))
   393         f.close()
   396         f.close()
   394 
   397