Fixes all deprecated API usage in libs.jgit and update gitignore IO code #7093

mbien · 2024-02-21T18:52:09Z

first commit:

remove deprecated jgit api usage
fixed all other compiler warnings too (edit: only in libs.jgit :))

second commit:

renovate the git ignore/unignore IO code
make sure the file specific line separators are retained during file updates

I tested (stepped through it) some of it manually: list/switch branches, list/add/remove tags

lets see what tests say

mbien · 2024-02-21T20:31:59Z

testLogWithBranchInfoMoreBranches: org.netbeans.libs.git.jgit.commands.LogTest

junit.framework.AssertionFailedError
	at org.netbeans.libs.git.jgit.commands.LogTest.testLogWithBranchInfoMoreBranches(LogTest.java:775)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at org.netbeans.junit.NbTestCase.access$200(NbTestCase.java:79)
	at org.netbeans.junit.NbTestCase$2.doSomething(NbTestCase.java:484)
	at org.netbeans.junit.NbTestCase$1Guard.run(NbTestCase.java:405)
	at java.base/java.lang.Thread.run(Thread.java:840)

one test fails, the bug is in ListBranchCommand, since it works when i revert the changes. Going to take a look tomorrow.

mbien · 2024-02-26T15:54:01Z

ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/LogTest.java

+        // git commit timestamp resolution is one second.
+        // commits with the same time stamp don't seem to influence log order unless branches
+        // change between commits. In that case the branch name is also affecting the order.
+        // (renaming "newbranch" to "aaa" would fix this too but obfuscate the problem)
+        Thread.sleep(1100);


