qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 16:17:56 -07:00
Code Releases Activity

codereview: print status when hung

Browse Source 
After 30 seconds, start printing status updates,
so that we can see whether hg is making progress.

$ hg upload 1983051
Thu Aug 26 15:06:15 2010 running gofmt
Thu Aug 26 15:06:30 2010 inspecting src/pkg/big/int_test.go
Thu Aug 26 15:06:45 2010 inspecting src/pkg/cmath/conj.go
Thu Aug 26 15:07:00 2010 inspecting src/pkg/expvar/expvar.go
Thu Aug 26 15:07:15 2010 inspecting src/pkg/os/env_unix.go
Thu Aug 26 15:07:30 2010 inspecting src/pkg/os/sys_bsd.go
Thu Aug 26 15:07:45 2010 inspecting src/pkg/rand/rand_test.go
Thu Aug 26 15:08:00 2010 inspecting src/pkg/runtime/sig.go
Thu Aug 26 15:08:15 2010 inspecting src/pkg/time/time_test.go
Thu Aug 26 15:08:30 2010 inspecting src/pkg/websocket/websocket.go
Thu Aug 26 15:08:45 2010 uploading src/pkg/utf8/utf8.go
Thu Aug 26 15:09:00 2010 uploading src/pkg/unicode/letter_test.go
Thu Aug 26 15:09:15 2010 uploading src/pkg/xml/embed_test.go
Thu Aug 26 15:09:30 2010 uploading src/pkg/time/tick.go
Thu Aug 26 15:09:45 2010 uploading src/pkg/big/rat_test.go
Thu Aug 26 15:10:00 2010 uploading src/pkg/time/sleep_test.go
Thu Aug 26 15:10:15 2010 uploading src/pkg/patch/patch_test.go
Thu Aug 26 15:10:30 2010 uploading src/pkg/rand/rand.go
https://golang.org/cl/1983051

$

R=gri
CC=golang-dev
https://golang.org/cl/2020045
This commit is contained in:
Russ Cox 2010-08-26 16:27:42 -04:00
parent 87229f54c3
commit e3ac0b5d3f
1 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/codereview/codereview.py
View File

