From 49bff2da222e27e42f155529edceacb81f2f7f0d Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 6 Oct 2010 18:10:23 -0400 Subject: [PATCH] codereview: disallow submit of *.[chys] files indented with spaces R=r CC=golang-dev https://golang.org/cl/2383041 --- lib/codereview/codereview.py | 38 ++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py index e7987f911a3..cc98b90d6e7 100644 --- a/lib/codereview/codereview.py +++ b/lib/codereview/codereview.py @@ -223,7 +223,7 @@ class CL(object): if not self.files: ui.warn("no files in change list\n") if ui.configbool("codereview", "force_gofmt", True) and gofmt: - CheckGofmt(ui, repo, self.files, just_warn=gofmt_just_warn) + CheckFormat(ui, repo, self.files, just_warn=gofmt_just_warn) set_status("uploading CL metadata + diffs") os.chdir(repo.root) form_fields = [ @@ -732,9 +732,13 @@ def RelativePath(path, cwd): return path[n+1:] return path -# Check that gofmt run on the list of files does not change them -def CheckGofmt(ui, repo, files, just_warn=False): +def CheckFormat(ui, repo, files, just_warn=False): set_status("running gofmt") + CheckGofmt(ui, repo, files, just_warn) + CheckTabfmt(ui, repo, files, just_warn) + +# Check that gofmt run on the list of files does not change them +def CheckGofmt(ui, repo, files, just_warn): files = [f for f in files if (f.startswith('src/') or f.startswith('test/bench/')) and f.endswith('.go')] if not files: return @@ -763,6 +767,32 @@ def CheckGofmt(ui, repo, files, just_warn=False): raise util.Abort(msg) return +# Check that *.[chys] files indent using tabs. +def CheckTabfmt(ui, repo, files, just_warn): + files = [f for f in files if f.startswith('src/') and re.search(r"\.[chys]$", f)] + if not files: + return + cwd = os.getcwd() + files = [RelativePath(repo.root + '/' + f, cwd) for f in files] + files = [f for f in files if os.access(f, 0)] + badfiles = [] + for f in files: + try: + for line in open(f, 'r'): + if line.startswith(' '): + badfiles.append(f) + break + except: + # ignore cannot open file, etc. + pass + if len(badfiles) > 0: + msg = "these files use spaces for indentation (use tabs instead):\n\t" + "\n\t".join(badfiles) + if just_warn: + ui.warn("warning: " + msg + "\n") + else: + raise util.Abort(msg) + return + ####################################################################### # Mercurial commands @@ -1159,7 +1189,7 @@ def submit(ui, repo, *pats, **opts): # check gofmt for real; allowed upload to warn in order to save CL. cl.Flush(ui, repo) - CheckGofmt(ui, repo, cl.files) + CheckFormat(ui, repo, cl.files) about += "%s%s\n" % (server_url_base, cl.name)