Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset e1c8b3657b31…

Parents 06c4b1a9b4dd…

Parents ec859ba201f3…

by Steve Borho

Changes to one file · Browse files at e1c8b3657b31 Showing diff from parent 06c4b1a9b4dd ec859ba201f3 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgemail.py Stacked
 
337
338
339
340
341
342
343
 
 
 
 
 
 
344
345
346
 
337
338
339
 
 
 
 
340
341
342
343
344
345
346
347
348
@@ -337,10 +337,12 @@
  cmdline += ['--intro']   tmpfile = None   try: - fd, tmpfile = tempfile.mkstemp(prefix="thg_emaildesc_") - os.write(fd, desc) - os.close(fd) - cmdline += ['--desc', tmpfile] + if desc or not hasattr(extensions.find('patchbomb'), 'introneeded'): + # --desc is interpreted differently after hg 1.5 + fd, tmpfile = tempfile.mkstemp(prefix="thg_emaildesc_") + os.write(fd, desc) + os.close(fd) + cmdline += ['--desc', tmpfile]   cmdline.extend(self.revargs)     dlg = hgcmd.CmdDialog(cmdline)