third_party/re2/lib/codereview/codereview.py - Issue 548083002: re2: Merge upstream 2225f94df8ec

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/re2/lib/codereview/codereview.py

Issue 548083002: re2: Merge upstream 2225f94df8ec (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/re2/lib/codereview/codereview.py

diff --git a/third_party/re2/lib/codereview/codereview.py b/third_party/re2/lib/codereview/codereview.py

index d26df2a5f18028629e225dcb7648936d1ef4273c..b892727c15e9467369cccca47e1a627cdb6748eb 100644

--- a/third_party/re2/lib/codereview/codereview.py

+++ b/third_party/re2/lib/codereview/codereview.py

@@ -711,7 +711,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

hans 2014/09/07 03:09:19 Was merging this intentional?

Nico 2014/09/07 03:11:25 Yup, it's part of that upstream revision: https://

def promptremove(ui, repo, f):

if promptyesno(ui, "hg remove %s (y/n)?" % (f,)):

@@ -2609,7 +2612,7 @@ def RietveldSetup(ui, repo):

rpc = None

global releaseBranch

- tags = repo.branchtags().keys()

+ tags = repo.branchmap().keys()

if 'release-branch.go10' in tags:

# NOTE(rsc): This tags.sort is going to get the wrong

# answer when comparing release-branch.go9 with

« no previous file with comments | « third_party/re2/README.chromium ('k') | third_party/re2/util/util.h » ('j') | no next file with comments »