mirror of
https://github.com/tiddly-gittly/TidGi-Desktop.git
synced 2025-12-06 02:30:47 -08:00
Fix/open app (#658)
* fix: registry-js not copied * Update wiki * Update getWorkspaceMenuTemplate.ts * fix: tiddlers\新条目.tid become "tiddlers/\346\226\260\346\235\241\347\233\256.tid" in git log * fix: git can't show and discard newly added or deleted files * refactor: duplicate code * lint * fix: type
This commit is contained in:
parent
45e3f76da1
commit
a674cd269f
17 changed files with 386 additions and 79 deletions
|
|
@ -24,7 +24,18 @@ import { WindowNames } from '@services/windows/WindowProperties';
|
|||
import { isWikiWorkspace, type IWorkspace } from '@services/workspaces/interface';
|
||||
import * as gitOperations from './gitOperations';
|
||||
import type { GitWorker } from './gitWorker';
|
||||
import type { ICommitAndSyncConfigs, IForcePullConfigs, IGitLogMessage, IGitLogOptions, IGitLogResult, IGitService, IGitStateChange, IGitUserInfos } from './interface';
|
||||
import type {
|
||||
ICommitAndSyncConfigs,
|
||||
IFileDiffResult,
|
||||
IFileWithStatus,
|
||||
IForcePullConfigs,
|
||||
IGitLogMessage,
|
||||
IGitLogOptions,
|
||||
IGitLogResult,
|
||||
IGitService,
|
||||
IGitStateChange,
|
||||
IGitUserInfos,
|
||||
} from './interface';
|
||||
import { registerMenu } from './registerMenu';
|
||||
import { getErrorMessageI18NDict, translateMessage } from './translateMessage';
|
||||
|
||||
|
|
@ -359,15 +370,15 @@ export class Git implements IGitService {
|
|||
return await gitOperations.getGitLog(wikiFolderPath, options);
|
||||
}
|
||||
|
||||
public async getCommitFiles(wikiFolderPath: string, commitHash: string): Promise<string[]> {
|
||||
public async getCommitFiles(wikiFolderPath: string, commitHash: string): Promise<IFileWithStatus[]> {
|
||||
return await gitOperations.getCommitFiles(wikiFolderPath, commitHash);
|
||||
}
|
||||
|
||||
public async getFileDiff(wikiFolderPath: string, commitHash: string, filePath: string, maxLines?: number, maxChars?: number): Promise<import('./interface').IFileDiffResult> {
|
||||
public async getFileDiff(wikiFolderPath: string, commitHash: string, filePath: string, maxLines?: number, maxChars?: number): Promise<IFileDiffResult> {
|
||||
return await gitOperations.getFileDiff(wikiFolderPath, commitHash, filePath, maxLines, maxChars);
|
||||
}
|
||||
|
||||
public async getFileContent(wikiFolderPath: string, commitHash: string, filePath: string, maxLines?: number, maxChars?: number): Promise<import('./interface').IFileDiffResult> {
|
||||
public async getFileContent(wikiFolderPath: string, commitHash: string, filePath: string, maxLines?: number, maxChars?: number): Promise<IFileDiffResult> {
|
||||
return await gitOperations.getFileContent(wikiFolderPath, commitHash, filePath, maxLines, maxChars);
|
||||
}
|
||||
|
||||
|
|
@ -408,6 +419,8 @@ export class Git implements IGitService {
|
|||
|
||||
public async addToGitignore(wikiFolderPath: string, pattern: string): Promise<void> {
|
||||
await gitOperations.addToGitignore(wikiFolderPath, pattern);
|
||||
// Notify git state change to refresh git log
|
||||
this.notifyGitStateChange(wikiFolderPath, 'file-change');
|
||||
}
|
||||
|
||||
public async isAIGenerateBackupTitleEnabled(): Promise<boolean> {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue