Bug 38319

Summary: svn-apply: Add a "format" property to the hashes returned by parseDiff() and parseDiffHeader()
Product: WebKit Reporter: Chris Jerdonek <cjerdonek>
Component: Tools / TestsAssignee: Chris Jerdonek <cjerdonek>
Status: RESOLVED FIXED    
Severity: Normal CC: cjerdonek, commit-queue, dbates, ddkilzer
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: All   
OS: All   
Bug Depends on:    
Bug Blocks: 38320    
Attachments:
Description Flags
Proposed patch none

Chris Jerdonek
Reported 2010-04-29 04:37:57 PDT
The "format" key can initially have values "svn" and "git". It can be set to "git" from within parseDiffHeader() if the first line matches-- > $line =~ m#^diff --git #
Attachments
Proposed patch (15.15 KB, patch)
2010-05-02 08:07 PDT, Chris Jerdonek 		no flags
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Chris Jerdonek
Comment 1 2010-05-02 08:07:29 PDT
Created attachment 54882 [details] Proposed patch
Eric Seidel (no email)
Comment 2 2010-05-02 18:33:26 PDT
Comment on attachment 54882 [details] Proposed patch OK.
WebKit Commit Bot
Comment 3 2010-05-02 18:49:37 PDT
Comment on attachment 54882 [details] Proposed patch Clearing flags on attachment: 54882 Committed r58663: <http://trac.webkit.org/changeset/58663>
WebKit Commit Bot
Comment 4 2010-05-02 18:49:42 PDT
All reviewed patches have been landed. Closing bug.
Daniel Bates
Comment 5 2010-05-02 20:17:35 PDT
Comment on attachment 54882 [details] Proposed patch > diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog > index e76aa08..b09d704 100644 > --- a/WebKitTools/ChangeLog > +++ b/WebKitTools/ChangeLog > @@ -1,3 +1,24 @@ > +2010-05-02 Chris Jerdonek <cjerdonek@webkit.org> > + > + Reviewed by NOBODY (OOPS!). > + > + https://bugs.webkit.org/show_bug.cgi?id=38319 > + > + * Scripts/VCSUtils.pm: > + - In parseDiffHeader()-- > + - Added an "scmFormat" hash key to the return value to represent > + whether the diff is Git or SVN formatted. > + - Adjusted the code so the value of "copiedFromPath" will > + be undef rather than "does not exist" if the file was not > + copied. > + > + * Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl: > + - Added a FIXME to refactor these unit tests to use is_deeply(). > + You added the FIXME comment to Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl. Not Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl.
Daniel Bates
Comment 6 2010-05-02 20:21:03 PDT
Not a big issue, just thought to point it out. (In reply to comment #5) > You added the FIXME comment to > Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl. Not > Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl.
Chris Jerdonek
Comment 7 2010-05-02 22:43:04 PDT
Thanks for the review, Eric! And thanks for pointing out the ChangeLog typo, Daniel. I fixed it here: http://trac.webkit.org/changeset/58666
Note You need to log in before you can comment on or make changes to this bug.