Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:源材料展示优化 #10733 #162

Merged
merged 4 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,11 @@ data class GitSourceSettings(
/**
* 是否设置安全目录
*/
val setSafeDirectory: Boolean? = true
val setSafeDirectory: Boolean? = true,
/**
* 是否为源材料主仓库
*/
val mainRepo: Boolean? = false
) {
val sourceRepoUrlEqualsRepoUrl: Boolean
get() = GitUtil.isSameRepository(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@ data class PipelineBuildMaterial(
val newCommitId: String?,
val newCommitComment: String?,
val commitTimes: Int?,
val scmType: ScmType?
val scmType: ScmType?,
val mainRepo: Boolean? = false
)
Original file line number Diff line number Diff line change
Expand Up @@ -144,5 +144,9 @@ data class CheckoutAtomParamInput(
/**
* 是否设置安全目录
*/
val setSafeDirectory: Boolean? = true
val setSafeDirectory: Boolean? = true,
/**
* 是否为源材料主仓库
*/
val mainRepo: Boolean? = false
)
Original file line number Diff line number Diff line change
Expand Up @@ -127,5 +127,9 @@ data class GitCodeAtomParamInput(
/**
* 是否设置安全目录
*/
val setSafeDirectory: Boolean? = true
val setSafeDirectory: Boolean? = true,
/**
* 是否为源材料主仓库
*/
val mainRepo: Boolean? = false
)
Original file line number Diff line number Diff line change
Expand Up @@ -138,5 +138,9 @@ data class GitCodeCommandAtomParamInput(
/**
* 是否设置安全目录
*/
val setSafeDirectory: Boolean? = true
val setSafeDirectory: Boolean? = true,
/**
* 是否为源材料主仓库
*/
val mainRepo: Boolean? = false
)
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@ class GitLogHelper(
newCommitId = commitMaterial.newCommitId ?: commitMaterial.lastCommitId,
newCommitComment = commitMaterial.newCommitComment,
commitTimes = commitMaterial.commitTimes,
scmType = commitMaterial.scmType
scmType = commitMaterial.scmType,
mainRepo = settings.mainRepo
)
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ class CheckoutAtomParamInputAdapter(
enableTGitCache = enableTGitCache,
tGitCacheUrl = tGitCacheUrl,
tGitCacheProxyUrl = tGitCacheProxyUrl,
setSafeDirectory = setSafeDirectory
setSafeDirectory = setSafeDirectory,
mainRepo = mainRepo
)
).getInputs()

Expand Down Expand Up @@ -189,7 +190,8 @@ class CheckoutAtomParamInputAdapter(
enableTGitCache = enableTGitCache,
tGitCacheUrl = tGitCacheUrl,
tGitCacheProxyUrl = tGitCacheProxyUrl,
setSafeDirectory = setSafeDirectory
setSafeDirectory = setSafeDirectory,
mainRepo = mainRepo
)
).getInputs()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ class GitCodeAtomParamInputAdapter(
enableTGitCache = enableTGitCache,
tGitCacheUrl = tGitCacheUrl,
tGitCacheProxyUrl = tGitCacheProxyUrl,
setSafeDirectory = setSafeDirectory
setSafeDirectory = setSafeDirectory,
mainRepo = mainRepo
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,8 @@ class GitCodeCommandAtomParamInputAdapter(
enableTGitCache = enableTGitCache,
tGitCacheUrl = tGitCacheUrl,
tGitCacheProxyUrl = tGitCacheProxyUrl,
setSafeDirectory = setSafeDirectory
setSafeDirectory = setSafeDirectory,
mainRepo = mainRepo
)
}
}
Expand Down