re2: Merge upstream 2225f94df8ec

third_party/re2/lib/codereview/codereview.py

 # coding=utf-8
 # (The line above is necessary so that I can use 世界 in the
 # *comment* below without Python getting all bent out of shape.)
 
 # Copyright 2007-2009 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ skipping 693 matching lines @@
 
         math: add IsInf, IsNaN
         
         net: fix cname in LookupHost
 
         unicode: update to Unicode 5.0.2
 
 '''
 
 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://code.google.com/p/re2/source/detail?r=2225f94df8ecb9399afbdfead2815ee...

 
 def promptremove(ui, repo, f):
         if promptyesno(ui, "hg remove %s (y/n)?" % (f,)):
                 if hg_commands.remove(ui, repo, 'path:'+f) != 0:
                         ui.warn("error removing %s" % (f,))
 
 def promptadd(ui, repo, f):
         if promptyesno(ui, "hg add %s (y/n)?" % (f,)):
                 if hg_commands.add(ui, repo, 'path:'+f) != 0:
                         ui.warn("error adding %s" % (f,))
@@ skipping 1877 matching lines @@
         upload_options.server = server
         upload_options.save_cookies = True
 
         if testing:
                 upload_options.save_cookies = False
                 upload_options.email = "test@example.com"
 
         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
                 # release-branch.go10.  It will be a while before we care.
                 raise hg_util.Abort('tags.sort needs to be fixed for release-branch.go10')
         tags.sort()
         for t in tags:
                 if t.startswith('release-branch.go'):
                         releaseBranch = t                       
 
@@ skipping 930 matching lines @@
                 ctype, body = EncodeMultipartFormData(form_fields, files)
                 url = "/%d/upload_patch/%d" % (int(issue), int(patchset))
                 print "Uploading patch for " + patch[0]
                 response_body = rpc_server.Send(url, body, content_type=ctype)
                 lines = response_body.splitlines()
                 if not lines or lines[0] != "OK":
                         StatusUpdate("  --> %s" % response_body)
                         sys.exit(1)
                 rv.append([lines[1], patch[0]])
         return rv