260         os.unlink(tmpname)

   260         os.unlink(tmpname)

   261         raise

   261         raise

   262 

   262 

   263     if subject and not message.startswith(subject):

   263     if subject and not message.startswith(subject):

   264         message = '%s\n%s' % (subject, message)

   264         message = '%s\n%s' % (subject, message)

   265     tmpfp.close()

   266     tmpfp.close()

   266     if not diffs_seen:

   267     if not diffs_seen:

   267         os.unlink(tmpname)

   268         os.unlink(tmpname)

   269         data['user'] = user

   269         data['user'] = user

   270         data['date'] = date

   270         data['date'] = date

   271         data['branch'] = branch

   271         data['branch'] = branch

   272         return data

   272         return data

   273 

   273 

   276         p1 = parents.pop(0)

   276         p1 = parents.pop(0)

   277         if parents:

   277         if parents:

   278             p2 = parents.pop(0)

   278             p2 = parents.pop(0)

   279 

   279 

   280     data['filename'] = tmpname

   280     data['filename'] = tmpname

   282     data['user'] = user

   281     data['user'] = user

   283     data['date'] = date

   282     data['date'] = date

   284     data['branch'] = branch

   283     data['branch'] = branch

   285     data['nodeid'] = nodeid

   284     data['nodeid'] = nodeid

   286     data['p1'] = p1

   285     data['p1'] = p1