record: allow splitting of hunks by manually editing patches It is possible that unrelated changes in a file are on sequential lines. The current record extension does not allow these to be committed independently. An example use case for this is in software development for deeply embedded real-time systems. In these environments, it is not always possible to use a debugger (due to time-constraints) and hence inline UART-based printing is often used. When fixing a bug in a module, it is often convenient to add a large number of 'printf's (linked to the UART via a custom fputc) to the module in order to work out what is going wrong. printf is a very slow function (and also variadic so somewhat frowned upon by the MISRA standard) and hence it is highly undesirable to commit these lines to the repository. If only a partial fix is implemented, however, it is desirable to commit the fix without deleting all of the printf lines. This is also simplifies removal of the printf lines as once the final fix is committed, 'hg revert' does the rest. It is likely that the printf lines will be very near the actual fix, so being able to split the hunk is very useful in this case. There were two alternatives I considered for the user interface. One was to manually edit the patch, the other to allow a hunk to be split into individual lines for consideration. The latter option would require a significant refactor of the record module and is less flexible. While the former is potentially more complicated to use, this is a feature that is likely to only be used in certain exceptional cases (such as the use case proposed above) and hence I felt that the complexity would not be a considerable issue. I've also written a follow-up patch that refactors the 'prompt' code to base everything on the choices variable. This tidies up and clarifies the code a bit (removes constructs like 'if ret == 7' and removes the 'e' option from the file scope options as it's not relevant there. It's not really a necessity, so I've excluded it from this submission for now, but I can send it separately if there's a desire and it's on bitbucket (see below) in the meantime. Possible future improvements include: * Tidying up the 'prompt' code to base everything on the choices variable. This would allow entries to be removed from the prompt as currently 'e' is offered even for entire file patches, which is currently unsupported. * Allowing the entire file (or even multi-file) patch to be edited manually: this would require quite a large refactor without much benefit, so I decided to exclude it from the initial submission. * Allow the option to retry if a patch fails to apply (this is what Git does). This would require quite a bit of refactoring given the current 'hg record' implementation, so it's debatable whether it's worth it. Output is similar to existing record user interface except that an additional option ('e') exists to allow manual editing of the patch. This opens the user's configured editor with the patch. A comment is added to the bottom of the patch explaining what to do (based on Git's one). A large proportion of the changeset is test-case changes to update the options reported by record (Ynesfdaq? instead of Ynsfdaq?). Functional changes are in record.py and there are some new test cases in test-record.t. [ 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

     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

twice = False

    16

if '--twice' in sys.argv:

    17

    sys.argv.remove('--twice')

    18

    twice = True

    19

    20

reasons = {'Not modified': 'Not Modified'} # python 2.4

    21

    22

tag = None

    23

def request(host, path, show):

    24

    25

    global tag

    26

    headers = {}

    27

    if tag:

    28

        headers['If-None-Match'] = tag

    29

    30

    conn = httplib.HTTPConnection(host)

    31

    conn.request("GET", path, None, headers)

    32

    response = conn.getresponse()

    33

    print response.status, reasons.get(response.reason, response.reason)

    34

    for h in [h.lower() for h in show]:

    35

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

    36

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

    37

    38

    print

    39

    data = response.read()

    40

    sys.stdout.write(data)

    41

    42

    if twice and response.getheader('ETag', None):

    43

        tag = response.getheader('ETag')

    44

    45

    return response.status

    46

    47

status = request(sys.argv[1], sys.argv[2], sys.argv[3:])

    48

if twice:

    49

    status = request(sys.argv[1], sys.argv[2], sys.argv[3:])

    50

    51

if 200 <= status <= 305:

    52

    sys.exit(0)

    53

sys.exit(1)