Skip to content

Commit 2a3d36e

Browse files
committed
feat: add git file and global commit history to git menu
1 parent a33b716 commit 2a3d36e

File tree

5 files changed

+34
-4
lines changed

5 files changed

+34
-4
lines changed

src/command/Commands.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,12 @@ define(function (require, exports, module) {
568568
/** Toggles display of untracked files */
569569
exports.CMD_GIT_TOGGLE_UNTRACKED = "git-toggle-untracked";
570570

571+
/** Toggles global history view in history panel */
572+
exports.CMD_GIT_HISTORY_GLOBAL = "git-history-global";
573+
574+
/** Toggles file history view in history panel */
575+
exports.CMD_GIT_HISTORY_FILE = "git-history-file";
576+
571577
// DEPRECATED: Working Set Commands
572578
DeprecationWarning.deprecateConstant(exports, "SORT_WORKINGSET_BY_ADDED", "CMD_WORKINGSET_SORT_BY_ADDED");
573579
DeprecationWarning.deprecateConstant(exports, "SORT_WORKINGSET_BY_NAME", "CMD_WORKINGSET_SORT_BY_NAME");

src/extensions/default/Git/src/Constants.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,6 @@ define(function (require, exports) {
5858
exports.CMD_GIT_AUTHORS_OF_SELECTION = Commands.CMD_GIT_AUTHORS_OF_SELECTION;
5959
exports.CMD_GIT_AUTHORS_OF_FILE = Commands.CMD_GIT_AUTHORS_OF_FILE;
6060
exports.CMD_GIT_TOGGLE_UNTRACKED = Commands.CMD_GIT_TOGGLE_UNTRACKED;
61+
exports.CMD_GIT_HISTORY_GLOBAL = Commands.CMD_GIT_HISTORY_GLOBAL;
62+
exports.CMD_GIT_HISTORY_FILE = Commands.CMD_GIT_HISTORY_FILE;
6163
});

src/extensions/default/Git/src/Main.js

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ define(function (require, exports) {
2929
const CMD_ADD_TO_IGNORE = "git.addToIgnore",
3030
CMD_REMOVE_FROM_IGNORE = "git.removeFromIgnore",
3131
$icon = $(`<a id='git-toolbar-icon' title="${Strings.STATUSBAR_SHOW_GIT}" href='#'></a>`)
32-
.addClass("forced-hidden")
33-
.prependTo($(".bottom-buttons"));
32+
.addClass("forced-hidden")
33+
.prependTo($(".bottom-buttons"));
3434

3535
let gitEnabled = false;
3636

@@ -160,7 +160,7 @@ define(function (require, exports) {
160160
const displayStr = StringUtils.format(Strings.RESET_DETAIL, commitDetailStr, gitCmdUsed);
161161
Utils.askQuestion(title,
162162
message + "<br><br>" + displayStr,
163-
{ booleanResponse: true, noescape: true ,
163+
{ booleanResponse: true, noescape: true,
164164
customOkBtn: Strings.RESET, customOkBtnClass: "danger"})
165165
.then(function (response) {
166166
if (response === true) {
@@ -228,7 +228,10 @@ define(function (require, exports) {
228228
// "More options" context menu commands
229229
Constants.CMD_GIT_DISCARD_ALL_CHANGES,
230230
Constants.CMD_GIT_UNDO_LAST_COMMIT,
231-
Constants.CMD_GIT_TOGGLE_UNTRACKED
231+
Constants.CMD_GIT_TOGGLE_UNTRACKED,
232+
233+
Constants.CMD_GIT_HISTORY_GLOBAL,
234+
Constants.CMD_GIT_HISTORY_FILE
232235
];
233236

234237
// Disable each command
@@ -257,6 +260,9 @@ define(function (require, exports) {
257260
gitSubMenu.addMenuItem(Constants.CMD_GIT_GOTO_PREVIOUS_CHANGE);
258261
gitSubMenu.addMenuItem(Constants.CMD_GIT_CLOSE_UNMODIFIED);
259262
gitSubMenu.addMenuDivider();
263+
gitSubMenu.addMenuItem(Constants.CMD_GIT_HISTORY_GLOBAL);
264+
gitSubMenu.addMenuItem(Constants.CMD_GIT_HISTORY_FILE);
265+
gitSubMenu.addMenuDivider();
260266
gitSubMenu.addMenuItem(Constants.CMD_GIT_AUTHORS_OF_SELECTION);
261267
gitSubMenu.addMenuItem(Constants.CMD_GIT_AUTHORS_OF_FILE);
262268
gitSubMenu.addMenuDivider();
@@ -304,6 +310,9 @@ define(function (require, exports) {
304310
optionsCmenu.addMenuItem(Constants.CMD_GIT_DISCARD_ALL_CHANGES);
305311
optionsCmenu.addMenuItem(Constants.CMD_GIT_UNDO_LAST_COMMIT);
306312
optionsCmenu.addMenuDivider();
313+
optionsCmenu.addMenuItem(Constants.CMD_GIT_HISTORY_GLOBAL);
314+
optionsCmenu.addMenuItem(Constants.CMD_GIT_HISTORY_FILE);
315+
optionsCmenu.addMenuDivider();
307316
optionsCmenu.addMenuItem(Constants.CMD_GIT_AUTHORS_OF_SELECTION);
308317
optionsCmenu.addMenuItem(Constants.CMD_GIT_AUTHORS_OF_FILE);
309318
optionsCmenu.addMenuDivider();
@@ -370,6 +379,9 @@ define(function (require, exports) {
370379
Utils.enableCommand(Constants.CMD_GIT_AUTHORS_OF_SELECTION, enabled);
371380
Utils.enableCommand(Constants.CMD_GIT_AUTHORS_OF_FILE, enabled);
372381

382+
Utils.enableCommand(Constants.CMD_GIT_HISTORY_GLOBAL, enabled);
383+
Utils.enableCommand(Constants.CMD_GIT_HISTORY_FILE, enabled);
384+
373385
Utils.enableCommand(Constants.CMD_GIT_COMMIT_CURRENT, enabled);
374386
Utils.enableCommand(Constants.CMD_GIT_COMMIT_ALL, enabled);
375387

src/extensions/default/Git/src/Panel.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,6 +1348,14 @@ define(function (require, exports) {
13481348
CommandManager.register(Strings.HIDE_UNTRACKED, Constants.CMD_GIT_TOGGLE_UNTRACKED, handleToggleUntracked);
13491349
CommandManager.register(Strings.GIT_INIT, Constants.CMD_GIT_INIT, EventEmitter.getEmitter(Events.HANDLE_GIT_INIT));
13501350
CommandManager.register(Strings.GIT_CLONE, Constants.CMD_GIT_CLONE, EventEmitter.getEmitter(Events.HANDLE_GIT_CLONE));
1351+
CommandManager.register(Strings.GIT_SHOW_HISTORY, Constants.CMD_GIT_HISTORY_GLOBAL, ()=>{
1352+
toggle(true);
1353+
EventEmitter.emit(Events.HISTORY_SHOW_GLOBAL);
1354+
});
1355+
CommandManager.register(Strings.GIT_SHOW_FILE_HISTORY, Constants.CMD_GIT_HISTORY_FILE, ()=>{
1356+
toggle(true);
1357+
EventEmitter.emit(Events.HISTORY_SHOW_FILE);
1358+
});
13511359

13521360
// Show gitPanel when appropriate
13531361
if (Preferences.get("panelEnabled") && Setup.isExtensionActivated()) {

src/nls/root/strings.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,6 +1446,8 @@ define({
14461446
"TOOLTIP_REFRESH_PANEL": "Refresh panel",
14471447
"TOOLTIP_SHOW_FILE_HISTORY": "Show file history",
14481448
"TOOLTIP_SHOW_HISTORY": "Show history",
1449+
"GIT_SHOW_FILE_HISTORY": "File Commit history",
1450+
"GIT_SHOW_HISTORY": "Commit history",
14491451
"UNDO_CHANGES": "Discard changes",
14501452
"UNDO_CHANGES_BTN": "Discard changes\u2026",
14511453
"UNDO_LAST_LOCAL_COMMIT": "Undo last local (not pushed) commit\u2026",

0 commit comments

Comments
 (0)