diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24c31ec..771b1c0 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.4 (January 10th, 2018; import git files to packages)
+## 0.28.5 (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 1bdcc61..3321cdf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "vscode-deploy-reloaded",
- "version": "0.28.4",
+ "version": "0.28.5",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 7207a23..8d260d1 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.4",
+ "version": "0.28.5",
"publisher": "mkloubert",
"engines": {
"vscode": "^1.19.0"
diff --git a/src/tools.ts b/src/tools.ts
index 913c85e..5b55008 100644
--- a/src/tools.ts
+++ b/src/tools.ts
@@ -794,20 +794,13 @@ export async function showPackageFiles(context: vscode.ExtensionContext,
const PACKAGE_NAME = deploy_packages.getPackageName(PACKAGE);
const WORKSPACE = PACKAGE.__workspace;
- const FILES = Enumerable.from( await WORKSPACE.findFilesByFilter(PACKAGE) ).select(f => {
+ const PACKAGE_FILES = Enumerable.from( await WORKSPACE.findFilesByFilter(PACKAGE) ).select(f => {
let realtivePath = WORKSPACE.toRelativePath(f);
if (false === realtivePath) {
realtivePath = f;
}
return realtivePath;
- }).distinct()
- .orderBy(f => {
- return Path.dirname(f).length;
- }).thenBy(f => {
- return deploy_helpers.normalizeString( Path.dirname(f) );
- }).thenBy(f => {
- return deploy_helpers.normalizeString( Path.basename(f) );
}).toArray();
let md = "# " + HTML_ENCODER.encode( WORKSPACE.t('workspace') ) + "\n";
@@ -815,11 +808,32 @@ export async function showPackageFiles(context: vscode.ExtensionContext,
md += "## " + WORKSPACE.t('files') + "\n";
- if (FILES.length > 0) {
+ let files = PACKAGE_FILES.map(f => f);
+
+ // import files from git
+ await deploy_packages.importPackageFilesFromGit(PACKAGE,
+ deploy_contracts.DeployOperation.Deploy,
+ files);
+ await deploy_packages.importPackageFilesFromGit(PACKAGE,
+ deploy_contracts.DeployOperation.Pull,
+ files);
+ await deploy_packages.importPackageFilesFromGit(PACKAGE,
+ deploy_contracts.DeployOperation.Delete,
+ files);
+
+ files = Enumerable.from(files).distinct().orderBy(f => {
+ return Path.dirname(f).length;
+ }).thenBy(f => {
+ return deploy_helpers.normalizeString( Path.dirname(f) );
+ }).thenBy(f => {
+ return deploy_helpers.normalizeString( Path.basename(f) );
+ }).toArray();
+
+ if (files.length > 0) {
md += "| " + WORKSPACE.t('file') + " | D-O-S1 | D-O-C2 | S-W-O3 | R-O-C4 \n";
md += "| ---- |\n";
- for (const F of FILES) {
+ for (const F of files) {
const FULL_PATH = Path.join(
WORKSPACE.rootPath, F
);