Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(dev-infra): misc fixes for the compare master and patch script #37150

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

fix(dev-infra): misc fixes for the compare master and patch script #37150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions scripts/compare-master-to-patch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ const ignorePatterns = [
'build(docs-infra): upgrade cli command docs sources',
];

// Limit the log history to start from v9.0.0 release date.
// Note: this is needed only for 9.0.x branch to avoid RC history.
// Remove it once `9.1.x` branch is created.
const after = '--after="2020-02-05"';
// String to be displayed as a version for initial commits in a branch
// (before first release from that branch).
const initialVersion = 'initial';

// Helper methods

Expand All @@ -55,7 +54,7 @@ function toArray(rawGitCommandOutput) {
}

function maybeExtractReleaseVersion(commit) {
const versionRegex = /release: cut the (.*?) release|docs: release notes for the (.*?) release/;
const versionRegex = /release: cut the (.*?) release/;
const matches = commit.match(versionRegex);
return matches ? matches[1] || matches[2] : null;
}
Expand All @@ -67,7 +66,7 @@ function maybeExtractReleaseVersion(commit) {
function collectCommitsAsMap(rawGitCommits) {
const commits = toArray(rawGitCommits);
const commitsMap = new Map();
let version = 'initial';
let version = initialVersion;
commits.reverse().forEach((item) => {
const skip = ignorePatterns.some(pattern => item.indexOf(pattern) > -1);
// Keep track of the current version while going though the list of commits, so that we can use
Expand All @@ -89,7 +88,8 @@ function collectCommitsAsMap(rawGitCommits) {
}

function getCommitInfoAsString(version, commitInfo) {
return `[${version}+] ${commitInfo}`;
const formattedVersion = version === initialVersion ? version : `${version}+`;
return `[${formattedVersion}] ${commitInfo}`;
}

/**
Expand Down Expand Up @@ -149,9 +149,9 @@ function main() {

// Extract master-only and patch-only commits using `git log` command.
const masterCommits = execGitCommand(
`git log --cherry-pick --oneline --right-only ${after} upstream/${branch}...upstream/master`);
`git log --cherry-pick --oneline --right-only upstream/${branch}...upstream/master`);
const patchCommits = execGitCommand(
`git log --cherry-pick --oneline --left-only ${after} upstream/${branch}...upstream/master`);
`git log --cherry-pick --oneline --left-only upstream/${branch}...upstream/master`);

// Post-process commits and convert raw data into a Map, so that we can diff it easier.
const masterCommitsMap = collectCommitsAsMap(masterCommits);
Expand Down