[jitsi-dev] Mixed EOL in source files


#1

Hi,

There is a lot of java files with mixed EOL (I found 202)
Can someone dos2unix them ?
(repo: libjitsi, jitsi-android-osgi, jitsi-videobridge, jitsi)

to find them:
find -name '*.java' | xargs file | grep 'CRLF, LF' | cut -d ':' -f1

to convert them
find -name '*.java' | xargs file | grep 'CRLF, LF' | cut -d ':' -f1 | xargs
-n1 dos2unix

Regards
Etienne


#2

Hi,

···

2016-02-15 9:30 GMT+01:00 Etienne Champetier <champetier.etienne@gmail.com>:

Hi,

There is a lot of java files with mixed EOL (I found 202)
Can someone dos2unix them ?
(repo: libjitsi, jitsi-android-osgi, jitsi-videobridge, jitsi)

to find them:
find -name '*.java' | xargs file | grep 'CRLF, LF' | cut -d ':' -f1

to convert them
find -name '*.java' | xargs file | grep 'CRLF, LF' | cut -d ':' -f1 |
xargs -n1 dos2unix

Regards
Etienne

https://github.com/jitsi/libjitsi/pull/82


#3

:

Hi,

2016-02-15 9:30 GMT+01:00 Etienne Champetier <champetier.etienne@gmail.com
>:

Hi,

There is a lot of java files with mixed EOL (I found 202)
Can someone dos2unix them ?
(repo: libjitsi, jitsi-android-osgi, jitsi-videobridge, jitsi)

to find them:
find -name '*.java' | xargs file | grep 'CRLF, LF' | cut -d ':' -f1

to convert them
find -name '*.java' | xargs file | grep 'CRLF, LF' | cut -d ':' -f1 |
xargs -n1 dos2unix

Regards
Etienne

Ping
I don't care about CRLF or LF, but mixed lines are really painful
(show up in git diff ...)

···

2016-02-16 14:55 GMT+01:00 Etienne Champetier <champetier.etienne@gmail.com>

https://github.com/jitsi/libjitsi/pull/82


#4

    There is a lot of java files with mixed EOL (I found 202)

Not sure what's going on here, but it wasn't long ago that I ran a dos2unix on all *.java files. There was nothing. I wonder where these came from.

    Can someone dos2unix them ?
Ping

I don't care about CRLF or LF, but mixed lines are really painful

(show up in git diff ...)
  https://github.com/jitsi/libjitsi/pull/82

We can't merge this PR as it is impossible to review it for unintended changes. I'll try to give dos2unix another try when I find some time - unless someone else beats me at it.

Ingo


#5

We just pushed fixes to libjitsi and jitsi-videobridge. There's also a PR for jitsi, but I'm reluctant to merge it because it is huge (140 files).

Thank you Etienne!

Regards,
Boris

···

On 23/02/16 14:08, Ingo Bauersachs wrote:

    There is a lot of java files with mixed EOL (I found 202)

Not sure what's going on here, but it wasn't long ago that I ran a dos2unix on all *.java files. There was nothing. I wonder where these came from.

    Can someone dos2unix them ?
Ping

I don't care about CRLF or LF, but mixed lines are really painful

(show up in git diff ...)
  https://github.com/jitsi/libjitsi/pull/82

We can't merge this PR as it is impossible to review it for unintended changes. I'll try to give dos2unix another try when I find some time - unless someone else beats me at it.


#6

We just pushed fixes to libjitsi and jitsi-videobridge. There's also a
PR for jitsi, but I'm reluctant to merge it because it is huge (140 files).

I merged it. If it breaks, it breaks.

Thank you Etienne!

Regards,
Boris

Ingo


#7

Hi,

                There is a lot of java files with mixed EOL (I found

202)

Not sure what's going on here, but it wasn't long ago that I ran a

dos2unix on all *.java files. There was nothing. I wonder where these came
from.

                Can someone dos2unix them ?
Ping

I don't care about CRLF or LF, but mixed lines are really painful

(show up in git diff ...)
        https://github.com/jitsi/libjitsi/pull/82

We can't merge this PR as it is impossible to review it for unintended

changes. I'll try to give dos2unix another try when I find some time -
unless someone else beats me at it.

Totally agree, i wouldn't trust me either :wink:

We just pushed fixes to libjitsi and jitsi-videobridge. There's also a PR

for jitsi, but I'm reluctant to merge it because it is huge (140 files).

You can try to convert to CRLF instead of LF maybe the diff is smaller (but
in the end we want LF i think)

Thank you Etienne!

Thank you!

···

Le 23 févr. 2016 21:45, "Boris Grozev" <boris@jitsi.org> a écrit :

On 23/02/16 14:08, Ingo Bauersachs wrote:

Regards,
Boris