From: Nathan Binkert <nate@binkert.org>
Date: Wed, 25 May 2011 04:19:31 +0000 (-0700)
Subject: style: Make the style hook work in directories other than the root.
X-Git-Tag: stable_2012_02_02~298
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1c23bc100f2cdb786f62e6e524de989612b6d819;p=gem5.git

style: Make the style hook work in directories other than the root.
---

diff --git a/util/style.py b/util/style.py
index 30d39aae8..2b9f654d4 100644
--- a/util/style.py
+++ b/util/style.py
@@ -400,10 +400,12 @@ def do_check_style(hgui, repo, *files, **args):
         if skip(fname):
             continue
 
-        if whitespace.apply(fname, prompt):
+        fpath = joinpath(repo.root, fname)
+
+        if whitespace.apply(fpath, prompt):
             return True
 
-        if sorted_includes.apply(fname, prompt):
+        if sorted_includes.apply(fpath, prompt):
             return True
 
     try:
@@ -416,12 +418,13 @@ def do_check_style(hgui, repo, *files, **args):
         if skip(fname):
             continue
 
+        fpath = joinpath(repo.root, fname)
         regions = modregions(wctx, fname)
 
-        if whitespace.apply(fname, prompt, regions):
+        if whitespace.apply(fpath, prompt, regions):
             return True
 
-        if sorted_includes.apply(fname, prompt, regions):
+        if sorted_includes.apply(fpath, prompt, regions):
             return True
 
     return False
@@ -434,7 +437,7 @@ def do_check_format(hgui, repo, **args):
     verbose = 0
     stats = ValidationStats()
     for f in modified + added:
-        validate(f, stats, verbose, None)
+        validate(joinpath(repo.root, f), stats, verbose, None)
 
     if stats:
         stats.dump()