-
Notifications
You must be signed in to change notification settings - Fork 21
/
extension.xml
470 lines (467 loc) · 29 KB
/
extension.xml
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
<xt:extension xmlns:xt="http://www.oxygenxml.com/ns/extension" id="com.oxygenxml.git">
<xt:location href="${project.build.finalName}-plugin.jar"/>
<xt:version>${project.nosnapshot.version}</xt:version>
<xt:oxy_version>25.0+</xt:oxy_version>
<xt:type>plugin</xt:type>
<xt:author>Syncro Soft</xt:author>
<xt:name>Git Client</xt:name>
<xt:description>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Git Client</title>
<style type="text/css"> ol {margin-top:0px;} p {margin-top:0px;margin-bottom:5px;} </style>
</head>
<body>
<div>
<p> This add-on installs a Git Client in Oxygen. It contributes multiple
side-views, each one specialized for various Git operations. The main one is called the
<i>Git Staging</i> view. Using the Git Client add-on, various Git operations can be
performed, such as committing changes into the local repository, pushing/pulling changes
to/from the remote repository, creating, checking out and deleting branches, showing the
history of the repository resources, and more. The add-on also includes a built-in tool
for comparing and merging changes. </p>
</div>
<div>
<h3>What's new in version 5.4.0</h3>
<ol>
<li>Added the possibility to sign commits using GPG keys.</li>
<li>If there are unpulled changes detected when creating a new branch, a
confirmation dialog box is displayed where you can choose whether or not to pull the
changes before processing the branch creation.
</li>
<li>When trying to commit while having unsaved changes in the local repository files you are currently editing, a warning message is presented.</li>
<li>When switching branches, merging branches, or restarting a merge, the progress of the operation is now shown when it takes more than two seconds to complete.</li>
<li>When the "index.lock" file exists in the local repository, the operations that cannot be performed because of it now show error messages containing explanations and instructions.</li>
<li>Fixed the vertical space in the progress dialog box so that messages do not get truncated.</li>
</ol>
</div>
<div>
<h3>What's new in version 5.3.0</h3>
<ol>
<li>Oxygen project detection has been improved when opening a new repository in the Staging view.</li>
<li>Submodules in parent repositories are now checked out at the index defined in the parent repository when checking out a branch. This ensures that the submodules reflect the actual state of the parent repository at that time.</li>
</ol>
</div>
<div>
<h3>What's new in version 5.2.0</h3>
<ol>
<li>Large File Support (LFS) is now supported. This means that if you have installed LFS and defined the tracked large files in your repository, they will be automatically detected and handled properly.</li>
<li>Improved various messages in the user interface.</li>
<li>Improved repository cloning process to automatically detect and load *.xpr files.</li>
<li>The absolute path to the working copy is now displayed in the tooltip of the Git Staging view's working copy combo.</li>
<li>Enhanced remote change detection and refresh in History view for improved performance.</li>
<li>An issue has been fixed where untracked files were not being restored from a stash.</li>
<li>The integrated JGit library was upgraded to version 6.5.</li>
<li>Other bug fixes.</li>
</ol>
</div>
<div>
<h3>What's new in version 5.1.1</h3>
<ol>
<li>Corrected a message that created confusion in the <i>Merge branches</i> dialog box.</li>
<li>Fixed an issue where Oxygen failed to start when there was no project open in the <i>Project view</i>.</li>
<li>Implemented other bug fixes.</li>
</ol>
</div>
<div>
<h3>What's new in version 5.1.0</h3>
<ol>
<li>A new options page was added for SHH Connections to control SSH agent usage.</li>
<li>Fixed an issue in which SSH agent was not used by default.</li>
<li>The commit dot in the <b>Git History</b> graph associated with the head of the current branch is now painted differently to make it easier to see.</li>
<li>The Oxygen project change detection mechanism was improved. It is now faster and the <b>Git Staging</b> view no longer needs to be displayed.</li>
<li>The presentation of the labels associated with a commit in the <b>Git History</b> view has been improved to avoid truncation of names when it is not necessary.</li>
<li>The "List stashes" dialog box now allows you to resize the tables for "Stashes" and "Affected files" without resizing the entire dialog box.</li>
<li>The "Open" action from the contextual menu in the <b>Git Staging</b> view now uses the URL of the current local working copy as much as possible.</li>
<li>A problem was solved where after the discard action on an untracked/added file was still presented in the <b>Git Staging</b> view even though it was deleted on disk.</li>
<li>Implemented various bug fixes and performance improvements.</li>
</ol>
</div>
<div>
<h3>What's new in version 5.0.0</h3>
<ol>
<li>A new <b>Validate each file before committing</b> option was added in the Git Client preferences page. Selecting this option enables automatic validation of each file before each commit.</li>
<li>A new <b>Validate all files from the project's "Main Files" folder before pushing</b> option was added in the Git Client preferences page. Selecting this option enables automatic validation of the files located in the Main Files folder before the push operation processes.</li>
<li>The integrated JGit library was upgraded to version 6.3, which brings support for ssh-agent forwarding.</li>
<li>An option has been added that automatically detects Oxygen projects from opened working copies to quickly open them in the Project View.</li>
<li>Added a <b>Squash merge "SELECTED_BRANCH" into "CURRENT_BRANCH"</b> action in the contextual menu for local branches in the <i>Git Branch Manager</i>. This will add all changes from the "SELECTED_BRANCH" to the "CURRENT_BRANCH" in a single new commit.</li>
<li>By default, the History view presents commits from all branches (both remote and local).</li><li>Tags can be deleted even if they have already been pushed to the remote repository.</li>
<li>If the local branch has not been published yet, the push button will be decorated with a <i>+</i> symbol and will have a tooltip to explain the context.</li>
<li>A more helpful message is displayed when pulling and the local branch doesn't track a remote.</li>
<li>In tree view mode, if there are no changes, the empty folder with the name of the repository will no longer be displayed.</li>
<li>The <i>Git Staging</i> view now has a busy cursor when an operation is in progress.</li>
<li>Fixed an issue when authentication tokens were lost from options.</li>
<li>Some dialogues have been improved to make them easier to understand.</li>
<li>Bug fixes and performance improvements.</li>
</ol>
</div>
<div>
<h3>What's new in version 4.0.2</h3>
<ol>
<li>Fixed an issue that made the <i>Pull(rebase)</i> action from the <i>Git Staging</i> view be disabled at all times.</li>
</ol>
</div>
<div>
<h3>What's new in version 4.0.1</h3>
<ol>
<li>Fixed a small problem where the UI would sometimes freeze when returning to Oxygen after going to another application.</li>
<li>Fixed an exception that appeared under certain conditions and made the Git support unusable.</li>
</ol>
</div>
<div>
<h3>What's new in version 4.0.0</h3>
<ol>
<li>The <i>History view</i> now includes a new revision graph that helps you to understand how commits connect with one another.</li>
<li>You now have the ability to manage remote repositories (add, edit or delete), track a remote branch for the current branch, or to edit the repository's configuration file.</li>
<li>A new Git menu that contains various Git actions was added in the main menu bar.</li>
<li>In the <i>History view</i> you can choose which branches will have the history shown. You have the following options: Current branch, Current local branch, All branches, All local branches.</li>
<li>A new <i>Checkout</i> action was added in the <i>History view</i> contextual menu to checkout a branch
at a specific commit (either in detached head form or by creating a new branch at that commit).</li>
<li>A combo box was added in the <i>Git staging</i> view to switch between local branches.</li>
<li>The Git Staging view toolbar was simplified to only include the most important actions (while all actions are available in a new three vertical dots menu).</li>
<li>Performance was improved by optimizing the process of checking the status of the repository.</li>
<li>The <i>Stash</i> dialog box now has a column that shows the creation time for each stash.</li>
<li>Fixed an issue where the index got reset after pulling changes from the remote.</li>
</ol>
</div>
<div>
<h3>What's new in version 3.0.0</h3>
<ol>
<li>You can save the uncommitted changes into stashes, reapply or delete the stashed
changes. </li>
<li> You can create new tags from the <i>Git History</i> contextual menu. In the <i>Git
Staging</i> toolbar, there is an action to list all the tags. Tags from the local
repository can be deleted or pushed to the remote repository. </li>
<li> Added a <b>Merge "SELECTED_BRANCH" into "CURRENT_BRANCH"</b> action in the
contextual menu for local branches in <i>Git Branch Manager</i> . </li>
<li>When showing the history for a directory in the affected files section, the files
that are descendants of the directory are presented on top and the files that are
outside it are grayed out. </li>
<li> Added a <b>Revert commit</b> action in the contextual menu for commits from the
<i>Git History</i> view. It creates a new commit that reverts all the changes from
the selected commit. </li>
<li> Added a <b>Reset file to this commit</b> action to the contextual menu for
resources associated to a revision in the <i>Git History</i> view. It checks out the
selected version of the file. </li>
<li> Added an <b>Open working copy version</b> action to the contextual menu for
resources associated to a revision in the <i>Git History</i> view. </li>
<li> A warning message is now displayed when trying to use the <i>Mark as resolved</i>
action on a file that contains conflict markers. </li>
<li>A message prompt is now displayed if you try to switch the branch while there are
uncommitted changes so that you can confirm that you want to stash the changes or move
the changes to the new branch. </li>
<li> A new editor variables is now supported: <b>${git(working_copy_url)}</b> . It is
resolved to the URL of the current working copy directory. </li>
<li> When hovering the cursor over the <i>Pull</i> and <i>Push</i> buttons, the
displayed tooltip now shows information about some of the incoming/outgoing commits
(such as the date, author and message). </li>
<li>When hovering the cursor over a branch name, a tooltip is displayed that provides
information about the last commit performed on that branch (such as the author and the
date of the commit). </li>
<li>An information message that is shown when starting Oxygen while being on a detached
HEAD now presents more information about the checked out commit (ID, author, date,
message). </li>
<li>The add-on's minimum compatible Oxygen version was increased to version 22.1. </li>
<li>The highlight boxes that surround branches and tags are now styled differently so
that it is easier to identify which represents a branch and which represents is a tag. </li>
<li>The settings in the Git client preferences page can be saved at project level. The
project can then be shared with other users and everyone will have the same Git client
settings. </li>
<li>Fixed an issue in where the commit details were not correctly displayed when a
filter text was active in the History view. </li>
</ol>
</div>
<div>
<h3>What's new in version 2.5.2</h3>
<ol>
<li>The JGit component included in the Git Client was updated to version 5.12.0. This
fixes the ssh without passphrase authentication which was broken in the previous 2.5.1
release. </li>
</ol>
</div>
<div>
<h3>What's new in version 2.5.1</h3>
<ol>
<li>Fixed a configuration problem caused by the selection of a branch to checkout when
cloning a repository. Because of this, remote changes could not be detected. </li>
<li>The JGit component included in the Git Client was updated to version 5.11.0. </li>
</ol>
</div>
<div>
<h3>What's new in version 2.5.0</h3>
<ol>
<li> Added a new field in the login dialog box for authentication using a personal
access token. Note that from August 13, 2021, GitHub will no longer accept
password-based authentication ( <a
href="https://github.blog/2020-12-15-token-authentication-requirements-for-git-operations"
>
https://github.blog/2020-12-15-token-authentication-requirements-for-git-operations
</a> ). </li>
<li>After a repository that contains submodules is cloned, all submodules are also
automatically initialized and cloned. </li>
<li> When pulling the remote changes for a repository that contains submodules, the
submodules are updated as well (by default). This behavior depends on the <i>Update
all submodules after pulling changes from the remote repository </i> option from the
<i>Git Client</i> preferences page in Oxygen. </li>
<li> If a submodule appears as changed in the <i>Unstaged files</i> area, you can open
it using the <i>Open</i> action from the contextual menu. </li>
<li> The tooltip shown for a modified submodule from the <i>Ustanged files</i> area now
presents information about the currently and previously tracked commits. </li>
<li> Branches created from other local branches are now automatically checked out. This
behavior can be disabled by deselecting the <i>Checkout branch</i> option in the
<i>Create branch</i> dialog box. </li>
<li> The <i>Git Staging</i> side-view has been slightly redesigned and now has a cleaner
look. </li>
<li>Added support for Dutch localization.</li>
<li>Fixed an issue where debugging the Git Client using Apache Log4j did not work. </li>
<li>Fixed an issue where opening submodules that required authentication was not
possible. </li>
<li>Fixed various other bugs and added several small UX improvements. </li>
</ol>
</div>
<div>
<h3>What's new in version 2.4.0</h3>
<ol>
<li> Added an "Abort merge" button for when conflicts result after a <i>Pull (merge)</i>
operation. It allows you to abort the current conflict resolution process. </li>
<li>Added a set of options in the Git Client preferences page that can be used to decide
whether to always switch to a newly detected working copy from a project, to never
switch, or to always ask. </li>
<li>Added a "Preferences" action in the Settings menu that acts as a shortcut to the Git
Client preferences page. </li>
<li>Fixed an issue where pushing to a remote branch did not work when local and upstream
branch had diffenrent names. </li>
<li>Integrated numerous other bug fixes, UI improvements, and speed improvements. </li>
<li>The JGit component included in the Git Client was updated to version 5.10.0. </li>
</ol>
</div>
<div>
<h3>What's new in version 2.3.1</h3>
<ol>
<li>Fixed some performance problems introduced by version 2.3.0. </li>
<li>Fixed an issue where branches removed from the remote repository were still
presented in the Git Branch Manager view even after refreshing it. </li>
</ol>
</div>
<div>
<h3>What's new in version 2.3.0</h3>
<ol>
<li> The Git Client now contributes a new side-view, called the <b>Git Branch Manager
</b> , which presents all the local and remote branches as a tree. Actions were added
to the tree's contextual menu to make it very easy to check out branches, and to
create or delete branches. </li>
<li>You can now easily switch between local branches using a drop-down menu in the
top-right corner of the Git Staging view or by using the Git Branch Manager. </li>
<li> A new action ( <b>Reset "[branch_name]" to this commit</b> ) was added in the
history table that can be used to undo changes by moving the HEAD of the current
branch to the selected commit. </li>
<li> Some editor variables are now supported, including: <ul>
<li>${git(working_copy_name)}</li>
<li>${git(working_copy_path)}</li>
<li>${git(short_branch_name)}</li>
<li>${git(full_branch_name)}</li>
</ul>
</li>
<li>The Git History view now has better automatic refresh support. </li>
<li>A confirmation dialog box has been added for instances when you try to commit
without a message. </li>
<li>The add-on now contributes a preferences page (Options / Preferences / Plugins / Git
Client) that contains a "Notify me about new commits in the remote repository" option.
When this option is selected, Oxygen will show notification messages when it detects
that new commits have been pushed to the remote repository. </li>
<li>Support for French localization was added.</li>
<li>The JGit component included in the Git Client was updated to version 5.9.0. </li>
<li>Various other minor improvements and bug fixes were implemented. </li>
</ol>
<p> For more information about the add-on's features, see <a
href="https://github.com/oxygenxml/oxygen-git-plugin/blob/master/README.md"> the
README document </a> . </p>
</div>
<div>
<h3>What's new in version 2.2.0</h3>
<ol>
<li>Added the possibility to amend the last commit.</li>
<li>Added the possibility to automatically push changes to the remote repository when
committing. </li>
<li>Added the possibility to create a new branch starting from the selected commit in
the History table, by using the "Create branch" contextual action. </li>
<li>Added the possibility to compare two revisions of the same file from the Git History
view, by using the "Compare with each other" action in the contextual menu of the
history table. </li>
<li>Added the possibility to reset the stored credentials, by using the "Reset
credentials" action in the Settings menu from the main toolbar. </li>
<li>If you have a local branch that is not tracking a remote branch, the push button
tooltip suggests that you push to create a remote branch with the same name as the
local one. </li>
<li>Incoming and outgoing commits are marked in the history table with corresponding
arrow characters. </li>
<li>Improved local repository detection when selecting a project. </li>
<li>Updated JGit to version 5.7.0 (which, among other things, fixes client-side hooks
execution). </li>
<li>Fixed a bug where failing commits did not show any messages to the user. </li>
<li>Fixed other small bugs.</li>
</ol>
<p> For more information about the add-on's features, see <a
href="https://github.com/oxygenxml/oxygen-git-plugin/blob/master/README.md"> the
README document </a> . </p>
</div>
<div>
<h3>What's new in version 2.1.1</h3>
<ol>
<li>Fixed a bug where the Text/Author page contextual menu was not shown when the opened
document was remote (e.g. from a WebDAV server). </li>
</ol>
</div>
<div>
<h3>What's new in version 2.1.0</h3>
<ol>
<li>Updated the JGit library to version 5.6.</li>
<li>Added a "Clear history" action in the working copies combo box. </li>
<li>Added the "Show history" and "Show blame" actions to the contextual menus of the
resources from the Project view and of the Text and Author editor pages. </li>
<li>Implemented renaming detection in the Git History view. Renamed resources are
presented using a suggestive icon (containing the "R" letter). All the actions from
the Git History view take into account the entire history of a resource, including
renames and path changes. </li>
<li>Numerous bug fixes and small improvements.</li>
</ol>
</div>
<div>
<h3>What's new in version 2.0.0</h3>
<ol>
<li> Added a new <b>Git History</b> side-view, available from the toolbar for the entire
repository, or from the contextual menu for each unstaged resource. </li>
<li> Added a <b>Show blame</b> action in the contextual menu of unstaged resources. This
action works in conjunction with the <b>Git History </b> side-view, where the revision
highlighted in the main editor is selected for presenting more details. </li>
<li> Added a <b>Pull (rebase)</b> action in the toolbar. </li>
<li>Added more 2X icons for high resolution screens.</li>
<li>Fixed UI freeze issues when working with large repositories. </li>
<li>Fixed some UI glitches such as unintended borders, lack of padding, crowded
components, etc. </li>
<li>Improved speed when performing various operations, such as committing or changing
the repository. </li>
<li>Other small bug fixes.</li>
</ol>
</div>
<div>
<h3>What's new in version 1.5.2</h3>
<ol>
<li> Updated to JGit version 5.4.2 which comes with various bug fixes: <a
href="https://projects.eclipse.org/projects/technology.jgit/releases/5.4.2/review">
https://projects.eclipse.org/projects/technology.jgit/releases/5.4.2/review </a>
</li>
<li>Fixed issue: Oxygen freezes on start-up.</li>
<li>Fixed issue: Opening a Git repository fails with a java.lang.NullPointerException.
</li>
</ol>
</div>
<div>
<h3>What's new in version 1.5.1</h3>
<ol>
<li>Updated to JGit 5.4.0.</li>
<li>Fixed issue: switching between flat mode and tree mode didn't always work. </li>
<li>Fixed issue: authentication through SSH using a passphase was broken in the previous
build. </li>
<li>Other bug fixes</li>
</ol>
</div>
<div>
<h3>What's new in version 1.5.0</h3>
<ol>
<li>Updated to JGit 5.3.1.</li>
<li> The add-on now works with more kinds of SSH keys, by using JGit's new SSH session
factory based on 'Apache MINA sshd' by default. See <a
href="https://wiki.eclipse.org/JGit/New_and_Noteworthy/5.2">
https://wiki.eclipse.org/JGit/New_and_Noteworthy/5.2 </a> for a full list of
benefits. </li>
<li>The tooltips of the push/pull buttons and the branch label now also present the
remote repository. </li>
<li>Bug fixes</li>
<li>Speed improvements</li>
</ol>
</div>
<div>
<h3>What's new in version 1.4.0</h3>
<ol>
<li>Update to JGit 5.2.1.</li>
<li>Performance improvements when checking the status of the repository. </li>
<li>Fixed bug that led to file loss when changing the letter case in a file name. </li>
<li>Better error message when the working copy is locked.</li>
<li>When closing, Oxygen will wait for Git commands to complete to avoid possible side
effects such as leaving the worky copy locked. </li>
</ol>
</div>
<div>
<h3>What's new in version 1.3.2</h3>
<ol>
<li>Initalize and update submodules if needed when the user opens a submodule. </li>
</ol>
</div>
<div>
<h3>What's new in version 1.3.1</h3>
<ol>
<li>Present an error message when Pull fails because local changes would be overwritten
by merge. </li>
</ol>
</div>
<div>
<h3>What's new in version 1.2.11</h3>
<ol>
<li>Various performance optimizations, bug fixes and the ability to check out a specific
branch when cloning a repository. </li>
</ol>
</div>
<div>
<h3>What's new in version 1.2.10</h3>
<ol>
<li>Speed improvement when invoking the contextual menu the Project view. </li>
</ol>
</div>
<div>
<h3>What's new in version 1.2.9</h3>
<ol>
<li>Fixed various issues encountered while working with resources in the tree view.
</li>
</ol>
</div>
<div>
<h3>What's new in version 1.2.6</h3>
<ol>
<li>Bug fix: The contextual menu didn't show when running Oxygen on Mac OS X (broken in
version 1.2.5) </li>
<li>Improved the calculation of pull behind and push ahead counters </li>
</ol>
</div>
<div>
<h3>What's new in version 1.2.5</h3>
<ol>
<li>Bug fixes </li>
<li>Performance improvements</li>
</ol>
</div>
<div>
<h1>Using the plugin</h1>
<p>
<b>Note:</b> After installing the plugin, if the <b>Git Staging</b> view is not visible,
you can open it from the <b>Window / Show View</b> menu. </p>
<p> For information about how to use the Git Client, please see the README document on
GitHub: <a href="https://github.com/oxygenxml/oxygen-git-plugin/blob/master/README.md">
https://github.com/oxygenxml/oxygen-git-plugin/blob/master/README.md </a> . </p>
</div>
</body>
</html>
</xt:description>
<xt:license><![CDATA[
Copyright 2018 Syncro Soft SRL
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
]]></xt:license>
</xt:extension>