|
|
Home » Developing U++ » U++ Developers corner » GIT support integration to the IDE (Can you help to improve GIT support in the IDE? Test the prototype!)
GIT support integration to the IDE [message #47022] |
Tue, 08 November 2016 12:31 |
coolman
Messages: 116 Registered: April 2006 Location: Czech Republic
|
Experienced Member |
|
|
Hi.
I try to implement GIT support to the IDE. You can find the actual implementation at https://github.com/CoolmanCZ/mirror.
Currently is supported:
* basic integration with IDE to support manipulation with the files
* GIT configuration
* GIT branch / remote configuration
* fetch, merge, push
* commit
* stash / stash apply
* GIT repository history
* GIT file history
I would like to ask you to help me with the testing, also suggestions are welcome. Please, take into account that the current implementation is a prototype. So It can be changed/enhanced by your requests.
For your requirements, please use the issue tracker at the link mentioned above.
Thanks, Radek
[Updated on: Mon, 14 November 2016 10:10] Report message to a moderator
|
|
|
|
|
|
|
|
Re: GIT support integration to the IDE [message #47049 is a reply to message #47046] |
Sun, 20 November 2016 20:21 |
coolman
Messages: 116 Registered: April 2006 Location: Czech Republic
|
Experienced Member |
|
|
deep wrote on Sat, 19 November 2016 16:16Hi,
The present Trunk in main repo is different than what you have used.
To use your modifications with current HEAD in git will require the patch for your changes.
You used some branch of IDE and then created your additions for git integration.
Can you create patch with ref to your original ide branch.
I would like to use patch to current HEAD.
Hi,
Thanks for the explanation. But you can create the diff yourself.
1. Clone the GIT repository git clone https://github.com/CoolmanCZ/mirror upp_git
2. Add remote upstream to the trunk repository cd upp_git
git remote add upstream https://github.com/ultimatepp/mirror
3. Create the diff git diff upstream/master..HEAD
When you are using the IDE from the U++ GIT repository and you already have the upstream configured, you don't need the patch. You can merge the changes from the upstream to the U++ GIT repository using integrated merge function.
Best regards, Radek
Edit: I am trying to keep the U++ GIT repository up to date with the latest trunk version of the IDE.
[Updated on: Sun, 20 November 2016 20:48] Report message to a moderator
|
|
|
|
|
|
|
|
Re: GIT support integration to the IDE [message #49318 is a reply to message #49316] |
Thu, 25 January 2018 12:11 |
coolman
Messages: 116 Registered: April 2006 Location: Czech Republic
|
Experienced Member |
|
|
[quote title=mirek wrote on Thu, 25 January 2018 11:12]coolman wrote on Wed, 24 January 2018 17:52Hi all,
BTW, U++ Synchronize now supports GIT as well (since 2017.2)...
The general idea is perhaps somewhat different from what you would expect from "real GIT support" - the idea, just as with SVN synchronize, is to automate repetitive tasks (commit / push / pull).
Hi,
Yes, I know about this feature. It can be used for synchronization.
But I needed something, e.g. for basic resolving the conflict during the merge, ... To minimize the situation with switching to the CMD to resolve the simple GIT problems.
BR, Radek
|
|
|
Re: GIT support integration to the IDE [message #49964 is a reply to message #47022] |
Thu, 07 June 2018 13:25 |
coolman
Messages: 116 Registered: April 2006 Location: Czech Republic
|
Experienced Member |
|
|
Hi,
I would like to invite you to try GIT menu implementation (develop branch) to the IDE.
BR, Radek
The current implementation includes the following options for manipulating a GIT repository
GIT init repository
Can be used to initialize the GIT repository for selected package if the package is not a part of already initialized GIT repository. When initialization is successfully done GIT config is invoked.
GIT config
It allows you to change the configuration parameters of individual GIT repositories as well as global GIT settings.
(all available GIT repositories are shown)
GIT history
This item displays the GIT commit history of the currently selected branch. A part of the view is a detailed listing of the currently selected commit or a summary of lines and files changed in this commit.
The right click menu allows you to create a new branch, insert/delete/show tags or create a diff/GIT patch of selected commit.
(all available GIT repositories are shown)
GIT update status
Compares and displays the status of local and remote branches within single GIT repositories.
GIT status
Shows the GIT status of the repository that contains the currently edited file.
GIT fetch
Download objects and refs from all remote repositories. Fetches branches and/or tags (collectively, "refs") along with the objects necessary to complete their histories. Remote-tracking branches are updated.
(git fetch is invoked on all available repositories)
GIT merge
Allows you to incorporate changes from one branch (even remote branch) into the current branch. You can see all changes between selected branches before the merge.
(all available GIT repositories are shown)
GIT stash
Stashing takes the dirty state of your working directory - that is, your modified tracked files and staged changes - and saves it on a stack of unfinished changes that you can reapply at any time.
GIT stash apply
You can select and apply the saved changes you just stashed previously.
GIT commit
Stores the current contents of the index in a new commit along with a log message from the user describing the changes. Before the commit you can see all changes made in the repository and:
- discard changes for a particular file
- basic manipulation with unmerged changes
- add untracked file to the repository
- delete file from the repository
- add file to the .gitignore file
- delete file
note: left doubleclick at the line in the right side of the diff output opens the appropriate file in the editor.
(all available GIT repositories are shown)
GIT push
Updates remote refs using local refs, while sending objects necessary to complete the given refs.
(git push is invoked on all available repositories)
GIT branch
Allows you to add / modify / delete /checkout a local branch. There is also the option to add / modify / delete a remote repository, including pairing a local branch with a remote branch in a remote repository.
(all available GIT repositories are shown)
GIT patch apply/abort
Reads the supplied diff output (i.e. "a patch") and applies it to files. When running from a subdirectory in a repository, patched paths outside the directory are ignored. This command applies the patch and create commits from patches generated by git-format-patch and/or received by email.
If the patch apply has failed, you can abort this patch using this menu option.
Show repository history of the file...
Shows GIT history of the edited file (diff output and detailed description of the commit)
Show repository history of the file lines...
Shows what revision and which author has later modified each row of the edited file.
|
|
|
Goto Forum:
Current Time: Fri Sep 20 03:23:23 CEST 2024
Total time taken to generate the page: 0.03133 seconds
|
|
|