mercurial/patch.py
changeset 26555 1e33384ff2ed
parent 26554 a6d51dcb1823
child 26556 2bef84fad19f
equal deleted inserted replaced
26554:a6d51dcb1823 26555:1e33384ff2ed
   260     if subject and not message.startswith(subject):
   260     if subject and not message.startswith(subject):
   261         message = '%s\n%s' % (subject, message)
   261         message = '%s\n%s' % (subject, message)
   262     data['message'] = message
   262     data['message'] = message
   263     data['user'] = user
   263     data['user'] = user
   264     tmpfp.close()
   264     tmpfp.close()
   265     if not diffs_seen:
       
   266         os.unlink(tmpname)
       
   267         return data
       
   268 
       
   269     if parents:
   265     if parents:
   270         data['p1'] = parents.pop(0)
   266         data['p1'] = parents.pop(0)
   271         if parents:
   267         if parents:
   272             data['p2'] = parents.pop(0)
   268             data['p2'] = parents.pop(0)
   273 
   269 
   274     data['filename'] = tmpname
   270     if diffs_seen:
       
   271         data['filename'] = tmpname
       
   272     else:
       
   273         os.unlink(tmpname)
   275     return data
   274     return data
   276 
   275 
   277 class patchmeta(object):
   276 class patchmeta(object):
   278     """Patched file metadata
   277     """Patched file metadata
   279 
   278