#173: use force update mode for ide-urls #155

jan-vcapgemini · 2023-12-12T15:37:38Z

Implements: #173

add force parameter to gitPullOrClone
if force is true and online do git pull followed with get reset and git cleanup
minor cleanups
added extra checks for changed and untracked files
introduced new GitUtils class (handles git commands and error messages)
added capture and warnings to all git commands
added tests and mocks for all git commands

Does not implement:

detect and fix changes if offline and force is active (has to be added in Offer git restore if urls were changed locally #148)

replaced git pull with hard reset and cleanup added force param to gitPullOrClone

salimbouch

Looks good to me :)

hohwille

@jan-vcapgemini thanks for your PR with analysis and fix. 👍
Great that you also addressed some code-cleanups.
I like your solution and also I think it is a very good idea that you added an explicit force flag instead of (mis)using our --force mode for this as this more depends on the Git use-case and for ide-urls this is exactly desired while for ide-settings this could end in a disaster as end-users may loose lots of valuable configuration work.

So in general I am happy with your PR and would like to merge it.
However, since you stumbled over some odd stuff in our code-base and started improving, I would love to take the opportunity to really fix that even though not related to the actual story.

cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java

…text.java Co-authored-by: Jörg Hohwiller <[email protected]>

coveralls · 2024-01-08T10:42:37Z

Pull Request Test Coverage Report for Build 8002948607

Details

0 of 0 changed or added relevant lines in 0 files are covered.
99 unchanged lines in 2 files lost coverage.
Overall coverage increased (+0.9%) to 57.192%

Files with Coverage Reduction	New Missed Lines	%
com/devonfw/tools/ide/context/AbstractIdeContext.java	47	65.48%
com/devonfw/tools/ide/process/ProcessContextImpl.java	52	0.0%

Totals
Change from base Build 7974016838:	0.9%
Covered Lines:	3851
Relevant Lines:	6475

💛 - Coveralls

added target to warning messages added a new warning if git failed to clean the local repository

hohwille

@jan-vcapgemini thanks for your rework. Now all looks good. 👍
I will however have to test this manually before I will merge.

# Conflicts: # cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java

removed gitPullOrClone from IdeContext interface moved gitPullOrCloneIfNeeded to GitUtils

added and implemented new GitContext interface added getGitContext to IdeContext

removed GitUtilsProcessResultMock renamed GitUtils to GitContext

# Conflicts: # cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java

cli/src/main/java/com/devonfw/tools/ide/context/GitContext.java

removed remoteName and branchName added remote and branch name retrieval added retrieveRemoteAndBranchName method to GitContextImpl

removed behind message from branch

added new GitUrl record added new pullOrFetchAndResetIfNeeded (for ide-urls only) adjusted tests (added HEAD file) passed GitUrl to clone method

cli/src/main/java/com/devonfw/tools/ide/context/GitContextImpl.java

hohwille

@jan-vcapgemini Thanks for completing this complex PR. Great job - you have reached a great state & result 👍
Ready for merge.

devonfw#6: fixed git pull hangs

4021e08

replaced git pull with hard reset and cleanup added force param to gitPullOrClone

jan-vcapgemini self-assigned this Dec 12, 2023

jan-vcapgemini added urls ide-urls repo and related processes and features CLI IDEasy command-line-interface (parsing args, etc.) bugfix labels Dec 12, 2023

jan-vcapgemini added this to the release:2024.01.001 milestone Dec 12, 2023

jan-vcapgemini added 2 commits December 12, 2023 16:48

devonfw#6: moved urls git url to constant

20172d5

devonfw#6: added some cleanups

3ea78c0

tobka777 requested a review from salimbouch December 14, 2023 09:45

tobka777 assigned salimbouch and unassigned jan-vcapgemini Dec 14, 2023

Merge branch 'main' into fix/6-git-pull-hangs

bfba3f7

salimbouch reviewed Dec 15, 2023

View reviewed changes

salimbouch assigned hohwille and unassigned salimbouch Dec 15, 2023

salimbouch requested a review from hohwille December 15, 2023 10:19

hohwille requested changes Jan 4, 2024

View reviewed changes

hohwille reviewed Jan 4, 2024

View reviewed changes

cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java Outdated Show resolved Hide resolved

hohwille reviewed Jan 4, 2024

View reviewed changes

cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java Outdated Show resolved Hide resolved

hohwille reviewed Jan 4, 2024

View reviewed changes

cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java Outdated Show resolved Hide resolved

hohwille assigned jan-vcapgemini and unassigned hohwille Jan 4, 2024

jan-vcapgemini and others added 2 commits January 8, 2024 11:40

Update cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeCon…

7f9b949

