michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix<Histories>: fix wrong context menu items for current branch

Browse source
This commit is contained in:
leo 2021-04-29 21:40:15 +08:00
parent 672af4527e
commit ee8efa5c47
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/Views/Widgets/Histories.xaml.cs
View file

@ -285,36 +285,36 @@ namespace SourceGit.Views.Widgets {
e.Handled = true; e.Handled = true;
}; };
menu.Items.Add(reset); menu.Items.Add(reset);
if (!merged) {
var rebase = new MenuItem();
rebase.Header = App.Text("CommitCM.Rebase", current.Name);
rebase.Click += (o, e) => {
new Popups.Rebase(repo.Path, current.Name, commit).Show();
e.Handled = true;
};
menu.Items.Add(rebase);
var cherryPick = new MenuItem();
cherryPick.Header = App.Text("CommitCM.CherryPick");
cherryPick.Click += (o, e) => {
new Popups.CherryPick(repo.Path, commit).Show();
e.Handled = true;
};
menu.Items.Add(cherryPick);
} else {
var revert = new MenuItem();
revert.Header = App.Text("CommitCM.Revert");
revert.Click += (o, e) => {
new Popups.Revert(repo.Path, commit).Show();
e.Handled = true;
};
menu.Items.Add(revert);
}
menu.Items.Add(new Separator());
} }
if (!merged) {
var rebase = new MenuItem();
rebase.Header = App.Text("CommitCM.Rebase", current.Name);
rebase.Click += (o, e) => {
new Popups.Rebase(repo.Path, current.Name, commit).Show();
e.Handled = true;
};
menu.Items.Add(rebase);
var cherryPick = new MenuItem();
cherryPick.Header = App.Text("CommitCM.CherryPick");
cherryPick.Click += (o, e) => {
new Popups.CherryPick(repo.Path, commit).Show();
e.Handled = true;
};
menu.Items.Add(cherryPick);
} else {
var revert = new MenuItem();
revert.Header = App.Text("CommitCM.Revert");
revert.Click += (o, e) => {
new Popups.Revert(repo.Path, commit).Show();
e.Handled = true;
};
menu.Items.Add(revert);
}
menu.Items.Add(new Separator());
var createBranch = new MenuItem(); var createBranch = new MenuItem();
createBranch.Header = App.Text("CreateBranch"); createBranch.Header = App.Text("CreateBranch");
createBranch.Click += (o, e) => { createBranch.Click += (o, e) => {