update: use higher level wording for "crosses branches" error When using "hg update" to update to a revision on another branch, if the user has uncommitted changes in the working directory, hg aborts with the following message: abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes) If the user isn't trying to update to tip and they follow the command examples verbatim, they would end up updating to the wrong revision. This patch removes the command examples in favor of just telling the user to either merge or use --clean: abort: crosses branches (merge branches or use --clean to discard changes) hg also aborts if the user tries to use "hg update" to get to tip (without specifying a revision) and tip is on another branch: abort: crosses branches (use 'hg merge' or use 'hg update -c') This message is changed in the same fashion: abort: crosses branches (merge branches or use --check to force update)

     1

#!/usr/bin/env python

     2

#

     3

# Wrapper script around the convert.py hgext extension

     4

# for foreign SCM conversion to mercurial format.

     5

#

     6

     7

import sys

     8

from mercurial import ui, fancyopts

     9

from hgext import convert

    10

    11

# Options extracted from the cmdtable

    12

func, options, help = convert.cmdtable['convert']

    13

    14

# An ui instance

    15

u = ui.ui()

    16

    17

opts = {}

    18

args = []

    19

try:

    20

    args = list(fancyopts.fancyopts(sys.argv[1:], options, opts))

    21

    args += [None]*(3 - len(args))

    22

    src, dest, revmapfile = args

    23

except (fancyopts.getopt.GetoptError, ValueError), inst:

    24

    u.warn('Usage:\n%s\n' % help)

    25

    sys.exit(-1)

    26

    27

convert.convert(u, src, dest, revmapfile, **opts)