development/gitg
development/gitg
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gitg synced 2024-06-30 23:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Add push action only if upstream is set

Browse Source
This commit is contained in:
Alberto Fanjul 2023-12-19 00:22:28 +01:00
parent 4c690fdc13
commit 7771b69c49
1 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gitg/gitg-ref-action-push.vala
View File

@ -29,7 +29,6 @@ class RefActionPush : GitgExt.UIElement, GitgExt.Action, GitgExt.RefAction, Obje
public GitgExt.RefActionInterface action_interface { get; construct set; }
public Gitg.Ref reference { get; construct set; }
private Gitg.Ref? d_remote_ref;
private Gitg.Remote? d_remote;
public RefActionPush(GitgExt.Application application,
@ -46,24 +45,10 @@ class RefActionPush : GitgExt.UIElement, GitgExt.Action, GitgExt.RefAction, Obje
{
try
{
d_remote_ref = branch.get_upstream() as Gitg.Ref;
var d_remote_ref = branch.get_upstream() as Gitg.Ref;
d_remote = application.remote_lookup.lookup(d_remote_ref.parsed_name.remote_name);
} catch {}
}
else if (reference.parsed_name.remote_name != null)
{
d_remote_ref = reference;
}
if (d_remote_ref != null)
{
d_remote = application.remote_lookup.lookup(d_remote_ref.parsed_name.remote_name);
}
if (d_remote == null)
{
d_remote = application.remote_lookup.lookup("origin");
}
}
public string id
@ -95,7 +80,7 @@ class RefActionPush : GitgExt.UIElement, GitgExt.Action, GitgExt.RefAction, Obje
{
get
{
return (d_remote != null) && reference.is_branch();
return (d_remote != null) && reference.is_branch() && ((Gitg.Branch)reference).get_upstream() != null;
}
}
@ -154,18 +139,6 @@ class RefActionPush : GitgExt.UIElement, GitgExt.Action, GitgExt.RefAction, Obje
var branch_name = reference.get_shorthand();
var branch = (reference as Gitg.Branch);
try
{
if (branch.get_upstream() == null)
{
branch.set_upstream(branch_name);
}
}
catch (Error e)
{}
push.begin(branch_name, (obj, res) => {
push.end(res);
});