|
|
… |
1 unchanged lines |
| 2 |
2 |
|
"name": "oxygen-vscode", |
| 3 |
3 |
|
"displayName": "Oxygen", |
| 4 |
4 |
|
"description": "Oxygen version control: source control view, diffs, decorations, bookmarks and history for oxy repositories", |
| 5 |
|
- |
"version": "0.6.0", |
|
5 |
+ |
"version": "0.7.0", |
| 6 |
6 |
|
"publisher": "oxygen", |
| 7 |
7 |
|
"license": "MIT OR Apache-2.0", |
| 8 |
8 |
|
"icon": "assets/images/oxygen.png", |
|
|
… |
17 unchanged lines |
| 26 |
26 |
|
"main": "./dist/extension.js", |
| 27 |
27 |
|
"contributes": { |
| 28 |
28 |
|
"commands": [ |
| 29 |
|
- |
{ "command": "oxygen.refresh", "title": "Refresh", "category": "Oxygen", "icon": "$(refresh)" }, |
| 30 |
|
- |
{ "command": "oxygen.commit", "title": "Commit", "category": "Oxygen", "icon": "$(check)" }, |
| 31 |
|
- |
{ "command": "oxygen.openFile", "title": "Open File", "category": "Oxygen", "icon": "$(go-to-file)" }, |
| 32 |
|
- |
{ "command": "oxygen.openChanges", "title": "Open Changes", "category": "Oxygen" }, |
| 33 |
|
- |
{ "command": "oxygen.openBaseVersion", "title": "Open Base Version", "category": "Oxygen" }, |
| 34 |
|
- |
{ "command": "oxygen.showOutput", "title": "Show Output", "category": "Oxygen" }, |
| 35 |
|
- |
{ "command": "oxygen.showLog", "title": "Show Log", "category": "Oxygen" }, |
| 36 |
|
- |
{ "command": "oxygen.init", "title": "Initialize Repository", "category": "Oxygen" }, |
| 37 |
|
- |
{ "command": "oxygen.discard", "title": "Discard Changes", "category": "Oxygen", "icon": "$(discard)" }, |
| 38 |
|
- |
{ "command": "oxygen.commitSelected", "title": "Commit Selected Paths", "category": "Oxygen" }, |
| 39 |
|
- |
{ "command": "oxygen.commitHunks", "title": "Commit Hunks…", "category": "Oxygen" }, |
| 40 |
|
- |
{ "command": "oxygen.amend", "title": "Amend", "category": "Oxygen" }, |
| 41 |
|
- |
{ "command": "oxygen.undo", "title": "Undo Last Operation", "category": "Oxygen", "icon": "$(discard)" }, |
| 42 |
|
- |
{ "command": "oxygen.undoTo", "title": "Undo to Here", "category": "Oxygen", "icon": "$(discard)" }, |
| 43 |
|
- |
{ "command": "oxygen.refreshOperations", "title": "Refresh Operations", "category": "Oxygen", "icon": "$(refresh)" }, |
| 44 |
|
- |
{ "command": "oxygen.switchBookmark", "title": "Switch Bookmark…", "category": "Oxygen", "icon": "$(bookmark)" }, |
| 45 |
|
- |
{ "command": "oxygen.createBookmark", "title": "Create Bookmark…", "category": "Oxygen" }, |
| 46 |
|
- |
{ "command": "oxygen.mergeBookmark", "title": "Merge Bookmark…", "category": "Oxygen" }, |
| 47 |
|
- |
{ "command": "oxygen.deleteBookmark", "title": "Delete Bookmark…", "category": "Oxygen" }, |
| 48 |
|
- |
{ "command": "oxygen.fetch", "title": "Fetch", "category": "Oxygen" }, |
| 49 |
|
- |
{ "command": "oxygen.pull", "title": "Pull", "category": "Oxygen" }, |
| 50 |
|
- |
{ "command": "oxygen.push", "title": "Push", "category": "Oxygen" }, |
| 51 |
|
- |
{ "command": "oxygen.pushBookmark", "title": "Push Bookmark…", "category": "Oxygen" }, |
| 52 |
|
- |
{ "command": "oxygen.sync", "title": "Sync", "category": "Oxygen", "icon": "$(sync)" }, |
| 53 |
|
- |
{ "command": "oxygen.showHistory", "title": "Show History", "category": "Oxygen", "icon": "$(git-commit)" }, |
| 54 |
|
- |
{ "command": "oxygen.fileHistory", "title": "File History…", "category": "Oxygen", "icon": "$(history)" }, |
| 55 |
|
- |
{ "command": "oxygen.toggleBlame", "title": "Toggle Inline Blame", "category": "Oxygen" }, |
| 56 |
|
- |
{ "command": "oxygen.showChange", "title": "Show Change", "category": "Oxygen" }, |
| 57 |
|
- |
{ "command": "oxygen.acceptSides", "title": "Accept Conflict Sides", "category": "Oxygen" }, |
| 58 |
|
- |
{ "command": "oxygen.keepCandidate", "title": "Keep This Candidate", "category": "Oxygen", "icon": "$(check)" }, |
| 59 |
|
- |
{ "command": "oxygen.markResolved", "title": "Mark Resolved", "category": "Oxygen", "icon": "$(check-all)" }, |
| 60 |
|
- |
{ "command": "oxygen.openConflict", "title": "Open Conflict", "category": "Oxygen" }, |
| 61 |
|
- |
{ "command": "oxygen.openSubrepo", "title": "Open Subrepo", "category": "Oxygen" }, |
| 62 |
|
- |
{ "command": "oxygen.updateSubrepo", "title": "Update to Pin", "category": "Oxygen", "icon": "$(cloud-download)" }, |
| 63 |
|
- |
{ "command": "oxygen.updateSubrepos", "title": "Update Subrepos", "category": "Oxygen" }, |
| 64 |
|
- |
{ "command": "oxygen.bisectStart", "title": "Bisect: Start", "category": "Oxygen" }, |
| 65 |
|
- |
{ "command": "oxygen.bisectGood", "title": "Bisect: Good", "category": "Oxygen" }, |
| 66 |
|
- |
{ "command": "oxygen.bisectBad", "title": "Bisect: Bad", "category": "Oxygen" }, |
| 67 |
|
- |
{ "command": "oxygen.bisectSkip", "title": "Bisect: Skip", "category": "Oxygen" }, |
| 68 |
|
- |
{ "command": "oxygen.bisectRun", "title": "Bisect: Run…", "category": "Oxygen" }, |
| 69 |
|
- |
{ "command": "oxygen.bisectReset", "title": "Bisect: Reset", "category": "Oxygen" }, |
| 70 |
|
- |
{ "command": "oxygen.refreshBisect", "title": "Refresh", "category": "Oxygen", "icon": "$(refresh)" }, |
| 71 |
|
- |
{ "command": "oxygen.refreshTrust", "title": "Refresh", "category": "Oxygen", "icon": "$(refresh)" }, |
| 72 |
|
- |
{ "command": "oxygen.verify", "title": "Verify Signatures", "category": "Oxygen" }, |
| 73 |
|
- |
{ "command": "oxygen.tags", "title": "Tags…", "category": "Oxygen" }, |
| 74 |
|
- |
{ "command": "oxygen.createTag", "title": "Create Tag…", "category": "Oxygen" }, |
| 75 |
|
- |
{ "command": "oxygen.addWorkspace", "title": "Add Workspace…", "category": "Oxygen" }, |
| 76 |
|
- |
{ "command": "oxygen.clone", "title": "Clone Repository…", "category": "Oxygen" } |
|
29 |
+ |
{ |
|
30 |
+ |
"command": "oxygen.refresh", |
|
31 |
+ |
"title": "Refresh", |
|
32 |
+ |
"category": "Oxygen", |
|
33 |
+ |
"icon": "$(refresh)" |
|
34 |
+ |
}, |
|
35 |
+ |
{ |
|
36 |
+ |
"command": "oxygen.commit", |
|
37 |
+ |
"title": "Commit", |
|
38 |
+ |
"category": "Oxygen", |
|
39 |
+ |
"icon": "$(check)" |
|
40 |
+ |
}, |
|
41 |
+ |
{ |
|
42 |
+ |
"command": "oxygen.openFile", |
|
43 |
+ |
"title": "Open File", |
|
44 |
+ |
"category": "Oxygen", |
|
45 |
+ |
"icon": "$(go-to-file)" |
|
46 |
+ |
}, |
|
47 |
+ |
{ |
|
48 |
+ |
"command": "oxygen.openChanges", |
|
49 |
+ |
"title": "Open Changes", |
|
50 |
+ |
"category": "Oxygen" |
|
51 |
+ |
}, |
|
52 |
+ |
{ |
|
53 |
+ |
"command": "oxygen.openBaseVersion", |
|
54 |
+ |
"title": "Open Base Version", |
|
55 |
+ |
"category": "Oxygen" |
|
56 |
+ |
}, |
|
57 |
+ |
{ |
|
58 |
+ |
"command": "oxygen.showOutput", |
|
59 |
+ |
"title": "Show Output", |
|
60 |
+ |
"category": "Oxygen" |
|
61 |
+ |
}, |
|
62 |
+ |
{ |
|
63 |
+ |
"command": "oxygen.showLog", |
|
64 |
+ |
"title": "Show Log", |
|
65 |
+ |
"category": "Oxygen" |
|
66 |
+ |
}, |
|
67 |
+ |
{ |
|
68 |
+ |
"command": "oxygen.init", |
|
69 |
+ |
"title": "Initialize Repository", |
|
70 |
+ |
"category": "Oxygen" |
|
71 |
+ |
}, |
|
72 |
+ |
{ |
|
73 |
+ |
"command": "oxygen.discard", |
|
74 |
+ |
"title": "Discard Changes", |
|
75 |
+ |
"category": "Oxygen", |
|
76 |
+ |
"icon": "$(discard)" |
|
77 |
+ |
}, |
|
78 |
+ |
{ |
|
79 |
+ |
"command": "oxygen.commitSelected", |
|
80 |
+ |
"title": "Commit Selected Paths", |
|
81 |
+ |
"category": "Oxygen" |
|
82 |
+ |
}, |
|
83 |
+ |
{ |
|
84 |
+ |
"command": "oxygen.commitHunks", |
|
85 |
+ |
"title": "Commit Hunks\u2026", |
|
86 |
+ |
"category": "Oxygen" |
|
87 |
+ |
}, |
|
88 |
+ |
{ |
|
89 |
+ |
"command": "oxygen.amend", |
|
90 |
+ |
"title": "Amend", |
|
91 |
+ |
"category": "Oxygen" |
|
92 |
+ |
}, |
|
93 |
+ |
{ |
|
94 |
+ |
"command": "oxygen.undo", |
|
95 |
+ |
"title": "Undo Last Operation", |
|
96 |
+ |
"category": "Oxygen", |
|
97 |
+ |
"icon": "$(discard)" |
|
98 |
+ |
}, |
|
99 |
+ |
{ |
|
100 |
+ |
"command": "oxygen.undoTo", |
|
101 |
+ |
"title": "Undo to Here", |
|
102 |
+ |
"category": "Oxygen", |
|
103 |
+ |
"icon": "$(discard)" |
|
104 |
+ |
}, |
|
105 |
+ |
{ |
|
106 |
+ |
"command": "oxygen.refreshOperations", |
|
107 |
+ |
"title": "Refresh Operations", |
|
108 |
+ |
"category": "Oxygen", |
|
109 |
+ |
"icon": "$(refresh)" |
|
110 |
+ |
}, |
|
111 |
+ |
{ |
|
112 |
+ |
"command": "oxygen.switchBookmark", |
|
113 |
+ |
"title": "Switch Bookmark\u2026", |
|
114 |
+ |
"category": "Oxygen", |
|
115 |
+ |
"icon": "$(bookmark)" |
|
116 |
+ |
}, |
|
117 |
+ |
{ |
|
118 |
+ |
"command": "oxygen.createBookmark", |
|
119 |
+ |
"title": "Create Bookmark\u2026", |
|
120 |
+ |
"category": "Oxygen" |
|
121 |
+ |
}, |
|
122 |
+ |
{ |
|
123 |
+ |
"command": "oxygen.mergeBookmark", |
|
124 |
+ |
"title": "Merge Bookmark\u2026", |
|
125 |
+ |
"category": "Oxygen" |
|
126 |
+ |
}, |
|
127 |
+ |
{ |
|
128 |
+ |
"command": "oxygen.deleteBookmark", |
|
129 |
+ |
"title": "Delete Bookmark\u2026", |
|
130 |
+ |
"category": "Oxygen" |
|
131 |
+ |
}, |
|
132 |
+ |
{ |
|
133 |
+ |
"command": "oxygen.fetch", |
|
134 |
+ |
"title": "Fetch", |
|
135 |
+ |
"category": "Oxygen" |
|
136 |
+ |
}, |
|
137 |
+ |
{ |
|
138 |
+ |
"command": "oxygen.pull", |
|
139 |
+ |
"title": "Pull", |
|
140 |
+ |
"category": "Oxygen" |
|
141 |
+ |
}, |
|
142 |
+ |
{ |
|
143 |
+ |
"command": "oxygen.push", |
|
144 |
+ |
"title": "Push", |
|
145 |
+ |
"category": "Oxygen" |
|
146 |
+ |
}, |
|
147 |
+ |
{ |
|
148 |
+ |
"command": "oxygen.pushBookmark", |
|
149 |
+ |
"title": "Push Bookmark\u2026", |
|
150 |
+ |
"category": "Oxygen" |
|
151 |
+ |
}, |
|
152 |
+ |
{ |
|
153 |
+ |
"command": "oxygen.sync", |
|
154 |
+ |
"title": "Sync", |
|
155 |
+ |
"category": "Oxygen", |
|
156 |
+ |
"icon": "$(sync)" |
|
157 |
+ |
}, |
|
158 |
+ |
{ |
|
159 |
+ |
"command": "oxygen.showHistory", |
|
160 |
+ |
"title": "Show History", |
|
161 |
+ |
"category": "Oxygen", |
|
162 |
+ |
"icon": "$(git-commit)" |
|
163 |
+ |
}, |
|
164 |
+ |
{ |
|
165 |
+ |
"command": "oxygen.fileHistory", |
|
166 |
+ |
"title": "File History\u2026", |
|
167 |
+ |
"category": "Oxygen", |
|
168 |
+ |
"icon": "$(history)" |
|
169 |
+ |
}, |
|
170 |
+ |
{ |
|
171 |
+ |
"command": "oxygen.toggleBlame", |
|
172 |
+ |
"title": "Toggle Inline Blame", |
|
173 |
+ |
"category": "Oxygen" |
|
174 |
+ |
}, |
|
175 |
+ |
{ |
|
176 |
+ |
"command": "oxygen.showChange", |
|
177 |
+ |
"title": "Show Change", |
|
178 |
+ |
"category": "Oxygen" |
|
179 |
+ |
}, |
|
180 |
+ |
{ |
|
181 |
+ |
"command": "oxygen.acceptSides", |
|
182 |
+ |
"title": "Accept Conflict Sides", |
|
183 |
+ |
"category": "Oxygen" |
|
184 |
+ |
}, |
|
185 |
+ |
{ |
|
186 |
+ |
"command": "oxygen.keepCandidate", |
|
187 |
+ |
"title": "Keep This Candidate", |
|
188 |
+ |
"category": "Oxygen", |
|
189 |
+ |
"icon": "$(check)" |
|
190 |
+ |
}, |
|
191 |
+ |
{ |
|
192 |
+ |
"command": "oxygen.markResolved", |
|
193 |
+ |
"title": "Mark Resolved", |
|
194 |
+ |
"category": "Oxygen", |
|
195 |
+ |
"icon": "$(check-all)" |
|
196 |
+ |
}, |
|
197 |
+ |
{ |
|
198 |
+ |
"command": "oxygen.openConflict", |
|
199 |
+ |
"title": "Open Conflict", |
|
200 |
+ |
"category": "Oxygen" |
|
201 |
+ |
}, |
|
202 |
+ |
{ |
|
203 |
+ |
"command": "oxygen.openSubrepo", |
|
204 |
+ |
"title": "Open Subrepo", |
|
205 |
+ |
"category": "Oxygen" |
|
206 |
+ |
}, |
|
207 |
+ |
{ |
|
208 |
+ |
"command": "oxygen.updateSubrepo", |
|
209 |
+ |
"title": "Update to Pin", |
|
210 |
+ |
"category": "Oxygen", |
|
211 |
+ |
"icon": "$(cloud-download)" |
|
212 |
+ |
}, |
|
213 |
+ |
{ |
|
214 |
+ |
"command": "oxygen.updateSubrepos", |
|
215 |
+ |
"title": "Update Subrepos", |
|
216 |
+ |
"category": "Oxygen" |
|
217 |
+ |
}, |
|
218 |
+ |
{ |
|
219 |
+ |
"command": "oxygen.bisectStart", |
|
220 |
+ |
"title": "Bisect: Start", |
|
221 |
+ |
"category": "Oxygen" |
|
222 |
+ |
}, |
|
223 |
+ |
{ |
|
224 |
+ |
"command": "oxygen.bisectGood", |
|
225 |
+ |
"title": "Bisect: Good", |
|
226 |
+ |
"category": "Oxygen" |
|
227 |
+ |
}, |
|
228 |
+ |
{ |
|
229 |
+ |
"command": "oxygen.bisectBad", |
|
230 |
+ |
"title": "Bisect: Bad", |
|
231 |
+ |
"category": "Oxygen" |
|
232 |
+ |
}, |
|
233 |
+ |
{ |
|
234 |
+ |
"command": "oxygen.bisectSkip", |
|
235 |
+ |
"title": "Bisect: Skip", |
|
236 |
+ |
"category": "Oxygen" |
|
237 |
+ |
}, |
|
238 |
+ |
{ |
|
239 |
+ |
"command": "oxygen.bisectRun", |
|
240 |
+ |
"title": "Bisect: Run\u2026", |
|
241 |
+ |
"category": "Oxygen" |
|
242 |
+ |
}, |
|
243 |
+ |
{ |
|
244 |
+ |
"command": "oxygen.bisectReset", |
|
245 |
+ |
"title": "Bisect: Reset", |
|
246 |
+ |
"category": "Oxygen" |
|
247 |
+ |
}, |
|
248 |
+ |
{ |
|
249 |
+ |
"command": "oxygen.refreshBisect", |
|
250 |
+ |
"title": "Refresh", |
|
251 |
+ |
"category": "Oxygen", |
|
252 |
+ |
"icon": "$(refresh)" |
|
253 |
+ |
}, |
|
254 |
+ |
{ |
|
255 |
+ |
"command": "oxygen.refreshTrust", |
|
256 |
+ |
"title": "Refresh", |
|
257 |
+ |
"category": "Oxygen", |
|
258 |
+ |
"icon": "$(refresh)" |
|
259 |
+ |
}, |
|
260 |
+ |
{ |
|
261 |
+ |
"command": "oxygen.verify", |
|
262 |
+ |
"title": "Verify Signatures", |
|
263 |
+ |
"category": "Oxygen" |
|
264 |
+ |
}, |
|
265 |
+ |
{ |
|
266 |
+ |
"command": "oxygen.tags", |
|
267 |
+ |
"title": "Tags\u2026", |
|
268 |
+ |
"category": "Oxygen" |
|
269 |
+ |
}, |
|
270 |
+ |
{ |
|
271 |
+ |
"command": "oxygen.createTag", |
|
272 |
+ |
"title": "Create Tag\u2026", |
|
273 |
+ |
"category": "Oxygen" |
|
274 |
+ |
}, |
|
275 |
+ |
{ |
|
276 |
+ |
"command": "oxygen.addWorkspace", |
|
277 |
+ |
"title": "Add Workspace\u2026", |
|
278 |
+ |
"category": "Oxygen" |
|
279 |
+ |
}, |
|
280 |
+ |
{ |
|
281 |
+ |
"command": "oxygen.clone", |
|
282 |
+ |
"title": "Clone Repository\u2026", |
|
283 |
+ |
"category": "Oxygen" |
|
284 |
+ |
}, |
|
285 |
+ |
{ |
|
286 |
+ |
"command": "oxygen.openOnRemote", |
|
287 |
+ |
"title": "Open on Remote", |
|
288 |
+ |
"category": "Oxygen", |
|
289 |
+ |
"icon": "$(link-external)" |
|
290 |
+ |
}, |
|
291 |
+ |
{ |
|
292 |
+ |
"command": "oxygen.openChangeOnRemote", |
|
293 |
+ |
"title": "Open Change on Remote", |
|
294 |
+ |
"category": "Oxygen" |
|
295 |
+ |
} |
| 77 |
296 |
|
], |
| 78 |
297 |
|
"views": { |
| 79 |
298 |
|
"scm": [ |
| 80 |
|
- |
{ "id": "oxygen.operations", "name": "Oxygen Operations", "when": "oxygen.hasRepository", "icon": "assets/images/oxygen.svg", "visibility": "collapsed" }, |
| 81 |
|
- |
{ "id": "oxygen.bisect", "name": "Oxygen Bisect", "when": "oxygen.hasRepository", "icon": "assets/images/oxygen.svg", "visibility": "collapsed" }, |
| 82 |
|
- |
{ "id": "oxygen.trust", "name": "Oxygen Trust", "when": "oxygen.hasRepository", "icon": "assets/images/oxygen.svg", "visibility": "collapsed" } |
|
299 |
+ |
{ |
|
300 |
+ |
"id": "oxygen.operations", |
|
301 |
+ |
"name": "Oxygen Operations", |
|
302 |
+ |
"when": "oxygen.hasRepository", |
|
303 |
+ |
"icon": "assets/images/oxygen.svg", |
|
304 |
+ |
"visibility": "collapsed" |
|
305 |
+ |
}, |
|
306 |
+ |
{ |
|
307 |
+ |
"id": "oxygen.bisect", |
|
308 |
+ |
"name": "Oxygen Bisect", |
|
309 |
+ |
"when": "oxygen.hasRepository", |
|
310 |
+ |
"icon": "assets/images/oxygen.svg", |
|
311 |
+ |
"visibility": "collapsed" |
|
312 |
+ |
}, |
|
313 |
+ |
{ |
|
314 |
+ |
"id": "oxygen.trust", |
|
315 |
+ |
"name": "Oxygen Trust", |
|
316 |
+ |
"when": "oxygen.hasRepository", |
|
317 |
+ |
"icon": "assets/images/oxygen.svg", |
|
318 |
+ |
"visibility": "collapsed" |
|
319 |
+ |
} |
| 83 |
320 |
|
] |
| 84 |
321 |
|
}, |
| 85 |
322 |
|
"viewsWelcome": [ |
|
|
… |
5 unchanged lines |
| 91 |
328 |
|
], |
| 92 |
329 |
|
"menus": { |
| 93 |
330 |
|
"scm/title": [ |
| 94 |
|
- |
{ "command": "oxygen.commit", "group": "navigation@1", "when": "scmProvider == oxygen" }, |
| 95 |
|
- |
{ "command": "oxygen.sync", "group": "navigation@2", "when": "scmProvider == oxygen" }, |
| 96 |
|
- |
{ "command": "oxygen.refresh", "group": "navigation@3", "when": "scmProvider == oxygen" }, |
| 97 |
|
- |
{ "command": "oxygen.pull", "group": "4_sync@1", "when": "scmProvider == oxygen" }, |
| 98 |
|
- |
{ "command": "oxygen.push", "group": "4_sync@2", "when": "scmProvider == oxygen" }, |
| 99 |
|
- |
{ "command": "oxygen.pushBookmark", "group": "4_sync@3", "when": "scmProvider == oxygen" }, |
| 100 |
|
- |
{ "command": "oxygen.fetch", "group": "4_sync@4", "when": "scmProvider == oxygen" }, |
| 101 |
|
- |
{ "command": "oxygen.switchBookmark", "group": "5_bookmarks@1", "when": "scmProvider == oxygen" }, |
| 102 |
|
- |
{ "command": "oxygen.createBookmark", "group": "5_bookmarks@2", "when": "scmProvider == oxygen" }, |
| 103 |
|
- |
{ "command": "oxygen.mergeBookmark", "group": "5_bookmarks@3", "when": "scmProvider == oxygen" }, |
| 104 |
|
- |
{ "command": "oxygen.deleteBookmark", "group": "5_bookmarks@4", "when": "scmProvider == oxygen" }, |
| 105 |
|
- |
{ "command": "oxygen.tags", "group": "6_more@1", "when": "scmProvider == oxygen" }, |
| 106 |
|
- |
{ "command": "oxygen.createTag", "group": "6_more@2", "when": "scmProvider == oxygen" }, |
| 107 |
|
- |
{ "command": "oxygen.addWorkspace", "group": "6_more@3", "when": "scmProvider == oxygen" }, |
| 108 |
|
- |
{ "command": "oxygen.updateSubrepos", "group": "6_more@4", "when": "scmProvider == oxygen" }, |
| 109 |
|
- |
{ "command": "oxygen.verify", "group": "6_more@5", "when": "scmProvider == oxygen" }, |
| 110 |
|
- |
{ "command": "oxygen.commitHunks", "group": "2_commit@1", "when": "scmProvider == oxygen" }, |
| 111 |
|
- |
{ "command": "oxygen.amend", "group": "2_commit@2", "when": "scmProvider == oxygen" }, |
| 112 |
|
- |
{ "command": "oxygen.undo", "group": "3_undo", "when": "scmProvider == oxygen" }, |
| 113 |
|
- |
{ "command": "oxygen.markResolved", "group": "2_commit@3", "when": "scmProvider == oxygen" }, |
| 114 |
|
- |
{ "command": "oxygen.showHistory", "group": "1_view@1", "when": "scmProvider == oxygen" }, |
| 115 |
|
- |
{ "command": "oxygen.showLog", "group": "1_view@2", "when": "scmProvider == oxygen" }, |
| 116 |
|
- |
{ "command": "oxygen.showOutput", "group": "1_view@3", "when": "scmProvider == oxygen" } |
|
331 |
+ |
{ |
|
332 |
+ |
"command": "oxygen.commit", |
|
333 |
+ |
"group": "navigation@1", |
|
334 |
+ |
"when": "scmProvider == oxygen" |
|
335 |
+ |
}, |
|
336 |
+ |
{ |
|
337 |
+ |
"command": "oxygen.sync", |
|
338 |
+ |
"group": "navigation@2", |
|
339 |
+ |
"when": "scmProvider == oxygen" |
|
340 |
+ |
}, |
|
341 |
+ |
{ |
|
342 |
+ |
"command": "oxygen.refresh", |
|
343 |
+ |
"group": "navigation@3", |
|
344 |
+ |
"when": "scmProvider == oxygen" |
|
345 |
+ |
}, |
|
346 |
+ |
{ |
|
347 |
+ |
"command": "oxygen.pull", |
|
348 |
+ |
"group": "4_sync@1", |
|
349 |
+ |
"when": "scmProvider == oxygen" |
|
350 |
+ |
}, |
|
351 |
+ |
{ |
|
352 |
+ |
"command": "oxygen.push", |
|
353 |
+ |
"group": "4_sync@2", |
|
354 |
+ |
"when": "scmProvider == oxygen" |
|
355 |
+ |
}, |
|
356 |
+ |
{ |
|
357 |
+ |
"command": "oxygen.pushBookmark", |
|
358 |
+ |
"group": "4_sync@3", |
|
359 |
+ |
"when": "scmProvider == oxygen" |
|
360 |
+ |
}, |
|
361 |
+ |
{ |
|
362 |
+ |
"command": "oxygen.fetch", |
|
363 |
+ |
"group": "4_sync@4", |
|
364 |
+ |
"when": "scmProvider == oxygen" |
|
365 |
+ |
}, |
|
366 |
+ |
{ |
|
367 |
+ |
"command": "oxygen.switchBookmark", |
|
368 |
+ |
"group": "5_bookmarks@1", |
|
369 |
+ |
"when": "scmProvider == oxygen" |
|
370 |
+ |
}, |
|
371 |
+ |
{ |
|
372 |
+ |
"command": "oxygen.createBookmark", |
|
373 |
+ |
"group": "5_bookmarks@2", |
|
374 |
+ |
"when": "scmProvider == oxygen" |
|
375 |
+ |
}, |
|
376 |
+ |
{ |
|
377 |
+ |
"command": "oxygen.mergeBookmark", |
|
378 |
+ |
"group": "5_bookmarks@3", |
|
379 |
+ |
"when": "scmProvider == oxygen" |
|
380 |
+ |
}, |
|
381 |
+ |
{ |
|
382 |
+ |
"command": "oxygen.deleteBookmark", |
|
383 |
+ |
"group": "5_bookmarks@4", |
|
384 |
+ |
"when": "scmProvider == oxygen" |
|
385 |
+ |
}, |
|
386 |
+ |
{ |
|
387 |
+ |
"command": "oxygen.tags", |
|
388 |
+ |
"group": "6_more@1", |
|
389 |
+ |
"when": "scmProvider == oxygen" |
|
390 |
+ |
}, |
|
391 |
+ |
{ |
|
392 |
+ |
"command": "oxygen.createTag", |
|
393 |
+ |
"group": "6_more@2", |
|
394 |
+ |
"when": "scmProvider == oxygen" |
|
395 |
+ |
}, |
|
396 |
+ |
{ |
|
397 |
+ |
"command": "oxygen.addWorkspace", |
|
398 |
+ |
"group": "6_more@3", |
|
399 |
+ |
"when": "scmProvider == oxygen" |
|
400 |
+ |
}, |
|
401 |
+ |
{ |
|
402 |
+ |
"command": "oxygen.updateSubrepos", |
|
403 |
+ |
"group": "6_more@4", |
|
404 |
+ |
"when": "scmProvider == oxygen" |
|
405 |
+ |
}, |
|
406 |
+ |
{ |
|
407 |
+ |
"command": "oxygen.verify", |
|
408 |
+ |
"group": "6_more@5", |
|
409 |
+ |
"when": "scmProvider == oxygen" |
|
410 |
+ |
}, |
|
411 |
+ |
{ |
|
412 |
+ |
"command": "oxygen.commitHunks", |
|
413 |
+ |
"group": "2_commit@1", |
|
414 |
+ |
"when": "scmProvider == oxygen" |
|
415 |
+ |
}, |
|
416 |
+ |
{ |
|
417 |
+ |
"command": "oxygen.amend", |
|
418 |
+ |
"group": "2_commit@2", |
|
419 |
+ |
"when": "scmProvider == oxygen" |
|
420 |
+ |
}, |
|
421 |
+ |
{ |
|
422 |
+ |
"command": "oxygen.undo", |
|
423 |
+ |
"group": "3_undo", |
|
424 |
+ |
"when": "scmProvider == oxygen" |
|
425 |
+ |
}, |
|
426 |
+ |
{ |
|
427 |
+ |
"command": "oxygen.markResolved", |
|
428 |
+ |
"group": "2_commit@3", |
|
429 |
+ |
"when": "scmProvider == oxygen" |
|
430 |
+ |
}, |
|
431 |
+ |
{ |
|
432 |
+ |
"command": "oxygen.showHistory", |
|
433 |
+ |
"group": "1_view@1", |
|
434 |
+ |
"when": "scmProvider == oxygen" |
|
435 |
+ |
}, |
|
436 |
+ |
{ |
|
437 |
+ |
"command": "oxygen.showLog", |
|
438 |
+ |
"group": "1_view@2", |
|
439 |
+ |
"when": "scmProvider == oxygen" |
|
440 |
+ |
}, |
|
441 |
+ |
{ |
|
442 |
+ |
"command": "oxygen.showOutput", |
|
443 |
+ |
"group": "1_view@3", |
|
444 |
+ |
"when": "scmProvider == oxygen" |
|
445 |
+ |
}, |
|
446 |
+ |
{ |
|
447 |
+ |
"command": "oxygen.openOnRemote", |
|
448 |
+ |
"when": "scmProvider == oxygen", |
|
449 |
+ |
"group": "navigation@9" |
|
450 |
+ |
} |
| 117 |
451 |
|
], |
| 118 |
452 |
|
"editor/title": [ |
| 119 |
|
- |
{ "command": "oxygen.fileHistory", "group": "navigation@9", "when": "oxygen.hasRepository && resourceScheme == file" } |
|
453 |
+ |
{ |
|
454 |
+ |
"command": "oxygen.fileHistory", |
|
455 |
+ |
"group": "navigation@9", |
|
456 |
+ |
"when": "oxygen.hasRepository && resourceScheme == file" |
|
457 |
+ |
} |
| 120 |
458 |
|
], |
| 121 |
459 |
|
"editor/context": [ |
| 122 |
|
- |
{ "command": "oxygen.toggleBlame", "group": "oxygen@1", "when": "oxygen.hasRepository && resourceScheme == file" }, |
| 123 |
|
- |
{ "command": "oxygen.fileHistory", "group": "oxygen@2", "when": "oxygen.hasRepository && resourceScheme == file" } |
|
460 |
+ |
{ |
|
461 |
+ |
"command": "oxygen.toggleBlame", |
|
462 |
+ |
"group": "oxygen@1", |
|
463 |
+ |
"when": "oxygen.hasRepository && resourceScheme == file" |
|
464 |
+ |
}, |
|
465 |
+ |
{ |
|
466 |
+ |
"command": "oxygen.fileHistory", |
|
467 |
+ |
"group": "oxygen@2", |
|
468 |
+ |
"when": "oxygen.hasRepository && resourceScheme == file" |
|
469 |
+ |
} |
| 124 |
470 |
|
], |
| 125 |
471 |
|
"explorer/context": [ |
| 126 |
|
- |
{ "command": "oxygen.fileHistory", "group": "7_modification@9", "when": "oxygen.hasRepository && !explorerResourceIsFolder" } |
|
472 |
+ |
{ |
|
473 |
+ |
"command": "oxygen.fileHistory", |
|
474 |
+ |
"group": "7_modification@9", |
|
475 |
+ |
"when": "oxygen.hasRepository && !explorerResourceIsFolder" |
|
476 |
+ |
} |
| 127 |
477 |
|
], |
| 128 |
478 |
|
"scm/resourceState/context": [ |
| 129 |
|
- |
{ "command": "oxygen.openFile", "group": "inline@1", "when": "scmProvider == oxygen" }, |
| 130 |
|
- |
{ "command": "oxygen.discard", "group": "inline@2", "when": "scmProvider == oxygen" }, |
| 131 |
|
- |
{ "command": "oxygen.openChanges", "group": "navigation", "when": "scmProvider == oxygen" }, |
| 132 |
|
- |
{ "command": "oxygen.openBaseVersion", "group": "navigation", "when": "scmProvider == oxygen" }, |
| 133 |
|
- |
{ "command": "oxygen.commitSelected", "group": "1_modification@1", "when": "scmProvider == oxygen" }, |
| 134 |
|
- |
{ "command": "oxygen.discard", "group": "1_modification@2", "when": "scmProvider == oxygen" }, |
| 135 |
|
- |
{ "command": "oxygen.keepCandidate", "group": "inline@0", "when": "scmProvider == oxygen && scmResourceState == candidate" }, |
| 136 |
|
- |
{ "command": "oxygen.updateSubrepo", "group": "inline@0", "when": "scmProvider == oxygen && scmResourceState == subrepo" }, |
| 137 |
|
- |
{ "command": "oxygen.keepCandidate", "group": "0_conflict", "when": "scmProvider == oxygen && scmResourceState == candidate" } |
|
479 |
+ |
{ |
|
480 |
+ |
"command": "oxygen.openFile", |
|
481 |
+ |
"group": "inline@1", |
|
482 |
+ |
"when": "scmProvider == oxygen" |
|
483 |
+ |
}, |
|
484 |
+ |
{ |
|
485 |
+ |
"command": "oxygen.discard", |
|
486 |
+ |
"group": "inline@2", |
|
487 |
+ |
"when": "scmProvider == oxygen" |
|
488 |
+ |
}, |
|
489 |
+ |
{ |
|
490 |
+ |
"command": "oxygen.openChanges", |
|
491 |
+ |
"group": "navigation", |
|
492 |
+ |
"when": "scmProvider == oxygen" |
|
493 |
+ |
}, |
|
494 |
+ |
{ |
|
495 |
+ |
"command": "oxygen.openBaseVersion", |
|
496 |
+ |
"group": "navigation", |
|
497 |
+ |
"when": "scmProvider == oxygen" |
|
498 |
+ |
}, |
|
499 |
+ |
{ |
|
500 |
+ |
"command": "oxygen.commitSelected", |
|
501 |
+ |
"group": "1_modification@1", |
|
502 |
+ |
"when": "scmProvider == oxygen" |
|
503 |
+ |
}, |
|
504 |
+ |
{ |
|
505 |
+ |
"command": "oxygen.discard", |
|
506 |
+ |
"group": "1_modification@2", |
|
507 |
+ |
"when": "scmProvider == oxygen" |
|
508 |
+ |
}, |
|
509 |
+ |
{ |
|
510 |
+ |
"command": "oxygen.keepCandidate", |
|
511 |
+ |
"group": "inline@0", |
|
512 |
+ |
"when": "scmProvider == oxygen && scmResourceState == candidate" |
|
513 |
+ |
}, |
|
514 |
+ |
{ |
|
515 |
+ |
"command": "oxygen.updateSubrepo", |
|
516 |
+ |
"group": "inline@0", |
|
517 |
+ |
"when": "scmProvider == oxygen && scmResourceState == subrepo" |
|
518 |
+ |
}, |
|
519 |
+ |
{ |
|
520 |
+ |
"command": "oxygen.keepCandidate", |
|
521 |
+ |
"group": "0_conflict", |
|
522 |
+ |
"when": "scmProvider == oxygen && scmResourceState == candidate" |
|
523 |
+ |
} |
| 138 |
524 |
|
], |
| 139 |
525 |
|
"scm/resourceGroup/context": [ |
| 140 |
|
- |
{ "command": "oxygen.markResolved", "group": "inline", "when": "scmProvider == oxygen && scmResourceGroup == conflicts" } |
|
526 |
+ |
{ |
|
527 |
+ |
"command": "oxygen.markResolved", |
|
528 |
+ |
"group": "inline", |
|
529 |
+ |
"when": "scmProvider == oxygen && scmResourceGroup == conflicts" |
|
530 |
+ |
} |
| 141 |
531 |
|
], |
| 142 |
532 |
|
"view/title": [ |
| 143 |
|
- |
{ "command": "oxygen.refreshOperations", "group": "navigation", "when": "view == oxygen.operations" }, |
| 144 |
|
- |
{ "command": "oxygen.refreshBisect", "group": "navigation", "when": "view == oxygen.bisect" }, |
| 145 |
|
- |
{ "command": "oxygen.refreshTrust", "group": "navigation", "when": "view == oxygen.trust" } |
|
533 |
+ |
{ |
|
534 |
+ |
"command": "oxygen.refreshOperations", |
|
535 |
+ |
"group": "navigation", |
|
536 |
+ |
"when": "view == oxygen.operations" |
|
537 |
+ |
}, |
|
538 |
+ |
{ |
|
539 |
+ |
"command": "oxygen.refreshBisect", |
|
540 |
+ |
"group": "navigation", |
|
541 |
+ |
"when": "view == oxygen.bisect" |
|
542 |
+ |
}, |
|
543 |
+ |
{ |
|
544 |
+ |
"command": "oxygen.refreshTrust", |
|
545 |
+ |
"group": "navigation", |
|
546 |
+ |
"when": "view == oxygen.trust" |
|
547 |
+ |
} |
| 146 |
548 |
|
], |
| 147 |
549 |
|
"view/item/context": [ |
| 148 |
|
- |
{ "command": "oxygen.undoTo", "group": "inline", "when": "view == oxygen.operations && viewItem == operation" } |
|
550 |
+ |
{ |
|
551 |
+ |
"command": "oxygen.undoTo", |
|
552 |
+ |
"group": "inline", |
|
553 |
+ |
"when": "view == oxygen.operations && viewItem == operation" |
|
554 |
+ |
} |
| 149 |
555 |
|
], |
| 150 |
556 |
|
"commandPalette": [ |
| 151 |
|
- |
{ "command": "oxygen.openFile", "when": "false" }, |
| 152 |
|
- |
{ "command": "oxygen.openChanges", "when": "false" }, |
| 153 |
|
- |
{ "command": "oxygen.openBaseVersion", "when": "false" }, |
| 154 |
|
- |
{ "command": "oxygen.discard", "when": "false" }, |
| 155 |
|
- |
{ "command": "oxygen.commitSelected", "when": "false" }, |
| 156 |
|
- |
{ "command": "oxygen.undoTo", "when": "false" }, |
| 157 |
|
- |
{ "command": "oxygen.refreshOperations", "when": "false" }, |
| 158 |
|
- |
{ "command": "oxygen.showChange", "when": "false" }, |
| 159 |
|
- |
{ "command": "oxygen.acceptSides", "when": "false" }, |
| 160 |
|
- |
{ "command": "oxygen.keepCandidate", "when": "false" }, |
| 161 |
|
- |
{ "command": "oxygen.openConflict", "when": "false" }, |
| 162 |
|
- |
{ "command": "oxygen.openSubrepo", "when": "false" }, |
| 163 |
|
- |
{ "command": "oxygen.updateSubrepo", "when": "false" }, |
| 164 |
|
- |
{ "command": "oxygen.refreshBisect", "when": "false" }, |
| 165 |
|
- |
{ "command": "oxygen.refreshTrust", "when": "false" } |
|
557 |
+ |
{ |
|
558 |
+ |
"command": "oxygen.openFile", |
|
559 |
+ |
"when": "false" |
|
560 |
+ |
}, |
|
561 |
+ |
{ |
|
562 |
+ |
"command": "oxygen.openChanges", |
|
563 |
+ |
"when": "false" |
|
564 |
+ |
}, |
|
565 |
+ |
{ |
|
566 |
+ |
"command": "oxygen.openBaseVersion", |
|
567 |
+ |
"when": "false" |
|
568 |
+ |
}, |
|
569 |
+ |
{ |
|
570 |
+ |
"command": "oxygen.discard", |
|
571 |
+ |
"when": "false" |
|
572 |
+ |
}, |
|
573 |
+ |
{ |
|
574 |
+ |
"command": "oxygen.commitSelected", |
|
575 |
+ |
"when": "false" |
|
576 |
+ |
}, |
|
577 |
+ |
{ |
|
578 |
+ |
"command": "oxygen.undoTo", |
|
579 |
+ |
"when": "false" |
|
580 |
+ |
}, |
|
581 |
+ |
{ |
|
582 |
+ |
"command": "oxygen.refreshOperations", |
|
583 |
+ |
"when": "false" |
|
584 |
+ |
}, |
|
585 |
+ |
{ |
|
586 |
+ |
"command": "oxygen.showChange", |
|
587 |
+ |
"when": "false" |
|
588 |
+ |
}, |
|
589 |
+ |
{ |
|
590 |
+ |
"command": "oxygen.acceptSides", |
|
591 |
+ |
"when": "false" |
|
592 |
+ |
}, |
|
593 |
+ |
{ |
|
594 |
+ |
"command": "oxygen.keepCandidate", |
|
595 |
+ |
"when": "false" |
|
596 |
+ |
}, |
|
597 |
+ |
{ |
|
598 |
+ |
"command": "oxygen.openConflict", |
|
599 |
+ |
"when": "false" |
|
600 |
+ |
}, |
|
601 |
+ |
{ |
|
602 |
+ |
"command": "oxygen.openSubrepo", |
|
603 |
+ |
"when": "false" |
|
604 |
+ |
}, |
|
605 |
+ |
{ |
|
606 |
+ |
"command": "oxygen.updateSubrepo", |
|
607 |
+ |
"when": "false" |
|
608 |
+ |
}, |
|
609 |
+ |
{ |
|
610 |
+ |
"command": "oxygen.refreshBisect", |
|
611 |
+ |
"when": "false" |
|
612 |
+ |
}, |
|
613 |
+ |
{ |
|
614 |
+ |
"command": "oxygen.refreshTrust", |
|
615 |
+ |
"when": "false" |
|
616 |
+ |
} |
|
617 |
+ |
], |
|
618 |
+ |
"editor/title/context": [ |
|
619 |
+ |
{ |
|
620 |
+ |
"command": "oxygen.openOnRemote", |
|
621 |
+ |
"when": "oxygen.hasRemoteProvider", |
|
622 |
+ |
"group": "oxygen" |
|
623 |
+ |
} |
| 166 |
624 |
|
] |
| 167 |
625 |
|
}, |
| 168 |
626 |
|
"configuration": { |
|
|
… |
41 unchanged lines |
| 210 |
668 |
|
"build": "esbuild src/extension.ts --bundle --platform=node --format=cjs --external:vscode --outfile=dist/extension.js --sourcemap", |
| 211 |
669 |
|
"watch": "npm run build -- --watch", |
| 212 |
670 |
|
"typecheck": "tsc --noEmit -p .", |
| 213 |
|
- |
"pretest": "esbuild src/oxy.ts --bundle --platform=node --format=esm --outfile=out/oxy.mjs && esbuild src/diffutil.ts --bundle --platform=node --format=esm --outfile=out/diffutil.mjs && esbuild src/markers.ts --bundle --platform=node --format=esm --outfile=out/markers.mjs", |
|
671 |
+ |
"pretest": "esbuild src/oxy.ts --bundle --platform=node --format=esm --outfile=out/oxy.mjs && esbuild src/diffutil.ts --bundle --platform=node --format=esm --outfile=out/diffutil.mjs && esbuild src/markers.ts --bundle --platform=node --format=esm --outfile=out/markers.mjs && esbuild src/api.ts --bundle --platform=node --format=esm --outfile=out/api.mjs", |
| 214 |
672 |
|
"test": "node --test \"test/**/*.test.mjs\"", |
| 215 |
673 |
|
"check": "npm run typecheck && npm run build && npm test", |
| 216 |
674 |
|
"package": "vsce package --no-dependencies" |
|
|
… |
9 unchanged lines |