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

# basic operation

     2

adding a

     3

changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57

     4

a

     5

# file that was removed is recreated

     6

adding a

     7

adding a

     8

changeset 2:44cd84c7349a backs out changeset 1:76862dcce372

     9

content

    10

# backout of backout is as if nothing happened

    11

removing a

    12

changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a

    13

cat: a: No such file or directory

    14

# backout with merge

    15

adding a

    16

changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23

    17

merging with changeset 2:b66ea5b77abb

    18

merging a

    19

line 1