mirror of
https://github.com/golang/go
synced 2024-11-21 22:14:41 -07:00
codereview: split name list only on commas; some user names have spaces
R=r CC=golang-dev https://golang.org/cl/184069
This commit is contained in:
parent
f85abf01bc
commit
84ac357c79
1
lib/codereview/codereview.cfg
Normal file
1
lib/codereview/codereview.cfg
Normal file
@ -0,0 +1 @@
|
|||||||
|
defaultcc: golang-dev@googlegroups.com
|
@ -89,10 +89,9 @@ if __name__ == "__main__":
|
|||||||
print >>sys.stderr, "This is a Mercurial extension and should not be invoked directly."
|
print >>sys.stderr, "This is a Mercurial extension and should not be invoked directly."
|
||||||
sys.exit(2)
|
sys.exit(2)
|
||||||
|
|
||||||
|
|
||||||
server = "codereview.appspot.com"
|
server = "codereview.appspot.com"
|
||||||
server_url_base = None
|
server_url_base = None
|
||||||
defaultcc = [ "golang-dev@googlegroups.com" ]
|
defaultcc = None
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
# Change list parsing.
|
# Change list parsing.
|
||||||
@ -340,7 +339,10 @@ def ParseCL(text, name):
|
|||||||
return cl, 0, ''
|
return cl, 0, ''
|
||||||
|
|
||||||
def SplitCommaSpace(s):
|
def SplitCommaSpace(s):
|
||||||
return s.replace(",", " ").split()
|
s = s.strip()
|
||||||
|
if s == "":
|
||||||
|
return []
|
||||||
|
return re.split(", *", s)
|
||||||
|
|
||||||
def CutDomain(s):
|
def CutDomain(s):
|
||||||
i = s.find('@')
|
i = s.find('@')
|
||||||
@ -1430,11 +1432,6 @@ def DownloadCL(ui, repo, clname):
|
|||||||
return None, None, "error looking up %s: got info for %s, %s" % (nick, match.group(1), match.group(2))
|
return None, None, "error looking up %s: got info for %s, %s" % (nick, match.group(1), match.group(2))
|
||||||
email = match.group(1)
|
email = match.group(1)
|
||||||
|
|
||||||
# Temporary hack until we move to the public code review server.
|
|
||||||
email1, _ = FindContributor(ui, repo, email, warn=False)
|
|
||||||
if email1 == "":
|
|
||||||
email = re.sub("@google.com$", "@golang.org", email)
|
|
||||||
|
|
||||||
# Print warning if email is not in CONTRIBUTORS file.
|
# Print warning if email is not in CONTRIBUTORS file.
|
||||||
FindContributor(ui, repo, email)
|
FindContributor(ui, repo, email)
|
||||||
cl.copied_from = email
|
cl.copied_from = email
|
||||||
@ -1593,7 +1590,16 @@ class opt(object):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
def RietveldSetup(ui, repo):
|
def RietveldSetup(ui, repo):
|
||||||
global upload_options, rpc, server, server_url_base, force_google_account, verbosity
|
global defaultcc, upload_options, rpc, server, server_url_base, force_google_account, verbosity
|
||||||
|
|
||||||
|
# Read repository-specific options from lib/codereview/codereview.cfg
|
||||||
|
try:
|
||||||
|
f = open(repo.root + '/lib/codereview/codereview.cfg')
|
||||||
|
for line in f:
|
||||||
|
if line.startswith('defaultcc: '):
|
||||||
|
defaultcc = SplitCommaSpace(line[10:])
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
# TODO(rsc): If the repository config has no codereview section,
|
# TODO(rsc): If the repository config has no codereview section,
|
||||||
# do not enable the extension. This allows users to
|
# do not enable the extension. This allows users to
|
||||||
@ -1617,11 +1623,6 @@ def RietveldSetup(ui, repo):
|
|||||||
if x is not None:
|
if x is not None:
|
||||||
email = x
|
email = x
|
||||||
|
|
||||||
cc = None
|
|
||||||
x = ui.config("codereview", "cc")
|
|
||||||
if x is not None:
|
|
||||||
cc = x
|
|
||||||
|
|
||||||
server_url_base = "http://" + server + "/"
|
server_url_base = "http://" + server + "/"
|
||||||
|
|
||||||
testing = ui.config("codereview", "testing")
|
testing = ui.config("codereview", "testing")
|
||||||
@ -1634,7 +1635,7 @@ def RietveldSetup(ui, repo):
|
|||||||
upload_options.description = None
|
upload_options.description = None
|
||||||
upload_options.description_file = None
|
upload_options.description_file = None
|
||||||
upload_options.reviewers = None
|
upload_options.reviewers = None
|
||||||
upload_options.cc = cc
|
upload_options.cc = None
|
||||||
upload_options.message = None
|
upload_options.message = None
|
||||||
upload_options.issue = None
|
upload_options.issue = None
|
||||||
upload_options.download_base = False
|
upload_options.download_base = False
|
||||||
|
Loading…
Reference in New Issue
Block a user