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.

Sign up for GitHub

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

Jump to bottom

Force git update of ide-urls #173

Closed
hohwille opened this issue Jan 9, 2024 · 0 comments · Fixed by #155
Closed

Force git update of ide-urls #173

hohwille opened this issue Jan 9, 2024 · 0 comments · Fixed by #155
Assignees
@jan-vcapgemini
Labels
enhancement New feature or request git
Milestone
release:2024.03.001

Comments

@hohwille
Copy link
Member

hohwille commented Jan 9, 2024

The repository ide-urls is cloned to $IDE_ROOT/_ide/urls and always updated.
If for some reason the end-user (accidentally) does a modification here, this can make IDEasy end up in strange errors if git pull causes merge conflicts that need manual resolving.

With PR #155 @jan-vcapgemini already introduced a nice feature to support force updating git repos that users shall not interfere with.
In such case, we simply fetch and then reset the git repo reverting any potential local change of the user.
This feature shall only be used for ide-urls as here we are using GIT only as a kind of efficient protocol to distribute changes efficiently from our server (github repo ide-urls) to the client (IDEasy installation). Changes of the user are always considered accidentally and are undesired. Therefore we can force override them.

However, repos like the settings repo must never use this new force update mode as the end-user could lose a lot of valuable work this way. Still we could improve interactive support in case of conflicts (asking the user to stash changes and then continue so after that the user can unstash and manually resolve conflicts with the git tool of his choice). The latter is so far just an idea and not part of this story.
@hohwille hohwille added the enhancement New feature or request label Jan 9, 2024
@hohwille hohwille added this to the release:2024.01.001 milestone Jan 9, 2024
@hohwille hohwille added the git label Jan 9, 2024
@hohwille hohwille mentioned this issue Jan 9, 2024
Merged
@hohwille hohwille linked a pull request Jan 9, 2024 that will close this issue
#173: use force update mode for ide-urls #155
Merged
This was referenced Jan 9, 2024
Closed
Closed
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Jan 23, 2024
@jan-vcapgemini
devonfw#173: added more git checks
6cc8b14 
added checks for untracked files to force mode
added checks for changed files to force mode
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Jan 25, 2024
@jan-vcapgemini
devonfw#173: introduced git utils
a04db03 
added new GitUtils class
made sure that force only runs in online mode
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Jan 26, 2024
@jan-vcapgemini
devonfw#173: more refactorings
49733fc
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Jan 29, 2024
@jan-vcapgemini
devonfw#173: more refactorings
ef9ae80 
removed runGitFetch method
added runGitClone method
added exception if git clone was attempted while being offline
removed result from runGitReset
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Jan 29, 2024
@jan-vcapgemini
devonfw#173: added/improved warnings
3d4f63a 
added warning to git clone
added remote and target to git pull
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Jan 30, 2024
@jan-vcapgemini
devonfw#173: applied non star imports
e862aac
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 2, 2024
@jan-vcapgemini
devonfw#173: replaced isOnline
057b495 
replaced isOnline with isOffline (to check offlineMode too)
removed obsolete method
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 2, 2024
@jan-vcapgemini
devonfw#173: implemented requested change
43f96c8 
added lazy loading of ProcessContext
added new initializeProcessContext method
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 5, 2024
@jan-vcapgemini
devonfw#173: added new tests and mocks
bdab005
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 5, 2024
@jan-vcapgemini
devonfw#173: added info messages
dbe5000
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 5, 2024
@jan-vcapgemini
devonfw#173: changed to debug mode
f0de981
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 5, 2024
@jan-vcapgemini
devonfw#173: changed to sysout
89bb42e
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 5, 2024
@jan-vcapgemini
devonfw#173: replaced try with assertThrows
f337621
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 5, 2024
@jan-vcapgemini
devonfw#173: disabled throw exception test
664f5f8
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 6, 2024
@jan-vcapgemini
devonfw#173: implemented tempDir
2d98ad0 
replaced copyForMutation with tempDir
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 9, 2024
@jan-vcapgemini
devonfw#173: fixed offline simulation
701df78 
renamed isOffline to isOnline
added override of isOnline to GitUtilsTextContext
added new testOnlineMode to GitUtilsTestContext
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 9, 2024
@jan-vcapgemini
devonfw#173: added git reset test
e3ac7ab 
removed souts
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 9, 2024
@jan-vcapgemini
devonfw#173: cleanup
10f09e1
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 13, 2024
@jan-vcapgemini
devonfw#173: fixed issues after merge
d5da12e
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 15, 2024
@jan-vcapgemini
devonfw#173: refactored AbstractIdeContext
b520ddc 
removed gitPullOrClone from IdeContext interface
moved gitPullOrCloneIfNeeded to GitUtils
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 15, 2024
@jan-vcapgemini
devonfw#173: new GitContext interface
a9f5b68 
added and implemented new GitContext interface
added getGitContext to IdeContext
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 15, 2024
@jan-vcapgemini
devonfw#173: more refactorings
b1b62bc
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 15, 2024
@jan-vcapgemini
devonfw#173: more refactorings
e914e81 
removed GitUtilsProcessResultMock
renamed GitUtils to GitContext
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 15, 2024
@jan-vcapgemini
devonfw#173: deleted GitUtils
cf77e70
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 16, 2024
@jan-vcapgemini
devonfw#173: fixed git pull hangs devonfw#6
84760ce
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 20, 2024
@jan-vcapgemini
devonfw#173: implemented requested changes
924d13a 
removed remoteName and branchName
added remote and branch name retrieval
added retrieveRemoteAndBranchName method to GitContextImpl
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 20, 2024
@jan-vcapgemini
devonfw#173: fixed behind message
51cd592 
removed behind message from branch
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 21, 2024
@jan-vcapgemini
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
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 21, 2024
@jan-vcapgemini
devonfw#173: fixed javadoc
ef7dc49
jan-vcapgemini added a commit to jan-vcapgemini/IDEasy that referenced this issue Feb 22, 2024
@jan-vcapgemini
devonfw#173: fixed merge conflict
c377e10
hohwille pushed a commit that referenced this issue Feb 27, 2024
@jan-vcapgemini
#173: use force update mode for ide-urls (#155) #6: fixed git pull hangs
137d923
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@jan-vcapgemini jan-vcapgemini

Labels
enhancement New feature or request git
Projects
IDEasy board
Status: ✅ Done
Milestone
release:2024.03.001
Development

Successfully merging a pull request may close this issue.

#173: use force update mode for ide-urls jan-vcapgemini/IDEasy
2 participants
@hohwille @jan-vcapgemini