commit d5bc73d467eda7d9f12681d3b428799411b93a8d
author Pierre-Antoine Manzagol <manzagop@chromium.org> Wed Mar 22 15:40:40 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Mon Mar 27 01:14:24 2017 +0000
tree f28769b1cd1a4e8f1ce46e62e1011e02812052f1
parent 2e401be12ef1ec44f4a81c6bc8acaf793c71e4de

Fix 'git cl format' on windows metrics files

The issue is with directory separators:
"Check that c:\src\chromium\src or 
c:\src\chromium\src\tools/metrics/histograms/pretty_print.py
exist and have execution permission."

BUG=679514

Change-Id: I88a57783ca3bf8aa5af4d83fb34901c2d2385fe9
Reviewed-on: https://chromium-review.googlesource.com/457800
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Pierre-Antoine Manzagol <manzagop@chromium.org>

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index 7122d1a..b672005 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -5584,13 +5584,13 @@
                      "\nTry running 'gn format' on this file manually.")
 
   metrics_xml_files = [
-    'tools/metrics/actions/actions.xml',
-    'tools/metrics/histograms/histograms.xml',
-    'tools/metrics/rappor/rappor.xml']
+    os.path.join('tools', 'metrics', 'actions', 'actions.xml'),
+    os.path.join('tools', 'metrics', 'histograms', 'histograms.xml'),
+    os.path.join('tools', 'metrics', 'rappor', 'rappor.xml')]
   for xml_file in metrics_xml_files:
     if xml_file in diff_files:
-      tool_dir = top_dir + '/' + os.path.dirname(xml_file)
-      cmd = [tool_dir + '/pretty_print.py', '--non-interactive']
+      tool_dir = os.path.join(top_dir, os.path.dirname(xml_file))
+      cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
       if opts.dry_run or opts.diff:
         cmd.append('--diff')
       stdout = RunCommand(cmd, cwd=top_dir)