diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-15 20:52:34 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-15 20:52:34 +0000 |
| commit | f2fd5ed808336398a509ade0185e74493d2b343c (patch) | |
| tree | 36dddf874431a2dafd968c6520ab661337746ca8 /tools/git | |
| parent | c63e251a3d640dd89769da213c9df888bb4c0bf3 (diff) | |
| download | chromium_src-f2fd5ed808336398a509ade0185e74493d2b343c.zip chromium_src-f2fd5ed808336398a509ade0185e74493d2b343c.tar.gz chromium_src-f2fd5ed808336398a509ade0185e74493d2b343c.tar.bz2 | |
Fixes to mass-rename and sort-headers scripts.
Error checking for non-moves having been staged (rather than erroring
out), and make sure that intshcut.h goes after ole2.h in Windows files.
(As broken repeatedly in https://codereview.chromium.org/18501013 and
https://codereview.chromium.org/18977003/)
R=jamesr@chromium.org
Review URL: https://chromiumcodereview.appspot.com/19228002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/git')
| -rwxr-xr-x | tools/git/mass-rename.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/git/mass-rename.py b/tools/git/mass-rename.py index 8efec09..21fbef7 100755 --- a/tools/git/mass-rename.py +++ b/tools/git/mass-rename.py @@ -29,7 +29,11 @@ def main(): if popen.returncode != 0: return 1 for line in out.splitlines(): - attrs, fro, to = line.split('\t') + parts = line.split('\t') + if len(parts) != 3: + print 'Skipping: %s -- not a rename?' % parts + continue + attrs, fro, to = parts if attrs.split()[4].startswith('R'): subprocess.check_call([ sys.executable, @@ -38,7 +42,7 @@ def main(): '--no_error_for_non_source_file', fro, to]) else: - print "Skipping: %s -- not a rename?" % fro + print 'Skipping: %s -- not a rename?' % fro return 0 |