fold: overhaul handling of revisions with --rev (BC) The fold command parsed the revision arguments in a very peculiar and idiosyncratic fashion: if revisions were passed without a --rev argument, then they would all be extended to ".", but if they were passed with --rev, then no extension would happen. Passing revisions both with and without --rev would abort. This is inconsistent with the way all other hg commands parse revision arguments. We have several examples of command where several revisions are passed, and the --rev option is optional for specifying those revisions (update, strip, export). This patch alters the way in which fold parses its revision arguments. No distinction is made between revisions passed with or without the --rev argument. Regardless if a single or multiple revision is specified, all will be folded together into the parent of the working directory. If the --exact argument is passed, then the parent of the working directory is ignored and the specified revisions must be a single contiguous line. The docstring and tests are modified accordingly.

     1

#!/usr/bin/env python

     2

     3

import os, time, errno, signal

     4

     5

# Kill off any leftover daemon processes

     6

try:

     7

    fp = open(os.environ['DAEMON_PIDS'])

     8

    for line in fp:

     9

        try:

    10

            pid = int(line)

    11

        except ValueError:

    12

            continue

    13

        try:

    14

            os.kill(pid, 0)

    15

            os.kill(pid, signal.SIGTERM)

    16

            for i in range(10):

    17

                time.sleep(0.05)

    18

                os.kill(pid, 0)

    19

            os.kill(pid, signal.SIGKILL)

    20

        except OSError, err:

    21

            if err.errno != errno.ESRCH:

    22

                raise

    23

    fp.close()

    24

except IOError:

    25

    pass