From a74579d709ee5805e7981585414bdfa90d8fec26 Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Thu, 29 May 2025 22:25:12 +0300 Subject: [PATCH 1/8] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=B4=D0=BE?= =?UTF-8?q?=D1=87=D0=BD=D1=8B=D1=85=20=D0=B8=D0=B5=D1=80=D0=BE=D0=B3=D0=BB?= =?UTF-8?q?=D0=B8=D1=84=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.en.md b/README.en.md index 622616c..6a217e0 100644 --- a/README.en.md +++ b/README.en.md @@ -93,7 +93,7 @@ snag restore [-h] [--no-pre] [--no-post] ``` - `--no-pre` — Skips pre-commands. -- `--no-post` —焦性 +- `--no-post` — Skips post-commands. - `` — Hash of the snapshot to restore. ### `snag list` From 8a64320214916404c148b1607ce163e1ea3c4d08 Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Fri, 30 May 2025 19:06:29 +0300 Subject: [PATCH 2/8] =?UTF-8?q?=D0=92=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8?= =?UTF-8?q?=D0=BE=D1=82=D0=B5=D0=BA=D1=83=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8?= =?UTF-8?q?=D1=8F=20=D1=80=D0=B0=D0=B7=D0=B1=D0=B8=D1=82=D0=B8=D1=8F=20?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D0=BF=D0=BE=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B2=D0=BE=D0=BC=D1=83=20=D1=81=D0=B8=D0=BC=D0=B2?= =?UTF-8?q?=D0=BE=D0=BB=D1=83=20=D0=BF=D1=80=D0=BE=D0=B1=D0=B5=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/snag/lib/lib.d | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/snag/lib/lib.d b/source/snag/lib/lib.d index 902691d..6db6056 100644 --- a/source/snag/lib/lib.d +++ b/source/snag/lib/lib.d @@ -2,6 +2,8 @@ module snag.lib.lib; import std.regex; import std.process; +import std.algorithm; +import std.string; bool isValidHash(string hash) { auto hashPattern = ctRegex!r"^[a-fA-F0-9]{7}$"; @@ -17,3 +19,9 @@ bool checkGit() { auto result = execute(["which", "git"]); return !result.status; } + +string[] splitByFirstSpace(string line) { + auto spaceIndex = line.indexOf(' '); + return spaceIndex == -1 ? + [line] : [line[0 .. spaceIndex], line[spaceIndex + 1..$]]; +} From 552b635b59cdce96d26645cf16521d8aa6fcb5c7 Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Fri, 30 May 2025 19:07:09 +0300 Subject: [PATCH 3/8] =?UTF-8?q?-=20=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=BD=D1=8B=D0=B9=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BF=D1=83=D1=82=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0/?= =?UTF-8?q?=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=D0=B5=20sta?= =?UTF-8?q?tus=20-=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=81=D0=B5=D0=BA=D1=83=D0=BD?= =?UTF-8?q?=D0=B4=20=D0=BF=D1=80=D0=B8=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B5=20info?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/snag/core/core.d | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/snag/core/core.d b/source/snag/core/core.d index 9917240..156d59a 100644 --- a/source/snag/core/core.d +++ b/source/snag/core/core.d @@ -131,7 +131,7 @@ class Snag { } writeln("The following list of files requires backup:"); result.output.split('\n')[0..$-1].map!(e => - e.strip.split + e.strip.splitByFirstSpace ).each!(e => writefln("\t%s\t/%s", gitStatus(e[0], true), e[1]) ); @@ -250,7 +250,7 @@ class Snag { [ "log", "--all", - "--date=format:%Y.%m.%d %H:%M", + "--date=format:%Y.%m.%d %H:%M:%S", "--pretty=" ~ format ], "Failed to retrieve the list of snapshots" From e43b792df8bd7558bbdd0dace62199a8d2da2f30 Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Fri, 30 May 2025 19:11:31 +0300 Subject: [PATCH 4/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D1=84=D0=B8=D0=B4=D0=B1?= =?UTF-8?q?=D1=8D=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=B2=D0=BE=D0=B7?= =?UTF-8?q?=D0=BD=D0=B8=D0=BA=D0=BD=D0=BE=D0=B2=D0=B5=D0=BD=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=BF=D1=80=D0=B5=D0=B4=D0=B2=D0=B8=D0=B4=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/app.d | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/app.d b/source/app.d index a79b3f8..d952688 100644 --- a/source/app.d +++ b/source/app.d @@ -237,7 +237,9 @@ int main(string[] args) return EXIT_FAILURE; } catch (Exception e) { writeln( - "AN UNEXPECTED ERROR HAS OCCURRED! PLEASE REPORT IT TO THE AUTHOR OF THE SNAG!\n\n", + "AN UNEXPECTED ERROR HAS OCCURRED!\n", + "PLEASE REPORT IT TO THE AUTHOR OF THE SNAG: ", + "alexander@zhirov.kz (Alexander Zhirov)\n\n", e ); return EXIT_FAILURE; From ee41d5f96d01794907c390209e1d7163c55896f8 Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Mon, 2 Jun 2025 00:26:38 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=A1=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=BE?= =?UTF-8?q?=D1=82=D0=BD=D0=BE=D1=81=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BF=D1=83=D1=82=D0=B8=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D0=BD=D0=B0=20=D0=B0=D0=B1?= =?UTF-8?q?=D1=81=D0=BE=D0=BB=D1=8E=D1=82=D0=BD=D1=8B=D0=B9,=20=D0=BA?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B9=20=D0=B8=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=20=D0=BF=D1=80=D0=BE=D0=B1?= =?UTF-8?q?=D0=BB=D0=B5=D0=BC=D1=83=20=D0=BF=D1=80=D0=B8=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B5=20=D1=81=20=D0=BF=D1=80=D0=BE=D0=B5?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D0=BC=20=D0=B2=D0=BE=20=D0=B2=D1=80=D0=B5?= =?UTF-8?q?=D0=BC=D1=8F=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F/=D0=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/snag/core/core.d | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/snag/core/core.d b/source/snag/core/core.d index 156d59a..62150fc 100644 --- a/source/snag/core/core.d +++ b/source/snag/core/core.d @@ -158,7 +158,7 @@ class Snag { result = execute(_baseCommand ~ ["rev-parse", "--short", "HEAD"]); if (result.status == 128) { // Если это самый первый коммит после инициализации репозитория - git(["add", "."], "Failed to prepare files for archiving"); + git(["add", _config.project], "Failed to prepare files for archiving"); git(["commit", "-m"] ~ message, "Failed to create a snapshot"); newSnapshot = git( ["rev-parse", "--short", "HEAD"], @@ -197,7 +197,7 @@ class Snag { "Failed to create a branch from the current state" ); git( - ["add", "."], + ["add", _config.project], "Failed to prepare files for archiving" ); git( @@ -211,7 +211,7 @@ class Snag { } else { // Если коммит является посленим в ветке git( - ["add", "."], + ["add", _config.project], "Failed to prepare files for archiving" ); git( @@ -273,7 +273,7 @@ class Snag { ); if (result.output.length) { git( - ["restore", "."], + ["restore", _config.project], "Failed to reset file changes state" ); git( @@ -406,7 +406,7 @@ class Snag { ); // Создание нового снимка на основе состояния файлов из распакованного архива - result = execute(customCommand ~ ["add", "."]); + result = execute(customCommand ~ ["add", tempDirectory]); result.status && throw new SnagException( "Failed to prepare files for archiving:\n" @@ -427,7 +427,7 @@ class Snag { // Сброс состояния файлов git( - ["restore", "."], + ["restore", _config.project], "Failed to reset file changes state" ); git( From 80ace62abffb0d4e48b275647fa13ee522260863 Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Mon, 2 Jun 2025 00:59:27 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=A3=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=20?= =?UTF-8?q?=D1=8F=D0=B2=D0=BD=D1=8B=D0=B9=20=D0=BF=D1=83=D1=82=D1=8C=20?= =?UTF-8?q?=D0=BA=20=D1=80=D0=B0=D0=B1=D0=BE=D1=87=D0=B5=D0=B9=20=D0=B4?= =?UTF-8?q?=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=B8=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=B0?= =?UTF-8?q?=D0=BD=D0=B4=D1=8B=20git,=20=D1=82=D0=B0=D0=BA=20=D0=BA=D0=B0?= =?UTF-8?q?=D0=BA=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=20snag=20=D0=B8=D0=B7?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=20=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=87=D0=B5=D0=B9=20=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=B8=20=D0=BD=D0=B5=20=D0=B2=D1=8B=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D0=BD=D1=8F=D0=BB=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D1=8B=D0=B5=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=20=D1=81=D1=82=D0=B0=D1=80=D1=8B=D1=85=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F=D1=85=20git?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/snag/core/core.d | 8 ++++---- source/snag/core/rules.d | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/snag/core/core.d b/source/snag/core/core.d index 62150fc..7f5f9a1 100644 --- a/source/snag/core/core.d +++ b/source/snag/core/core.d @@ -22,8 +22,8 @@ class Snag { this(SnagConfig config) { _baseCommand = format( - "git --git-dir=%s --work-tree=%s", - config.git, config.project + "git -C %s --git-dir=%s --work-tree=%s", + config.project, config.git, config.project ).split(); _config = config; @@ -381,8 +381,8 @@ class Snag { // Выполнение git команд относительно распакованного архива string[] customCommand = format( - "git --git-dir=%s --work-tree=%s", - _config.git, tempDirectory + "git -C %s --git-dir=%s --work-tree=%s", + tempDirectory, _config.git, tempDirectory ).split(); // Необходимо проверить, что текущее состояние файлов не идентично файлам распакованного архива diff --git a/source/snag/core/rules.d b/source/snag/core/rules.d index d8a2c9c..85fca40 100644 --- a/source/snag/core/rules.d +++ b/source/snag/core/rules.d @@ -75,8 +75,8 @@ class SnagRules { _gitignoreBak = _gitignore ~ ".bak"; _baseCommand = format( - "git --git-dir=%s --work-tree=%s", - config.git, config.project + "git -C %s --git-dir=%s --work-tree=%s", + config.project, config.git, config.project ).split(); generate(); From 4277eb752b3510f7a9c98ea328b1b7922b194c0c Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Mon, 2 Jun 2025 18:10:31 +0300 Subject: [PATCH 7/8] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BE=20=D0=B2=D0=B5=D1=80=D1=81?= =?UTF-8?q?=D0=B8=D0=B8=200.1.0-alpha.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/snag/version_.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/snag/version_.d b/source/snag/version_.d index 3dcb82b..5f8c518 100644 --- a/source/snag/version_.d +++ b/source/snag/version_.d @@ -1,3 +1,3 @@ module snag.version_; -enum snagVersion = "0.1.0-alpha.1"; +enum snagVersion = "0.1.0-alpha.2"; From a711af3ec87af5d885b281e7d5285599c71238db Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Mon, 2 Jun 2025 19:35:51 +0300 Subject: [PATCH 8/8] =?UTF-8?q?Revert=20"=D0=A1=D0=BC=D0=B5=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BD=D0=BE=D1=81=D0=B8=D1=82=D0=B5=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BF=D1=83=D1=82=D0=B8=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D0=BD=D0=B0=20=D0=B0?= =?UTF-8?q?=D0=B1=D1=81=D0=BE=D0=BB=D1=8E=D1=82=D0=BD=D1=8B=D0=B9,=20?= =?UTF-8?q?=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B9=20=D0=B8=D1=81=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B1=D0=BB=D0=B5=D0=BC=D1=83=20=D0=BF=D1=80=D0=B8=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B5=20=D1=81=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=BE=D0=BC=20=D0=B2=D0=BE=20=D0=B2=D1=80?= =?UTF-8?q?=D0=B5=D0=BC=D1=8F=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F/=D0=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Выявлены проблемы при добавлении в индекс. Использование утилиты на Windows показало, что при добавлении полный путь вызывает ошибку, так как он идентифицируется за пределами проекта. Решено использовать в рамках конктекста "-C " добавление как "add ." отсносительно корня проекта. This reverts commit ee41d5f96d01794907c390209e1d7163c55896f8. --- source/snag/core/core.d | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/snag/core/core.d b/source/snag/core/core.d index 7f5f9a1..4196481 100644 --- a/source/snag/core/core.d +++ b/source/snag/core/core.d @@ -158,7 +158,7 @@ class Snag { result = execute(_baseCommand ~ ["rev-parse", "--short", "HEAD"]); if (result.status == 128) { // Если это самый первый коммит после инициализации репозитория - git(["add", _config.project], "Failed to prepare files for archiving"); + git(["add", "."], "Failed to prepare files for archiving"); git(["commit", "-m"] ~ message, "Failed to create a snapshot"); newSnapshot = git( ["rev-parse", "--short", "HEAD"], @@ -197,7 +197,7 @@ class Snag { "Failed to create a branch from the current state" ); git( - ["add", _config.project], + ["add", "."], "Failed to prepare files for archiving" ); git( @@ -211,7 +211,7 @@ class Snag { } else { // Если коммит является посленим в ветке git( - ["add", _config.project], + ["add", "."], "Failed to prepare files for archiving" ); git( @@ -273,7 +273,7 @@ class Snag { ); if (result.output.length) { git( - ["restore", _config.project], + ["restore", "."], "Failed to reset file changes state" ); git( @@ -406,7 +406,7 @@ class Snag { ); // Создание нового снимка на основе состояния файлов из распакованного архива - result = execute(customCommand ~ ["add", tempDirectory]); + result = execute(customCommand ~ ["add", "."]); result.status && throw new SnagException( "Failed to prepare files for archiving:\n" @@ -427,7 +427,7 @@ class Snag { // Сброс состояния файлов git( - ["restore", _config.project], + ["restore", "."], "Failed to reset file changes state" ); git(