@tangelo/tangelo-configuration-toolkit 1.11.1 → 1.11.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +1 -1
- package/package.json +1 -1
- package/src/modules/migrate/index.js +1 -1
- package/src/modules/version/index.js +3 -3
package/index.js
CHANGED
|
@@ -80,7 +80,7 @@ global._git = {
|
|
|
80
80
|
user: execGitCommand(`config --get user.email`, _paths.repo),
|
|
81
81
|
commitLocal: execGitCommand(`log -1 --format=%D;%H;%cd --date=iso-strict`, _paths.repo, ['branch', 'hash', 'date']),
|
|
82
82
|
commitLocalTdi: {
|
|
83
|
-
...execGitCommand(`log -1 --format=%D;%H;%cd --date=
|
|
83
|
+
...execGitCommand(`log -1 --format=%D;%H;%cd --date=iso-strict`, path.join(_paths.repo, _paths.tdi),['tags', 'hash', 'date']),
|
|
84
84
|
after (commitHash) {
|
|
85
85
|
return execGitCommand(`merge-base --is-ancestor ${commitHash} ${this.hash}`, path.join(_paths.repo, _paths.tdi), null, 0);
|
|
86
86
|
},
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tangelo/tangelo-configuration-toolkit",
|
|
3
|
-
"version": "1.11.
|
|
3
|
+
"version": "1.11.2",
|
|
4
4
|
"description": "Tangelo Configuration Toolkit is a command-line toolkit which offers support for developing a Tangelo configuration.",
|
|
5
5
|
"bin": {
|
|
6
6
|
"tct": "bin/index.js",
|
|
@@ -59,7 +59,7 @@ module.exports = function migrate (argv) {
|
|
|
59
59
|
a.projects.forEach(p => {
|
|
60
60
|
projectFolders.push(p.path_dbconfig ? p.path_dbconfig.join('/') : (_repoconfig.customer.dirname+'/'+p.dirname));
|
|
61
61
|
// push cmscustom path if it differs from dbconfig path
|
|
62
|
-
if (p.path_dbconfig != p.path_cmscustom) projectFolders.push(p.path_cmscustom.join('/'));
|
|
62
|
+
if (p.path_dbconfig.join('/') != p.path_cmscustom.join('/')) projectFolders.push(p.path_cmscustom.join('/'));
|
|
63
63
|
});
|
|
64
64
|
// Set filter to chosen active documents
|
|
65
65
|
filter = projectFolders.length == 1 ? `**/${projectFolders}/**` : `**/{${projectFolders.join(',')}}/**`;
|
|
@@ -22,7 +22,7 @@ const getGitInfo = (argv) => {
|
|
|
22
22
|
execGitCommand(`fetch -pf --all`, path.join(_paths.repo, _paths.tdi));
|
|
23
23
|
|
|
24
24
|
// Get branches containing TDI HEAD commit
|
|
25
|
-
const releaseBranches = execGitCommand(`branch --contains ${_git.commitLocalTdi.hash}`, path.join(_paths.repo, _paths.tdi)).match(/release\/[^\s]+/gsm);
|
|
25
|
+
const releaseBranches = execGitCommand(`branch --all --contains ${_git.commitLocalTdi.hash}`, path.join(_paths.repo, _paths.tdi)).match(/release\/[^\s]+/gsm);
|
|
26
26
|
if (releaseBranches) {
|
|
27
27
|
releaseBranches.forEach(b => {
|
|
28
28
|
// Get number of commits behind
|
|
@@ -38,8 +38,8 @@ const getGitInfo = (argv) => {
|
|
|
38
38
|
|
|
39
39
|
// Create table rows for TDI submodule info
|
|
40
40
|
gitSubmoduleInfo.addRow({
|
|
41
|
-
property: `Commit date
|
|
42
|
-
value: `${_git.commitLocalTdi.date.toLocaleDateString('
|
|
41
|
+
property: `Commit date`,
|
|
42
|
+
value: `${_git.commitLocalTdi.date.toLocaleDateString(`en-gb`,{day:'numeric',month:'short',year:'numeric',hour:'2-digit',minute:'2-digit'})}`
|
|
43
43
|
});
|
|
44
44
|
if (firstBranch) {
|
|
45
45
|
gitSubmoduleInfo.addRow({
|