Skip to content

Merge minor UX improvements #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 7, 2021
Merged

Merge minor UX improvements #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfbc848
If the branch is already up-to-date then a proper message is displayed
isc-svelury Dec 3, 2021
e56f4cc
Merge branch 'main' into merge-minor-ux-improvements
isc-svelury Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions git-webui/release/share/git-webui/webui/js/git-webui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,6 +2102,12 @@ $(function () {

});

function upToDateHandler(message){
if(message.includes("Already up to date.")) {
webui.showSuccess(message);
}
}

$(document).on('click', '.btn-merge-branch', function(e){
e.preventDefault();
var refName = $(this).parent().parent().parent().siblings(
Expand All @@ -2121,7 +2127,7 @@ $(function () {
webui.showError(message);
}
}
webui.git("merge --no-commit --no-ff "+refName, "", "", testMergeHandler, testMergeHandler);
webui.git("merge --no-commit --no-ff "+refName, "", upToDateHandler, testMergeHandler, testMergeHandler);
});

$(document).on('click', '.btn-merge-remote-branch', function(e){
Expand All @@ -2138,7 +2144,6 @@ $(function () {
function suppressErrorMessage(error) {
}
webui.git("merge --abort", "", "", suppressErrorMessage);

if(message.includes("Automatic merge went well") || message.includes("Auto-merging ")){
webui.git("merge "+refName, function (output){
webui.showSuccess(output);
Expand All @@ -2148,7 +2153,7 @@ $(function () {
webui.showError(message);
}
}
webui.git("merge --no-commit --no-ff "+refName, "", "", testMergeHandler, testMergeHandler);
webui.git("merge --no-commit --no-ff "+refName, "", upToDateHandler, testMergeHandler, testMergeHandler);
});

$(document).on('click', '.btn-checkout-remote-branch', function(e) {
Expand Down
11 changes: 8 additions & 3 deletions git-webui/src/share/git-webui/webui/js/git-webui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,6 +2102,12 @@ $(function () {

});

function upToDateHandler(message){
if(message.includes("Already up to date.")) {
webui.showSuccess(message);
}
}

$(document).on('click', '.btn-merge-branch', function(e){
e.preventDefault();
var refName = $(this).parent().parent().parent().siblings(
Expand All @@ -2121,7 +2127,7 @@ $(function () {
webui.showError(message);
}
}
webui.git("merge --no-commit --no-ff "+refName, "", "", testMergeHandler, testMergeHandler);
webui.git("merge --no-commit --no-ff "+refName, "", upToDateHandler, testMergeHandler, testMergeHandler);
});

$(document).on('click', '.btn-merge-remote-branch', function(e){
Expand All @@ -2138,7 +2144,6 @@ $(function () {
function suppressErrorMessage(error) {
}
webui.git("merge --abort", "", "", suppressErrorMessage);

if(message.includes("Automatic merge went well") || message.includes("Auto-merging ")){
webui.git("merge "+refName, function (output){
webui.showSuccess(output);
Expand All @@ -2148,7 +2153,7 @@ $(function () {
webui.showError(message);
}
}
webui.git("merge --no-commit --no-ff "+refName, "", "", testMergeHandler, testMergeHandler);
webui.git("merge --no-commit --no-ff "+refName, "", upToDateHandler, testMergeHandler, testMergeHandler);
});

$(document).on('click', '.btn-checkout-remote-branch', function(e) {
Expand Down