diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bdee997c8..1c9dbd00e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.39.1] - 2022-10-12 +### Fixed +- Handling of old commits as new ones in new branches ([#2130](https://github.com/scm-manager/scm-manager/pull/2130)) + ## [2.39.0] - 2022-09-14 ### Added - Reindex mechanism for search ([#2104](https://github.com/scm-manager/scm-manager/pull/2104)) @@ -1148,3 +1152,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.38.0]: https://scm-manager.org/download/2.38.0 [2.38.1]: https://scm-manager.org/download/2.38.1 [2.39.0]: https://scm-manager.org/download/2.39.0 +[2.39.1]: https://scm-manager.org/download/2.39.1 diff --git a/gradle.properties b/gradle.properties index 115ef58761..a139578024 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.39.1-SNAPSHOT +version = 2.39.2-SNAPSHOT org.gradle.jvmargs=-Xmx1024M diff --git a/gradle/changelog/fix_empty_branches.yaml b/gradle/changelog/fix_empty_branches.yaml new file mode 100644 index 0000000000..1bfe7bf549 --- /dev/null +++ b/gradle/changelog/fix_empty_branches.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Handling of old commits as new ones in new branches ([#2130](https://github.com/scm-manager/scm-manager/pull/2130)) diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index b6acb1e49e..596522f76c 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-git-plugin", "private": true, - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.39.1-SNAPSHOT" + "@scm-manager/ui-plugins": "2.39.2-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/CollectingPackParserListener.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/CollectingPackParserListener.java index 11dba9ce83..0cbda8c4ef 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/CollectingPackParserListener.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/CollectingPackParserListener.java @@ -123,21 +123,13 @@ public class CollectingPackParserListener implements PackParserListener if (newObjectIdMap != null) { newObjectIds = ImmutableSet.copyOf(newObjectIdMap); - } - else - { - logger.warn("pack parser returned no newObjectIds"); - newObjectIds = ImmutableSet.of(); - } - - if (newObjectIds.isEmpty()) - { - logger.debug("new object ids are empty, we treat every commit as new"); - } - else - { logger.debug("collected {} new object ids", newObjectIds.size()); } + else + { + logger.warn("pack parser returned no newObjectIds; no commit will be treated as a new one"); + newObjectIds = Set.of(); + } } /** @@ -161,10 +153,7 @@ public class CollectingPackParserListener implements PackParserListener //~--- get methods ---------------------------------------------------------- /** - * Returns {@code true} if the object is a new object. The method will also - * return {@code true}, if the pack parser does not return a list with new - * object ids. - * + * Returns {@code true} if the object is a new object. * * @param object rev object * @@ -174,7 +163,7 @@ public class CollectingPackParserListener implements PackParserListener { ensureAfterWasCalled(); - return newObjectIds.isEmpty() || newObjectIds.contains(object.getId()); + return newObjectIds.contains(object.getId()); } //~--- methods -------------------------------------------------------------- diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index cb42e326e5..233d62d34d 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-hg-plugin", "private": true, - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.39.1-SNAPSHOT" + "@scm-manager/ui-plugins": "2.39.2-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index eadf11c39d..6c4e427e6f 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-legacy-plugin", "private": true, - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.39.1-SNAPSHOT" + "@scm-manager/ui-plugins": "2.39.2-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index e9134084e8..48a1a01c36 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-svn-plugin", "private": true, - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.39.1-SNAPSHOT" + "@scm-manager/ui-plugins": "2.39.2-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-ui/e2e-tests/package.json b/scm-ui/e2e-tests/package.json index 01ceb9d981..7dce34b052 100644 --- a/scm-ui/e2e-tests/package.json +++ b/scm-ui/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/e2e-tests", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "description": "End to end Tests for SCM-Manager", "main": "index.js", "author": "Eduard Heimbuch ", diff --git a/scm-ui/ui-api/package.json b/scm-ui/ui-api/package.json index cfd4fcfcad..1a1114d54c 100644 --- a/scm-ui/ui-api/package.json +++ b/scm-ui/ui-api/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-api", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "description": "React hook api for the SCM-Manager backend", "main": "build/index.js", "module": "build/index.mjs", @@ -29,7 +29,7 @@ "tsup": "^5.12.6" }, "dependencies": { - "@scm-manager/ui-types": "2.39.1-SNAPSHOT", + "@scm-manager/ui-types": "2.39.2-SNAPSHOT", "fetch-mock-jest": "^1.5.1", "gitdiff-parser": "^0.2.2", "query-string": "6.14.1", diff --git a/scm-ui/ui-buttons/package.json b/scm-ui/ui-buttons/package.json index 82cbfe4e93..fe9684e4fb 100644 --- a/scm-ui/ui-buttons/package.json +++ b/scm-ui/ui-buttons/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-buttons", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -27,7 +27,7 @@ }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.39.1-SNAPSHOT", + "@scm-manager/ui-api": "2.39.2-SNAPSHOT", "@scm-manager/eslint-config": "^2.16.0", "@babel/core": "^7.17.8", "@scm-manager/tsconfig": "^2.12.0", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index bfd8ef6373..84f34fbd29 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-components", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -20,14 +20,14 @@ "update-storyshots": "jest --testPathPattern=\"storyshots.test.ts\" --collectCoverage=false -u" }, "devDependencies": { - "@scm-manager/ui-syntaxhighlighting": "2.39.1-SNAPSHOT", - "@scm-manager/ui-text": "2.39.1-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.39.2-SNAPSHOT", + "@scm-manager/ui-text": "2.39.2-SNAPSHOT", "@scm-manager/babel-preset": "^2.13.1", "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/jest-preset": "^2.13.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-tests": "2.39.1-SNAPSHOT", + "@scm-manager/ui-tests": "2.39.2-SNAPSHOT", "@storybook/addon-actions": "^6.4.20", "@storybook/addon-essentials": "^6.4.20", "@storybook/addon-interactions": "^6.4.20", @@ -66,9 +66,9 @@ }, "dependencies": { "@headlessui/react": "^1.4.3", - "@scm-manager/ui-api": "2.39.1-SNAPSHOT", - "@scm-manager/ui-extensions": "2.39.1-SNAPSHOT", - "@scm-manager/ui-types": "2.39.1-SNAPSHOT", + "@scm-manager/ui-api": "2.39.2-SNAPSHOT", + "@scm-manager/ui-extensions": "2.39.2-SNAPSHOT", + "@scm-manager/ui-types": "2.39.2-SNAPSHOT", "classnames": "^2.2.6", "date-fns": "^2.4.1", "deepmerge": "^4.2.2", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index 8441cebcd9..ea45e597c8 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-extensions", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.39.1-SNAPSHOT", + "@scm-manager/ui-types": "2.39.2-SNAPSHOT", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index af0920791c..3f7a51aa83 100644 --- a/scm-ui/ui-legacy/package.json +++ b/scm-ui/ui-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-legacy", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -12,9 +12,9 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@scm-manager/ui-api": "2.39.1-SNAPSHOT", - "@scm-manager/ui-extensions": "2.39.1-SNAPSHOT", - "@scm-manager/ui-types": "2.39.1-SNAPSHOT", + "@scm-manager/ui-api": "2.39.2-SNAPSHOT", + "@scm-manager/ui-extensions": "2.39.2-SNAPSHOT", + "@scm-manager/ui-types": "2.39.2-SNAPSHOT", "react": "^17.0.1", "react-redux": "^5.0.7", "redux": "^4.0.0" diff --git a/scm-ui/ui-modules/package.json b/scm-ui/ui-modules/package.json index 7fd4770c4f..a23369c53e 100644 --- a/scm-ui/ui-modules/package.json +++ b/scm-ui/ui-modules/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-modules", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "private": true, "main": "build/index.js", "module": "build/index.mjs", diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index fced1aab39..a2e120f0cb 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,13 +1,13 @@ { "name": "@scm-manager/ui-plugins", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "license": "MIT", "bin": { "ui-plugins": "./bin/ui-plugins.js" }, "dependencies": { - "@scm-manager/ui-components": "2.39.1-SNAPSHOT", - "@scm-manager/ui-extensions": "2.39.1-SNAPSHOT", + "@scm-manager/ui-components": "2.39.2-SNAPSHOT", + "@scm-manager/ui-extensions": "2.39.2-SNAPSHOT", "classnames": "^2.2.6", "query-string": "6.14.1", "react": "^17.0.1", @@ -26,9 +26,9 @@ "@scm-manager/plugin-scripts": "^1.2.2", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-scripts": "2.39.1-SNAPSHOT", - "@scm-manager/ui-tests": "2.39.1-SNAPSHOT", - "@scm-manager/ui-types": "2.39.1-SNAPSHOT", + "@scm-manager/ui-scripts": "2.39.2-SNAPSHOT", + "@scm-manager/ui-tests": "2.39.2-SNAPSHOT", + "@scm-manager/ui-types": "2.39.2-SNAPSHOT", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", "@types/fetch-mock": "^7.3.1", diff --git a/scm-ui/ui-polyfill/package.json b/scm-ui/ui-polyfill/package.json index 230057f377..43ed9b44c8 100644 --- a/scm-ui/ui-polyfill/package.json +++ b/scm-ui/ui-polyfill/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-polyfill", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "description": "Polyfills for SCM-Manager UI", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-scripts/package.json b/scm-ui/ui-scripts/package.json index 3812086885..e27f9888b7 100644 --- a/scm-ui/ui-scripts/package.json +++ b/scm-ui/ui-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-scripts", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "description": "Build scripts for SCM-Manager", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index 8a4fa2e38b..aa52251dfe 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-styles", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "MIT", diff --git a/scm-ui/ui-syntaxhighlighting/package.json b/scm-ui/ui-syntaxhighlighting/package.json index 6076d9e830..c67a1214b9 100644 --- a/scm-ui/ui-syntaxhighlighting/package.json +++ b/scm-ui/ui-syntaxhighlighting/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-syntaxhighlighting", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.39.1-SNAPSHOT", + "@scm-manager/ui-text": "2.39.2-SNAPSHOT", "nanoid": "^3.3.2", "react-diff-view": "^2.4.10", "refractor": "^4.5.0" diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index a69b3211bf..818d96c830 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-tests", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "MIT", diff --git a/scm-ui/ui-text/package.json b/scm-ui/ui-text/package.json index 7300320c9b..2955a5e3e7 100644 --- a/scm-ui/ui-text/package.json +++ b/scm-ui/ui-text/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-text", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "private": true, "main": "build/index.js", "module": "build/index.mjs", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index 6fe9e9fb41..485f27bb99 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-types", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "description": "Typescript types for SCM-Manager related Objects", "main": "src/index.ts", "files": [ diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json index 90f49c89dd..75aa740032 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,16 +1,16 @@ { "name": "@scm-manager/ui-webapp", - "version": "2.39.1-SNAPSHOT", + "version": "2.39.2-SNAPSHOT", "private": true, "dependencies": { "@headlessui/react": "^1.4.3", - "@scm-manager/ui-api": "2.39.1-SNAPSHOT", - "@scm-manager/ui-components": "2.39.1-SNAPSHOT", - "@scm-manager/ui-extensions": "2.39.1-SNAPSHOT", - "@scm-manager/ui-modules": "2.39.1-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.39.1-SNAPSHOT", - "@scm-manager/ui-text": "2.39.1-SNAPSHOT", - "@scm-manager/ui-legacy": "2.39.1-SNAPSHOT", + "@scm-manager/ui-api": "2.39.2-SNAPSHOT", + "@scm-manager/ui-components": "2.39.2-SNAPSHOT", + "@scm-manager/ui-extensions": "2.39.2-SNAPSHOT", + "@scm-manager/ui-modules": "2.39.2-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.39.2-SNAPSHOT", + "@scm-manager/ui-text": "2.39.2-SNAPSHOT", + "@scm-manager/ui-legacy": "2.39.2-SNAPSHOT", "classnames": "^2.2.5", "history": "^4.10.1", "i18next": "^19.6.0", @@ -39,7 +39,7 @@ "devDependencies": { "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/jest-preset": "^2.13.0", - "@scm-manager/ui-tests": "2.39.1-SNAPSHOT", + "@scm-manager/ui-tests": "2.39.2-SNAPSHOT", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3",