Fuel

Diff
Login

Differences From Artifact [4743ac0f46]:

To Artifact [b6c43a8aed]:


2752
2753
2754
2755
2756
2757
2758
2759
2760
2761





2762
2763
2764
2765
2766
2767
2768
2769
	if(remotes.empty())
		return;

	QUrl url(remotes.first());

	if(getWorkspace().setRemoteDefault(url))
	{
		// FIXME: Fossil currently ignores the password
		if(!url.isLocalFile())
			KeychainGet(this, url, *settings.GetStore());





		fossil().setRemoteUrl(url);
	}

	updateWorkspaceView();
}

//------------------------------------------------------------------------------
void MainWindow::on_actionAddRemote_triggered()







<


>
>
>
>
>
|







2752
2753
2754
2755
2756
2757
2758

2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
	if(remotes.empty())
		return;

	QUrl url(remotes.first());

	if(getWorkspace().setRemoteDefault(url))
	{

		if(!url.isLocalFile())
			KeychainGet(this, url, *settings.GetStore());

		// FIXME: Fossil currently ignores the password in "remote-url"
		// which breaks commits due to a missing password when autosync is enabled
		// so only set the remote url when there is no password set
		if(url.password().isEmpty())
			fossil().setRemoteUrl(url);
	}

	updateWorkspaceView();
}

//------------------------------------------------------------------------------
void MainWindow::on_actionAddRemote_triggered()