…text.java Co-authored-by: Jörg Hohwiller <[email protected]>

Update cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeCon…

097d2f7

…text.java Co-authored-by: Jörg Hohwiller <[email protected]>

devonfw#6: implemented requested changes

512a367

added target to warning messages added a new warning if git failed to clean the local repository

jan-vcapgemini requested a review from hohwille January 8, 2024 11:02

Merge branch 'main' into fix/6-git-pull-hangs

5b4d856

hohwille approved these changes Jan 8, 2024

View reviewed changes

jan-vcapgemini added 8 commits February 13, 2024 11:11

Merge branch 'main' into fix/6-git-pull-hangs

ef70b06

# Conflicts: # cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java

devonfw#173: fixed issues after merge

d5da12e

devonfw#173: refactored AbstractIdeContext

b520ddc

removed gitPullOrClone from IdeContext interface moved gitPullOrCloneIfNeeded to GitUtils

devonfw#173: new GitContext interface

a9f5b68

added and implemented new GitContext interface added getGitContext to IdeContext

devonfw#173: more refactorings

b1b62bc

devonfw#173: more refactorings

e914e81

removed GitUtilsProcessResultMock renamed GitUtils to GitContext

devonfw#173: deleted GitUtils

cf77e70

Merge branch 'main' into fix/6-git-pull-hangs

0d5bb39

# Conflicts: # cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java

jan-vcapgemini requested a review from hohwille February 15, 2024 10:31

jan-vcapgemini added 2 commits February 16, 2024 14:36

devonfw#173: fixed git pull hangs devonfw#6

84760ce

Merge branch 'main' into fix/6-git-pull-hangs

7ebbf2f

hohwille reviewed Feb 19, 2024

View reviewed changes

cli/src/main/java/com/devonfw/tools/ide/context/GitContext.java Outdated Show resolved Hide resolved

hohwille reviewed Feb 19, 2024

View reviewed changes

cli/src/main/java/com/devonfw/tools/ide/context/GitContext.java Outdated Show resolved Hide resolved

jan-vcapgemini added 7 commits February 20, 2024 11:53

devonfw#173: implemented requested changes

924d13a

removed remoteName and branchName added remote and branch name retrieval added retrieveRemoteAndBranchName method to GitContextImpl

devonfw#173: fixed behind message

51cd592

removed behind message from branch

devonfw#173: implemented requested changes

b358885

added new GitUrl record added new pullOrFetchAndResetIfNeeded (for ide-urls only) adjusted tests (added HEAD file) passed GitUrl to clone method

devonfw#173: fixed javadoc

ef7dc49

Merge branch 'main' into fix/6-git-pull-hangs

df7b883

devonfw#173: fixed merge conflict

c377e10

Merge branch 'main' into fix/6-git-pull-hangs

400d0d5

hohwille reviewed Feb 27, 2024

View reviewed changes

cli/src/main/java/com/devonfw/tools/ide/context/GitContextImpl.java Show resolved Hide resolved

hohwille approved these changes Feb 27, 2024

View reviewed changes

Merge branch 'main' into fix/6-git-pull-hangs

47e9eda

hohwille linked an issue Feb 27, 2024 that may be closed by this pull request

git pull hangs #6

Closed

hohwille merged commit 137d923 into devonfw:main Feb 27, 2024
4 checks passed

hohwille added the story-review marks PRs that will be presented in the sprint-review label May 3, 2024

hohwille assigned jan-vcapgemini May 3, 2024

jan-vcapgemini deleted the fix/6-git-pull-hangs branch May 7, 2024 08:05

tobka777 added reviewed Marks PRs that have been presented in the sprint-review meeting or that do not need to be presented. and removed story-review marks PRs that will be presented in the sprint-review labels May 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#173: use force update mode for ide-urls #155

#173: use force update mode for ide-urls #155

jan-vcapgemini commented Dec 12, 2023 •

edited

Loading

salimbouch left a comment

hohwille left a comment

coveralls commented Jan 8, 2024 •

edited

Loading

hohwille left a comment

hohwille left a comment

#173: use force update mode for ide-urls #155

#173: use force update mode for ide-urls #155

Conversation

jan-vcapgemini commented Dec 12, 2023 • edited Loading

salimbouch left a comment

Choose a reason for hiding this comment

hohwille left a comment

Choose a reason for hiding this comment

coveralls commented Jan 8, 2024 • edited Loading

Pull Request Test Coverage Report for Build 8002948607

Details

💛 - Coveralls

hohwille left a comment

Choose a reason for hiding this comment

hohwille left a comment

Choose a reason for hiding this comment

jan-vcapgemini commented Dec 12, 2023 •

edited

Loading

coveralls commented Jan 8, 2024 •

edited

Loading