From d548152c006a076601a84a3033bacc7edd3f8b23 Mon Sep 17 00:00:00 2001 From: Marcel Kloubert Date: Wed, 10 Jan 2018 18:53:56 +0100 Subject: [PATCH] bugfixes --- CHANGELOG.md | 2 +- package-lock.json | 2 +- package.json | 2 +- src/i18.ts | 1 + src/lang/de.ts | 1 + src/lang/en.ts | 1 + src/packages.ts | 10 +++++++++- 7 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2c2db8..db0b971 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ [![Share via Facebook](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Facebook.png)](https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded"e=vscode-deploy-reloaded) [![Share via Twitter](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Twitter.png)](https://twitter.com/intent/tweet?source=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&text=vscode-deploy-reloaded:%20https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&via=mjkloubert) [![Share via Google+](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Google+.png)](https://plus.google.com/share?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded) [![Share via Pinterest](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Pinterest.png)](https://pinterest.com/pin/create/button/?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&media=https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/demo1.gif&description=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.) [![Share via Reddit](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Reddit.png)](https://www.reddit.com/submit?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&title=vscode-deploy-reloaded) [![Share via LinkedIn](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/LinkedIn.png)](https://www.linkedin.com/shareArticle?mini=true&url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&title=vscode-deploy-reloaded&summary=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.&source=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded) [![Share via Wordpress](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Wordpress.png)](https://wordpress.com/press-this.php?u=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded"e=vscode-deploy-reloaded&s=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.&i=https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/demo1.gif) [![Share via Email](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Email.png)](mailto:?subject=vscode-deploy-reloaded&body=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20'vs-deploy'%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.:%20https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded) -## 0.28.2 (January 10th, 2018; import git files to packages) +## 0.28.3 (January 10th, 2018; import git files to packages) * bugfixes * can [import files from git](https://github.com/mkloubert/vscode-deploy-reloaded/wiki/import_git_files_to_packages) into a [package](https://github.com/mkloubert/vscode-deploy-reloaded/wiki#packages-) now diff --git a/package-lock.json b/package-lock.json index a216f80..4715bc3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "vscode-deploy-reloaded", - "version": "0.28.2", + "version": "0.28.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9d480df..85f8581 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-deploy-reloaded", "displayName": "Deploy (Reloaded)", "description": "Deploys files of a workspace to a destination.", - "version": "0.28.2", + "version": "0.28.3", "publisher": "mkloubert", "engines": { "vscode": "^1.19.0" diff --git a/src/i18.ts b/src/i18.ts index fb7e32d..5e61e9b 100644 --- a/src/i18.ts +++ b/src/i18.ts @@ -573,6 +573,7 @@ export interface Translation { }; errors?: { cannotDetectGitClient?: string; + cannotDetectGitFolder?: string; cannotDetectMappedPathInfoForFile?: string; cannotDetectPathInfoForFile?: string; cannotFindBranch?: string; diff --git a/src/lang/de.ts b/src/lang/de.ts index 4d01868..5373e76 100644 --- a/src/lang/de.ts +++ b/src/lang/de.ts @@ -567,6 +567,7 @@ export const translation: Translation = { }, errors: { cannotDetectGitClient: "git-Client konnte nicht für{0:trim,surround,leading_space} gefunden werden!", + cannotDetectGitFolder: "'.git'-Verzeichnis für{0:trim,surround,leading_space} wurde nicht gefunden!", cannotDetectMappedPathInfoForFile: "Gemappte Pfad-Informationen konnten für die Datei{0:trim,surround,leading_space} nicht ermittelt werden!", cannotDetectPathInfoForFile: "Pfad-Informationen konnten für die Datei{0:trim,surround,leading_space} nicht ermittelt werden!", cannotFindBranch: "Konnte Branch{0:trim,surround,leading_space} in{1:trim,surround,leading_space} nicht finden!", diff --git a/src/lang/en.ts b/src/lang/en.ts index e3d6de6..f09bf78 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -568,6 +568,7 @@ export const translation: Translation = { }, errors: { cannotDetectGitClient: "Could not find git client for{0:trim,surround,leading_space}!", + cannotDetectGitFolder: "Could not find '.git' folder for{0:trim,surround,leading_space}!", cannotDetectMappedPathInfoForFile: "Cannot detect mapped path information for file{0:trim,surround,leading_space}!", cannotDetectPathInfoForFile: "Cannot detect path information for file{0:trim,surround,leading_space}!", cannotFindBranch: "Cannot find branch{0:trim,surround,leading_space} in{1:trim,surround,leading_space}!", diff --git a/src/packages.ts b/src/packages.ts index 5a78370..46ba38c 100644 --- a/src/packages.ts +++ b/src/packages.ts @@ -590,6 +590,14 @@ export async function importPackageFilesFromGit(pkg: Package, operation: deploy_ ); } + const GIT_FOLDER = WORKSPACE.gitFolder; + if (false === GIT_FOLDER) { + throw new Error( + WORKSPACE.t('workspaces.errors.cannotDetectGitFolder', + WORKSPACE.name) + ); + } + let branchName = deploy_helpers.normalizeString(gitSettings.branch); if ('' === branchName) { branchName = 'master'; @@ -809,7 +817,7 @@ export async function importPackageFilesFromGit(pkg: Package, operation: deploy_ for (const CHG of CHANGES) { let f = CHG.file; if (!Path.isAbsolute(f)) { - f = Path.join(WORKSPACE.rootPath, f); + f = Path.join(GIT_FOLDER, f); } f = Path.resolve(f);