Changeset 46669 in webkit

Timestamp:

Aug 1, 2009 7:23:34 AM (15 years ago)

Author:

ddkilzer@apple.com

Message:

Implement VCSUtils::determineVCSRoot()

Reviewed by Eric Seidel.

Step 1 to fix:
<​http://webkit.org/b/18599> resolve-ChangeLogs doesn't work with relative paths

• Scripts/VCSUtils.pm: Removed reference to webkitdirs module. (VCSUtils::EXPORT): Added &determineVCSRoot. Realphabetized. (VCSUtils::determineGitRoot): Added. Based on code in commit-log-editor. (VCSUtils::determineVCSRoot): Implemented using determineGitRoot() and determineSVNRoot().
• Scripts/commit-log-editor: Replaced use of topLevelSourceDirectory() with determineVCSRoot(). Resorted use statements. (topLevelSourceDirectory): Removed.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/VCSUtils.pm (modified) (5 diffs)
• Scripts/commit-log-editor (modified) (4 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-08-01  David Kilzer  <ddkilzer@apple.com>
+
+        Implement VCSUtils::determineVCSRoot()
+
+        Reviewed by Eric Seidel.
+
+        Step 1 to fix:
+        <http://webkit.org/b/18599> resolve-ChangeLogs doesn't work with relative paths
+
+        * Scripts/VCSUtils.pm: Removed reference to webkitdirs module.
+        (VCSUtils::EXPORT): Added &determineVCSRoot.  Realphabetized.
+        (VCSUtils::determineGitRoot): Added.  Based on code in
+        commit-log-editor.
+        (VCSUtils::determineVCSRoot): Implemented using
+        determineGitRoot() and determineSVNRoot().
+        * Scripts/commit-log-editor: Replaced use of
+        topLevelSourceDirectory() with determineVCSRoot().  Resorted
+        use statements.
+        (topLevelSourceDirectory): Removed.
+
 2009-07-31  Daniel Bates  <dbates@intudata.com>
 

trunk/WebKitTools/Scripts/VCSUtils.pm

@@ -1 @@
-# Copyright (C) 2007 Apple Inc.  All rights reserved.
+# Copyright (C) 2007, 2008, 2009 Apple Inc.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29 +29 @@
 use strict;
 use warnings;
+
+use File::Basename;
 use File::Spec;
-use webkitdirs;
 
 BEGIN {
@@ -37 +38 @@
    $VERSION     = 1.00;
    @ISA         = qw(Exporter);
-   @EXPORT      = qw(&isGitDirectory &isGit &isSVNDirectory &isSVN &determineSVNRoot &makeFilePathRelative);
+   @EXPORT      = qw(&determineSVNRoot &determineVCSRoot &isGit &isGitDirectory &isSVN &isSVNDirectory &makeFilePathRelative);
    %EXPORT_TAGS = ( );
    @EXPORT_OK   = ();
@@ -103 +104 @@
     $isSVN = isSVNDirectory(".");
     return $isSVN;
+}
+
+sub determineGitRoot()
+{
+    chomp(my $gitDir = `git rev-parse --git-dir`);
+    return dirname($gitDir);
 }
 
@@ -140 +147 @@
 }
 
+sub determineVCSRoot()
+{
+    if (isGit()) {
+        return determineGitRoot();
+    }
+    if (isSVN()) {
+        return determineSVNRoot();
+    }
+    die "Unable to determine VCS root";
+}
+
 sub svnRevisionForDirectory($)
 {

trunk/WebKitTools/Scripts/commit-log-editor

@@ -1 +1 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+# Copyright (C) 2006, 2007, 2008, 2009 Apple Inc.  All rights reserved.
 # Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
 #
@@ -35 +35 @@
 use FindBin;
 use lib $FindBin::Bin;
+use Term::ReadKey;
 use VCSUtils;
 use webkitdirs;
-use Term::ReadKey;
 
 sub normalizeLineEndings($$);
@@ -126 +126 @@
 exec $editor, @ARGV if $existingLog && $keepExistingLog;
 
-my $topLevel = topLevelSourceDirectory();
+my $topLevel = determineVCSRoot();
 
 my %changeLogSort;
@@ -221 +221 @@
 unlink "$log.edit";
 
-sub topLevelSourceDirectory
-{
-    if (isGit()) {
-        chomp(my $gitDir = `git rev-parse --git-dir`);
-        return dirname($gitDir);
-    } elsif (isSVN()) {
-        return determineSVNRoot();
-    }
-}
-
 sub normalizeLineEndings($$)
 {