Skip to content

Commit 3aa8a14

Browse files
aboseabose
committed
chore: git branch operations metrics
1 parent e4709be commit 3aa8a14

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

‎src/extensions/default/Git/src/Branch.js‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ define(function (require, exports) {
1212
StringUtils = brackets.getModule("utils/StringUtils"),
1313
DocumentManager = brackets.getModule("document/DocumentManager"),
1414
Strings = brackets.getModule("strings"),
15+
Metrics = brackets.getModule("utils/Metrics"),
1516
MainViewManager = brackets.getModule("view/MainViewManager");
1617

1718
var Git = require("src/git/Git"),
1819
Events = require("src/Events"),
1920
EventEmitter = require("src/EventEmitter"),
2021
ErrorHandler = require("src/ErrorHandler"),
2122
Panel = require("src/Panel"),
22-
Setup = require("src/utils/Setup"),
23+
Setup = require("src/utils/Setup"),
2324
Preferences = require("src/Preferences"),
2425
ProgressDialog = require("src/dialogs/Progress"),
2526
Utils = require("src/Utils"),
@@ -105,22 +106,25 @@ define(function (require, exports) {
105106
if (useRebase) {
106107

107108
Git.rebaseInit(fromBranch).catch(function (err) {
109+
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'rebase', "fail");
108110
throw ErrorHandler.showError(err, Strings.ERROR_REBASE_FAILED);
109111
}).then(function (stdout) {
112+
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'rebase', "success");
110113
Utils.showOutput(stdout || Strings.GIT_REBASE_SUCCESS, Strings.REBASE_RESULT).finally(function () {
111114
EventEmitter.emit(Events.REFRESH_ALL);
112115
});
113-
114-
});
116+
}).catch(console.error);
115117
} else {
116118

117119
Git.mergeBranch(fromBranch, mergeMsg, useNoff).catch(function (err) {
120+
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'merge', "fail");
118121
throw ErrorHandler.showError(err, Strings.ERROR_MERGE_FAILED);
119122
}).then(function (stdout) {
123+
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'merge', "success");
120124
Utils.showOutput(stdout || Strings.GIT_MERGE_SUCCESS, Strings.MERGE_RESULT).finally(function () {
121125
EventEmitter.emit(Events.REFRESH_ALL);
122126
});
123-
});
127+
}).catch(console.error);
124128
}
125129
}
126130
});
@@ -218,8 +222,10 @@ define(function (require, exports) {
218222
track = !!isRemote;
219223

220224
Git.createBranch(branchName, originName, track).catch(function (err) {
225+
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'branch', "createFail");
221226
throw ErrorHandler.showError(err, Strings.ERROR_CREATE_BRANCH);
222227
}).then(function () {
228+
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'branch', "create");
223229
EventEmitter.emit(Events.REFRESH_ALL);
224230
});
225231
}
@@ -246,8 +252,10 @@ define(function (require, exports) {
246252
}).then(function (response) {
247253
if (response === true) {
248254
return Git.forceBranchDelete(branchName).then(function (output) {
255+
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'branch', "delete");
249256
return Utils.showOutput(output || Strings.GIT_BRANCH_DELETE_SUCCESS);
250257
}).catch(function (err) {
258+
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'branch', "deleteFail");
251259
ErrorHandler.showError(err, Strings.ERROR_BRANCH_DELETE_FORCED);
252260
});
253261
}
@@ -273,12 +281,15 @@ define(function (require, exports) {
273281

274282
Git.getCurrentBranchName().then(function (oldBranchName) {
275283
Git.checkout(newBranchName).then(function () {
284+
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'branch', "switch");
276285
return closeNotExistingFiles(oldBranchName, newBranchName);
277286
}).catch(function (err) {
278-
throw ErrorHandler.showError(err, Strings.ERROR_SWITCHING_BRANCHES);
287+
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'branch', "switchFail");
288+
ErrorHandler.showError(err, Strings.ERROR_SWITCHING_BRANCHES);
279289
});
280290
}).catch(function (err) {
281-
throw ErrorHandler.showError(err, Strings.ERROR_GETTING_CURRENT_BRANCH);
291+
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'branch', "switchFail");
292+
ErrorHandler.showError(err, Strings.ERROR_GETTING_CURRENT_BRANCH);
282293
});
283294

284295
});
@@ -483,7 +494,7 @@ define(function (require, exports) {
483494
}
484495
});
485496
}).catch(function (err) {
486-
throw ErrorHandler.showError(err);
497+
ErrorHandler.showError(err);
487498
});
488499
}
489500

‎src/extensions/default/Git/src/ErrorHandler.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
define(function (require, exports) {
22

3-
var _ = brackets.getModule("thirdparty/lodash"),
4-
Dialogs = brackets.getModule("widgets/Dialogs"),
3+
const Dialogs = brackets.getModule("widgets/Dialogs"),
54
Mustache = brackets.getModule("thirdparty/mustache/mustache"),
65
Metrics = brackets.getModule("utils/Metrics"),
76
Strings = brackets.getModule("strings"),
87
Utils = require("src/Utils"),
98
errorDialogTemplate = require("text!templates/git-error-dialog.html");
109

11-
var errorQueue = [];
12-
1310
function errorToString(err) {
1411
return Utils.encodeSensitiveInformation(err.toString());
1512
}
@@ -34,9 +31,8 @@ define(function (require, exports) {
3431
};
3532

3633
exports.logError = function (err) {
37-
var msg = err && err.stack ? err.stack : err;
34+
const msg = err && err.stack ? err.stack : err;
3835
Utils.consoleError("[brackets-git] " + msg);
39-
errorQueue.push(err);
4036
return err;
4137
};
4238

0 commit comments

Comments
 (0)