@ -224,6 +224,7 @@ class CL(object):
ui.warn("no files in change list\n") ui.warn("no files in change list\n")
if ui.configbool("codereview", "force_gofmt", True) and gofmt: if ui.configbool("codereview", "force_gofmt", True) and gofmt:
CheckGofmt(ui, repo, self.files, just_warn=gofmt_just_warn) CheckGofmt(ui, repo, self.files, just_warn=gofmt_just_warn)
set_status("uploading CL metadata + diffs")
os.chdir(repo.root) os.chdir(repo.root)
form_fields = [ form_fields = [
("content_upload", "1"), ("content_upload", "1"),
@ -262,6 +263,7 @@ class CL(object):
patchset = lines[1].strip() patchset = lines[1].strip()
patches = [x.split(" ", 1) for x in lines[2:]] patches = [x.split(" ", 1) for x in lines[2:]]
ui.status(msg + "\n") ui.status(msg + "\n")
set_status("uploaded CL metadata + diffs")
if not response_body.startswith("Issue created.") and not response_body.startswith("Issue updated."): if not response_body.startswith("Issue created.") and not response_body.startswith("Issue updated."):
raise util.Abort("failed to update issue: " + response_body) raise util.Abort("failed to update issue: " + response_body)
issue = msg[msg.rfind("/")+1:] issue = msg[msg.rfind("/")+1:]
@ -269,12 +271,16 @@ class CL(object):
if not self.url: if not self.url:
self.url = server_url_base + self.name self.url = server_url_base + self.name
if not uploaded_diff_file: if not uploaded_diff_file:
set_status("uploading patches")
patches = UploadSeparatePatches(issue, rpc, patchset, data, upload_options) patches = UploadSeparatePatches(issue, rpc, patchset, data, upload_options)
if vcs: if vcs:
set_status("uploading base files")
vcs.UploadBaseFiles(issue, rpc, patches, patchset, upload_options, files) vcs.UploadBaseFiles(issue, rpc, patches, patchset, upload_options, files)
if send_mail: if send_mail:
set_status("sending mail")
MySend("/" + issue + "/mail", payload="") MySend("/" + issue + "/mail", payload="")
self.web = True self.web = True
set_status("flushing changes to disk")
self.Flush(ui, repo) self.Flush(ui, repo)
return return
@ -387,6 +393,7 @@ def IsLocalCL(ui, repo, name):
# Load CL from disk and/or the web. # Load CL from disk and/or the web.
def LoadCL(ui, repo, name, web=True): def LoadCL(ui, repo, name, web=True):
set_status("loading CL " + name)
if not GoodCLName(name): if not GoodCLName(name):
return None, "invalid CL name" return None, "invalid CL name"
dir = CodeReviewDir(ui, repo) dir = CodeReviewDir(ui, repo)
@ -420,8 +427,38 @@ def LoadCL(ui, repo, name, web=True):
cl.desc = f['description'] cl.desc = f['description']
cl.url = server_url_base + name cl.url = server_url_base + name
cl.web = True cl.web = True
set_status("loaded CL " + name)
return cl, '' return cl, ''
global_status = ""
def set_status(s):
# print >>sys.stderr, "\t", time.asctime(), s
global global_status
global_status = s
class StatusThread(threading.Thread):
def __init__(self):
threading.Thread.__init__(self)
def run(self):
# pause a reasonable amount of time before
# starting to display status messages, so that
# most hg commands won't ever see them.
time.sleep(30)
# now show status every 15 seconds
while True:
time.sleep(15 - time.time() % 15)
s = global_status
if s is None:
continue
if s == "":
s = "(unknown status)"
print >>sys.stderr, time.asctime(), s
def start_status_thread():
StatusThread().start()
class LoadCLThread(threading.Thread): class LoadCLThread(threading.Thread):
def __init__(self, ui, repo, dir, f, web): def __init__(self, ui, repo, dir, f, web):
threading.Thread.__init__(self) threading.Thread.__init__(self)
@ -614,6 +651,7 @@ def Incoming(ui, repo, opts):
return incoming return incoming
def EditCL(ui, repo, cl): def EditCL(ui, repo, cl):
set_status(None) # do not show status
s = cl.EditorText() s = cl.EditorText()
while True: while True:
s = ui.edit(s, ui.username()) s = ui.edit(s, ui.username())
@ -696,6 +734,7 @@ def RelativePath(path, cwd):
# Check that gofmt run on the list of files does not change them # Check that gofmt run on the list of files does not change them
def CheckGofmt(ui, repo, files, just_warn=False): def CheckGofmt(ui, repo, files, just_warn=False):
set_status("running gofmt")
files = [f for f in files if (f.startswith('src/') or f.startswith('test/bench/')) and f.endswith('.go')] files = [f for f in files if (f.startswith('src/') or f.startswith('test/bench/')) and f.endswith('.go')]
if not files: if not files:
return return
@ -712,6 +751,7 @@ def CheckGofmt(ui, repo, files, just_warn=False):
data = cmd.stdout.read() data = cmd.stdout.read()
errors = cmd.stderr.read() errors = cmd.stderr.read()
cmd.wait() cmd.wait()
set_status("done with gofmt")
if len(errors) > 0: if len(errors) > 0:
ui.warn("gofmt errors:\n" + errors.rstrip() + "\n") ui.warn("gofmt errors:\n" + errors.rstrip() + "\n")
return return
@ -1045,11 +1085,13 @@ def pending(ui, repo, *pats, **opts):
def reposetup(ui, repo): def reposetup(ui, repo):
global original_match global original_match
if original_match is None: if original_match is None:
start_status_thread()
original_match = cmdutil.match original_match = cmdutil.match
cmdutil.match = ReplacementForCmdutilMatch cmdutil.match = ReplacementForCmdutilMatch
RietveldSetup(ui, repo) RietveldSetup(ui, repo)
def CheckContributor(ui, repo, user=None): def CheckContributor(ui, repo, user=None):
set_status("checking CONTRIBUTORS file")
if not user: if not user:
user = ui.config("ui", "username") user = ui.config("ui", "username")
if not user: if not user:
@ -1444,6 +1486,7 @@ def IsRietveldSubmitted(ui, clname, hex):
return False return False
def DownloadCL(ui, repo, clname): def DownloadCL(ui, repo, clname):
set_status("downloading CL " + clname)
cl, err = LoadCL(ui, repo, clname) cl, err = LoadCL(ui, repo, clname)
if err != "": if err != "":
return None, None, "error loading CL %s: %s" % (clname, ExceptionDetail()) return None, None, "error loading CL %s: %s" % (clname, ExceptionDetail())
@ -1588,6 +1631,7 @@ def GetForm(url):
# Fetch the settings for the CL, like reviewer and CC list, by # Fetch the settings for the CL, like reviewer and CC list, by
# scraping the Rietveld editing forms. # scraping the Rietveld editing forms.
def GetSettings(issue): def GetSettings(issue):
set_status("getting issue metadata from web")
# The /issue/edit page has everything but only the # The /issue/edit page has everything but only the
# CL owner is allowed to fetch it (and submit it). # CL owner is allowed to fetch it (and submit it).
f = None f = None
@ -1604,6 +1648,7 @@ def GetSettings(issue):
return f return f
def EditDesc(issue, subject=None, desc=None, reviewers=None, cc=None, closed=None): def EditDesc(issue, subject=None, desc=None, reviewers=None, cc=None, closed=None):
set_status("uploading change to description")
form_fields = GetForm("/" + issue + "/edit") form_fields = GetForm("/" + issue + "/edit")
if subject is not None: if subject is not None:
form_fields['subject'] = subject form_fields['subject'] = subject
@ -1622,6 +1667,7 @@ def EditDesc(issue, subject=None, desc=None, reviewers=None, cc=None, closed=Non
sys.exit(2) sys.exit(2)
def PostMessage(ui, issue, message, reviewers=None, cc=None, send_mail=True, subject=None): def PostMessage(ui, issue, message, reviewers=None, cc=None, send_mail=True, subject=None):
set_status("uploading message")
form_fields = GetForm("/" + issue + "/publish") form_fields = GetForm("/" + issue + "/publish")
if reviewers is not None: if reviewers is not None:
form_fields['reviewers'] = reviewers form_fields['reviewers'] = reviewers
@ -2447,6 +2493,7 @@ class VersionControlSystem(object):
def UploadFile(filename, file_id, content, is_binary, status, is_base): def UploadFile(filename, file_id, content, is_binary, status, is_base):
"""Uploads a file to the server.""" """Uploads a file to the server."""
set_status("uploading " + filename)
file_too_large = False file_too_large = False
if is_base: if is_base:
type = "base" type = "base"
@ -2948,6 +2995,7 @@ class MercurialVCS(VersionControlSystem):
return unknown_files return unknown_files
def GetBaseFile(self, filename): def GetBaseFile(self, filename):
set_status("inspecting " + filename)
# "hg status" and "hg cat" both take a path relative to the current subdir # "hg status" and "hg cat" both take a path relative to the current subdir
# rather than to the repo root, but "hg diff" has given us the full path # rather than to the repo root, but "hg diff" has given us the full path
# to the repo root. # to the repo root.
@ -3035,6 +3083,7 @@ def UploadSeparatePatches(issue, rpc_server, patchset, data, options):
patches = SplitPatch(data) patches = SplitPatch(data)
rv = [] rv = []
for patch in patches: for patch in patches:
set_status("uploading patch for " + patch[0])
if len(patch[1]) > MAX_UPLOAD_SIZE: if len(patch[1]) > MAX_UPLOAD_SIZE:
print ("Not uploading the patch for " + patch[0] + print ("Not uploading the patch for " + patch[0] +
" because the file is too large.") " because the file is too large.")