You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by GitBox <gi...@apache.org> on 2020/08/28 16:38:24 UTC
[GitHub] [incubator-daffodil] rsteinberger opened a new pull request #412: Removed ExecutionMode.scala and all references
rsteinberger opened a new pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412
This process has been documented as no longer being necessary.
Daffodil-1814
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] rsteinberger edited a comment on pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
rsteinberger edited a comment on pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412#issuecomment-683202031
Right, so I can see that master contains SDE.scala with windows line endings. That seems to be the root of the problem. So I'm starting to wonder if we need a commit to fix that first? Or do we push this? Sorry its such a pain, but I've been elected to be the windows (always small w) guy.
So, to be clear. What I believe is happening. Master SDE.scala has windows CRLF. I created a branch off of Master. I have git configured to commit CRLF->LF. Thus the git diff.
It could be that we need a "clean" process. Hard to imagine this is the only case.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] rsteinberger edited a comment on pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
rsteinberger edited a comment on pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412#issuecomment-683202031
Right, so I can see that master contains SDE.scala with windows line endings. That seems to be the root of the problem. So I'm starting to wonder if we need a commit to fix that first? Or do we push this? Sorry its such a pain, but I've been elected to be the windows (always small w) guy.
So, to be clear. What I believe is happening. Master SDE.scala has windows CRLF. I created a branch off of Master. I have git configured to commit CRLF->LF. Thus the git diff.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] rsteinberger commented on a change in pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
rsteinberger commented on a change in pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412#discussion_r479432779
##########
File path: daffodil-runtime1/src/main/scala/org/apache/daffodil/dsom/SDE.scala
##########
@@ -1,224 +1,221 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
Review comment:
Yes, I corrected and pushed all of them.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] rsteinberger commented on pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
rsteinberger commented on pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412#issuecomment-683309459
Very interesting. I need to go deeper into this. I down loaded the zip of the repo to by pass git, and see that SDE.scala does not contain 0D. So git is having fun with me. Weird that it’s just this file. Stay tuned. And thanks.
> On Aug 28, 2020, at 9:10 PM, Rick Steinberger <no...@github.com> wrote:
>
>
> SDE.scala in master has LF line endings for me, and git on linux doesn't do any munging of line endings linke winows can, which confuses things. And I've checked out your PR branch, and then SDE.scala has CRLF line endings. So it definitely seems to me that this PR is changing from LF to CRLF, which we don't want.
>
> Ususally git on windows has the core.autocrlf configuration option set to true. This makes it so that when you checkout a branch, git wil convet the line endings to CRLF (which probably explains why it looks like a CRLF to you). And then when you make a commit, git will change them back to LF. So this all happens transparently to the user. But for some reason, it seems like git isn't converting the the CRLF back to a LF for this file. I have no idea why it wouldn't do that. All your other PR's have been fine. Maybe something is weird about this one file?
>
> Note that it's also not a bad thing that you're using windows. It's great to have a diversity of build environments so tha we are more likely to catch environment specific issues. And it'll be good if we can figure out this issue so that we know how to fix if if more windows developers join the project and hit this problem.
>
> —
> You are receiving this because you authored the thread.
> Reply to this email directly, view it on GitHub <https://github.com/apache/incubator-daffodil/pull/412#issuecomment-683286201>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABF4TW6QZTHRHGCEXP3V34LSDD2SLANCNFSM4QOJ73LQ>.
>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] stevedlawrence commented on a change in pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
stevedlawrence commented on a change in pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412#discussion_r479429705
##########
File path: daffodil-runtime1/src/main/scala/org/apache/daffodil/dsom/SDE.scala
##########
@@ -1,224 +1,221 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
Review comment:
Looks like this file had line endings messed up too.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] tuxji commented on a change in pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
tuxji commented on a change in pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412#discussion_r479504668
##########
File path: daffodil-runtime1/src/main/scala/org/apache/daffodil/dsom/SDE.scala
##########
@@ -1,224 +1,221 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
Review comment:
I think you missed SDE.scala, I still see a huge diff.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] rsteinberger commented on pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
rsteinberger commented on pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412#issuecomment-683820110
Should all be correct now. Please let me know if you still see issues. It turned out to be a combination of config setting in git vs Intellij. I now have get configured with git config --global core.autocrlf false to do no conversion. And Intellij configured to use only LF, at the project level. That should do it. But, I will certainly keep an eye on it. All documented in the New Developer doc.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] stevedlawrence merged pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
stevedlawrence merged pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] stevedlawrence commented on pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
stevedlawrence commented on pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412#issuecomment-683286201
SDE.scala in master has LF line endings for me, and git on linux doesn't do any munging of line endings linke winows can, which confuses things. And I've checked out your PR branch, and then SDE.scala has CRLF line endings. So it definitely seems to me that this PR is changing from LF to CRLF, which we don't want.
Ususally git on windows has the ``core.autocrlf`` configuration option set to ``true``. This makes it so that when you checkout a branch, git wil convet the line endings to CRLF (which probably explains why it looks like a CRLF to you). And then when you make a commit, git will change them back to LF. So this all happens transparently to the user. But for some reason, it seems like git isn't converting the the CRLF back to a LF for this file. I have no idea why it wouldn't do that. All your other PR's have been fine. Maybe something is weird about this one file?
Note that it's also not a bad thing that you're using windows. It's great to have a diversity of build environments so tha we are more likely to catch environment specific issues. And it'll be good if we can figure out this issue so that we know how to fix if if more windows developers join the project and hit this problem.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] stevedlawrence commented on a change in pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
stevedlawrence commented on a change in pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412#discussion_r479419967
##########
File path: daffodil-core/src/main/scala/org/apache/daffodil/dsom/AnnotatedSchemaComponent.scala
##########
@@ -1,485 +1,482 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
Review comment:
This entire file shows as a diff. Did you change the line endings perhaps? We try to always use unix lined endings. Make sure you IDE isn't changing things. It's not clear what changes were actually made to this and other files.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] rsteinberger commented on pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
rsteinberger commented on pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412#issuecomment-683202031
Right, so I can see that master contains SDE.scala with windows line endings. That seems to be the root of the problem. So I'm starting to wonder if we need a commit to fix that first? Or do we push this? Sorry its such a pain, but I've been elected to be the windows (always small w) guy.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] tuxji commented on pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
tuxji commented on pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412#issuecomment-683783166
Rick, I use a Windows 10 (winver 1909) laptop too. I made git checkouts using Cygwin git for a long time using the following snippet inside my `~/.gitconfig`:
```ini
[core]
safecrlf = true
autocrlf = input
```
However, I now develop in Windows Subsystem for Linux (WSL) almost exclusively since the WSL experience (including Microsoft Terminal) has improved to the point where I feel like I'm using both Ubuntu 20.04 (inside Microsoft Terminal except for Emacs and IntelliJ IDEA which are running in their own windows using the VcXsrv X server) and Windows 10 at the same time. The only concession I've made for Windows in my Ubuntu 20.04 environment's `~/.gitconfig` is to tell git to ignore files' executable bit in case a Windows program has created a file in my git checkout or my checkout is in a Windows filesystem instead of an Ubuntu filesystem:
```ini
[core]
filemode = false
```
You may want to try WSL too which will allow you to mix and match your favorite development tools as you wish. For example, I also run Visual Studio Code natively on Windows with a plugin that performs remote compilations and debugging inside WSL.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] stevedlawrence merged pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
stevedlawrence merged pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] stevedlawrence merged pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
stevedlawrence merged pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] stevedlawrence merged pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
stevedlawrence merged pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-daffodil] stevedlawrence commented on a change in pull request #412: Removed ExecutionMode.scala and all references
Posted by GitBox <gi...@apache.org>.
stevedlawrence commented on a change in pull request #412:
URL: https://github.com/apache/incubator-daffodil/pull/412#discussion_r479433450
##########
File path: daffodil-runtime1/src/main/scala/org/apache/daffodil/dsom/SDE.scala
##########
@@ -1,224 +1,221 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
Review comment:
Double check SDE.scala, looks like it still has the issue. All the other ones look correct.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org