Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inconsistent EOL #40

Open
fredroy opened this issue Aug 4, 2022 · 0 comments
Open

Inconsistent EOL #40

fredroy opened this issue Aug 4, 2022 · 0 comments

Comments

@fredroy
Copy link
Contributor

fredroy commented Aug 4, 2022

The files on the repository have different endings, and it leads in some issue with editors which change all of them while developing, thus completely wiping out the blame/history in those files.

Status:

$ find . -type f \( -name "*.h" -o -name "*.cpp" -o -name "*.inl" \) -exec file {} \;
./src/BeamAdapter/initBeamAdapter.h: C source, ASCII text
./src/BeamAdapter/initBeamAdapter.cpp: C source, ASCII text
./src/BeamAdapter/component/MultiAdaptiveBeamContactMapper.h: C++ source, ASCII text, with CRLF, LF line terminators
./src/BeamAdapter/component/AdaptiveBeamContactMapper.h: C++ source, ASCII text, with CRLF, LF line terminators
./src/BeamAdapter/component/MultiAdaptiveBeamContactMapper.cpp: C++ source, ASCII text
./src/BeamAdapter/component/WireBeamInterpolation.h: C++ source, ASCII text
./src/BeamAdapter/component/controller/AdaptiveBeamController.inl: C++ source, Unicode text, UTF-8 text
./src/BeamAdapter/component/controller/InterventionalRadiologyController.cpp: C source, ASCII text, with CRLF, LF line terminators
./src/BeamAdapter/component/controller/SutureController.h: C++ source, ASCII text
./src/BeamAdapter/component/controller/InterventionalRadiologyController.inl: C++ source, Unicode text, UTF-8 text
./src/BeamAdapter/component/controller/SutureController.cpp: C++ source, ASCII text
./src/BeamAdapter/component/controller/SutureController.inl: C++ source, Unicode text, UTF-8 text, with CRLF, LF line terminators
./src/BeamAdapter/component/controller/InterventionalRadiologyController.h: C++ source, ASCII text
./src/BeamAdapter/component/controller/AdaptiveBeamController.cpp: C++ source, ASCII text
./src/BeamAdapter/component/controller/AdaptiveBeamController.h: C++ source, ASCII text
./src/BeamAdapter/component/BeamInterpolation.inl: C++ source, ASCII text, with CRLF line terminators
./src/BeamAdapter/component/engine/WireRestShape.cpp: C++ source, ASCII text
./src/BeamAdapter/component/engine/SteerableCatheter.cpp: C source, ASCII text
./src/BeamAdapter/component/engine/SteerableCatheter.h: C++ source, ASCII text
./src/BeamAdapter/component/engine/SteerableCatheter.inl: C++ source, Unicode text, UTF-8 text
./src/BeamAdapter/component/engine/WireRestShape.h: C++ source, ASCII text
./src/BeamAdapter/component/engine/WireRestShape.inl: C++ source, Unicode text, UTF-8 text
./src/BeamAdapter/component/MultiAdaptiveBeamContactMapper.inl: C++ source, ASCII text
./src/BeamAdapter/component/BeamInterpolation.cpp: C++ source, ASCII text
./src/BeamAdapter/component/AdaptiveBeamContactMapper.inl: C++ source, ASCII text
./src/BeamAdapter/component/mapping/AdaptiveBeamMapping.cpp: C++ source, ASCII text
./src/BeamAdapter/component/mapping/BeamLengthMapping.cpp: C++ source, ASCII text
./src/BeamAdapter/component/mapping/MultiAdaptiveBeamMapping.h: C++ source, ASCII text
./src/BeamAdapter/component/mapping/BeamLengthMapping.inl: C++ source, ASCII text
./src/BeamAdapter/component/mapping/AdaptiveBeamMapping.h: C++ source, ASCII text
./src/BeamAdapter/component/mapping/MultiAdaptiveBeamMapping.inl: C++ source, ASCII text
./src/BeamAdapter/component/mapping/AdaptiveBeamMapping.inl: C++ source, ASCII text
./src/BeamAdapter/component/mapping/MultiAdaptiveBeamMapping.cpp: C source, ASCII text
./src/BeamAdapter/component/mapping/BeamLengthMapping.h: C++ source, ASCII text
./src/BeamAdapter/component/AdaptiveBeamFrictionContact.cpp: C++ source, ASCII text
./src/BeamAdapter/component/WireBeamInterpolation.inl: C++ source, Unicode text, UTF-8 text, with CRLF, LF line terminators
./src/BeamAdapter/component/WireBeamInterpolation.cpp: C++ source, ASCII text
./src/BeamAdapter/component/AdaptiveBeamContactMapper.cpp: C++ source, ASCII text
./src/BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.inl: C++ source, Unicode text, UTF-8 text, with CRLF line terminators
./src/BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.inl: C++ source, Unicode text, UTF-8 text, with CRLF, LF line terminators
./src/BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.h: C++ source, ASCII text
./src/BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.cpp: C source, ASCII text
./src/BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.cpp: C source, ASCII text
./src/BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.h: C++ source, ASCII text
./src/BeamAdapter/component/constraint/AdaptiveBeamLengthConstraint.cpp: C++ source, ASCII text, with CRLF, LF line terminators
./src/BeamAdapter/component/constraint/AdaptiveBeamSlidingConstraint.cpp: C++ source, ASCII text, with CRLF line terminators
./src/BeamAdapter/component/constraint/ImplicitSurfaceAdaptiveConstraint.inl: C++ source, ASCII text
./src/BeamAdapter/component/constraint/AdaptiveBeamLengthConstraint.h: C++ source, ASCII text
./src/BeamAdapter/component/constraint/AdaptiveBeamLengthConstraint.inl: C++ source, ASCII text
./src/BeamAdapter/component/constraint/ImplicitSurfaceAdaptiveConstraint.h: C++ source, ASCII text
./src/BeamAdapter/component/constraint/AdaptiveBeamSlidingConstraint.h: C++ source, ASCII text
./src/BeamAdapter/component/constraint/ImplicitSurfaceAdaptiveConstraint.cpp: C source, ASCII text
./src/BeamAdapter/component/constraint/AdaptiveBeamSlidingConstraint.inl: C++ source, ASCII text
./src/BeamAdapter/component/BeamInterpolation.h: C++ source, Unicode text, UTF-8 text, with CRLF line terminators
./src/BeamAdapter/component/solver/UnbuiltGenericConstraintSolver.h: C++ source, ASCII text
./src/BeamAdapter/component/solver/UnbuiltGenericConstraintSolver.cpp: C++ source, ASCII text
./src/BeamAdapter/utils/deprecatedcomponent.h: C++ source, ASCII text
./BeamAdapter_test/BeamInterpolation_test.cpp: C++ source, ASCII text
./BeamAdapter_test/component/mapping/BeamLengthMappingTest.cpp: C++ source, ASCII text
./BeamAdapter_test/component/forcefield/AdaptiveBeamForceFieldAndMassTest.cpp: C++ source, ASCII text
./BeamAdapter_test/component/constraint/AdaptiveBeamSlidingConstraintTest.cpp: C++ source, ASCII text

As we can see BeamInterpolation.{h, inl},, AdaptiveBeamSlidingConstraint.cpp, AdaptiveBeamForceFieldAndMass.inl have CRLF defined, others even have a mix of CRLF/LF defined...
I dont really know how to fix easily that, without destroying the history (either completely replace the content of the file, or by git-filter the complete history of the repo)
In any case, we should be careful while doing PR, diff/conflicts are really a mess because of this 🙈

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant