mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2025-12-06 02:30:47 -08:00
Code Issues Projects Releases Packages Wiki Activity

chore: upgrade git-sync

Browse source
This commit is contained in:
tiddlygit-test 2022-01-28 02:23:11 +08:00
parent 056bc2706c
commit 3a5532b8b9
5 changed files with 2335 additions and 810 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/services/git/index.ts
View file

@ -33,6 +33,7 @@ import { LOCAL_GIT_DIRECTORY } from '@/constants/appPaths';
import { WindowNames } from '@services/windows/WindowProperties';
import { lazyInject } from '@services/container';
import { githubDesktopUrl } from '@/constants/urls';
import { defaultGitInfo } from './defaultGitInfo';
@injectable()
export class Git implements IGitService {
@ -60,7 +61,7 @@ export class Git implements IGitService {
public async getWorkspacesRemote(wikiFolderPath: string): Promise<string | undefined> {
if (await hasGit(wikiFolderPath)) {
return await this.gitWorker?.getRemoteUrl(wikiFolderPath);
return await this.gitWorker?.getRemoteUrl(wikiFolderPath, defaultGitInfo.remote);
}
}
@ -196,7 +197,7 @@ export class Git implements IGitService {
if (error instanceof AssumeSyncError) {
error.message = i18n.t('Log.SynchronizationFailed');
} else if (error instanceof SyncParameterMissingError) {
error.message = i18n.t('Log.GitTokenMissing') + error.parameterName;
error.message = i18n.t('Log.GitTokenMissing') + (error as SyncParameterMissingError).parameterName;
} else if (error instanceof GitPullPushError) {
error.message = i18n.t('Log.SyncFailedSystemError');
} else if (error instanceof CantSyncGitNotInitializedError) {