Merge pull request #2190 from NativeScript/raikov/fix-symlinks-prepare

tzraikov · web-flow · commit 3f0c49c3f569 · 2016-11-04T13:48:15.000+02:00
Fixes time mismatch issues with prepare when using symlinks
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit a650ccc520ae46655bfb9e08160c676d39814d00
+Subproject commit 901e91e293bc931558835243dc0076fbdfd55b60
diff --git a/lib/services/project-changes-info.ts b/lib/services/project-changes-info.ts
@@ -102,6 +102,10 @@ export class ProjectChangesInfo {
 			if (fileStats.mtime.getTime() > mtime) {
 				return true;
 			}
+			let lFileStats = this.$fs.getLsStats(filePath).wait();
+			if (lFileStats.mtime.getTime() > mtime) {
+				return true;
+			}
 			if (fileStats.isDirectory()) {
 				if (this.containsNewerFiles(filePath, skipDir, mtime)) {
 					return true;
diff --git a/test/stubs.ts b/test/stubs.ts
@@ -121,6 +121,10 @@ export class FileSystemStub implements IFileSystem {
 		return undefined;
 	}
 
+	getLsStats(path: string): IFuture<IFsStats> {
+		return undefined;
+	}
+
 	isEmptyDir(directoryPath: string): IFuture<boolean> {
 		return Future.fromResult(true);
 	}

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,10 @@ export class FileSystemStub implements IFileSystem {`
`121`	`121`	`return undefined;`
`122`	`122`	`}`
`123`	`123`
	`124`	`+ getLsStats(path: string): IFuture<IFsStats> {`
	`125`	`+ return undefined;`
	`126`	`+ }`
	`127`	`+`
`124`	`128`	`isEmptyDir(directoryPath: string): IFuture<boolean> {`
`125`	`129`	`return Future.fromResult(true);`
`126`	`130`	`}`