jiriks74/create-pull-request
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use source mode for deleted files

Browse source
This commit is contained in:
Peter Evans 2024-08-08 15:15:58 +00:00
parent b2a409b0a3
commit 6b1053d0d8
6 changed files with 132 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
__test__/create-or-update-branch.int.test.ts
View file

@ -270,7 +270,7 @@ describe('create-or-update-branch tests', () => {
expect(branchCommits[0].subject).toEqual('Test changes')
expect(branchCommits[0].changes.length).toEqual(3)
expect(branchCommits[0].changes).toEqual([
{mode: '000000', path: TRACKED_FILE, status: 'D'},
{mode: '100644', path: TRACKED_FILE, status: 'D'},
{mode: '100644', path: UNTRACKED_FILE, status: 'A'},
{mode: '100644', path: TRACKED_FILE_NEW_PATH, status: 'A'}
])

66
dist/index.js vendored
View file

@ -185,7 +185,8 @@ function createOrUpdateBranch(git, commitMessage, base, branch, branchRemoteName
action: 'none',
base: base,
hasDiffWithBase: false,
headSha: ''
headSha: '',
branchCommits: []
};
// Save the working base changes to a temporary branch
const tempBranch = (0, uuid_1.v4)();
@ -306,6 +307,8 @@ function createOrUpdateBranch(git, commitMessage, base, branch, branchRemoteName
// Check if the pull request branch is ahead of the base
result.hasDiffWithBase = yield isAhead(git, base, branch);
}
// Build the branch commits
result.branchCommits = yield buildBranchCommits(git, base, branch);
// Build the branch file changes
result.branchFileChanges = yield buildBranchFileChanges(git, base, branch);
// Get the pull request branch SHA
@ -485,7 +488,21 @@ function createPullRequest(inputs) {
// The branch was created or updated
core.startGroup(`Pushing pull request branch to '${branchRemoteName}/${inputs.branch}'`);
if (inputs.signCommit) {
// Stash any uncommitted tracked and untracked changes
const stashed = yield git.stashPush(['--include-untracked']);
yield git.checkout(inputs.branch);
// await githubHelper.pushSignedCommits(
// branchRepository,
// inputs.branch,
// inputs.base,
// inputs.commitMessage,
// result.branchCommits
// )
yield githubHelper.pushSignedCommit(branchRepository, inputs.branch, inputs.base, inputs.commitMessage, result.branchFileChanges);
yield git.checkout('-');
if (stashed) {
yield git.stashPop();
}
}
else {
yield git.push([
@ -721,12 +738,12 @@ class GitCommandManager {
subject: detailLines[3],
body: detailLines.slice(4, endOfBodyIndex).join('\n'),
changes: lines.slice(endOfBodyIndex + 2, -1).map(line => {
const change = line.match(/^:\d{6} (\d{6}) \w{7} \w{7} ([AMD])\s+(.*)$/);
const change = line.match(/^:(\d{6}) (\d{6}) \w{7} \w{7} ([AMD])\s+(.*)$/);
if (change) {
return {
mode: change[1],
status: change[2],
path: change[3]
mode: change[3] === 'D' ? change[1] : change[2],
status: change[3],
path: change[4]
};
}
else {
@ -1195,6 +1212,7 @@ var __rest = (this && this.__rest) || function (s, e) {
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.GitHubHelper = void 0;
const core = __importStar(__nccwpck_require__(2186));
// import {Commit} from './git-command-manager'
const octokit_client_1 = __nccwpck_require__(5040);
const utils = __importStar(__nccwpck_require__(918));
const ERROR_PR_REVIEW_TOKEN_SCOPE = 'Validation Failed: "Could not resolve to a node with the global id of';
@ -1308,6 +1326,44 @@ class GitHubHelper {
return pull;
});
}
// async pushSignedCommits(
// branchCommits: Commit[],
// repoPath: string,
// branchRepository: string,
// branch: string,
// base: string,
// commitMessage: string
// ): Promise<void> {
// for (const commit of branchCommits) {
// await this.createCommit(commit, repoPath, branchRepository)
// }
// // update branch ref
// }
// private async createCommit(
// commit: Commit,
// repoPath: string,
// branchRepository: string
// ): Promise<void> {
// const tree = await Promise.all(
// commit.changes.map(async ({path, mode, status}) => {
// let sha: string | null = null
// if (status === 'A' || status === 'M') {
// const {data: blob} = await this.octokit.rest.git.createBlob({
// ...this.parseRepository(branchRepository),
// content: utils.readFileBase64([repoPath, path]),
// encoding: 'base64'
// })
// sha = blob.sha
// }
// return {
// path,
// mode,
// sha,
// type: 'blob'
// }
// })
// )
// }
pushSignedCommit(branchRepository, branch, base, commitMessage, branchFileChanges) {
return __awaiter(this, void 0, void 0, function* () {
var _a;

7
src/create-or-update-branch.ts
View file

@ -177,6 +177,7 @@ interface CreateOrUpdateBranchResult {
hasDiffWithBase: boolean
headSha: string
branchFileChanges?: BranchFileChanges
branchCommits: Commit[]
}
export async function createOrUpdateBranch(
@ -206,7 +207,8 @@ export async function createOrUpdateBranch(
action: 'none',
base: base,
hasDiffWithBase: false,
headSha: ''
headSha: '',
branchCommits: []
}
// Save the working base changes to a temporary branch
@ -351,6 +353,9 @@ export async function createOrUpdateBranch(
result.hasDiffWithBase = await isAhead(git, base, branch)
}
// Build the branch commits
result.branchCommits = await buildBranchCommits(git, base, branch)
// Build the branch file changes
result.branchFileChanges = await buildBranchFileChanges(git, base, branch)

14
src/create-pull-request.ts
View file

@ -196,6 +196,16 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
`Pushing pull request branch to '${branchRemoteName}/${inputs.branch}'`
)
if (inputs.signCommit) {
// Stash any uncommitted tracked and untracked changes
const stashed = await git.stashPush(['--include-untracked'])
await git.checkout(inputs.branch)
// await githubHelper.pushSignedCommits(
// branchRepository,
// inputs.branch,
// inputs.base,
// inputs.commitMessage,
// result.branchCommits
// )
await githubHelper.pushSignedCommit(
branchRepository,
inputs.branch,
@ -203,6 +213,10 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
inputs.commitMessage,
result.branchFileChanges
)
await git.checkout('-')
if (stashed) {
await git.stashPop()
}
} else {
await git.push([
'--force-with-lease',

10
src/git-command-manager.ts
View file

@ -172,12 +172,14 @@ export class GitCommandManager {
subject: detailLines[3],
body: detailLines.slice(4, endOfBodyIndex).join('\n'),
changes: lines.slice(endOfBodyIndex + 2, -1).map(line => {
const change = line.match(/^:\d{6} (\d{6}) \w{7} \w{7} ([AMD])\s+(.*)$/)
const change = line.match(
/^:(\d{6}) (\d{6}) \w{7} \w{7} ([AMD])\s+(.*)$/
)
if (change) {
return {
mode: change[1],
status: change[2],
path: change[3]
mode: change[3] === 'D' ? change[1] : change[2],
status: change[3],
path: change[4]
}
} else {
throw new Error(`Unexpected line format: ${line}`)

46
src/github-helper.ts
View file

@ -1,10 +1,11 @@
import * as core from '@actions/core'
import {Inputs} from './create-pull-request'
// import {Commit} from './git-command-manager'
import {Octokit, OctokitOptions} from './octokit-client'
import type {
Repository as TempRepository,
Ref,
Commit,
Commit as CommitTemp,
FileChanges
} from '@octokit/graphql-schema'
import {BranchFileChanges} from './create-or-update-branch'
@ -192,6 +193,47 @@ export class GitHubHelper {
return pull
}
// async pushSignedCommits(
// branchCommits: Commit[],
// repoPath: string,
// branchRepository: string,
// branch: string,
// base: string,
// commitMessage: string
// ): Promise<void> {
// for (const commit of branchCommits) {
// await this.createCommit(commit, repoPath, branchRepository)
// }
// // update branch ref
// }
// private async createCommit(
// commit: Commit,
// repoPath: string,
// branchRepository: string
// ): Promise<void> {
// const tree = await Promise.all(
// commit.changes.map(async ({path, mode, status}) => {
// let sha: string | null = null
// if (status === 'A' || status === 'M') {
// const {data: blob} = await this.octokit.rest.git.createBlob({
// ...this.parseRepository(branchRepository),
// content: utils.readFileBase64([repoPath, path]),
// encoding: 'base64'
// })
// sha = blob.sha
// }
// return {
// path,
// mode,
// sha,
// type: 'blob'
// }
// })
// )
// }
async pushSignedCommit(
branchRepository: string,
branch: string,
@ -350,7 +392,7 @@ export class GitHubHelper {
)
const commit = await this.octokit.graphql<{
createCommitOnBranch: {ref: Ref; commit: Commit}
createCommitOnBranch: {ref: Ref; commit: CommitTemp}
}>(pushCommitMutation, pushCommitVars)
core.debug(`Pushed commit - '${JSON.stringify(commit)}'`)