174339 2017-07-10 17:23:54 -0700 Do not duplicate files when deleting directories with svn 1.9 2017-07-11 17:24:49 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard buildbot commit-queue dbates ddkilzer lforschler matthew_hanson sam webkit-bug-importer oldest_to_newest 1327291 0 jbedard 2017-07-10 17:23:54 -0700 When directories are moved or deleted, files will be duplicated in svn-create-patch. Prevent this duplication. 1327292 1 webkit-bug-importer 2017-07-10 17:24:25 -0700 <rdar://problem/33226781> 1327295 2 jbedard 2017-07-10 17:27:55 -0700 Note that this change must be made before The WebKit2 -> WebKit and WebKit -> WebKitLegacy change is made. 1327315 3 315058 jbedard 2017-07-10 18:28:59 -0700 Created attachment 315058 Patch 1327371 4 315058 sam 2017-07-10 21:45:39 -0700 Comment on attachment 315058 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=315058&action=review > Tools/ChangeLog:3 > + Need a short description (OOPS!). Please add a descriptive title. > Tools/ChangeLog:10 > + (diffOptionsForFile): No longer pass -N option, since this does not work in SVN 1.9.4. Should this be predicated on the svn version? I know we support older versions of subversion, since we have checks like isSVNVersion16OrNewer(). 1327470 5 jbedard 2017-07-11 08:17:01 -0700 (In reply to Sam Weinig from comment #4) > Comment on attachment 315058 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=315058&action=review > > > Tools/ChangeLog:3 > > + Need a short description (OOPS!). > > Please add a descriptive title. > > > Tools/ChangeLog:10 > > + (diffOptionsForFile): No longer pass -N option, since this does not work in SVN 1.9.4. > > Should this be predicated on the svn version? I know we support older > versions of subversion, since we have checks like isSVNVersion16OrNewer(). This will still work with older versions of svn. What this patch does is run a diff on the highest level directory deleted instead of each child. So for example, given the following: D folder1 D folder1/subfolder D folder1/file1 D folder1/subfolder/file2 we would only run 'svn diff' on folder1. 1327645 6 315143 jbedard 2017-07-11 12:27:48 -0700 Created attachment 315143 Patch 1327647 7 315058 ddkilzer 2017-07-11 12:38:17 -0700 Comment on attachment 315058 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=315058&action=review Tentative r=me if this has been tested with older svn versions, and you change the $flag variable name to describe why a path is being skipped. However, I'd like to understand why --depth=XYZ won't work to replace -N for svn v1.9.x. >> Tools/ChangeLog:10 >> + (diffOptionsForFile): No longer pass -N option, since this does not work in SVN 1.9.4. > > Should this be predicated on the svn version? I know we support older versions of subversion, since we have checks like isSVNVersion16OrNewer(). Technically, the -N switch doesn't work because it was purposely deprecated. (This makes it sound like it was broken by accident.) > Tools/Scripts/svn-create-patch:278 > + # svn diff -N doesn't work on svn 1.9, so only return top-level deletions. > + if ($modificationType eq "deletion") { > + push @deletedFiles, $path; > + next; > + } Has this change been tested with older versions of svn like v1.7.x or v1.8.x? Looking at "svn help diff", I see that -N is deprecated in svn v1.9.x: -N [--non-recursive] : obsolete; try --depth=files or --depth=immediates --depth ARG : limit operation by depth ARG ('empty', 'files', 'immediates', or 'infinity') Can the --depth=XYZ switch be used instead of -N on svn v1.9.x and later? (I could probably answer this if I was fully paying attention when you were talking to Matt yesterday. Sorry.) It seems like --depth=files might do what you want by listing all deleted files under the deleted directory, though. > Tools/Scripts/svn-create-patch:297 > + my $flag = 0; Need a more descriptive name than "flag" for this variable to describe why the path is being skipped. Maybe something like these (whichever makes the most sense): $duplicatePathFound $parentDirectoryFound $parentPathFound 1327648 8 315143 ddkilzer 2017-07-11 12:39:57 -0700 Comment on attachment 315143 Patch Tentative r=me, but all comments from Attachment 315058 still apply. 1327655 9 jbedard 2017-07-11 12:47:57 -0700 (In reply to David Kilzer (:ddkilzer) from comment #7) > Comment on attachment 315058 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=315058&action=review > > Tentative r=me if this has been tested with older svn versions, and you > change the $flag variable name to describe why a path is being skipped. > > However, I'd like to understand why --depth=XYZ won't work to replace -N for > svn v1.9.x. > > >> Tools/ChangeLog:10 > >> + (diffOptionsForFile): No longer pass -N option, since this does not work in SVN 1.9.4. > > > > Should this be predicated on the svn version? I know we support older versions of subversion, since we have checks like isSVNVersion16OrNewer(). > > Technically, the -N switch doesn't work because it was purposely deprecated. > (This makes it sound like it was broken by accident.) > > > Tools/Scripts/svn-create-patch:278 > > + # svn diff -N doesn't work on svn 1.9, so only return top-level deletions. > > + if ($modificationType eq "deletion") { > > + push @deletedFiles, $path; > > + next; > > + } > > Has this change been tested with older versions of svn like v1.7.x or v1.8.x? I will double-check it against svn 1.7 and 1.8. I don't expect this will cause any problems because it is essentially just using svn's recursion instead of us implementing our own. > Looking at "svn help diff", I see that -N is deprecated in svn v1.9.x: > > -N [--non-recursive] : obsolete; try --depth=files or > --depth=immediates > --depth ARG : limit operation by depth ARG ('empty', 'files', > 'immediates', or 'infinity') > > Can the --depth=XYZ switch be used instead of -N on svn v1.9.x and later? > > (I could probably answer this if I was fully paying attention when you were > talking to Matt yesterday. Sorry.) > > It seems like --depth=files might do what you want by listing all deleted > files under the deleted directory, though. I'm pretty sure -N was broken by accident. The reason I say this is that --depth doesn't work either. In fact, '--depth empty,' '--depth infinity' and '--depth immediates' all behave the way I would expect '--depth infinity' to behave. > > > Tools/Scripts/svn-create-patch:297 > > + my $flag = 0; > > Need a more descriptive name than "flag" for this variable to describe why > the path is being skipped. Maybe something like these (whichever makes the > most sense): > > $duplicatePathFound > $parentDirectoryFound > $parentPathFound I'll update flag to a more reasonable name. 1327740 10 ddkilzer 2017-07-11 14:23:22 -0700 (In reply to Jonathan Bedard from comment #9) > (In reply to David Kilzer (:ddkilzer) from comment #7) > > Comment on attachment 315058 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=315058&action=review > > > > Tentative r=me if this has been tested with older svn versions, and you > > change the $flag variable name to describe why a path is being skipped. > > > > However, I'd like to understand why --depth=XYZ won't work to replace -N for > > svn v1.9.x. > > > > >> Tools/ChangeLog:10 > > >> + (diffOptionsForFile): No longer pass -N option, since this does not work in SVN 1.9.4. > > > > > > Should this be predicated on the svn version? I know we support older versions of subversion, since we have checks like isSVNVersion16OrNewer(). > > > > Technically, the -N switch doesn't work because it was purposely deprecated. > > (This makes it sound like it was broken by accident.) > > > > > Tools/Scripts/svn-create-patch:278 > > > + # svn diff -N doesn't work on svn 1.9, so only return top-level deletions. > > > + if ($modificationType eq "deletion") { > > > + push @deletedFiles, $path; > > > + next; > > > + } > > > > Has this change been tested with older versions of svn like v1.7.x or v1.8.x? > > I will double-check it against svn 1.7 and 1.8. I don't expect this will > cause any problems because it is essentially just using svn's recursion > instead of us implementing our own. > > > Looking at "svn help diff", I see that -N is deprecated in svn v1.9.x: > > > > -N [--non-recursive] : obsolete; try --depth=files or > > --depth=immediates > > --depth ARG : limit operation by depth ARG ('empty', 'files', > > 'immediates', or 'infinity') > > > > Can the --depth=XYZ switch be used instead of -N on svn v1.9.x and later? > > > > (I could probably answer this if I was fully paying attention when you were > > talking to Matt yesterday. Sorry.) > > > > It seems like --depth=files might do what you want by listing all deleted > > files under the deleted directory, though. > > I'm pretty sure -N was broken by accident. The reason I say this is that > --depth doesn't work either. In fact, '--depth empty,' '--depth infinity' > and '--depth immediates' all behave the way I would expect '--depth > infinity' to behave. This is really picking nits, but does svn care if you use '--depth=files' vs. '--depth files'? 1327767 11 jbedard 2017-07-11 15:11:06 -0700 (In reply to David Kilzer (:ddkilzer) from comment #10) > ... > > This is really picking nits, but does svn care if you use '--depth=files' > vs. '--depth files'? No, it doesn't care which format. And actually, when testing both formats, I learned that SVN is respecting those flags, at least partially. But it isn't sufficient for our use cases. Using this example: D containing/folder1 D containing/folder1/subfolder D containing/folder1/file1 D containing/folder1/subfolder/file2 'svn diff --diff-cmd diff -x -uap --depth=empty containing' will return nothing, as expected. However, 'svn diff --diff-cmd diff -x -uap --depth=empty containing/folder1/subfolder' will contain the diff of the removed file2. 1327781 12 315174 jbedard 2017-07-11 15:28:21 -0700 Created attachment 315174 Patch 1327858 13 315174 commit-queue 2017-07-11 17:24:47 -0700 Comment on attachment 315174 Patch Clearing flags on attachment: 315174 Committed r219376: <http://trac.webkit.org/changeset/219376> 1327859 14 commit-queue 2017-07-11 17:24:49 -0700 All reviewed patches have been landed. Closing bug. 315058 2017-07-10 18:28:59 -0700 2017-07-11 12:38:39 -0700 Patch bug-174339-20170710182859.patch text/plain 2854 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxOTMxNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE3LTA3LTEwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBOZWVkIGEgc2hvcnQgZGVzY3JpcHRpb24gKE9PUFMhKS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDMzOQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMzMyMjY3ODE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2g6CisgICAgICAgIChk aWZmT3B0aW9uc0ZvckZpbGUpOiBObyBsb25nZXIgcGFzcyAtTiBvcHRpb24sIHNpbmNlIHRoaXMg ZG9lcyBub3Qgd29yayBpbiBTVk4gMS45LjQuCisgICAgICAgIChnZW5lcmF0ZUZpbGVMaXN0KTog RGV0ZXJtaW5lIHdoaWNoIGZpbGVzIGFyZSBkZWxldGVkIGJlY2F1c2UgdGhleSBhcmUgcGFydCBv ZiBhCisgICAgICAgIGRpcmVjdG9yeSBiZWluZyBkZWxldGVkLgorCiAyMDE3LTA3LTAzICBCcmlh biBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBSZXBsYXk6IHJlbW92ZSBz b21lIHVudXNlZCBjb2RlCkluZGV4OiBUb29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoCShyZXZpc2lvbiAyMTkz MTcpCisrKyBUb29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gJKHdvcmtpbmcgY29weSkKQEAg LTE0Myw3ICsxNDMsNyBAQCBzdWIgZGlmZk9wdGlvbnNGb3JGaWxlKCQpCiB7CiAgICAgbXkgKCRm aWxlKSA9IEBfOwogCi0gICAgbXkgJG9wdGlvbnMgPSAidWFOcCI7CisgICAgbXkgJG9wdGlvbnMg PSAidWFwIjsKIAogICAgIGlmIChteSAkaHVua0hlYWRlckxpbmVSZWdFeCA9IGh1bmtIZWFkZXJM aW5lUmVnRXhGb3JGaWxlKCRmaWxlKSkgewogICAgICAgICAkb3B0aW9ucyAuPSAiRickaHVua0hl YWRlckxpbmVSZWdFeCciOwpAQCAtMjU0LDYgKzI1NCw4IEBAIHN1YiBnZW5lcmF0ZUZpbGVMaXN0 KCRcJSkKICAgICBteSAoJHN0YXRQYXRoLCAkZGlmZkZpbGVzKSA9IEBfOwogICAgIG15ICV0ZXN0 RGlyZWN0b3JpZXMgPSBtYXAgeyAkXyA9PiAxIH0gcXcoTGF5b3V0VGVzdHMpOwogICAgIG15ICRl c2NhcGVkU3RhdFBhdGggPSBlc2NhcGVTdWJ2ZXJzaW9uUGF0aCgkc3RhdFBhdGgpOworICAgIG15 IEBkZWxldGVkRmlsZXM7CisKICAgICBvcGVuIFNUQVQsICJzdm4gc3RhdCAnJGVzY2FwZWRTdGF0 UGF0aCcgfCIgb3IgZGllOwogICAgIHdoaWxlIChteSAkbGluZSA9IDxTVEFUPikgewogICAgICAg ICAjIHN2biBtYXkgb3V0cHV0IGEgZGlmZmVyZW50IEVPTCBzZXF1ZW5jZSB0aGFuICQvLCBzbyBh dm9pZCBjaG9tcC4KQEAgLTI2OSw2ICsyNzEsMTIgQEAgc3ViIGdlbmVyYXRlRmlsZUxpc3QoJFwl KQogICAgICAgICB9CiAgICAgICAgIG5leHQgaWYgLWQgJHBhdGg7CiAgICAgICAgIG15ICRtb2Rp ZmljYXRpb25UeXBlID0gZmluZE1vZGlmaWNhdGlvblR5cGUoJHN0YXQpOworICAgICAgICAjIHN2 biBkaWZmIC1OIGRvZXNuJ3Qgd29yayBvbiBzdm4gMS45LCBzbyBvbmx5IHJldHVybiB0b3AtbGV2 ZWwgZGVsZXRpb25zLgorICAgICAgICBpZiAoJG1vZGlmaWNhdGlvblR5cGUgZXEgImRlbGV0aW9u IikgeworICAgICAgICAgICAgcHVzaCBAZGVsZXRlZEZpbGVzLCAkcGF0aDsKKyAgICAgICAgICAg IG5leHQ7CisgICAgICAgIH0KKwogICAgICAgICBpZiAoJG1vZGlmaWNhdGlvblR5cGUpIHsKICAg ICAgICAgICAgICRkaWZmRmlsZXMtPnskcGF0aH0tPntwYXRofSA9ICRwYXRoOwogICAgICAgICAg ICAgJGRpZmZGaWxlcy0+eyRwYXRofS0+e21vZGlmaWNhdGlvblR5cGV9ID0gJG1vZGlmaWNhdGlv blR5cGU7CkBAIC0yODQsNiArMjkyLDIyIEBAIHN1YiBnZW5lcmF0ZUZpbGVMaXN0KCRcJSkKICAg ICAgICAgfQogICAgIH0KICAgICBjbG9zZSBTVEFUOworCisgICAgZm9yZWFjaCBteSAkcGF0aCAo QGRlbGV0ZWRGaWxlcykgeworICAgICAgICBteSAkZmxhZyA9IDA7CisgICAgICAgIGZvcmVhY2gg bXkgJGNvbXBhcmUgKEBkZWxldGVkRmlsZXMpIHsKKyAgICAgICAgICAgIG5leHQgaWYgJGNvbXBh cmUgZXEgJHBhdGg7CisgICAgICAgICAgICBpZiAoc3Vic3RyKCRwYXRoLCAwLCBsZW5ndGgoJGNv bXBhcmUpKSBlcSAkY29tcGFyZSkgeworICAgICAgICAgICAgICAgICRmbGFnID0gMTsKKyAgICAg ICAgICAgICAgICBsYXN0OworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIG5leHQg aWYgJGZsYWc7CisgICAgICAgICRkaWZmRmlsZXMtPnskcGF0aH0tPntwYXRofSA9ICRwYXRoOwor ICAgICAgICAkZGlmZkZpbGVzLT57JHBhdGh9LT57bW9kaWZpY2F0aW9uVHlwZX0gPSAiZGVsZXRp b24iOworICAgICAgICAkZGlmZkZpbGVzLT57JHBhdGh9LT57aXNCaW5hcnl9ID0gaXNCaW5hcnlN aW1lVHlwZSgkcGF0aCk7CisgICAgICAgICRkaWZmRmlsZXMtPnskcGF0aH0tPntpc1Rlc3RGaWxl fSA9IGV4aXN0cyAkdGVzdERpcmVjdG9yaWVzeyhGaWxlOjpTcGVjLT5zcGxpdGRpcigkcGF0aCkp WzBdfSA/IDEgOiAwOworICAgIH0KIH0KIAogc3ViIGh1bmtIZWFkZXJMaW5lUmVnRXhGb3JGaWxl KCQpCg== 315143 2017-07-11 12:27:48 -0700 2017-07-11 15:28:20 -0700 Patch bug-174339-20170711122747.patch text/plain 2912 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxOTM1MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE3LTA3LTExICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBEbyBub3QgZHVwbGljYXRlIGZpbGVzIHdoZW4gZGVsZXRpbmcgZGlyZWN0 b3JpZXMgd2l0aCBzdm4gMS45CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzQzMzkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMzMjI2NzgxPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9z dm4tY3JlYXRlLXBhdGNoOgorICAgICAgICAoZGlmZk9wdGlvbnNGb3JGaWxlKTogTm8gbG9uZ2Vy IHBhc3MgLU4gb3B0aW9uLCBzaW5jZSB0aGlzIGRvZXMgbm90IHdvcmsgaW4gU1ZOIDEuOS40Lgor ICAgICAgICAoZ2VuZXJhdGVGaWxlTGlzdCk6IERldGVybWluZSB3aGljaCBmaWxlcyBhcmUgZGVs ZXRlZCBiZWNhdXNlIHRoZXkgYXJlIHBhcnQgb2YgYQorICAgICAgICBkaXJlY3RvcnkgYmVpbmcg ZGVsZXRlZC4KKwogMjAxNy0wNy0xMSAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5j b20+CiAKICAgICAgICAgW1dQRV0gQnVtcCBHU3RyZWFtZXIgcGFja2FnZXMgaW4gamhidWlsZC5t b2R1bGVzIHRvIDEuMTAuNQpJbmRleDogVG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAkocmV2aXNpb24gMjE5 MzUwKQorKysgVG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoCSh3b3JraW5nIGNvcHkpCkBA IC0xNDMsNyArMTQzLDcgQEAgc3ViIGRpZmZPcHRpb25zRm9yRmlsZSgkKQogewogICAgIG15ICgk ZmlsZSkgPSBAXzsKIAotICAgIG15ICRvcHRpb25zID0gInVhTnAiOworICAgIG15ICRvcHRpb25z ID0gInVhcCI7CiAKICAgICBpZiAobXkgJGh1bmtIZWFkZXJMaW5lUmVnRXggPSBodW5rSGVhZGVy TGluZVJlZ0V4Rm9yRmlsZSgkZmlsZSkpIHsKICAgICAgICAgJG9wdGlvbnMgLj0gIkYnJGh1bmtI ZWFkZXJMaW5lUmVnRXgnIjsKQEAgLTI1NCw2ICsyNTQsOCBAQCBzdWIgZ2VuZXJhdGVGaWxlTGlz dCgkXCUpCiAgICAgbXkgKCRzdGF0UGF0aCwgJGRpZmZGaWxlcykgPSBAXzsKICAgICBteSAldGVz dERpcmVjdG9yaWVzID0gbWFwIHsgJF8gPT4gMSB9IHF3KExheW91dFRlc3RzKTsKICAgICBteSAk ZXNjYXBlZFN0YXRQYXRoID0gZXNjYXBlU3VidmVyc2lvblBhdGgoJHN0YXRQYXRoKTsKKyAgICBt eSBAZGVsZXRlZEZpbGVzOworCiAgICAgb3BlbiBTVEFULCAic3ZuIHN0YXQgJyRlc2NhcGVkU3Rh dFBhdGgnIHwiIG9yIGRpZTsKICAgICB3aGlsZSAobXkgJGxpbmUgPSA8U1RBVD4pIHsKICAgICAg ICAgIyBzdm4gbWF5IG91dHB1dCBhIGRpZmZlcmVudCBFT0wgc2VxdWVuY2UgdGhhbiAkLywgc28g YXZvaWQgY2hvbXAuCkBAIC0yNjksNiArMjcxLDEyIEBAIHN1YiBnZW5lcmF0ZUZpbGVMaXN0KCRc JSkKICAgICAgICAgfQogICAgICAgICBuZXh0IGlmIC1kICRwYXRoOwogICAgICAgICBteSAkbW9k aWZpY2F0aW9uVHlwZSA9IGZpbmRNb2RpZmljYXRpb25UeXBlKCRzdGF0KTsKKyAgICAgICAgIyBz dm4gZGlmZiAtTiBkb2Vzbid0IHdvcmsgb24gc3ZuIDEuOSwgc28gb25seSByZXR1cm4gdG9wLWxl dmVsIGRlbGV0aW9ucy4KKyAgICAgICAgaWYgKCRtb2RpZmljYXRpb25UeXBlIGVxICJkZWxldGlv biIpIHsKKyAgICAgICAgICAgIHB1c2ggQGRlbGV0ZWRGaWxlcywgJHBhdGg7CisgICAgICAgICAg ICBuZXh0OworICAgICAgICB9CisKICAgICAgICAgaWYgKCRtb2RpZmljYXRpb25UeXBlKSB7CiAg ICAgICAgICAgICAkZGlmZkZpbGVzLT57JHBhdGh9LT57cGF0aH0gPSAkcGF0aDsKICAgICAgICAg ICAgICRkaWZmRmlsZXMtPnskcGF0aH0tPnttb2RpZmljYXRpb25UeXBlfSA9ICRtb2RpZmljYXRp b25UeXBlOwpAQCAtMjg0LDYgKzI5MiwyMiBAQCBzdWIgZ2VuZXJhdGVGaWxlTGlzdCgkXCUpCiAg ICAgICAgIH0KICAgICB9CiAgICAgY2xvc2UgU1RBVDsKKworICAgIGZvcmVhY2ggbXkgJHBhdGgg KEBkZWxldGVkRmlsZXMpIHsKKyAgICAgICAgbXkgJGZsYWcgPSAwOworICAgICAgICBmb3JlYWNo IG15ICRjb21wYXJlIChAZGVsZXRlZEZpbGVzKSB7CisgICAgICAgICAgICBuZXh0IGlmICRjb21w YXJlIGVxICRwYXRoOworICAgICAgICAgICAgaWYgKHN1YnN0cigkcGF0aCwgMCwgbGVuZ3RoKCRj b21wYXJlKSkgZXEgJGNvbXBhcmUpIHsKKyAgICAgICAgICAgICAgICAkZmxhZyA9IDE7CisgICAg ICAgICAgICAgICAgbGFzdDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICBuZXh0 IGlmICRmbGFnOworICAgICAgICAkZGlmZkZpbGVzLT57JHBhdGh9LT57cGF0aH0gPSAkcGF0aDsK KyAgICAgICAgJGRpZmZGaWxlcy0+eyRwYXRofS0+e21vZGlmaWNhdGlvblR5cGV9ID0gImRlbGV0 aW9uIjsKKyAgICAgICAgJGRpZmZGaWxlcy0+eyRwYXRofS0+e2lzQmluYXJ5fSA9IGlzQmluYXJ5 TWltZVR5cGUoJHBhdGgpOworICAgICAgICAkZGlmZkZpbGVzLT57JHBhdGh9LT57aXNUZXN0Rmls ZX0gPSBleGlzdHMgJHRlc3REaXJlY3Rvcmllc3soRmlsZTo6U3BlYy0+c3BsaXRkaXIoJHBhdGgp KVswXX0gPyAxIDogMDsKKyAgICB9CiB9CiAKIHN1YiBodW5rSGVhZGVyTGluZVJlZ0V4Rm9yRmls ZSgkKQo= 315174 2017-07-11 15:28:21 -0700 2017-07-11 17:24:47 -0700 Patch bug-174339-20170711152821.patch text/plain 2970 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxOTM1MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE3LTA3LTExICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBEbyBub3QgZHVwbGljYXRlIGZpbGVzIHdoZW4gZGVsZXRpbmcgZGlyZWN0 b3JpZXMgd2l0aCBzdm4gMS45CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzQzMzkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMzMjI2NzgxPgorCisg ICAgICAgIFJldmlld2VkIGJ5IERhdmlkIEtpbHplci4KKworICAgICAgICAqIFNjcmlwdHMvc3Zu LWNyZWF0ZS1wYXRjaDoKKyAgICAgICAgKGRpZmZPcHRpb25zRm9yRmlsZSk6IE5vIGxvbmdlciBw YXNzIC1OIG9wdGlvbiwgc2luY2UgdGhpcyBkb2VzIG5vdCB3b3JrIGluIFNWTiAxLjkuNC4KKyAg ICAgICAgKGdlbmVyYXRlRmlsZUxpc3QpOiBEZXRlcm1pbmUgd2hpY2ggZmlsZXMgYXJlIGRlbGV0 ZWQgYmVjYXVzZSB0aGV5IGFyZSBwYXJ0IG9mIGEKKyAgICAgICAgZGlyZWN0b3J5IGJlaW5nIGRl bGV0ZWQuCisKIDIwMTctMDctMTEgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29t PgogCiAgICAgICAgIFtXUEVdIEJ1bXAgR1N0cmVhbWVyIHBhY2thZ2VzIGluIGpoYnVpbGQubW9k dWxlcyB0byAxLjEwLjUKSW5kZXg6IFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gJKHJldmlzaW9uIDIxOTM1 MCkKKysrIFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAkod29ya2luZyBjb3B5KQpAQCAt MTQzLDcgKzE0Myw3IEBAIHN1YiBkaWZmT3B0aW9uc0ZvckZpbGUoJCkKIHsKICAgICBteSAoJGZp bGUpID0gQF87CiAKLSAgICBteSAkb3B0aW9ucyA9ICJ1YU5wIjsKKyAgICBteSAkb3B0aW9ucyA9 ICJ1YXAiOwogCiAgICAgaWYgKG15ICRodW5rSGVhZGVyTGluZVJlZ0V4ID0gaHVua0hlYWRlckxp bmVSZWdFeEZvckZpbGUoJGZpbGUpKSB7CiAgICAgICAgICRvcHRpb25zIC49ICJGJyRodW5rSGVh ZGVyTGluZVJlZ0V4JyI7CkBAIC0yNTQsNiArMjU0LDggQEAgc3ViIGdlbmVyYXRlRmlsZUxpc3Qo JFwlKQogICAgIG15ICgkc3RhdFBhdGgsICRkaWZmRmlsZXMpID0gQF87CiAgICAgbXkgJXRlc3RE aXJlY3RvcmllcyA9IG1hcCB7ICRfID0+IDEgfSBxdyhMYXlvdXRUZXN0cyk7CiAgICAgbXkgJGVz Y2FwZWRTdGF0UGF0aCA9IGVzY2FwZVN1YnZlcnNpb25QYXRoKCRzdGF0UGF0aCk7CisgICAgbXkg QGRlbGV0ZWRGaWxlczsKKwogICAgIG9wZW4gU1RBVCwgInN2biBzdGF0ICckZXNjYXBlZFN0YXRQ YXRoJyB8IiBvciBkaWU7CiAgICAgd2hpbGUgKG15ICRsaW5lID0gPFNUQVQ+KSB7CiAgICAgICAg ICMgc3ZuIG1heSBvdXRwdXQgYSBkaWZmZXJlbnQgRU9MIHNlcXVlbmNlIHRoYW4gJC8sIHNvIGF2 b2lkIGNob21wLgpAQCAtMjY5LDYgKzI3MSwxMiBAQCBzdWIgZ2VuZXJhdGVGaWxlTGlzdCgkXCUp CiAgICAgICAgIH0KICAgICAgICAgbmV4dCBpZiAtZCAkcGF0aDsKICAgICAgICAgbXkgJG1vZGlm aWNhdGlvblR5cGUgPSBmaW5kTW9kaWZpY2F0aW9uVHlwZSgkc3RhdCk7CisgICAgICAgICMgc3Zu IGRpZmYgLU4gZG9lc24ndCB3b3JrIG9uIHN2biAxLjksIHNvIG9ubHkgcmV0dXJuIHRvcC1sZXZl bCBkZWxldGlvbnMuCisgICAgICAgIGlmICgkbW9kaWZpY2F0aW9uVHlwZSBlcSAiZGVsZXRpb24i KSB7CisgICAgICAgICAgICBwdXNoIEBkZWxldGVkRmlsZXMsICRwYXRoOworICAgICAgICAgICAg bmV4dDsKKyAgICAgICAgfQorCiAgICAgICAgIGlmICgkbW9kaWZpY2F0aW9uVHlwZSkgewogICAg ICAgICAgICAgJGRpZmZGaWxlcy0+eyRwYXRofS0+e3BhdGh9ID0gJHBhdGg7CiAgICAgICAgICAg ICAkZGlmZkZpbGVzLT57JHBhdGh9LT57bW9kaWZpY2F0aW9uVHlwZX0gPSAkbW9kaWZpY2F0aW9u VHlwZTsKQEAgLTI4NCw2ICsyOTIsMjIgQEAgc3ViIGdlbmVyYXRlRmlsZUxpc3QoJFwlKQogICAg ICAgICB9CiAgICAgfQogICAgIGNsb3NlIFNUQVQ7CisKKyAgICBmb3JlYWNoIG15ICRwYXRoIChA ZGVsZXRlZEZpbGVzKSB7CisgICAgICAgIG15ICRpc0luc2lkZURlbGV0ZWREaXJlY3RvcnkgPSAw OworICAgICAgICBmb3JlYWNoIG15ICRjb21wYXJlIChAZGVsZXRlZEZpbGVzKSB7CisgICAgICAg ICAgICBuZXh0IGlmICRjb21wYXJlIGVxICRwYXRoOworICAgICAgICAgICAgaWYgKHN1YnN0cigk cGF0aCwgMCwgbGVuZ3RoKCRjb21wYXJlKSkgZXEgJGNvbXBhcmUpIHsKKyAgICAgICAgICAgICAg ICAkaXNJbnNpZGVEZWxldGVkRGlyZWN0b3J5ID0gMTsKKyAgICAgICAgICAgICAgICBsYXN0Owor ICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIG5leHQgaWYgJGlzSW5zaWRlRGVsZXRl ZERpcmVjdG9yeTsKKyAgICAgICAgJGRpZmZGaWxlcy0+eyRwYXRofS0+e3BhdGh9ID0gJHBhdGg7 CisgICAgICAgICRkaWZmRmlsZXMtPnskcGF0aH0tPnttb2RpZmljYXRpb25UeXBlfSA9ICJkZWxl dGlvbiI7CisgICAgICAgICRkaWZmRmlsZXMtPnskcGF0aH0tPntpc0JpbmFyeX0gPSBpc0JpbmFy eU1pbWVUeXBlKCRwYXRoKTsKKyAgICAgICAgJGRpZmZGaWxlcy0+eyRwYXRofS0+e2lzVGVzdEZp bGV9ID0gZXhpc3RzICR0ZXN0RGlyZWN0b3JpZXN7KEZpbGU6OlNwZWMtPnNwbGl0ZGlyKCRwYXRo KSlbMF19ID8gMSA6IDA7CisgICAgfQogfQogCiBzdWIgaHVua0hlYWRlckxpbmVSZWdFeEZvckZp bGUoJCkK