Hello everyone, Those of you that are using Git might be interested to know that there is a new Git plugin for Oxygen [1]. If you want to give it a try, it can be quickly installed through Oxygen's add-on support [2][2.1]. In the beginning we focused on the essential functionality, the operations that are performed often, like committing, pulling changes etc. Another cool feature is the use of Oxygen's Diff tool [3] to highlight the changes. Moreover, if the file is in conflict (has been modified both by you and another), Oxygen's Three Way Diff [4] will show a comparison between the local change, the remote change, and the original base revision. Please let us know if you have any suggestions about how to make it better or what other functionality is worth adding. [1] https://github.com/oxygenxml/Oxygen-Git-Plugin#git-support-plugin [2] https://www.oxygenxml.com/doc/versions/19.0/ug-editor/topics/installing-and-... [2.1] https://raw.githubusercontent.com/oxygenxml/Oxygen-Git-Plugin/master/build/a... [3] https://www.oxygenxml.com/doc/versions/19.0/ug-editor/topics/file-comparison... [4] https://www.oxygenxml.com/doc/versions/19.0/ug-editor/topics/file-comparison... Best regards, Alex -- Alex Jitianu <oXygen/> XML Editor, Schema Editor and XSLT Editor/Debugger http://www.oxygenxml.com
Great work, guys! Really love it! :-) Especially the diffing with oXygen Diff Tools! Cheers, Tobias Tobias Fischer Senior Software Engineer (XML/EPUB/PrintCSS) Telefon: +49 (0)7071 9876-44 · Fax: -22 Mail: tobias.fischer@pagina.gmbh pagina GmbH - Publikationstechnologien Herrenberger Straße 51 | D-72070 Tübingen www.pagina.gmbh | www.parsx.de Handelsregister Stuttgart - HRB 380249 Geschäftsführer: Tobias Ott Am 22.08.2017 um 10:36 schrieb Alex Jitianu:
Hello everyone,
Those of you that are using Git might be interested to know that there is a new Git plugin for Oxygen [1]. If you want to give it a try, it can be quickly installed through Oxygen's add-on support [2][2.1]. In the beginning we focused on the essential functionality, the operations that are performed often, like committing, pulling changes etc. Another cool feature is the use of Oxygen's Diff tool [3] to highlight the changes. Moreover, if the file is in conflict (has been modified both by you and another), Oxygen's Three Way Diff [4] will show a comparison between the local change, the remote change, and the original base revision.
Please let us know if you have any suggestions about how to make it better or what other functionality is worth adding.
[1] https://github.com/oxygenxml/Oxygen-Git-Plugin#git-support-plugin [2] https://www.oxygenxml.com/doc/versions/19.0/ug-editor/topics/installing-and-... [2.1] https://raw.githubusercontent.com/oxygenxml/Oxygen-Git-Plugin/master/build/a... [3] https://www.oxygenxml.com/doc/versions/19.0/ug-editor/topics/file-comparison... [4] https://www.oxygenxml.com/doc/versions/19.0/ug-editor/topics/file-comparison...
Best regards, Alex
On 22/08/2017 09:36, Alex Jitianu wrote:
Those of you that are using Git might be interested to know that there is a new Git plugin for Oxygen [1].
I installed version 1.1.6, thank you. I have an oXygen project that has a Git repository with a submodule, where the submodule has work done in it that has been committed and pushed fairly often but the parent project hasn't been touched for a while. By some combination of events, when I configured the Git plugin to use the Git repository, the submodule was switched to '(no branch)' and with contents seemingly corresponding to the last time that the parent project was committed. Quite apart from the confusion that this caused, it also lost some changes in the submodule that had not yet been committed. Regards, Tony Graham. -- Senior Architect XML Division Antenna House, Inc. ---- Skerries, Ireland tgraham@antenna.co.jp
Hi Tony, Thank you for reporting this issue and I'm sorry for the headache... We've released a new version that fixes this bug. You can go to *Help->Check for add-ons updates...* and follow the update procedure. If you have any other feedback please do not hesitate to tell us. Best regards, Alex -- Alex Jitianu <oXygen/> XML Editor, Schema Editor and XSLT Editor/Debugger http://www.oxygenxml.com On 9/15/2017 12:52 PM, Tony Graham wrote:
On 22/08/2017 09:36, Alex Jitianu wrote:
Those of you that are using Git might be interested to know that there is a new Git plugin for Oxygen [1].
I installed version 1.1.6, thank you.
I have an oXygen project that has a Git repository with a submodule, where the submodule has work done in it that has been committed and pushed fairly often but the parent project hasn't been touched for a while.
By some combination of events, when I configured the Git plugin to use the Git repository, the submodule was switched to '(no branch)' and with contents seemingly corresponding to the last time that the parent project was committed.
Quite apart from the confusion that this caused, it also lost some changes in the submodule that had not yet been committed.
Regards,
Tony Graham.
using pre-commit hook, to stop a commit, From the plugin's point of view, I guess we can make this check from
Hi Stefan, Thank you for providing more insight into the submodule feature. As you've probably guessed, we haven't worked that much with them so any help is most welcomed! the code of the plugin, when the user presses the Commit button. Having a pre-commit hook, though, will ensure this situation will be caught no matter which client you use.
However Oxygen should warn, that the head is detached and ask the user to pick a branch, because that's what he always wants. But Oxygen should not checkout a random branch, because that would also lead to unexpected results. If something else is meant here, please excuse to make you read this text. I agree. I've added an issue to implement this behavior [1].
[1] https://github.com/oxygenxml/Oxygen-Git-Plugin/issues/35 Best regards, Alex -- Alex Jitianu <oXygen/> XML Editor, Schema Editor and XSLT Editor/Debugger http://www.oxygenxml.com On 9/18/2017 5:06 PM, Stefan Eike wrote:
Hi Alex,
I have not tested this, but read this mail. Just to make sure: It's wanted (but annoying) behavior, that a submodule always points to a commit hash and not to a branch. So it's a common and wanted (but annoying) situation, that submodules fall in a detached head state. To avoid this, I'd recommend using pre-commit hook, to stop a commit, if there is not branch checked out. Otherwise the Oxygen Git Client would work diffently than the Git CLI client. This may lead to unexpected results. However Oxygen should warn, that the head is detached and ask the user to pick a branch, because that's what he always wants. But Oxygen should not checkout a random branch, because that would also lead to unexpected results. If something else is meant here, please excuse to make you read this text.
Cheers, Stefan
Alex Jitianu <alex_jitianu@sync.ro> hat am 18. September 2017 um 15:40 geschrieben:
Hi Tony,
Thank you for reporting this issue and I'm sorry for the headache... We've released a new version that fixes this bug. You can go to *Help->Check for add-ons updates...* and follow the update procedure.
If you have any other feedback please do not hesitate to tell us.
Best regards, Alex -- Alex Jitianu <oXygen/> XML Editor, Schema Editor and XSLT Editor/Debugger http://www.oxygenxml.com On 9/15/2017 12:52 PM, Tony Graham wrote:
On 22/08/2017 09:36, Alex Jitianu wrote:
Those of you that are using Git might be interested to know that there is a new Git plugin for Oxygen [1].
I installed version 1.1.6, thank you.
I have an oXygen project that has a Git repository with a submodule, where the submodule has work done in it that has been committed and pushed fairly often but the parent project hasn't been touched for a while.
By some combination of events, when I configured the Git plugin to use the Git repository, the submodule was switched to '(no branch)' and with contents seemingly corresponding to the last time that the parent project was committed.
Quite apart from the confusion that this caused, it also lost some changes in the submodule that had not yet been committed.
Regards,
Tony Graham.
_______________________________________________ oXygen-user mailing list oXygen-user@oxygenxml.com https://www.oxygenxml.com/mailman/listinfo/oxygen-user
Hi, I installed this plugin a while back in version 18.1 and I could not tell if it was working or not. I could not figure out the user interface. I did not have more time to spend on it but I left it installed. Since that time, it takes a very long time to open Oxygen, like 6 minutes. After that long period I get an error message "Trailing char < > at index 126: <long path name>". After that Oxygen works normally until I start it again. I just now uninstalled the git plugin and restarted Oxygen, and it opened in about 30 seconds. FYI Thanks, Mark On 22/08/2017 09:36, Alex Jitianu wrote:
Those of you that are using Git might be interested to know that there is a new Git plugin for Oxygen [1].
Hi Mark, I'm sorry to hear that... Let's take it one by one. 1. The Git plugin shouldn't block the UI thread (at least that's how we design it). If you have some time to help us understand what's going on, here is what you could do: - Install the latest plugin version (1.2.3) using the add-ons support: https://raw.githubusercontent.com/oxygenxml/Oxygen-Git-Plugin/master/build/a... - Before restarting Oxygen, copy the attached file inside {oxygenInstallDir} * Note: *Please remember to remove this file after you finish this procedure because it introduces performance penalties - Restart Oxygen. After a minute or so, zip *${user.home}/Desktop/oxygenLog**/* and send it to me so I can see why is it taking so long. 2. There are two ways to start using the plugin. Either clone a repository, or open an already existing working copy. Perhaps the reason you didn't manage has something to do with the delayed start and the error message. Hopefully the log will help us understand. Best regards, Alex -- Alex Jitianu <oXygen/> XML Editor, Schema Editor and XSLT Editor/Debugger http://www.oxygenxml.com On 10/18/2017 8:53 PM, Mark Giffin wrote:
Hi,
I installed this plugin a while back in version 18.1 and I could not tell if it was working or not. I could not figure out the user interface. I did not have more time to spend on it but I left it installed. Since that time, it takes a very long time to open Oxygen, like 6 minutes. After that long period I get an error message "Trailing char < > at index 126: <long path name>". After that Oxygen works normally until I start it again.
I just now uninstalled the git plugin and restarted Oxygen, and it opened in about 30 seconds.
FYI
Thanks, Mark
On 22/08/2017 09:36, Alex Jitianu wrote:
Those of you that are using Git might be interested to know that there is a new Git plugin for Oxygen [1].
oXygen-user mailing list oXygen-user@oxygenxml.com https://www.oxygenxml.com/mailman/listinfo/oxygen-user
Hi Alex, I followed your instructions below. By the way I'm on Windows 7. With the git plugin installed, it took 9 minutes for Oxygen to load. I attached the log. When Oxygen finally loaded, the Git pane was completely blank, so there was nothing I could do with it. Screen capture attached. I then uninstalled the Git plugin again and restarted Oxygen, and it loaded in about 2.5 minutes. Thanks, Mark On 10/19/2017 5:56 AM, oXygen XML Editor Support - Alex Jitianu wrote:
Hi Mark,
I'm sorry to hear that... Let's take it one by one.
1. The Git plugin shouldn't block the UI thread (at least that's how we design it). If you have some time to help us understand what's going on, here is what you could do:
- Install the latest plugin version (1.2.3) using the add-ons support:
https://raw.githubusercontent.com/oxygenxml/Oxygen-Git-Plugin/master/build/a...
- Before restarting Oxygen, copy the attached file inside {oxygenInstallDir}
* Note: *Please remember to remove this file after you finish this procedure because it introduces performance penalties
- Restart Oxygen. After a minute or so, zip *${user.home}/Desktop/oxygenLog**/* and send it to me so I can see why is it taking so long.
2. There are two ways to start using the plugin. Either clone a repository, or open an already existing working copy. Perhaps the reason you didn't manage has something to do with the delayed start and the error message. Hopefully the log will help us understand.
Best regards, Alex -- Alex Jitianu <oXygen/> XML Editor, Schema Editor and XSLT Editor/Debugger http://www.oxygenxml.com On 10/18/2017 8:53 PM, Mark Giffin wrote:
Hi,
I installed this plugin a while back in version 18.1 and I could not tell if it was working or not. I could not figure out the user interface. I did not have more time to spend on it but I left it installed. Since that time, it takes a very long time to open Oxygen, like 6 minutes. After that long period I get an error message "Trailing char < > at index 126: <long path name>". After that Oxygen works normally until I start it again.
I just now uninstalled the git plugin and restarted Oxygen, and it opened in about 30 seconds.
FYI
Thanks, Mark
On 22/08/2017 09:36, Alex Jitianu wrote:
> Those of you that are using Git might be interested to know that > there is a new Git plugin for Oxygen [1].
oXygen-user mailing list oXygen-user@oxygenxml.com https://www.oxygenxml.com/mailman/listinfo/oxygen-user
_______________________________________________ oXygen-user mailing list oXygen-user@oxygenxml.com https://www.oxygenxml.com/mailman/listinfo/oxygen-user
participants (6)
-
Alex Jitianu -
Mark Giffin -
oXygen XML Editor Support - Alex Jitianu -
Stefan Eike -
Tobias Fischer | pagina GmbH -
Tony Graham