rebase: improve error message for --base being empty or causing emptiness Before it just said 'nothing to rebase'. Now 'if "base" is an empty set: abort: empty "base" revision set - can't compute rebase set If the set of changesets to rebase can't be found from "base", it will fail as before but with more explanation of what the problem was. The name of the "base" option is not obvious - it is more like "samples identifying the branch to rebase". The error messages for problems with the specified "base" value will use that term and might thus also not be obvious, but at least they are consistent with the option name. The name "base" will not be used if the base only was specified implicitly as the working directory parent.

     1

#!/usr/bin/env python

     2

     3

import sys

     4

import os

     5

     6

os.chdir(os.getenv('TESTTMP'))

     7

     8

if sys.argv[1] != "user@dummy":

     9

    sys.exit(-1)

    10

    11

os.environ["SSH_CLIENT"] = "127.0.0.1 1 2"

    12

    13

log = open("dummylog", "ab")

    14

log.write("Got arguments")

    15

for i, arg in enumerate(sys.argv[1:]):

    16

    log.write(" %d:%s" % (i + 1, arg))

    17

log.write("\n")

    18

log.close()

    19

hgcmd = sys.argv[2]

    20

if os.name == 'nt':

    21

    # hack to make simple unix single quote quoting work on windows

    22

    hgcmd = hgcmd.replace("'", '"')

    23

r = os.system(hgcmd)

    24

sys.exit(bool(r))