26999 2009-07-06 13:45:15 -0700 bugzilla-tool/svn-apply can't handle patches made from a non-root directory 2009-10-23 14:31:33 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned bfulgham darin ddkilzer joepeck mrowe oldest_to_newest 129996 0 eric 2009-07-06 13:45:15 -0700 bugzilla-tool/svn-apply can't handle patches made from a non-root directory We need to make some part of this scripting smarter so that it can figure out where the patch was made from instead of failing when people attach patches made in just WebCore/ or JavaScriptCore/ 130440 1 joepeck 2009-07-08 09:00:33 -0700 Should this be handled on the patch generation side? By changing WebKit/WebKitTools/Scripts/svn-create-patch? Calculate the path difference between the current working directory and the WebKit root (substring of the pwd). Run generateFileList() as normal from the pwd. Now you have the list of all files changed from the pwd (current behavior) but you can change directory to the WebKit root and run the diffs from the root (for `svn diff`). Or should this be handled on the applying side? 130581 2 32491 joepeck 2009-07-08 17:29:58 -0700 Created attachment 32491 This would make it so svn-create-patch provides full paths from the WebKit root directory. This should keep the current svn-create-patch behavior, but just make it so that the paths for the files are from the WebKit root directory. This would be on the create patch side, not on the apply patch side. I don't know how common it is to get patches in a form other then one produced by svn-create-patch. If its better to handle the apply side then I'm perfectly fine with this getting r-. I tested this a number of different ways on OS X, I haven't tried Windows. 131121 3 eric 2009-07-11 11:28:37 -0700 These seems like an OK idea to me. # Change to WebKit dir and get the difference from the current dir 458 sub chdirWebKitAndGetPrefix 459 { 460 my $before = File::Spec->rel2abs( File::Spec->curdir() ); 461 chdirWebKit(); 462 my $after = File::Spec->rel2abs( File::Spec->curdir() ); 463 $before =~ s/^$after\/?//; 464 return $before if $before eq ''; # Already at WebKit dir 465 $before .= '/' if $before !~ /\/$/; # Prefix needs a trailing '/' 466 return $before; 467 } seems a little complicated and hard to read... Shouldn't we just have a command in wkdirs.pm like: git rev-parse --show-prefix ? Which is then separate from the chdirWebKit command? 131122 4 eric 2009-07-11 11:29:06 -0700 I would like an svn user, like Mark or Darin or someone to comment though. 131581 5 32491 ddkilzer 2009-07-14 09:07:59 -0700 Comment on attachment 32491 This would make it so svn-create-patch provides full paths from the WebKit root directory. > +use webkitdirs; It's unfortunate that we need to use the webkitdirs module since this script could be used on any SVN working directory previously. (Darin Adler may have more input on this.) > +sub chdirWebKitAndGetPrefix; This needs empty parenthesis after the declaration (an empty prototype) to match the style of the rest of the source. > + my $file = $prefix . $fileData->{path}; This should use File::Spec->catdir($prefix, $fileData->{path}) instead. Then you don't have to worry about the trailing '/' in chdirWebKitAndGetPrefix(). > +# Change to WebKit dir and get the difference from the current dir This comment isn't really needed; the method name explains what it does already. > +sub chdirWebKitAndGetPrefix Needs parenthesis after the method to match the style of the rest of the source. > +{ > + my $before = File::Spec->rel2abs( File::Spec->curdir() ); > + chdirWebKit(); > + my $after = File::Spec->rel2abs( File::Spec->curdir() ); > + $before =~ s/^$after\/?//; I think it would be clearer to use File::Spec::abs2rel() instead of rolling your own regex here: my $relativePath = File::Spec->abs2rel($after, $before); > + return $before if $before eq ''; # Already at WebKit dir > + $before .= '/' if $before !~ /\/$/; # Prefix needs a trailing '/' > + return $before; > +} With the change to use File::Spec::catdir() above, and because File::Spec::abs2rel() will either return a relative path or an empty string, this logic goes away: return $relativePath; In fact, you should just remove the $relativePath variable and return the result directly: return File::Spec->abs2rel($after, $before); r- to fix everything except the 'use webkitdirs' issue. IMO, it would be great to have a replacement subroutine for chdirwebkit() that got the svn URL from the "svn info" command in the current directory, then did a "chdir .." until the current svn URL no longer matched the previous svn URL (minus one directory), then you could chdir back into the last directory. This would then put you at the root of the svn working directory regardless of whether you're working on WebKit or not. 131589 6 darin 2009-07-14 09:35:34 -0700 (In reply to comment #5) > It's unfortunate that we need to use the webkitdirs module since this script > could be used on any SVN working directory previously. (Darin Adler may have > more input on this.) Exactly. This was originally intended to be a Subversion script, not a WebKit-project-specific script. > IMO, it would be great to have a replacement subroutine for chdirwebkit() that > got the svn URL from the "svn info" command in the current directory, then did > a "chdir .." until the current svn URL no longer matched the previous svn URL > (minus one directory), then you could chdir back into the last directory. This > would then put you at the root of the svn working directory regardless of > whether you're working on WebKit or not. I agree. 131591 7 joepeck 2009-07-14 09:38:39 -0700 David, thanks for the through review. My inexperience with Perl is apparent. =) However, is it worth cleaning this up? I still haven't gotten an answer wether or not it makes more sense to just fix the "svn-apply" side instead. I am not a committer so I don't know if even making this modification to svn-create-patch will stop enough of these problems, or end up just fixing a few. 131599 8 ddkilzer 2009-07-14 10:06:24 -0700 (In reply to comment #7) > David, thanks for the through review. My inexperience with Perl is apparent. > =) Your Perl is fine. We're just picky. :) > However, is it worth cleaning this up? I still haven't gotten an answer wether > or not it makes more sense to just fix the "svn-apply" side instead. I am not > a committer so I don't know if even making this modification to > svn-create-patch will stop enough of these problems, or end up just fixing a > few. It's a step forward, which is what's important. If there are still issues with svn-apply, we can address those after this fix lands. 131721 9 32742 joepeck 2009-07-14 15:55:27 -0700 Created attachment 32742 svn-create-patch provides full paths Subversion Repository's Root Directory Much cleaner! This addresses the points in David's review. 131722 10 32743 joepeck 2009-07-14 15:55:27 -0700 Created attachment 32743 svn-create-patch provides full paths Subversion Repository's Root Directory Much cleaner! This addresses the points in David's review. 131726 11 joepeck 2009-07-14 16:03:19 -0700 (In reply to comment #5) > (From update of attachment 32491 [details]) > > +use webkitdirs; > > It's unfortunate that we need to use the webkitdirs module since this script > could be used on any SVN working directory previously. (Darin Adler may have > more input on this.) This removes the dependency on "webkitdirs" which removes a few other includes that this had introduced. > > +sub chdirWebKitAndGetPrefix; > > This needs empty parenthesis after the declaration (an empty prototype) to > match the style of the rest of the source. Done. This and all other style changes. > > + my $file = $prefix . $fileData->{path}; > > This should use File::Spec->catdir($prefix, $fileData->{path}) instead. Then > you don't have to worry about the trailing '/' in chdirWebKitAndGetPrefix(). Done. Much cleaner. > > +{ > > + my $before = File::Spec->rel2abs( File::Spec->curdir() ); > > + chdirWebKit(); > > + my $after = File::Spec->rel2abs( File::Spec->curdir() ); > > + $before =~ s/^$after\/?//; > > I think it would be clearer to use File::Spec::abs2rel() instead of rolling > your own regex here: > > my $relativePath = File::Spec->abs2rel($after, $before); Done. Much cleaner. > IMO, it would be great to have a replacement subroutine for chdirwebkit() that > got the svn URL from the "svn info" command in the current directory, then did > a "chdir .." until the current svn URL no longer matched the previous svn URL > (minus one directory), then you could chdir back into the last directory. This > would then put you at the root of the svn working directory regardless of > whether you're working on WebKit or not. The way I went about it was using "svn info [PATH]". And building up that path as a trail of "../". I also use system() to check the error code of svn info. Let me know if there is a problem with this approach (cross platform?) or if you think of a better way and I'll see what I can do. 131785 12 32743 ddkilzer 2009-07-14 18:30:06 -0700 Comment on attachment 32743 svn-create-patch provides full paths Subversion Repository's Root Directory (In reply to comment #11) > (In reply to comment #5) > > IMO, it would be great to have a replacement subroutine for chdirwebkit() that > > got the svn URL from the "svn info" command in the current directory, then did > > a "chdir .." until the current svn URL no longer matched the previous svn URL > > (minus one directory), then you could chdir back into the last directory. This > > would then put you at the root of the svn working directory regardless of > > whether you're working on WebKit or not. > > The way I went about it was using "svn info [PATH]". And building up that path > as a trail of "../". I also use system() to check the error code of svn info. > Let me know if there is a problem with this approach (cross platform?) or if > you think of a better way and I'll see what I can do. I thought of doing that after my last comment as well! The only situation where this won't work is if a user has a "mixed" svn working directory where they have one svn working directory at "dir" and a second svn working directory (from a different repository) under "dir", and the user ran svn-create-patch in the second working directory. I don't know how prevalent this use case is, and I doubt it's common with WebKit, so let's not worry about that for now. >+sub chdirAndGetDifference($); Nit: Instead of "GetDifference", I think something like "ReturnRelativePath" might be more descriptive. I can change this when I land the patch. r=me! 131788 13 joepeck 2009-07-14 18:39:20 -0700 > The only situation where this won't work is [nested svn working dirs] > I don't know how prevalent this use case is, and I doubt it's common > with WebKit, so let's not worry about that for now. I thought about this too. But I don't even think that is realistic or would work properly. My only guess would be the actual Subversion team testing Subversion =P. But maybe it is possible and you're approach from before (checking the URL from svn info and using that) would be more appropriate. > >+sub chdirAndGetDifference($); > > Nit: Instead of "GetDifference", I think something like "ReturnRelativePath" > might be more descriptive. I can change this when I land the patch. Sounds good. Thanks for the review! Cheers. 132005 14 bfulgham 2009-07-15 13:11:25 -0700 Landed in http://trac.webkit.org/changeset/45939. 132404 15 ddkilzer 2009-07-16 16:44:41 -0700 (In reply to comment #12) > I thought of doing that after my last comment as well! The only situation > where this won't work is if a user has a "mixed" svn working directory where > they have one svn working directory at "dir" and a second svn working directory > (from a different repository) under "dir", and the user ran svn-create-patch in > the second working directory. I don't know how prevalent this use case is, and > I doubt it's common with WebKit, so let's not worry about that for now. Oops. See Bug 27323 Comment #6. 157307 16 eric 2009-10-23 14:31:33 -0700 *** Bug 28421 has been marked as a duplicate of this bug. *** 32491 2009-07-08 17:29:58 -0700 2009-07-14 15:55:27 -0700 This would make it so svn-create-patch provides full paths from the WebKit root directory. CreatePatchWithRootPaths.patch text/plain 2708 joepeck SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ1NjUyKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTEgQEAKKzIwMDktMDctMDggIEpvc2VwaCBQZWNvcmFybyAg PGpvZXBlY2swMkBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTWFrZSBzdm4tY3JlYXRlLXBhdGNoIHByb3ZpZGUgZmlsZSBwYXRoZXMg ZnJvbSB0aGUgcm9vdCBXZWJLaXQgZGlyLgorCisgICAgICAgICogU2NyaXB0cy9zdm4tY3JlYXRl LXBhdGNoOgorCiAyMDA5LTA3LTA4ICBNYWNpZWogU3RhY2hvd2lhayAgPG1qc0BhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFyayBSb3dlLgpJbmRleDogV2ViS2l0VG9vbHMvU2Ny aXB0cy9zdm4tY3JlYXRlLXBhdGNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMv c3ZuLWNyZWF0ZS1wYXRjaAkocmV2aXNpb24gNDU1MTEpCisrKyBXZWJLaXRUb29scy9TY3JpcHRz L3N2bi1jcmVhdGUtcGF0Y2gJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDIzICs0NCwyNiBAQCB1c2Ug c3RyaWN0OwogdXNlIHdhcm5pbmdzOwogCiB1c2UgQ29uZmlnOwotdXNlIEN3ZDsKIHVzZSBGaWxl OjpCYXNlbmFtZTsKIHVzZSBGaWxlOjpTcGVjOwogdXNlIEZpbGU6OnN0YXQ7Cit1c2UgRmluZEJp bjsKK3VzZSBsaWIgJEZpbmRCaW46OkJpbjsKIHVzZSBHZXRvcHQ6Okxvbmc7CiB1c2UgTUlNRTo6 QmFzZTY0OwogdXNlIFBPU0lYIHF3KDplcnJub19oKTsKIHVzZSBUaW1lOjpnbXRpbWU7Cit1c2Ug d2Via2l0ZGlyczsKIAogc3ViIGJpbmFyeWNtcCgkJCk7CiBzdWIgY2Fub25pY2FsaXplUGF0aCgk KTsKK3N1YiBjaGRpcldlYktpdEFuZEdldFByZWZpeDsKIHN1YiBmaW5kQmFzZVVybCgkKTsKIHN1 YiBmaW5kTWltZVR5cGUoJDskKTsKIHN1YiBmaW5kTW9kaWZpY2F0aW9uVHlwZSgkKTsKIHN1YiBm aW5kU291cmNlRmlsZUFuZFJldmlzaW9uKCQpOwogc3ViIGZpeENoYW5nZUxvZ1BhdGNoKCQpOwot c3ViIGdlbmVyYXRlRGlmZigkKTsKK3N1YiBnZW5lcmF0ZURpZmYoJCQpOwogc3ViIGdlbmVyYXRl RmlsZUxpc3QoJFwlKTsKIHN1YiBpc0JpbmFyeU1pbWVUeXBlKCQpOwogc3ViIG1hbnVmYWN0dXJl UGF0Y2hGb3JBZGRpdGlvbldpdGhIaXN0b3J5KCQpOwpAQCAtOTQsOSArOTcsMTIgQEAgZm9yIG15 ICRwYXRoIChrZXlzICVwYXRocykgewogICAgIGdlbmVyYXRlRmlsZUxpc3QoJHBhdGgsICVkaWZm RmlsZXMpOwogfQogCisjIEFwcGx5IHBhdGNoZXMgZnJvbSB0aGUgV2ViS2l0IGRpcmVjdG9yeQor bXkgJHByZWZpeCA9IGNoZGlyV2ViS2l0QW5kR2V0UHJlZml4KCk7CisKICMgR2VuZXJhdGUgdGhl IGRpZmZzLCBpbiBhIG9yZGVyIGNob3NlbiBmb3IgZWFzeSByZXZpZXdpbmcuCiBmb3IgbXkgJHBh dGggKHNvcnQgcGF0Y2hwYXRoY21wIHZhbHVlcyAlZGlmZkZpbGVzKSB7Ci0gICAgZ2VuZXJhdGVE aWZmKCRwYXRoKTsKKyAgICBnZW5lcmF0ZURpZmYoJHBhdGgsICRwcmVmaXgpOwogfQogCiBleGl0 IDA7CkBAIC0yNTIsMTAgKzI1OCwxMCBAQCBzdWIgZml4Q2hhbmdlTG9nUGF0Y2goJCkKICAgICBy ZXR1cm4gJG5ld1BhdGNoOwogfQogCi1zdWIgZ2VuZXJhdGVEaWZmKCQpCitzdWIgZ2VuZXJhdGVE aWZmKCQkKQogewotICAgIG15ICgkZmlsZURhdGEpID0gQF87Ci0gICAgbXkgJGZpbGUgPSAkZmls ZURhdGEtPntwYXRofTsKKyAgICBteSAoJGZpbGVEYXRhLCAkcHJlZml4KSA9IEBfOworICAgIG15 ICRmaWxlID0gJHByZWZpeCAuICRmaWxlRGF0YS0+e3BhdGh9OwogICAgIG15ICRwYXRjaDsKICAg ICBpZiAoJGZpbGVEYXRhLT57bW9kaWZpY2F0aW9uVHlwZX0gZXEgImFkZGl0aW9uV2l0aEhpc3Rv cnkiKSB7CiAgICAgICAgIG1hbnVmYWN0dXJlUGF0Y2hGb3JBZGRpdGlvbldpdGhIaXN0b3J5KCRm aWxlRGF0YSk7CkBAIC00NDcsMyArNDUzLDE1IEBAIHN1YiB0ZXN0ZmlsZWNtcCgkJCkKICAgICBt eSAoJGZpbGVEYXRhQSwgJGZpbGVEYXRhQikgPSBAXzsKICAgICByZXR1cm4gJGZpbGVEYXRhQS0+ e2lzVGVzdEZpbGV9IDw9PiAkZmlsZURhdGFCLT57aXNUZXN0RmlsZX07CiB9CisKKyMgQ2hhbmdl IHRvIFdlYktpdCBkaXIgYW5kIGdldCB0aGUgZGlmZmVyZW5jZSBmcm9tIHRoZSBjdXJyZW50IGRp cgorc3ViIGNoZGlyV2ViS2l0QW5kR2V0UHJlZml4Cit7CisgICAgbXkgJGJlZm9yZSA9IEZpbGU6 OlNwZWMtPnJlbDJhYnMoIEZpbGU6OlNwZWMtPmN1cmRpcigpICk7CisgICAgY2hkaXJXZWJLaXQo KTsKKyAgICBteSAkYWZ0ZXIgPSBGaWxlOjpTcGVjLT5yZWwyYWJzKCBGaWxlOjpTcGVjLT5jdXJk aXIoKSApOworICAgICRiZWZvcmUgPX4gcy9eJGFmdGVyXC8/Ly87CisgICAgcmV0dXJuICRiZWZv cmUgaWYgJGJlZm9yZSBlcSAnJzsgICAgIyBBbHJlYWR5IGF0IFdlYktpdCBkaXIKKyAgICAkYmVm b3JlIC49ICcvJyBpZiAkYmVmb3JlICF+IC9cLyQvOyAjIFByZWZpeCBuZWVkcyBhIHRyYWlsaW5n ICcvJworICAgIHJldHVybiAkYmVmb3JlOworfQo= 32742 2009-07-14 15:55:27 -0700 2009-07-14 15:58:39 -0700 svn-create-patch provides full paths Subversion Repository's Root Directory SvnCreatePatchesFromRoot.patch text/plain 2924 joepeck SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ1ODc3KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMDctMTQgIEpvc2VwaCBQZWNvcmFybyAg PGpvZXBlY2swMkBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgYnVnemlsbGEtdG9vbC9zdm4tYXBwbHkgY2FuJ3QgaGFuZGxlIHBhdGNo ZXMgbWFkZSBmcm9tIGEgbm9uLXJvb3QgZGlyZWN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjk5OQorCisgICAgICAgICogU2NyaXB0cy9zdm4t Y3JlYXRlLXBhdGNoOgorCiAyMDA5LTA3LTE0ICBTaGluaWNoaXJvIEhhbWFqaSAgPGhhbWFqaUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBX ZWJLaXRUb29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 VG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoCShyZXZpc2lvbiA0NTgzNSkKKysrIFdlYktp dFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNyAr NDQsNiBAQCB1c2Ugc3RyaWN0OwogdXNlIHdhcm5pbmdzOwogCiB1c2UgQ29uZmlnOwotdXNlIEN3 ZDsKIHVzZSBGaWxlOjpCYXNlbmFtZTsKIHVzZSBGaWxlOjpTcGVjOwogdXNlIEZpbGU6OnN0YXQ7 CkBAIC01NSwxMiArNTQsMTQgQEAgdXNlIFRpbWU6OmdtdGltZTsKIAogc3ViIGJpbmFyeWNtcCgk JCk7CiBzdWIgY2Fub25pY2FsaXplUGF0aCgkKTsKK3N1YiBjaGRpckFuZEdldERpZmZlcmVuY2Uo JCk7CitzdWIgZGV0ZXJtaW5lU3ZuUm9vdCgpOwogc3ViIGZpbmRCYXNlVXJsKCQpOwogc3ViIGZp bmRNaW1lVHlwZSgkOyQpOwogc3ViIGZpbmRNb2RpZmljYXRpb25UeXBlKCQpOwogc3ViIGZpbmRT b3VyY2VGaWxlQW5kUmV2aXNpb24oJCk7CiBzdWIgZml4Q2hhbmdlTG9nUGF0Y2goJCk7Ci1zdWIg Z2VuZXJhdGVEaWZmKCQpOworc3ViIGdlbmVyYXRlRGlmZigkJCk7CiBzdWIgZ2VuZXJhdGVGaWxl TGlzdCgkXCUpOwogc3ViIGlzQmluYXJ5TWltZVR5cGUoJCk7CiBzdWIgbWFudWZhY3R1cmVQYXRj aEZvckFkZGl0aW9uV2l0aEhpc3RvcnkoJCk7CkBAIC05NCw5ICs5NSwxMiBAQCBmb3IgbXkgJHBh dGggKGtleXMgJXBhdGhzKSB7CiAgICAgZ2VuZXJhdGVGaWxlTGlzdCgkcGF0aCwgJWRpZmZGaWxl cyk7CiB9CiAKK215ICRzdm5Sb290ID0gZGV0ZXJtaW5lU3ZuUm9vdCgpOworbXkgJHByZWZpeCA9 IGNoZGlyQW5kR2V0RGlmZmVyZW5jZSgkc3ZuUm9vdCk7CisKICMgR2VuZXJhdGUgdGhlIGRpZmZz LCBpbiBhIG9yZGVyIGNob3NlbiBmb3IgZWFzeSByZXZpZXdpbmcuCiBmb3IgbXkgJHBhdGggKHNv cnQgcGF0Y2hwYXRoY21wIHZhbHVlcyAlZGlmZkZpbGVzKSB7Ci0gICAgZ2VuZXJhdGVEaWZmKCRw YXRoKTsKKyAgICBnZW5lcmF0ZURpZmYoJHBhdGgsICRwcmVmaXgpOwogfQogCiBleGl0IDA7CkBA IC0yNTIsMTAgKzI1NiwxMCBAQCBzdWIgZml4Q2hhbmdlTG9nUGF0Y2goJCkKICAgICByZXR1cm4g JG5ld1BhdGNoOwogfQogCi1zdWIgZ2VuZXJhdGVEaWZmKCQpCitzdWIgZ2VuZXJhdGVEaWZmKCQk KQogewotICAgIG15ICgkZmlsZURhdGEpID0gQF87Ci0gICAgbXkgJGZpbGUgPSAkZmlsZURhdGEt PntwYXRofTsKKyAgICBteSAoJGZpbGVEYXRhLCAkcHJlZml4KSA9IEBfOworICAgIG15ICRmaWxl ID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRwcmVmaXgsICRmaWxlRGF0YS0+e3BhdGh9KTsKICAgICBt eSAkcGF0Y2g7CiAgICAgaWYgKCRmaWxlRGF0YS0+e21vZGlmaWNhdGlvblR5cGV9IGVxICJhZGRp dGlvbldpdGhIaXN0b3J5IikgewogICAgICAgICBtYW51ZmFjdHVyZVBhdGNoRm9yQWRkaXRpb25X aXRoSGlzdG9yeSgkZmlsZURhdGEpOwpAQCAtNDQ3LDMgKzQ1MSwyOSBAQCBzdWIgdGVzdGZpbGVj bXAoJCQpCiAgICAgbXkgKCRmaWxlRGF0YUEsICRmaWxlRGF0YUIpID0gQF87CiAgICAgcmV0dXJu ICRmaWxlRGF0YUEtPntpc1Rlc3RGaWxlfSA8PT4gJGZpbGVEYXRhQi0+e2lzVGVzdEZpbGV9Owog fQorCitzdWIgY2hkaXJBbmRHZXREaWZmZXJlbmNlKCQpCit7CisgICAgbXkgKCRuZXdkaXIpID0g QF87CisgICAgbXkgJGJlZm9yZSA9IEZpbGU6OlNwZWMtPnJlbDJhYnMoIEZpbGU6OlNwZWMtPmN1 cmRpcigpICk7CisgICAgY2hkaXIgJG5ld2RpcjsKKyAgICBteSAkYWZ0ZXIgPSBGaWxlOjpTcGVj LT5yZWwyYWJzKCBGaWxlOjpTcGVjLT5jdXJkaXIoKSApOworICAgIHJldHVybiBGaWxlOjpTcGVj LT5hYnMycmVsKCRiZWZvcmUsICRhZnRlcik7Cit9CisKK3N1YiBkZXRlcm1pbmVTdm5Sb290KCkK K3sKKyAgICBteSAkbGFzdCA9ICcnOworICAgIG15ICRwYXRoID0gJy4nOworICAgIG15ICRwYXJl bnQgPSAnLi4vJzsKKyAgICBteSAkZGV2bnVsbCA9IEZpbGU6OlNwZWMtPmRldm51bGwoKTsKKyAg ICBteSAkZXhpdENvZGU7CisgICAgd2hpbGUgKDEpIHsKKyAgICAgICAgJGV4aXRDb2RlID0gc3lz dGVtKCJzdm4gaW5mbyAkcGF0aCAyPiAkZGV2bnVsbCA+ICRkZXZudWxsIikvMjU2OworICAgICAg ICBsYXN0IGlmICRleGl0Q29kZTsKKyAgICAgICAgJGxhc3QgPSAkcGF0aDsKKyAgICAgICAgJHBh dGggPSAkcGFyZW50IC4gJHBhdGg7CisgICAgfQorCisgICAgcmV0dXJuIEZpbGU6OlNwZWMtPnJl bDJhYnMoJGxhc3QpOworfQo= 32743 2009-07-14 15:55:27 -0700 2009-07-14 18:30:06 -0700 svn-create-patch provides full paths Subversion Repository's Root Directory SvnCreatePatchesFromRoot.patch text/plain 2924 joepeck SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ1ODc3KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMDctMTQgIEpvc2VwaCBQZWNvcmFybyAg PGpvZXBlY2swMkBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgYnVnemlsbGEtdG9vbC9zdm4tYXBwbHkgY2FuJ3QgaGFuZGxlIHBhdGNo ZXMgbWFkZSBmcm9tIGEgbm9uLXJvb3QgZGlyZWN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjk5OQorCisgICAgICAgICogU2NyaXB0cy9zdm4t Y3JlYXRlLXBhdGNoOgorCiAyMDA5LTA3LTE0ICBTaGluaWNoaXJvIEhhbWFqaSAgPGhhbWFqaUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBX ZWJLaXRUb29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 VG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoCShyZXZpc2lvbiA0NTgzNSkKKysrIFdlYktp dFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNyAr NDQsNiBAQCB1c2Ugc3RyaWN0OwogdXNlIHdhcm5pbmdzOwogCiB1c2UgQ29uZmlnOwotdXNlIEN3 ZDsKIHVzZSBGaWxlOjpCYXNlbmFtZTsKIHVzZSBGaWxlOjpTcGVjOwogdXNlIEZpbGU6OnN0YXQ7 CkBAIC01NSwxMiArNTQsMTQgQEAgdXNlIFRpbWU6OmdtdGltZTsKIAogc3ViIGJpbmFyeWNtcCgk JCk7CiBzdWIgY2Fub25pY2FsaXplUGF0aCgkKTsKK3N1YiBjaGRpckFuZEdldERpZmZlcmVuY2Uo JCk7CitzdWIgZGV0ZXJtaW5lU3ZuUm9vdCgpOwogc3ViIGZpbmRCYXNlVXJsKCQpOwogc3ViIGZp bmRNaW1lVHlwZSgkOyQpOwogc3ViIGZpbmRNb2RpZmljYXRpb25UeXBlKCQpOwogc3ViIGZpbmRT b3VyY2VGaWxlQW5kUmV2aXNpb24oJCk7CiBzdWIgZml4Q2hhbmdlTG9nUGF0Y2goJCk7Ci1zdWIg Z2VuZXJhdGVEaWZmKCQpOworc3ViIGdlbmVyYXRlRGlmZigkJCk7CiBzdWIgZ2VuZXJhdGVGaWxl TGlzdCgkXCUpOwogc3ViIGlzQmluYXJ5TWltZVR5cGUoJCk7CiBzdWIgbWFudWZhY3R1cmVQYXRj aEZvckFkZGl0aW9uV2l0aEhpc3RvcnkoJCk7CkBAIC05NCw5ICs5NSwxMiBAQCBmb3IgbXkgJHBh dGggKGtleXMgJXBhdGhzKSB7CiAgICAgZ2VuZXJhdGVGaWxlTGlzdCgkcGF0aCwgJWRpZmZGaWxl cyk7CiB9CiAKK215ICRzdm5Sb290ID0gZGV0ZXJtaW5lU3ZuUm9vdCgpOworbXkgJHByZWZpeCA9 IGNoZGlyQW5kR2V0RGlmZmVyZW5jZSgkc3ZuUm9vdCk7CisKICMgR2VuZXJhdGUgdGhlIGRpZmZz LCBpbiBhIG9yZGVyIGNob3NlbiBmb3IgZWFzeSByZXZpZXdpbmcuCiBmb3IgbXkgJHBhdGggKHNv cnQgcGF0Y2hwYXRoY21wIHZhbHVlcyAlZGlmZkZpbGVzKSB7Ci0gICAgZ2VuZXJhdGVEaWZmKCRw YXRoKTsKKyAgICBnZW5lcmF0ZURpZmYoJHBhdGgsICRwcmVmaXgpOwogfQogCiBleGl0IDA7CkBA IC0yNTIsMTAgKzI1NiwxMCBAQCBzdWIgZml4Q2hhbmdlTG9nUGF0Y2goJCkKICAgICByZXR1cm4g JG5ld1BhdGNoOwogfQogCi1zdWIgZ2VuZXJhdGVEaWZmKCQpCitzdWIgZ2VuZXJhdGVEaWZmKCQk KQogewotICAgIG15ICgkZmlsZURhdGEpID0gQF87Ci0gICAgbXkgJGZpbGUgPSAkZmlsZURhdGEt PntwYXRofTsKKyAgICBteSAoJGZpbGVEYXRhLCAkcHJlZml4KSA9IEBfOworICAgIG15ICRmaWxl ID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRwcmVmaXgsICRmaWxlRGF0YS0+e3BhdGh9KTsKICAgICBt eSAkcGF0Y2g7CiAgICAgaWYgKCRmaWxlRGF0YS0+e21vZGlmaWNhdGlvblR5cGV9IGVxICJhZGRp dGlvbldpdGhIaXN0b3J5IikgewogICAgICAgICBtYW51ZmFjdHVyZVBhdGNoRm9yQWRkaXRpb25X aXRoSGlzdG9yeSgkZmlsZURhdGEpOwpAQCAtNDQ3LDMgKzQ1MSwyOSBAQCBzdWIgdGVzdGZpbGVj bXAoJCQpCiAgICAgbXkgKCRmaWxlRGF0YUEsICRmaWxlRGF0YUIpID0gQF87CiAgICAgcmV0dXJu ICRmaWxlRGF0YUEtPntpc1Rlc3RGaWxlfSA8PT4gJGZpbGVEYXRhQi0+e2lzVGVzdEZpbGV9Owog fQorCitzdWIgY2hkaXJBbmRHZXREaWZmZXJlbmNlKCQpCit7CisgICAgbXkgKCRuZXdkaXIpID0g QF87CisgICAgbXkgJGJlZm9yZSA9IEZpbGU6OlNwZWMtPnJlbDJhYnMoIEZpbGU6OlNwZWMtPmN1 cmRpcigpICk7CisgICAgY2hkaXIgJG5ld2RpcjsKKyAgICBteSAkYWZ0ZXIgPSBGaWxlOjpTcGVj LT5yZWwyYWJzKCBGaWxlOjpTcGVjLT5jdXJkaXIoKSApOworICAgIHJldHVybiBGaWxlOjpTcGVj LT5hYnMycmVsKCRiZWZvcmUsICRhZnRlcik7Cit9CisKK3N1YiBkZXRlcm1pbmVTdm5Sb290KCkK K3sKKyAgICBteSAkbGFzdCA9ICcnOworICAgIG15ICRwYXRoID0gJy4nOworICAgIG15ICRwYXJl bnQgPSAnLi4vJzsKKyAgICBteSAkZGV2bnVsbCA9IEZpbGU6OlNwZWMtPmRldm51bGwoKTsKKyAg ICBteSAkZXhpdENvZGU7CisgICAgd2hpbGUgKDEpIHsKKyAgICAgICAgJGV4aXRDb2RlID0gc3lz dGVtKCJzdm4gaW5mbyAkcGF0aCAyPiAkZGV2bnVsbCA+ICRkZXZudWxsIikvMjU2OworICAgICAg ICBsYXN0IGlmICRleGl0Q29kZTsKKyAgICAgICAgJGxhc3QgPSAkcGF0aDsKKyAgICAgICAgJHBh dGggPSAkcGFyZW50IC4gJHBhdGg7CisgICAgfQorCisgICAgcmV0dXJuIEZpbGU6OlNwZWMtPnJl bDJhYnMoJGxhc3QpOworfQo=