18599 2008-04-18 14:47:32 -0700 resolve-ChangeLogs doesn't work with relative paths 2009-08-10 11:19:29 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 eric ddkilzer aroben ddkilzer evan pkasting oldest_to_newest 78180 0 eric 2008-04-18 14:47:32 -0700 SilverTop [4479:WebCore]% resolve-ChangeLogs ../WebKit/mac/ChangeLog [~/Projects/WebKit/WebCore] fatal: git-ls-files: cannot generate relative filenames containing '..' WARNING: ../WebKit/mac/ChangeLog does not need merging. SilverTop [4480:WebCore]% cd .. [~/Projects/WebKit/WebCore] SilverTop [4481:WebKit]% resolve-ChangeLogs WebKit/mac/ChangeLog [~/Projects/WebKit] M WebKit/mac/ChangeLog Two bugs here. 1. we should work around the git-ls-files limitation 2. when git-ls-files fails, we should fail... 93098 1 ddkilzer 2008-09-27 16:54:38 -0700 Could probably use some combination of chdirWebKit() and/or determineSourceDir() from webkitdirs.pm, and fix up any relative paths passed in on the command line. However, this assumes resolve-ChangeLogs resides in the same WebKitTools directory that would be (in Eric's example) at ../WebKitTools. 119257 2 ddkilzer 2009-04-28 20:34:05 -0700 *** Bug 25456 has been marked as a duplicate of this bug. *** 119260 3 29878 ddkilzer 2009-04-28 20:42:12 -0700 Created attachment 29878 Potential fix This needs testing. If you try it out, please report back on your results. The basic idea is that the resolve-ChangeLogs script will always chdir to the root of the source directory for you (if you don't run it from there), so that this assumption (that it's run from the root source dir) is no longer violated. What I don't like about this patch is that it makes it impossible to use resolve-ChangeLogs from any project other than WebKit due to the way chdirWebKit() works. It would be better to use git prefix (and something equivalent for svn--anyone? Bueller?) to chdir() instead. 136314 4 33910 ddkilzer 2009-07-31 17:36:46 -0700 Created attachment 33910 Add error checking to git ls-files command on close() Reviewed by NOBODY (OOPS!). Item 2 of <https://bugs.webkit.org/show_bug.cgi?id=18599#c0>. * Scripts/resolve-ChangeLogs: Added error checking to close() after running git ls-files. Added error checking to all system() calls by checking for a non-zero WEXITSTATUS($?). Changed "|| die;" expressions to "or die $!;". --- 2 files changed, 34 insertions(+), 15 deletions(-) 136315 5 33911 ddkilzer 2009-07-31 17:36:50 -0700 Created attachment 33911 resolve-ChangeLogs doesn't work with relative paths Reviewed by NOBODY (OOPS!). * Scripts/resolve-ChangeLogs: Used chdirReturningRelativePath() and determineVCSRoot() to change directories to the root of the project before running the command and to provide a path for removeChangeLogArguments() to make sure any ChangeLog arguments on the command line are still found. (canonicalRelativePath): Added. Returns a canonical path (e.g., stripping 'dir/../' from the path) relative to the current directory. (removeChangeLogArguments): Added argument which contains a relative path that must be prepended to any ChangeLog arguments. Used canonicalRelativePath() and File::Spec->catfile() to construct a normalized, relative path to each file. --- 2 files changed, 34 insertions(+), 4 deletions(-) 136316 6 33912 ddkilzer 2009-07-31 17:36:53 -0700 Created attachment 33912 Implement VCSUtils::chdirReturningRelativePath() Reviewed by NOBODY (OOPS!). Step 2 to fix: <http://webkit.org/b/18599> resolve-ChangeLogs doesn't work with relative paths * Scripts/VCSUtils.pm: (VCSUtils::chdirReturningRelativePath): Moved here from chdirAndGetDifference() in svn-create-patch. * Scripts/svn-create-patch: Switched to use chdirReturningRelativePath() instead of chdirAndGetDifference(). (chdirAndGetDifference): Removed. --- 3 files changed, 29 insertions(+), 13 deletions(-) 136317 7 33913 ddkilzer 2009-07-31 17:36:56 -0700 Created attachment 33913 Implement VCSUtils::determineVCSRoot() Reviewed by NOBODY (OOPS!). 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. --- 3 files changed, 44 insertions(+), 16 deletions(-) 136318 8 ddkilzer 2009-07-31 17:42:03 -0700 Odd...I expected the patches to be posted in the reverse order from bugzilla-tool! 136328 9 33910 eric 2009-07-31 18:25:39 -0700 Comment on attachment 33910 Add error checking to git ls-files command on close() Perl is so disgusting. 136329 10 33911 eric 2009-07-31 18:26:48 -0700 Comment on attachment 33911 resolve-ChangeLogs doesn't work with relative paths I don't fully understand, but so long as it works, rs=me. :) 136330 11 33912 eric 2009-07-31 18:29:19 -0700 Comment on attachment 33912 Implement VCSUtils::chdirReturningRelativePath() you don't need qw() just (), iirc qw() == (), or? I've never seen this line actually do anything: @EXPORT = qw(&chdirReturningRelativePath &determineSVNRoot &determineVCSRoot &isGit &isGitDirectory &isSVN &isSVNDirectory &makeFilePathRelative I think we just have it to comply with perl hear-say. ;) LGTM. 136331 12 33913 eric 2009-07-31 18:30:20 -0700 Comment on attachment 33913 Implement VCSUtils::determineVCSRoot() LGTM. Shame we have the same logic in both our python libraries and our perl libraries (yes, I know the perl ones came first). :) 136446 13 ddkilzer 2009-08-01 06:30:32 -0700 (In reply to comment #11) > (From update of attachment 33912 [details]) > you don't need qw() just (), iirc qw() == (), or? Nope. The qw() or quote word operator is different from just adding parenthesis and making a list. To change qw(alpha beta gamma) to drop the qw operator, you would have to write ("alpha", "beta", "gamma"). See "man perlop" and search for "qw" for more details. See also the q, qq, qr and qx operators. > I've never seen this line actually do anything: > @EXPORT = qw(&chdirReturningRelativePath &determineSVNRoot > &determineVCSRoot &isGit &isGitDirectory &isSVN &isSVNDirectory > &makeFilePathRelative > I think we just have it to comply with perl hear-say. ;) Then you've never tried removing a method from the list and then running a script that uses the method. This line tells the perl module which methods are implicitly exported by default when the module is 'use'd in another module or script. This is the "opposite" of explicitly importing a list of variables or methods or :groups in a use statement, e.g.: use Getopt::Long qw(:config pass_through); See "man perlmod" for more details about how to write Perl modules. See "man perlfunc" for more information about "use". 136448 14 33913 ddkilzer 2009-08-01 07:26:13 -0700 Comment on attachment 33913 Implement VCSUtils::determineVCSRoot() Clearing review+ flag. Landed in r46669. <http://trac.webkit.org/changeset/46669> 136449 15 33913 ddkilzer 2009-08-01 07:26:27 -0700 Comment on attachment 33913 Implement VCSUtils::determineVCSRoot() Clearing review+ flag. Landed in r46669. <http://trac.webkit.org/changeset/46669> 136450 16 ddkilzer 2009-08-01 07:29:11 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/VCSUtils.pm M WebKitTools/Scripts/svn-create-patch Committed r46670 M WebKitTools/ChangeLog M WebKitTools/Scripts/VCSUtils.pm M WebKitTools/Scripts/svn-create-patch r46670 = f28f8d26c5ba542a9e276de8ecc1ba1eb85ec487 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46670 136451 17 ddkilzer 2009-08-01 07:29:15 -0700 All reviewed patches have been landed. Closing bug. 136452 18 ddkilzer 2009-08-01 07:29:24 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/resolve-ChangeLogs Committed r46671 M WebKitTools/ChangeLog M WebKitTools/Scripts/resolve-ChangeLogs r46671 = 368a45ec528e8feb5b11df9c57b625a8d371e678 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46671 136453 19 ddkilzer 2009-08-01 07:29:28 -0700 All reviewed patches have been landed. Closing bug. 136454 20 ddkilzer 2009-08-01 07:29:37 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/resolve-ChangeLogs Committed r46672 M WebKitTools/ChangeLog M WebKitTools/Scripts/resolve-ChangeLogs r46672 = e8e8619072e33a2a51ac3dc86e988e2b41ea1570 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46672 136455 21 ddkilzer 2009-08-01 07:29:41 -0700 All reviewed patches have been landed. Closing bug. 136456 22 ddkilzer 2009-08-01 07:31:12 -0700 Hmm...my local 'land-commits' patch to bugzilla-tool needs a lot more work when landing a patch series on a single bug. 138740 23 pkasting 2009-08-10 11:19:29 -0700 Additional fix (work around abs2rel() bug with symlinks) committed as r46988. 29878 2009-04-28 20:42:12 -0700 2009-07-31 17:36:43 -0700 Potential fix bug-18599-fix.diff text/plain 1438 ddkilzer ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzIGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3MKaW5kZXggOTY2NmYyZi4uMjc5ZDky NyAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3MKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3MKQEAgLTMzLDYgKzMzLDcg QEAgdXNlIHN0cmljdDsKIHVzZSBGaW5kQmluOwogdXNlIGxpYiAkRmluZEJpbjo6QmluOwogCit1 c2UgQ3dkIHF3KGN3ZCk7CiB1c2UgRmlsZTo6QmFzZW5hbWU7CiB1c2UgRmlsZTo6UGF0aDsKIHVz ZSBGaWxlOjpTcGVjOwpAQCAtNDgsNyArNDksNyBAQCBzdWIgZml4TWVyZ2VkQ2hhbmdlTG9ncygk O0ApOwogc3ViIGZpeE9uZU1lcmdlZENoYW5nZUxvZygkKTsKIHN1YiBtZXJnZUNoYW5nZXMoJCQk KTsKIHN1YiBwYXJzZUZpeE1lcmdlZCgkJDskKTsKLXN1YiByZW1vdmVDaGFuZ2VMb2dBcmd1bWVu dHMoKTsKK3N1YiByZW1vdmVDaGFuZ2VMb2dBcmd1bWVudHMoJCk7CiBzdWIgcmVzb2x2ZUNoYW5n ZUxvZygkKTsKIHN1YiByZXNvbHZlQ29uZmxpY3QoJCk7CiBzdWIgc2hvd1N0YXR1cygkOyQpOwpA QCAtNzAsNyArNzEsMTAgQEAgbXkgJGdldE9wdGlvbnNSZXN1bHQgPSBHZXRPcHRpb25zKAogICAg ICd3fHdhcm5pbmdzIScgICAgPT4gXCRwcmludFdhcm5pbmdzLAogKTsKIAotbXkgQGNoYW5nZUxv Z0ZpbGVzID0gcmVtb3ZlQ2hhbmdlTG9nQXJndW1lbnRzKCk7CitteSAkaW5pdGlhbERpciA9IGN3 ZCgpOworY2hkaXJXZWJLaXQoKTsKKworbXkgQGNoYW5nZUxvZ0ZpbGVzID0gcmVtb3ZlQ2hhbmdl TG9nQXJndW1lbnRzKCRpbml0aWFsRGlyKTsKIAogaWYgKCFkZWZpbmVkICRmaXhNZXJnZWQgJiYg c2NhbGFyKEBjaGFuZ2VMb2dGaWxlcykgPT0gMCkgewogICAgIEBjaGFuZ2VMb2dGaWxlcyA9IGZp bmRVbm1lcmdlZENoYW5nZUxvZ3MoKTsKQEAgLTQ0NCwxMiArNDQ4LDEzIEBAIHN1YiBwYXJzZUZp eE1lcmdlZCgkJDskKQogICAgIH0KIH0KIAotc3ViIHJlbW92ZUNoYW5nZUxvZ0FyZ3VtZW50cygp CitzdWIgcmVtb3ZlQ2hhbmdlTG9nQXJndW1lbnRzKCQpCiB7CisgICAgbXkgKCRiYXNlRGlyKSA9 IEBfOwogICAgIG15IEByZXN1bHRzID0gKCk7CiAKICAgICBmb3IgKG15ICRpID0gMDsgJGkgPCBz Y2FsYXIoQEFSR1YpOyApIHsKLSAgICAgICAgbXkgJGZpbGUgPSBmaW5kQ2hhbmdlTG9nKCRBUkdW WyRpXSk7CisgICAgICAgIG15ICRmaWxlID0gZmluZENoYW5nZUxvZyhGaWxlOjpTcGVjLT5jYXRm aWxlKCRiYXNlRGlyLCAkQVJHVlskaV0pKTsKICAgICAgICAgaWYgKGRlZmluZWQgJGZpbGUpIHsK ICAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwogICAgICAgICAgICAgcHVzaCBAcmVz dWx0cywgJGZpbGU7Cg== 33910 2009-07-31 17:36:46 -0700 2009-07-31 18:25:39 -0700 Add error checking to git ls-files command on close() bug-18599-20090731173645.patch text/plain 6389 ddkilzer ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1ZTFhZTkzLi5iOTlmZjA4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMDktMDct MzEgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAorICAgICAgICBBZGQgZXJy b3IgY2hlY2tpbmcgdG8gZ2l0IGxzLWZpbGVzIGNvbW1hbmQgb24gY2xvc2UoKQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0ZW0gMiBvZiA8aHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTk5I2MwPi4KKworICAgICAgICAq IFNjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzOiBBZGRlZCBlcnJvciBjaGVja2luZyB0byBjbG9z ZSgpCisgICAgICAgIGFmdGVyIHJ1bm5pbmcgZ2l0IGxzLWZpbGVzLiAgQWRkZWQgZXJyb3IgY2hl Y2tpbmcgdG8gYWxsCisgICAgICAgIHN5c3RlbSgpIGNhbGxzIGJ5IGNoZWNraW5nIGZvciBhIG5v bi16ZXJvIFdFWElUU1RBVFVTKCQ/KS4KKyAgICAgICAgQ2hhbmdlZCAifHwgZGllOyIgZXhwcmVz c2lvbnMgdG8gIm9yIGRpZSAkITsiLgorCisyMDA5LTA3LTMxICBEYXZpZCBLaWx6ZXIgIDxkZGtp bHplckBhcHBsZS5jb20+CisKICAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvMTg1OTk+IHJl c29sdmUtQ2hhbmdlTG9ncyBkb2Vzbid0IHdvcmsgd2l0aCByZWxhdGl2ZSBwYXRocwogCiAgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3MgYi9XZWJLaXRUb29scy9TY3JpcHRzL3Jlc29sdmUt Q2hhbmdlTG9ncwppbmRleCAwYzNiMWE3Li4yNDJlYWFmIDEwMDc1NQotLS0gYS9XZWJLaXRUb29s cy9TY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9ncworKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3Jl c29sdmUtQ2hhbmdlTG9ncwpAQCAtMTY0LDcgKzE2NCw3IEBAIHN1YiBjb25mbGljdEZpbGVzKCQp CiAgICAgfQogCiAgICAgaWYgKCRpc1NWTikgewotICAgICAgICBvcGVuIFNUQVQsICItfCIsICRT Vk4sICJzdGF0dXMiLCAkZmlsZSB8fCBkaWU7CisgICAgICAgIG9wZW4gU1RBVCwgIi18IiwgJFNW TiwgInN0YXR1cyIsICRmaWxlIG9yIGRpZSAkITsKICAgICAgICAgbXkgJHN0YXR1cyA9IDxTVEFU PjsKICAgICAgICAgY2xvc2UgU1RBVDsKICAgICAgICAgaWYgKCEkc3RhdHVzIHx8ICRzdGF0dXMg IX4gbS9eQ1xzKy8pIHsKQEAgLTE3NSw3ICsxNzUsNyBAQCBzdWIgY29uZmxpY3RGaWxlcygkKQog ICAgICAgICAkZmlsZU1pbmUgPSAiJHtmaWxlfS5taW5lIiBpZiAtZSAiJHtmaWxlfS5taW5lIjsK IAogICAgICAgICBteSAkY3VycmVudFJldmlzaW9uOwotICAgICAgICBvcGVuIElORk8sICItfCIs ICRTVk4sICJpbmZvIiwgJGZpbGUgfHwgZGllOworICAgICAgICBvcGVuIElORk8sICItfCIsICRT Vk4sICJpbmZvIiwgJGZpbGUgb3IgZGllICQhOwogICAgICAgICB3aGlsZSAobXkgJGxpbmUgPSA8 SU5GTz4pIHsKICAgICAgICAgICAgIGlmICgkbGluZSA9fiBtL15SZXZpc2lvbjogKFswLTldKykv KSB7CiAgICAgICAgICAgICAgICAgJGN1cnJlbnRSZXZpc2lvbiA9ICQxOwpAQCAtMTk0LDcgKzE5 NCw3IEBAIHN1YiBjb25mbGljdEZpbGVzKCQpCiAgICAgfSBlbHNpZiAoJGlzR2l0KSB7CiAgICAg ICAgIG15ICRnaXRQcmVmaXggPSBgJEdJVCByZXYtcGFyc2UgLS1zaG93LXByZWZpeGA7CiAgICAg ICAgIGNob21wICRnaXRQcmVmaXg7Ci0gICAgICAgIG9wZW4gR0lULCAiLXwiLCAkR0lULCAibHMt ZmlsZXMiLCAiLS11bm1lcmdlZCIsICRmaWxlIHx8IGRpZTsKKyAgICAgICAgb3BlbiBHSVQsICIt fCIsICRHSVQsICJscy1maWxlcyIsICItLXVubWVyZ2VkIiwgJGZpbGUgb3IgZGllICQhOwogICAg ICAgICB3aGlsZSAobXkgJGxpbmUgPSA8R0lUPikgewogICAgICAgICAgICAgbXkgKCRtb2RlLCAk aGFzaCwgJHN0YWdlLCAkZmlsZU5hbWUpID0gc3BsaXQoJyAnLCAkbGluZSk7CiAgICAgICAgICAg ICBteSAkb3V0cHV0RmlsZTsKQEAgLTIxMSw4ICsyMTEsOSBAQCBzdWIgY29uZmxpY3RGaWxlcygk KQogICAgICAgICAgICAgICAgIGRpZSAiVW5rbm93biBmaWxlIHN0YWdlOiAkc3RhZ2UiOwogICAg ICAgICAgICAgfQogICAgICAgICAgICAgc3lzdGVtKCIkR0lUIGNhdC1maWxlIGJsb2IgOiR7c3Rh Z2V9OiR7Z2l0UHJlZml4fSR7ZmlsZX0gPiAkb3V0cHV0RmlsZSIpOworICAgICAgICAgICAgZGll ICQhIGlmIFdFWElUU1RBVFVTKCQ/KTsKICAgICAgICAgfQotICAgICAgICBjbG9zZSBHSVQ7Cisg ICAgICAgIGNsb3NlIEdJVCBvciBkaWUgJCE7CiAgICAgfSBlbHNlIHsKICAgICAgICAgZGllICJV bmtub3duIHZlcnNpb24gY29udHJvbCBzeXN0ZW0iOwogICAgIH0KQEAgLTMzOSw5ICszNDAsOSBA QCBzdWIgZml4TWVyZ2VkQ2hhbmdlTG9ncygkO0ApCiAKICAgICBpZiAoc2NhbGFyKEBjaGFuZ2Vk RmlsZXMpIDwgMSkgewogICAgICAgICAjIFJlYWQgaW4gbGlzdCBvZiBmaWxlcyBjaGFuZ2VkIGlu ICRyZXZpc2lvblJhbmdlCi0gICAgICAgIG9wZW4gR0lULCAiLXwiLCAkR0lULCAiZGlmZiIsICIt LW5hbWUtb25seSIsICRyZXZpc2lvblJhbmdlIHx8IGRpZTsKKyAgICAgICAgb3BlbiBHSVQsICIt fCIsICRHSVQsICJkaWZmIiwgIi0tbmFtZS1vbmx5IiwgJHJldmlzaW9uUmFuZ2Ugb3IgZGllICQh OwogICAgICAgICBwdXNoIEBjaGFuZ2VkRmlsZXMsIDxHSVQ+OwotICAgICAgICBjbG9zZSBHSVQg fHwgZGllOworICAgICAgICBjbG9zZSBHSVQgb3IgZGllICQhOwogICAgICAgICBkaWUgIk5vIGNo YW5nZWQgZmlsZXMgaW4gJHJldmlzaW9uUmFuZ2UiIGlmIHNjYWxhcihAY2hhbmdlZEZpbGVzKSA8 IDE7CiAgICAgICAgIGNob21wIEBjaGFuZ2VkRmlsZXM7CiAgICAgfQpAQCAtMzY1LDEzICszNjYs MTQgQEAgc3ViIGZpeE9uZU1lcmdlZENoYW5nZUxvZygkKQogICAgICMgUmVhZCBpbiBwYXRjaCBm b3IgaW5jb3JyZWN0bHkgbWVyZ2VkIENoYW5nZUxvZyBlbnRyeQogICAgIHsKICAgICAgICAgbG9j YWwgJC8gPSB1bmRlZjsKLSAgICAgICAgb3BlbiBHSVQsICItfCIsICRHSVQsICJkaWZmIiwgKCRF TlZ7R0lUX0NPTU1JVH0gfHwgIkhFQUQiKSAuICJeIiwgJGZpbGUgfHwgZGllOworICAgICAgICBv cGVuIEdJVCwgIi18IiwgJEdJVCwgImRpZmYiLCAoJEVOVntHSVRfQ09NTUlUfSB8fCAiSEVBRCIp IC4gIl4iLCAkZmlsZSBvciBkaWUgJCE7CiAgICAgICAgICRwYXRjaCA9IDxHSVQ+OwotICAgICAg ICBjbG9zZSBHSVQgfHwgZGllOworICAgICAgICBjbG9zZSBHSVQgb3IgZGllICQhOwogICAgIH0K IAogICAgICMgQWx3YXlzIGNoZWNrb3V0IHRoZSBwcmV2aW91cyBjb21taXQncyBjb3B5IG9mIHRo ZSBDaGFuZ2VMb2cKICAgICBzeXN0ZW0oJEdJVCwgImNoZWNrb3V0IiwgJEVOVntNQVBQRURfUFJF VklPVVNfQ09NTUlUfSB8fCAiSEVBRF4iLCAkZmlsZSk7CisgICAgZGllICQhIGlmIFdFWElUU1RB VFVTKCQ/KTsKIAogICAgICMgVGhlIHBhdGNoIG11c3QgaGF2ZSAwIG9yIG1vcmUgbGluZXMgb2Yg Y29udGV4dCwgdGhlbiAxIG9yIG1vcmUgbGluZXMKICAgICAjIG9mIGFkZGl0aW9ucywgYW5kIHRo ZW4gMSBvciBtb3JlIGxpbmVzIG9mIGNvbnRleHQuICBJZiBub3QsIHdlIHNraXAgaXQuCkBAIC00 MDAsMjQgKzQwMiwyNiBAQCBzdWIgZml4T25lTWVyZ2VkQ2hhbmdlTG9nKCQpCiAgICAgICAgICRu ZXdQYXRjaCAuPSBqb2luKCIiLCBAcGF0Y2hMaW5lcyk7CiAKICAgICAgICAgIyBBZGQgMyBsaW5l cyBvZiBjb250ZXh0IHRvIHRoZSBlbmQKLSAgICAgICAgb3BlbiBGSUxFLCAiPCIsICRmaWxlIHx8 IGRpZTsKKyAgICAgICAgb3BlbiBGSUxFLCAiPCIsICRmaWxlIG9yIGRpZSAkITsKICAgICAgICAg Zm9yIChteSAkaSA9IDA7ICRpIDwgMzsgJGkrKykgewogICAgICAgICAgICAgJG5ld1BhdGNoIC49 ICIgIiAuIDxGSUxFPjsKICAgICAgICAgfQogICAgICAgICBjbG9zZSBGSUxFOwogCiAgICAgICAg ICMgQXBwbHkgdGhlIG5ldyBwYXRjaAotICAgICAgICBvcGVuKFBBVENILCAifCBwYXRjaCAtcDEg JGZpbGUgPiAvZGV2L251bGwiKSB8fCBkaWU7CisgICAgICAgIG9wZW4oUEFUQ0gsICJ8IHBhdGNo IC1wMSAkZmlsZSA+IC9kZXYvbnVsbCIpIG9yIGRpZSAkITsKICAgICAgICAgcHJpbnQgUEFUQ0gg JG5ld1BhdGNoOwotICAgICAgICBjbG9zZShQQVRDSCkgfHwgZGllOworICAgICAgICBjbG9zZShQ QVRDSCkgb3IgZGllICQhOwogCiAgICAgICAgICMgUnVuICJnaXQgYWRkIiBvbiB0aGUgZml4ZWQg Q2hhbmdlTG9nIGZpbGUKICAgICAgICAgc3lzdGVtKCRHSVQsICJhZGQiLCAkZmlsZSk7CisgICAg ICAgIGRpZSAkISBpZiBXRVhJVFNUQVRVUygkPyk7CiAKICAgICAgICAgc2hvd1N0YXR1cygkZmls ZSwgMSk7CiAgICAgfSBlbHNpZiAoJHBhdGNoKSB7CiAgICAgICAgICMgUmVzdG9yZSB0aGUgY3Vy cmVudCBjb3B5IG9mIHRoZSBDaGFuZ2VMb2cgZmlsZSBzaW5jZSB3ZSBjYW4ndCByZXBhdGNoIGl0 CiAgICAgICAgIHN5c3RlbSgkR0lULCAiY2hlY2tvdXQiLCAkRU5We0dJVF9DT01NSVR9IHx8ICJI RUFEIiwgJGZpbGUpOworICAgICAgICBkaWUgJCEgaWYgV0VYSVRTVEFUVVMoJD8pOwogICAgICAg ICBwcmludCBTVERFUlIgIldBUk5JTkc6IExhc3QgY2hhbmdlIHRvICR7ZmlsZX0gY291bGQgbm90 IGJlIGZpeGVkIGFuZCByZS1tZXJnZWQuXG4iIGlmICRwcmludFdhcm5pbmdzOwogICAgIH0KIH0K QEAgLTQzOCwxMyArNDQyLDEzIEBAIHN1YiBtZXJnZUNoYW5nZXMoJCQkKQogCiAgICAgbXkgJHBh dGNoOwogICAgIGlmICgkdHJhZGl0aW9uYWxSZWplY3QpIHsKLSAgICAgICAgb3BlbihESUZGLCAi PCIsICRmaWxlTWluZSk7CisgICAgICAgIG9wZW4oRElGRiwgIjwiLCAkZmlsZU1pbmUpIG9yIGRp ZSAkITsKICAgICAgICAgJHBhdGNoID0gPERJRkY+OwogICAgICAgICBjbG9zZShESUZGKTsKICAg ICAgICAgcmVuYW1lKCRmaWxlTWluZSwgIiRmaWxlTWluZS5zYXZlIik7CiAgICAgICAgIHJlbmFt ZSgkZmlsZU9sZGVyLCAiJGZpbGVPbGRlci5zYXZlIik7CiAgICAgfSBlbHNlIHsKLSAgICAgICAg b3BlbihESUZGLCAiLXwiLCBxdyhkaWZmIC11IC1hIC0tYmluYXJ5KSwgJGZpbGVPbGRlciwgJGZp bGVNaW5lKSB8fCBkaWU7CisgICAgICAgIG9wZW4oRElGRiwgIi18IiwgcXcoZGlmZiAtdSAtYSAt LWJpbmFyeSksICRmaWxlT2xkZXIsICRmaWxlTWluZSkgb3IgZGllICQhOwogICAgICAgICAkcGF0 Y2ggPSA8RElGRj47CiAgICAgICAgIGNsb3NlKERJRkYpOwogICAgIH0KQEAgLTQ1Miw3ICs0NTYs NyBAQCBzdWIgbWVyZ2VDaGFuZ2VzKCQkJCkKICAgICB1bmxpbmsoIiR7ZmlsZU5ld2VyfS5vcmln Iik7CiAgICAgdW5saW5rKCIke2ZpbGVOZXdlcn0ucmVqIik7CiAKLSAgICBvcGVuKFBBVENILCAi fCBwYXRjaCAtLWZ1eno9MyAtLWJpbmFyeSAkZmlsZU5ld2VyID4gL2Rldi9udWxsIikgfHwgZGll OworICAgIG9wZW4oUEFUQ0gsICJ8IHBhdGNoIC0tZnV6ej0zIC0tYmluYXJ5ICRmaWxlTmV3ZXIg PiAvZGV2L251bGwiKSBvciBkaWUgJCE7CiAgICAgcHJpbnQgUEFUQ0ggZml4Q2hhbmdlTG9nUGF0 Y2goJHBhdGNoKTsKICAgICBjbG9zZShQQVRDSCk7CiAKQEAgLTUyMSw3ICs1MjUsNyBAQCBzdWIg cmVzb2x2ZUNoYW5nZUxvZygkKQogICAgIGlmIChtZXJnZUNoYW5nZXMoJGZpbGVNaW5lLCAkZmls ZU9sZGVyLCAkZmlsZU5ld2VyKSkgewogICAgICAgICBpZiAoJGZpbGUgbmUgJGZpbGVOZXdlcikg ewogICAgICAgICAgICAgdW5saW5rKCRmaWxlKTsKLSAgICAgICAgICAgIHJlbmFtZSgkZmlsZU5l d2VyLCAkZmlsZSkgfHwgZGllOworICAgICAgICAgICAgcmVuYW1lKCRmaWxlTmV3ZXIsICRmaWxl KSBvciBkaWUgJCE7CiAgICAgICAgIH0KICAgICAgICAgdW5saW5rKCRmaWxlTWluZSwgJGZpbGVP bGRlcik7CiAgICAgICAgIHJlc29sdmVDb25mbGljdCgkZmlsZSk7CkBAIC01MzksOCArNTQzLDEw IEBAIHN1YiByZXNvbHZlQ29uZmxpY3QoJCkKIAogICAgIGlmICgkaXNTVk4pIHsKICAgICAgICAg c3lzdGVtKCRTVk4sICJyZXNvbHZlZCIsICRmaWxlKTsKKyAgICAgICAgZGllICQhIGlmIFdFWElU U1RBVFVTKCQ/KTsKICAgICB9IGVsc2lmICgkaXNHaXQpIHsKICAgICAgICAgc3lzdGVtKCRHSVQs ICJhZGQiLCAkZmlsZSk7CisgICAgICAgIGRpZSAkISBpZiBXRVhJVFNUQVRVUygkPyk7CiAgICAg fSBlbHNlIHsKICAgICAgICAgZGllICJVbmtub3duIHZlcnNpb24gY29udHJvbCBzeXN0ZW0iOwog ICAgIH0= 33911 2009-07-31 17:36:50 -0700 2009-07-31 18:26:48 -0700 resolve-ChangeLogs doesn't work with relative paths bug-18599-20090731173649.patch text/plain 3012 ddkilzer ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2OWRkOWZkLi41ZTFhZTkzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDktMDct MzEgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICA8aHR0cDov L3dlYmtpdC5vcmcvYi8xODU5OT4gcmVzb2x2ZS1DaGFuZ2VMb2dzIGRvZXNuJ3Qgd29yayB3aXRo IHJlbGF0aXZlIHBhdGhzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBTY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9nczogVXNlZCBjaGRpclJldHVybmlu Z1JlbGF0aXZlUGF0aCgpCisgICAgICAgIGFuZCBkZXRlcm1pbmVWQ1NSb290KCkgdG8gY2hhbmdl IGRpcmVjdG9yaWVzIHRvIHRoZSByb290IG9mIHRoZQorICAgICAgICBwcm9qZWN0IGJlZm9yZSBy dW5uaW5nIHRoZSBjb21tYW5kIGFuZCB0byBwcm92aWRlIGEgcGF0aCBmb3IKKyAgICAgICAgcmVt b3ZlQ2hhbmdlTG9nQXJndW1lbnRzKCkgdG8gbWFrZSBzdXJlIGFueSBDaGFuZ2VMb2cgYXJndW1l bnRzCisgICAgICAgIG9uIHRoZSBjb21tYW5kIGxpbmUgYXJlIHN0aWxsIGZvdW5kLgorICAgICAg ICAoY2Fub25pY2FsUmVsYXRpdmVQYXRoKTogQWRkZWQuICBSZXR1cm5zIGEgY2Fub25pY2FsIHBh dGggKGUuZy4sCisgICAgICAgIHN0cmlwcGluZyAnZGlyLy4uLycgZnJvbSB0aGUgcGF0aCkgcmVs YXRpdmUgdG8gdGhlIGN1cnJlbnQKKyAgICAgICAgZGlyZWN0b3J5LgorICAgICAgICAocmVtb3Zl Q2hhbmdlTG9nQXJndW1lbnRzKTogQWRkZWQgYXJndW1lbnQgd2hpY2ggY29udGFpbnMgYQorICAg ICAgICByZWxhdGl2ZSBwYXRoIHRoYXQgbXVzdCBiZSBwcmVwZW5kZWQgdG8gYW55IENoYW5nZUxv ZyBhcmd1bWVudHMuCisgICAgICAgIFVzZWQgY2Fub25pY2FsUmVsYXRpdmVQYXRoKCkgYW5kIEZp bGU6OlNwZWMtPmNhdGZpbGUoKSB0bworICAgICAgICBjb25zdHJ1Y3QgYSBub3JtYWxpemVkLCBy ZWxhdGl2ZSBwYXRoIHRvIGVhY2ggZmlsZS4KKwogMjAwOS0wNy0zMCAgRGF2aWQgS2lsemVyICA8 ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBWQ1NVdGlsczo6Y2hkaXJS ZXR1cm5pbmdSZWxhdGl2ZVBhdGgoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9y ZXNvbHZlLUNoYW5nZUxvZ3MgYi9XZWJLaXRUb29scy9TY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9n cwppbmRleCA0OWYzOWE2Li4wYzNiMWE3IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3Jlc29sdmUtQ2hhbmdlTG9ncworKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3Jlc29sdmUtQ2hh bmdlTG9ncwpAQCAtNDAsNiArNDAsNyBAQCB1c2UgR2V0b3B0OjpMb25nOwogdXNlIFBPU0lYOwog dXNlIFZDU1V0aWxzOwogCitzdWIgY2Fub25pY2FsUmVsYXRpdmVQYXRoKCQpOwogc3ViIGNvbmZs aWN0RmlsZXMoJCk7CiBzdWIgZmluZENoYW5nZUxvZygkKTsKIHN1YiBmaW5kVW5tZXJnZWRDaGFu Z2VMb2dzKCk7CkBAIC00OSw3ICs1MCw3IEBAIHN1YiBmaXhPbmVNZXJnZWRDaGFuZ2VMb2coJCk7 CiBzdWIgaGFzR2l0VW5tZXJnZWRGaWxlcygpOwogc3ViIG1lcmdlQ2hhbmdlcygkJCQpOwogc3Vi IHBhcnNlRml4TWVyZ2VkKCQkOyQpOwotc3ViIHJlbW92ZUNoYW5nZUxvZ0FyZ3VtZW50cygpOwor c3ViIHJlbW92ZUNoYW5nZUxvZ0FyZ3VtZW50cygkKTsKIHN1YiByZXNvbHZlQ2hhbmdlTG9nKCQp Owogc3ViIHJlc29sdmVDb25mbGljdCgkKTsKIHN1YiBzaG93U3RhdHVzKCQ7JCk7CkBAIC03Niw3 ICs3Nyw5IEBAIG15ICRnZXRPcHRpb25zUmVzdWx0ID0gR2V0T3B0aW9ucygKICAgICAnd3x3YXJu aW5ncyEnICAgID0+IFwkcHJpbnRXYXJuaW5ncywKICk7CiAKLW15IEBjaGFuZ2VMb2dGaWxlcyA9 IHJlbW92ZUNoYW5nZUxvZ0FyZ3VtZW50cygpOworbXkgJHJlbGF0aXZlUGF0aCA9IGNoZGlyUmV0 dXJuaW5nUmVsYXRpdmVQYXRoKGRldGVybWluZVZDU1Jvb3QoKSk7CisKK215IEBjaGFuZ2VMb2dG aWxlcyA9IHJlbW92ZUNoYW5nZUxvZ0FyZ3VtZW50cygkcmVsYXRpdmVQYXRoKTsKIAogaWYgKCFk ZWZpbmVkICRmaXhNZXJnZWQgJiYgc2NhbGFyKEBjaGFuZ2VMb2dGaWxlcykgPT0gMCkgewogICAg IEBjaGFuZ2VMb2dGaWxlcyA9IGZpbmRVbm1lcmdlZENoYW5nZUxvZ3MoKTsKQEAgLTE0Miw2ICsx NDUsMTMgQEAgaWYgKCRnaXRSZWJhc2VDb250aW51ZSkgewogCiBleGl0IDA7CiAKK3N1YiBjYW5v bmljYWxSZWxhdGl2ZVBhdGgoJCkKK3sKKyAgICBteSAoJG9yaWdpbmFsUGF0aCkgPSBAXzsKKyAg ICBteSAkYWJzb2x1dGVQYXRoID0gQ3dkOjphYnNfcGF0aCgkb3JpZ2luYWxQYXRoKTsKKyAgICBy ZXR1cm4gRmlsZTo6U3BlYy0+YWJzMnJlbCgkYWJzb2x1dGVQYXRoKTsKK30KKwogc3ViIGNvbmZs aWN0RmlsZXMoJCkKIHsKICAgICBteSAoJGZpbGUpID0gQF87CkBAIC00ODIsMTIgKzQ5MiwxMyBA QCBzdWIgcGFyc2VGaXhNZXJnZWQoJCQ7JCkKICAgICB9CiB9CiAKLXN1YiByZW1vdmVDaGFuZ2VM b2dBcmd1bWVudHMoKQorc3ViIHJlbW92ZUNoYW5nZUxvZ0FyZ3VtZW50cygkKQogeworICAgIG15 ICgkYmFzZURpcikgPSBAXzsKICAgICBteSBAcmVzdWx0cyA9ICgpOwogCiAgICAgZm9yIChteSAk aSA9IDA7ICRpIDwgc2NhbGFyKEBBUkdWKTsgKSB7Ci0gICAgICAgIG15ICRmaWxlID0gZmluZENo YW5nZUxvZygkQVJHVlskaV0pOworICAgICAgICBteSAkZmlsZSA9IGZpbmRDaGFuZ2VMb2coY2Fu b25pY2FsUmVsYXRpdmVQYXRoKEZpbGU6OlNwZWMtPmNhdGZpbGUoJGJhc2VEaXIsICRBUkdWWyRp XSkpKTsKICAgICAgICAgaWYgKGRlZmluZWQgJGZpbGUpIHsKICAgICAgICAgICAgIHNwbGljZShA QVJHViwgJGksIDEpOwogICAgICAgICAgICAgcHVzaCBAcmVzdWx0cywgJGZpbGU7 33912 2009-07-31 17:36:53 -0700 2009-07-31 18:29:19 -0700 Implement VCSUtils::chdirReturningRelativePath() bug-18599-20090731173652.patch text/plain 3399 ddkilzer ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3MjRlNzc2Li42OWRkOWZkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIwMDktMDct MzAgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAorICAgICAgICBJbXBsZW1l bnQgVkNTVXRpbHM6OmNoZGlyUmV0dXJuaW5nUmVsYXRpdmVQYXRoKCkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdGVwIDIgdG8gZml4OgorICAgICAg ICA8aHR0cDovL3dlYmtpdC5vcmcvYi8xODU5OT4gcmVzb2x2ZS1DaGFuZ2VMb2dzIGRvZXNuJ3Qg d29yayB3aXRoIHJlbGF0aXZlIHBhdGhzCisKKyAgICAgICAgKiBTY3JpcHRzL1ZDU1V0aWxzLnBt OgorICAgICAgICAoVkNTVXRpbHM6OmNoZGlyUmV0dXJuaW5nUmVsYXRpdmVQYXRoKTogTW92ZWQg aGVyZSBmcm9tCisgICAgICAgIGNoZGlyQW5kR2V0RGlmZmVyZW5jZSgpIGluIHN2bi1jcmVhdGUt cGF0Y2guCisgICAgICAgICogU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoOiBTd2l0Y2hlZCB0byB1 c2UKKyAgICAgICAgY2hkaXJSZXR1cm5pbmdSZWxhdGl2ZVBhdGgoKSBpbnN0ZWFkIG9mIGNoZGly QW5kR2V0RGlmZmVyZW5jZSgpLgorICAgICAgICAoY2hkaXJBbmRHZXREaWZmZXJlbmNlKTogUmVt b3ZlZC4KKworMjAwOS0wNy0zMCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgor CiAgICAgICAgIEltcGxlbWVudCBWQ1NVdGlsczo6ZGV0ZXJtaW5lVkNTUm9vdCgpCiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL1ZDU1V0aWxzLnBtIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQppbmRl eCAxODkzZDlmLi41NzE0ODdkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0 aWxzLnBtCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KQEAgLTI5LDYgKzI5 LDcgQEAKIHVzZSBzdHJpY3Q7CiB1c2Ugd2FybmluZ3M7CiAKK3VzZSBDd2QgcXcoKTsgICMgInF3 KCkiIHByZXZlbnRzIHdhcm5pbmdzIGFib3V0IHJlZGVmaW5pbmcgZ2V0Y3dkKCkgd2l0aCAidXNl IFBPU0lYOyIKIHVzZSBGaWxlOjpCYXNlbmFtZTsKIHVzZSBGaWxlOjpTcGVjOwogCkBAIC0zNyw3 ICszOCw3IEBAIEJFR0lOIHsKICAgIG91ciAoJFZFUlNJT04sIEBJU0EsIEBFWFBPUlQsIEBFWFBP UlRfT0ssICVFWFBPUlRfVEFHUyk7CiAgICAkVkVSU0lPTiAgICAgPSAxLjAwOwogICAgQElTQSAg ICAgICAgID0gcXcoRXhwb3J0ZXIpOwotICAgQEVYUE9SVCAgICAgID0gcXcoJmRldGVybWluZVNW TlJvb3QgJmRldGVybWluZVZDU1Jvb3QgJmlzR2l0ICZpc0dpdERpcmVjdG9yeSAmaXNTVk4gJmlz U1ZORGlyZWN0b3J5ICZtYWtlRmlsZVBhdGhSZWxhdGl2ZSk7CisgICBARVhQT1JUICAgICAgPSBx dygmY2hkaXJSZXR1cm5pbmdSZWxhdGl2ZVBhdGggJmRldGVybWluZVNWTlJvb3QgJmRldGVybWlu ZVZDU1Jvb3QgJmlzR2l0ICZpc0dpdERpcmVjdG9yeSAmaXNTVk4gJmlzU1ZORGlyZWN0b3J5ICZt YWtlRmlsZVBhdGhSZWxhdGl2ZSk7CiAgICAlRVhQT1JUX1RBR1MgPSAoICk7CiAgICBARVhQT1JU X09LICAgPSAoKTsKIH0KQEAgLTEwNSw2ICsxMDYsMTYgQEAgc3ViIGlzU1ZOKCkKICAgICByZXR1 cm4gJGlzU1ZOOwogfQogCitzdWIgY2hkaXJSZXR1cm5pbmdSZWxhdGl2ZVBhdGgoJCkKK3sKKyAg ICBteSAoJGRpcmVjdG9yeSkgPSBAXzsKKyAgICBteSAkcHJldmlvdXNEaXJlY3RvcnkgPSBDd2Q6 OmdldGN3ZCgpOworICAgIGNoZGlyICRkaXJlY3Rvcnk7CisgICAgbXkgJG5ld0RpcmVjdG9yeSA9 IEN3ZDo6Z2V0Y3dkKCk7CisgICAgcmV0dXJuICIuIiBpZiAkbmV3RGlyZWN0b3J5IGVxICRwcmV2 aW91c0RpcmVjdG9yeTsKKyAgICByZXR1cm4gRmlsZTo6U3BlYy0+YWJzMnJlbCgkcHJldmlvdXNE aXJlY3RvcnksICRuZXdEaXJlY3RvcnkpOworfQorCiBzdWIgZGV0ZXJtaW5lR2l0Um9vdCgpCiB7 CiAgICAgY2hvbXAobXkgJGdpdERpciA9IGBnaXQgcmV2LXBhcnNlIC0tZ2l0LWRpcmApOwpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoIGIvV2ViS2l0VG9v bHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoCmluZGV4IGNkZDUzYTYuLjc1YzgyYmMgMTAwNzU1 Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAorKysgYi9XZWJLaXRU b29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gKQEAgLTQ0LDcgKzQ0LDYgQEAgdXNlIHN0cmlj dDsKIHVzZSB3YXJuaW5nczsKIAogdXNlIENvbmZpZzsKLXVzZSBDd2QgcXcoKTsgICMgInF3KCki IHByZXZlbnRzIHdhcm5pbmdzIGlmIHdlIGxhdGVyIChpbmRpcmVjdGx5KSAidXNlIFBPU0lYOyIu CiB1c2UgRmlsZTo6QmFzZW5hbWU7CiB1c2UgRmlsZTo6U3BlYzsKIHVzZSBGaWxlOjpzdGF0OwpA QCAtNTgsNyArNTcsNiBAQCB1c2UgVkNTVXRpbHM7CiAKIHN1YiBiaW5hcnljbXAoJCQpOwogc3Vi IGNhbm9uaWNhbGl6ZVBhdGgoJCk7Ci1zdWIgY2hkaXJBbmRHZXREaWZmZXJlbmNlKCQpOwogc3Vi IGZpbmRCYXNlVXJsKCQpOwogc3ViIGZpbmRNaW1lVHlwZSgkOyQpOwogc3ViIGZpbmRNb2RpZmlj YXRpb25UeXBlKCQpOwpAQCAtMTAwLDcgKzk4LDcgQEAgZm9yIG15ICRwYXRoIChrZXlzICVwYXRo cykgewogfQogCiBteSAkc3ZuUm9vdCA9IGRldGVybWluZVNWTlJvb3QoKTsKLW15ICRwcmVmaXgg PSBjaGRpckFuZEdldERpZmZlcmVuY2UoJHN2blJvb3QpOworbXkgJHByZWZpeCA9IGNoZGlyUmV0 dXJuaW5nUmVsYXRpdmVQYXRoKCRzdm5Sb290KTsKIAogIyBHZW5lcmF0ZSB0aGUgZGlmZnMsIGlu IGEgb3JkZXIgY2hvc2VuIGZvciBlYXN5IHJldmlld2luZy4KIGZvciBteSAkcGF0aCAoc29ydCBw YXRjaHBhdGhjbXAgdmFsdWVzICVkaWZmRmlsZXMpIHsKQEAgLTQ2MCwxMiArNDU4LDMgQEAgc3Vi IHRlc3RmaWxlY21wKCQkKQogICAgIHJldHVybiAkZmlsZURhdGFBLT57aXNUZXN0RmlsZX0gPD0+ ICRmaWxlRGF0YUItPntpc1Rlc3RGaWxlfTsKIH0KIAotc3ViIGNoZGlyQW5kR2V0RGlmZmVyZW5j ZSgkKQotewotICAgIG15ICgkbmV3ZGlyKSA9IEBfOwotICAgIG15ICRiZWZvcmUgPSBDd2Q6Omdl dGN3ZCgpOwotICAgIGNoZGlyICRuZXdkaXI7Ci0gICAgbXkgJGFmdGVyID0gQ3dkOjpnZXRjd2Qo KTsKLSAgICByZXR1cm4gIi4iIGlmICRhZnRlciBlcSAkYmVmb3JlOwotICAgIHJldHVybiBGaWxl OjpTcGVjLT5hYnMycmVsKCRiZWZvcmUsICRhZnRlcik7Ci19 33913 2009-07-31 17:36:56 -0700 2009-08-01 07:26:27 -0700 Implement VCSUtils::determineVCSRoot() bug-18599-20090731173655.patch text/plain 4013 ddkilzer ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzYjM3Yzc2Li43MjRlNzc2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDktMDct MzAgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBJbXBsZW1l bnQgVkNTVXRpbHM6OmRldGVybWluZVZDU1Jvb3QoKQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0ZXAgMSB0byBmaXg6CisgICAgICAgIDxodHRwOi8v d2Via2l0Lm9yZy9iLzE4NTk5PiByZXNvbHZlLUNoYW5nZUxvZ3MgZG9lc24ndCB3b3JrIHdpdGgg cmVsYXRpdmUgcGF0aHMKKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06IFJlbW92ZWQg cmVmZXJlbmNlIHRvIHdlYmtpdGRpcnMgbW9kdWxlLgorICAgICAgICAoVkNTVXRpbHM6OkVYUE9S VCk6IEFkZGVkICZkZXRlcm1pbmVWQ1NSb290LiAgUmVhbHBoYWJldGl6ZWQuCisgICAgICAgIChW Q1NVdGlsczo6ZGV0ZXJtaW5lR2l0Um9vdCk6IEFkZGVkLiAgQmFzZWQgb24gY29kZSBpbgorICAg ICAgICBjb21taXQtbG9nLWVkaXRvci4KKyAgICAgICAgKFZDU1V0aWxzOjpkZXRlcm1pbmVWQ1NS b290KTogSW1wbGVtZW50ZWQgdXNpbmcKKyAgICAgICAgZGV0ZXJtaW5lR2l0Um9vdCgpIGFuZCBk ZXRlcm1pbmVTVk5Sb290KCkuCisgICAgICAgICogU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcjog UmVwbGFjZWQgdXNlIG9mCisgICAgICAgIHRvcExldmVsU291cmNlRGlyZWN0b3J5KCkgd2l0aCBk ZXRlcm1pbmVWQ1NSb290KCkuICBSZXNvcnRlZAorICAgICAgICB1c2Ugc3RhdGVtZW50cy4KKyAg ICAgICAgKHRvcExldmVsU291cmNlRGlyZWN0b3J5KTogUmVtb3ZlZC4KKwogMjAwOS0wNy0zMSAg QnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg Sm9obiBTdWxsaXZhbi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMu cG0gYi9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCmluZGV4IDBiZWMzZDIuLjE4OTNk OWYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KKysrIGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQpAQCAtMSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0 IChDKSAyMDA3IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAo QykgMjAwNywgMjAwOCwgMjAwOSBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwog IyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yOCwxNSArMjgsMTYgQEAKIAogdXNlIHN0cmlj dDsKIHVzZSB3YXJuaW5nczsKKwordXNlIEZpbGU6OkJhc2VuYW1lOwogdXNlIEZpbGU6OlNwZWM7 Ci11c2Ugd2Via2l0ZGlyczsKIAogQkVHSU4gewogICAgdXNlIEV4cG9ydGVyICAgKCk7CiAgICBv dXIgKCRWRVJTSU9OLCBASVNBLCBARVhQT1JULCBARVhQT1JUX09LLCAlRVhQT1JUX1RBR1MpOwog ICAgJFZFUlNJT04gICAgID0gMS4wMDsKICAgIEBJU0EgICAgICAgICA9IHF3KEV4cG9ydGVyKTsK LSAgIEBFWFBPUlQgICAgICA9IHF3KCZpc0dpdERpcmVjdG9yeSAmaXNHaXQgJmlzU1ZORGlyZWN0 b3J5ICZpc1NWTiAmZGV0ZXJtaW5lU1ZOUm9vdCAmbWFrZUZpbGVQYXRoUmVsYXRpdmUpOworICAg QEVYUE9SVCAgICAgID0gcXcoJmRldGVybWluZVNWTlJvb3QgJmRldGVybWluZVZDU1Jvb3QgJmlz R2l0ICZpc0dpdERpcmVjdG9yeSAmaXNTVk4gJmlzU1ZORGlyZWN0b3J5ICZtYWtlRmlsZVBhdGhS ZWxhdGl2ZSk7CiAgICAlRVhQT1JUX1RBR1MgPSAoICk7CiAgICBARVhQT1JUX09LICAgPSAoKTsK IH0KQEAgLTEwNCw2ICsxMDUsMTIgQEAgc3ViIGlzU1ZOKCkKICAgICByZXR1cm4gJGlzU1ZOOwog fQogCitzdWIgZGV0ZXJtaW5lR2l0Um9vdCgpCit7CisgICAgY2hvbXAobXkgJGdpdERpciA9IGBn aXQgcmV2LXBhcnNlIC0tZ2l0LWRpcmApOworICAgIHJldHVybiBkaXJuYW1lKCRnaXREaXIpOwor fQorCiBzdWIgZGV0ZXJtaW5lU1ZOUm9vdCgpCiB7CiAgICAgbXkgJGRldk51bGwgPSBGaWxlOjpT cGVjLT5kZXZudWxsKCk7CkBAIC0xMzksNiArMTQ2LDE3IEBAIHN1YiBkZXRlcm1pbmVTVk5Sb290 KCkKICAgICByZXR1cm4gRmlsZTo6U3BlYy0+cmVsMmFicygkbGFzdCk7CiB9CiAKK3N1YiBkZXRl cm1pbmVWQ1NSb290KCkKK3sKKyAgICBpZiAoaXNHaXQoKSkgeworICAgICAgICByZXR1cm4gZGV0 ZXJtaW5lR2l0Um9vdCgpOworICAgIH0KKyAgICBpZiAoaXNTVk4oKSkgeworICAgICAgICByZXR1 cm4gZGV0ZXJtaW5lU1ZOUm9vdCgpOworICAgIH0KKyAgICBkaWUgIlVuYWJsZSB0byBkZXRlcm1p bmUgVkNTIHJvb3QiOworfQorCiBzdWIgc3ZuUmV2aXNpb25Gb3JEaXJlY3RvcnkoJCkKIHsKICAg ICBteSAoJGRpcikgPSBAXzsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvY29tbWl0 LWxvZy1lZGl0b3IgYi9XZWJLaXRUb29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yCmluZGV4 IGZmMWU4NDcuLjhlYzM4ZGIgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvY29tbWl0 LWxvZy1lZGl0b3IKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcgpA QCAtMSw2ICsxLDYgQEAKICMhL3Vzci9iaW4vcGVybCAtdwogCi0jIENvcHlyaWdodCAoQykgMjAw NiwgMjAwNyBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMp IDIwMDYsIDIwMDcsIDIwMDgsIDIwMDkgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICMgQ29weXJpZ2h0IChDKSAyMDA5IFRvcmNoIE1vYmlsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dApAQCAtMzQsOSArMzQsOSBAQCB1c2UgRmlsZTo6QmFzZW5hbWU7 CiB1c2UgRmlsZTo6U3BlYzsKIHVzZSBGaW5kQmluOwogdXNlIGxpYiAkRmluZEJpbjo6QmluOwor dXNlIFRlcm06OlJlYWRLZXk7CiB1c2UgVkNTVXRpbHM7CiB1c2Ugd2Via2l0ZGlyczsKLXVzZSBU ZXJtOjpSZWFkS2V5OwogCiBzdWIgbm9ybWFsaXplTGluZUVuZGluZ3MoJCQpOwogCkBAIC0xMjUs NyArMTI1LDcgQEAgaWYgKCRyZWdlbmVyYXRlTG9nICYmICRleGlzdGluZ0xvZyAmJiBzY2FsYXIo QGNoYW5nZUxvZ3MpID4gMCkgewogIyAoYXMgY2FuIGhhcHBlbiB3aXRoIGdpdC1jb21taXQgLS1h bWVuZCkKIGV4ZWMgJGVkaXRvciwgQEFSR1YgaWYgJGV4aXN0aW5nTG9nICYmICRrZWVwRXhpc3Rp bmdMb2c7CiAKLW15ICR0b3BMZXZlbCA9IHRvcExldmVsU291cmNlRGlyZWN0b3J5KCk7CitteSAk dG9wTGV2ZWwgPSBkZXRlcm1pbmVWQ1NSb290KCk7CiAKIG15ICVjaGFuZ2VMb2dTb3J0OwogbXkg JWNoYW5nZUxvZ0NvbnRlbnRzOwpAQCAtMjIwLDE2ICsyMjAsNiBAQCBpZiAoJGZvdW5kQ29tbWVu dCkgewogCiB1bmxpbmsgIiRsb2cuZWRpdCI7CiAKLXN1YiB0b3BMZXZlbFNvdXJjZURpcmVjdG9y eQotewotICAgIGlmIChpc0dpdCgpKSB7Ci0gICAgICAgIGNob21wKG15ICRnaXREaXIgPSBgZ2l0 IHJldi1wYXJzZSAtLWdpdC1kaXJgKTsKLSAgICAgICAgcmV0dXJuIGRpcm5hbWUoJGdpdERpcik7 Ci0gICAgfSBlbHNpZiAoaXNTVk4oKSkgewotICAgICAgICByZXR1cm4gZGV0ZXJtaW5lU1ZOUm9v dCgpOwotICAgIH0KLX0KLQogc3ViIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCQkKQogewogICAgIG15 ICgkc3RyaW5nLCAkZW5kbCkgPSBAXzs=