qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 03:50:21 -07:00
Code Releases Activity

codereview: preserve branch prefix in subject during hg mail

Browse Source 
LGTM=minux
R=minux
CC=golang-codereviews
https://golang.org/cl/124800043
This commit is contained in:
Russ Cox 2014-08-06 15:15:45 -04:00
parent c0ccf6f314
commit 6ff5c317eb
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/codereview/codereview.py
View File

@ -307,14 +307,19 @@ class CL(object):
dir = CodeReviewDir(ui, repo) dir = CodeReviewDir(ui, repo)
os.unlink(dir + "/cl." + self.name) os.unlink(dir + "/cl." + self.name)
def Subject(self): def Subject(self, ui, repo):
branchPrefix = ""
branch = repo[None].branch()
if branch.startswith("dev."):
branchPrefix = "[" + branch + "] "
s = line1(self.desc) s = line1(self.desc)
if len(s) > 60: if len(s) > 60:
s = s[0:55] + "..." s = s[0:55] + "..."
if self.name != "new": if self.name != "new":
s = "code review %s: %s" % (self.name, s) s = "code review %s: %s" % (self.name, s)
typecheck(s, str) typecheck(s, str)
return s return branchPrefix + s
def Upload(self, ui, repo, send_mail=False, gofmt=True, gofmt_just_warn=False, creating=False, quiet=False): def Upload(self, ui, repo, send_mail=False, gofmt=True, gofmt_just_warn=False, creating=False, quiet=False):
if not self.files and not creating: if not self.files and not creating:
@ -324,10 +329,6 @@ class CL(object):
set_status("uploading CL metadata + diffs") set_status("uploading CL metadata + diffs")
os.chdir(repo.root) os.chdir(repo.root)
branchPrefix = ""
branch = repo[None].branch()
if branch.startswith("dev."):
branchPrefix = "[" + branch + "] "
form_fields = [ form_fields = [
("content_upload", "1"), ("content_upload", "1"),
("reviewers", JoinComma(self.reviewer)), ("reviewers", JoinComma(self.reviewer)),
@ -363,7 +364,8 @@ class CL(object):
form_fields.append(("subject", "diff -r " + vcs.base_rev + " " + ui.expandpath("default"))) form_fields.append(("subject", "diff -r " + vcs.base_rev + " " + ui.expandpath("default")))
else: else:
# First upload sets the subject for the CL itself. # First upload sets the subject for the CL itself.
form_fields.append(("subject", branchPrefix+self.Subject())) form_fields.append(("subject", self.Subject(ui, repo)))
ctype, body = EncodeMultipartFormData(form_fields, uploaded_diff_file) ctype, body = EncodeMultipartFormData(form_fields, uploaded_diff_file)
response_body = MySend("/upload", body, content_type=ctype) response_body = MySend("/upload", body, content_type=ctype)
patchset = None patchset = None
@ -416,7 +418,7 @@ class CL(object):
else: else:
pmsg += "Please take another look.\n" pmsg += "Please take another look.\n"
typecheck(pmsg, str) typecheck(pmsg, str)
PostMessage(ui, self.name, pmsg, subject=self.Subject()) PostMessage(ui, self.name, pmsg, subject=self.Subject(ui, repo))
self.mailed = True self.mailed = True
self.Flush(ui, repo) self.Flush(ui, repo)