this resolves the encountered test failure. (#7093 (comment))

matthiasblaesing

Looks sane to me. I only found a single location where I think the behavior changed.

ide/libs.git/src/org/netbeans/libs/git/jgit/commands/ListBranchCommand.java

matthiasblaesing

Thank you.

mbien · 2024-02-27T14:55:22Z

refreshed PR, testing this a bit manually and if I don't find anything I will merge once green again

mbien · 2024-02-27T18:41:54Z

added an extra commit which renovates git ignore/unignore IO code

mbien · 2024-02-27T18:46:00Z

ide/libs.git/src/org/netbeans/libs/git/jgit/commands/IgnoreUnignoreCommand.java

-        StringBuilder sb = new StringBuilder('/');
+        StringBuilder sb = new StringBuilder();


this did set the capacity of the SB. The char was cast to int. The code did still work though since it didn't need that slash.

matthiasblaesing · 2024-02-27T19:02:04Z

added an extra commit which renovates git ignore/unignore IO code

Would it be possible to detect the line end character of the file and use that on save? I observe, that using the Ignore/Unignore action in NetBeans currently leads to many of my .gitignore files to be completely changed.

mbien · 2024-02-27T19:32:16Z

@matthiasblaesing I take a look

mbien · 2024-02-27T20:16:39Z

ide/libs.git/src/org/netbeans/libs/git/jgit/commands/IgnoreUnignoreCommand.java

+    @SuppressWarnings("NestedAssignment")
+    private static String probeLineSeparator(Path file) throws IOException {
+        if (Files.exists(file)) {
+            try (BufferedReader br = Files.newBufferedReader(file)) {
+                int current;
+                int last = -1;
+                while ((current = br.read()) != -1) {
+                    if (current == '\n') {
+                        return last == '\r' ? "\r\n" : "\n";
+                    }
+                    last = current;
                }
            }
        }
-        return rules;
+        return System.lineSeparator();


@matthiasblaesing could you check if this works for you?
It probes before save and uses the probed result for write. System default as fallback.

- code renovation - file specific line separators are now retained between updates - added tests

mbien · 2024-02-28T16:33:10Z

added tests + refreshed PR

matthiasblaesing

I was not able to test this at work on Windows, but I tested locally the opposite situation: A .gitignore file with windows line endings on linux. The implementation also looks sane to me.

Thank you!

mbien added Code cleanup git [ci] enable versioning job ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) labels Feb 21, 2024

mbien added this to the NB22 milestone Feb 21, 2024

mbien marked this pull request as draft February 21, 2024 20:32

mbien force-pushed the fix-jgit-deprecations branch from 1cf5b77 to 124c4db Compare February 26, 2024 15:52

mbien marked this pull request as ready for review February 26, 2024 15:52

mbien commented Feb 26, 2024

View reviewed changes

matthiasblaesing reviewed Feb 26, 2024

View reviewed changes

ide/libs.git/src/org/netbeans/libs/git/jgit/commands/ListBranchCommand.java Outdated Show resolved Hide resolved

mbien force-pushed the fix-jgit-deprecations branch from 124c4db to e02c519 Compare February 26, 2024 20:16

matthiasblaesing approved these changes Feb 26, 2024

View reviewed changes

mbien force-pushed the fix-jgit-deprecations branch from e02c519 to 74791e4 Compare February 27, 2024 14:52

mbien commented Feb 27, 2024

View reviewed changes

mbien force-pushed the fix-jgit-deprecations branch from ff8ea3a to da74685 Compare February 27, 2024 20:13

mbien added the DO NOT squash label Feb 27, 2024

mbien commented Feb 27, 2024

View reviewed changes

mbien added 2 commits February 28, 2024 17:29

Fixes all deprecated API usage in libs.jgit

dc78790

Simplified git ignore/unignore IO code

2983c0f

- code renovation - file specific line separators are now retained between updates - added tests

mbien force-pushed the fix-jgit-deprecations branch from da74685 to 2983c0f Compare February 28, 2024 16:32

matthiasblaesing approved these changes Feb 28, 2024

View reviewed changes

mbien changed the title ~~Fixes all deprecated API usage in libs.jgit~~ Fixes all deprecated API usage in libs.jgit and update gitignore IO code Feb 28, 2024

mbien merged commit bcaa1ab into apache:master Feb 28, 2024
35 checks passed

mbien removed the DO NOT squash label Mar 23, 2024

mbien mentioned this pull request Oct 20, 2024

Upgrading jgit to 7.0.0.202409031743-r #7851

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes all deprecated API usage in libs.jgit and update gitignore IO code #7093

Fixes all deprecated API usage in libs.jgit and update gitignore IO code #7093

mbien commented Feb 21, 2024 •

edited

Loading

mbien commented Feb 21, 2024

mbien Feb 26, 2024 •

edited

Loading

matthiasblaesing left a comment

matthiasblaesing left a comment

mbien commented Feb 27, 2024

mbien commented Feb 27, 2024

mbien Feb 27, 2024

matthiasblaesing commented Feb 27, 2024

mbien commented Feb 27, 2024

mbien Feb 27, 2024

mbien commented Feb 28, 2024

matthiasblaesing left a comment

		StringBuilder sb = new StringBuilder('/');
		StringBuilder sb = new StringBuilder();

Fixes all deprecated API usage in libs.jgit and update gitignore IO code #7093

Fixes all deprecated API usage in libs.jgit and update gitignore IO code #7093

Conversation

mbien commented Feb 21, 2024 • edited Loading

mbien commented Feb 21, 2024

mbien Feb 26, 2024 • edited Loading

Choose a reason for hiding this comment

matthiasblaesing left a comment

Choose a reason for hiding this comment

matthiasblaesing left a comment

Choose a reason for hiding this comment

mbien commented Feb 27, 2024

mbien commented Feb 27, 2024

mbien Feb 27, 2024

Choose a reason for hiding this comment

matthiasblaesing commented Feb 27, 2024

mbien commented Feb 27, 2024

mbien Feb 27, 2024

Choose a reason for hiding this comment

mbien commented Feb 28, 2024

matthiasblaesing left a comment

Choose a reason for hiding this comment

mbien commented Feb 21, 2024 •

edited

Loading

mbien Feb 26, 2024 •

edited

Loading