From 44c1980988c5c41e425f5fc54a04d4ec9a70325d Mon Sep 17 00:00:00 2001 From: "Claus Schneider(Eficode)" Date: Fri, 26 Apr 2024 13:14:59 +0200 Subject: [PATCH 1/4] gh-4 : convert ascii drawning to mermaid - both graph and gitgraph --- README.md | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7e8ebf5..aa1efd9 100644 --- a/README.md +++ b/README.md @@ -33,13 +33,37 @@ A few remarks, aspects and thoughts when retrieving the artifacts Git normally stacks the history hence you cannot delete commit in the middle of the history. `git-artifact` make a "horizontal" history - i.e the commits are not stacked on top of each other, but next to each other. The history is basically like this + +``` mermaid +%%{init: { 'gitGraph': {'showCommitLabel': false, 'showBranches': false}} }%% +gitGraph + commit id: "init" tag: "init" + branch latest-1.0 + branch latest-1.1 + branch latest-1.2 + branch latest-2.0 + branch latest + checkout latest-1.0 + commit id: "1.0/bin" tag: "1.0/bin" + commit id: "1.0/src" tag: "1.0/src" + checkout latest-1.1 + commit id: "1.1/bin" tag: "1.1" + checkout latest-1.2 + commit id: "1.2/bin" tag: "1.2" + checkout latest-2.0 + commit id: "2.0/bin" tag: "2.0" + checkout latest-1.0 + commit id: "2.0/test" tag: "2.0/test" +``` + +``` mermaid +graph TD; + 0.1/bin --> main; + 0.2/test --> 0.2/src --> 0.2/bin --> main; + 0.2/bin --> main; + 0.3/bin --> main; ``` - [0.2/test] - | -[0.1/bin] [0.2/bin] [0.3/bin] -| / / -
-``` + `git-artifacts` has all the functions available that make the above history straight for and natural workflow. ### Prerequisites From 208b9b1947192148f39aca16e65b268d8d1c9925 Mon Sep 17 00:00:00 2001 From: "Claus Schneider(Eficode)" Date: Fri, 26 Apr 2024 13:26:57 +0200 Subject: [PATCH 2/4] gh-4 : convert ascii drawning to mermaid - both graph and gitgraph - fix --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index aa1efd9..92b4150 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Git normally stacks the history hence you cannot delete commit in the middle of The history is basically like this ``` mermaid -%%{init: { 'gitGraph': {'showCommitLabel': false, 'showBranches': false}} }%% +%%{init: { 'gitGraph': {'showCommitLabel': false, 'showBranches': true}} }%% gitGraph commit id: "init" tag: "init" branch latest-1.0 @@ -60,7 +60,6 @@ gitGraph graph TD; 0.1/bin --> main; 0.2/test --> 0.2/src --> 0.2/bin --> main; - 0.2/bin --> main; 0.3/bin --> main; ``` From 39075a51b1aa63f17d3c3d993bec17a0c87310be Mon Sep 17 00:00:00 2001 From: "Claus Schneider(Eficode)" Date: Fri, 26 Apr 2024 15:40:14 +0200 Subject: [PATCH 3/4] gh-4 : convert ascii drawning to mermaid - both graph and gitgraph - fix --- README.md | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 92b4150..2f67286 100644 --- a/README.md +++ b/README.md @@ -55,15 +55,9 @@ gitGraph checkout latest-1.0 commit id: "2.0/test" tag: "2.0/test" ``` - -``` mermaid -graph TD; - 0.1/bin --> main; - 0.2/test --> 0.2/src --> 0.2/bin --> main; - 0.3/bin --> main; -``` -`git-artifacts` has all the functions available that make the above history straight for and natural workflow. + +`git-artifacts` has all the functions available that make the above history natural workflow. ### Prerequisites The tool uses tags hence the producer need to tag push-rights. It is also beneficial to have tag delete-rights to clean old artifacts. From 615de3c70c7eadcb3bcd6389864814743529a5aa Mon Sep 17 00:00:00 2001 From: "Claus Schneider(Eficode)" Date: Fri, 26 Apr 2024 18:34:17 +0200 Subject: [PATCH 4/4] gh-4 : convert ascii drawning to mermaid - both graph and gitgraph --- README.md | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 2f67286..79791d3 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ I have, over the years in the embbeded enterprise industry, constantly come across many scenarios where zipping, downloading and unzipping generic dependencies and maintaining workspace has slowed down turn around time for developers and CI system. Git is a fantastic zipper it self and you get integrity of workspaces for free. -Git has always been mentioned to be bad for storing artifacts due to the block chain technology and distrubuted architecture. Git-artifact make sure this problem is handled by storing commits "horisontally" using tags rather than the default "stacked" way. It gives a few advantages compared to standard usage of git: +Git has always been mentioned to be bad for storing artifacts due to the block chain technology and distrubuted architecture. `git-artifact` make sure this problem is handled by storing commits "horisontally" using tags rather than the default "stacked" way. It gives a few advantages compared to standard usage of git: - Firstly; You can garbage collect intermidiate artifacts by just deleting the tag - Secondly; You only fetch what you need - even without using shallow. @@ -35,14 +35,19 @@ Git normally stacks the history hence you cannot delete commit in the middle of The history is basically like this ``` mermaid -%%{init: { 'gitGraph': {'showCommitLabel': false, 'showBranches': true}} }%% -gitGraph - commit id: "init" tag: "init" - branch latest-1.0 - branch latest-1.1 - branch latest-1.2 - branch latest-2.0 - branch latest +%%{init: { + 'gitGraph': { + 'loglevel' : 'debug', + 'orientation': 'vertical', + 'showCommitLabel': true, + 'showBranches': false + }} }%% +gitGraph: + commit id: "init" tag: "init" type: HIGHLIGHT + branch latest-1.0 order: 2 + branch latest-1.1 order: 3 + branch latest-1.2 order: 4 + branch latest-2.0 order: 5 checkout latest-1.0 commit id: "1.0/bin" tag: "1.0/bin" commit id: "1.0/src" tag: "1.0/src" @@ -52,12 +57,17 @@ gitGraph commit id: "1.2/bin" tag: "1.2" checkout latest-2.0 commit id: "2.0/bin" tag: "2.0" + checkout main + commit id: "update scripts" tag: "main" type: HIGHLIGHT + branch foo order: 1 + checkout foo + commit id: "3.0/bin" tag: "3.0/bin" checkout latest-1.0 commit id: "2.0/test" tag: "2.0/test" ``` -`git-artifacts` has all the functions available that make the above history natural workflow. +`git-artifact` has all the functions available that make the above history natural workflow. ### Prerequisites The tool uses tags hence the producer need to tag push-rights. It is also beneficial to have tag delete-rights to clean old artifacts.