[PATCH 2 of 8 RFC] merge: move prompts out of manifestmerge into a separate phase

Matt Mackall mpm at selenic.com
Wed Dec 21 15:06:05 CST 2011


On Wed, 2011-12-21 at 20:45 +0100, Laurens Holst wrote:
> # HG changeset patch
> # User Laurens Holst <laurens.hg at grauw.nl>
> # Date 1324436157 -3600
> # Node ID 41d3bb4d1ef5bdc3a68214123da13f7c7935898f
> # Parent  4cff963c895a6465b04a5c6a9e0a207c966e2dcb
> merge: move prompts out of manifestmerge into a separate phase

This may be worth doing whether or not we end up doing --guard just to
simplify manifestmerge.

> +            return "pf" # prompt for flags

Hmm, how does this work?

> +        elif (m == "e" or m == "g") and a[2] == "pf":
> +            act("prompted flags", m, f, promptflags(f))
> +
> +        elif m == "m" and a[4] == "pf":
> +            act("prompted flags", m, f, a[2], a[3], promptflags(f), a[5])

Oh, by delayed magic. Perhaps we need to break the flags piece off the
'g' and 'm' actions into its own action, so that when we do a get or a
merge, we may or may not do a flag action too. And this will let the
flagmerge code simply add a setflag or promptflag action rather than
return a raw flag.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list