Proper check to see if zip dest needs to be wrapped in tellable From hgweb, calling archival.zipit fails with the error message "Illegal seek". This happens because sys.stdout.tell() throws an exception: Traceback (most recent call last): File "/usr/lib/python2.4/site-packages/mercurial/archival.py", line 99, in addfile self.z.writestr(i, data) File "/usr/lib/python2.4/zipfile.py", line 468, in writestr zinfo.header_offset = self.fp.tell() # Start of header bytes Checking whether hasattr(dest, 'tell') is insufficient, because sys.stdout has a tell() method; you just can't call it. This patch instead determines whether a fileobj is tellable by trying to tell(), wrapping the fileobj if an exception is generated.

     1

#!/bin/sh

     2

     3

hg init

     4

touch a

     5

hg add a

     6

hg ci -m "a" -d "1000000 0"

     7

     8

echo 123 > b

     9

hg add b

    10

hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \

    11

              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"

    12

    13

hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \

    14

                     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"

    15

    16

echo foo > a

    17

hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \

    18

              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"