From: Anthony Martin <ality@pbrane.org>
Date: Fri, 6 Sep 2013 19:48:21 +0000 (-0400)
Subject: codereview: update use of promptchoice for Mercurial 2.7
X-Git-Tag: go1.2rc2~330
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8f764fb689ea4313c5a6de2cabdf65aee9f89c5d;p=gostls13.git

codereview: update use of promptchoice for Mercurial 2.7

Fixes #6186.

R=golang-dev, bradfitz, remyoudompheng, rsc
CC=golang-dev
https://golang.org/cl/13112043
---

diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py
index 39cdc0f273..01d14c4a23 100644
--- a/lib/codereview/codereview.py
+++ b/lib/codereview/codereview.py
@@ -712,7 +712,10 @@ Examples:
 '''
 
 def promptyesno(ui, msg):
-	return ui.promptchoice(msg, ["&yes", "&no"], 0) == 0
+	if hgversion >= "2.7":
+		return ui.promptchoice(msg + " $$ &yes $$ &no", 0) == 0
+	else:
+		return ui.promptchoice(msg, ["&yes", "&no"], 0) == 0
 
 def promptremove(ui, repo, f):
 	if promptyesno(ui, "hg remove %s (y/n)?" % (f,)):