patch: use temporary files to handle intermediate copies git patches may require copies to be handled out-of-order. For instance, take the following sequence: * modify a * copy a into b Here, we have to generate b from a before its modification. To do so, applydiff() was scanning for copy metadata and performing the copies before processing the other changes in-order. While smart and efficient, this approach complicates things by handling file copies and file creations at different places and times. While a new file must not exist before being patched a copied file already exists before applying the first hunk. Instead of copying the files at their final destination before patching, we store them in a temporary file location and retrieve them when patching. The filestore always stores file content in real files but nothing prevents adding a cache layer. The filestore class was kept separate from fsbackend for at least two reasons: - This class is likely to be reused as a temporary result store for a future repository patching call (entries just have to be extended to contain copy sources). - Delegating this role to backends might be more efficient in a repository backend case: the source files are already available in the repository itself and do not need to be copied again. It also means that third-parties backend would have to implement two other methods. If we ever decide to merge the filestore feature into backend, a minimalistic approach would be to compose with filestore directly. Keep in mind this copy overhead only applies for copy/rename sources, and may even be reduced to copy sources which have to handled ahead of time. [ original upstream message ]

     1

#!/usr/bin/env python

     2

     3

"""This does HTTP GET requests given a host:port and path and returns

     4

a subset of the headers plus the body of the result."""

     5

     6

import httplib, sys, re

     7

     8

try:

     9

    import msvcrt, os

    10

    msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)

    11

    msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)

    12

except ImportError:

    13

    pass

    14

    15

headers = [h.lower() for h in sys.argv[3:]]

    16

conn = httplib.HTTPConnection(sys.argv[1])

    17

conn.request("GET", sys.argv[2])

    18

response = conn.getresponse()

    19

print response.status, response.reason

    20

for h in headers:

    21

    if response.getheader(h, None) is not None:

    22

        print "%s: %s" % (h, response.getheader(h))

    23

print

    24

data = response.read()

    25

sys.stdout.write(data)

    26

    27

if 200 <= response.status <= 299:

    28

    sys.exit(0)

    29

sys.exit(1)