From af120041b68f2b9221bdd3cf0047f7e20705aa5a Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 29 Nov 2016 17:04:41 -0800
Subject: Move file functions to vcpkg_Files.h

---
 toolsrc/src/vcpkg_Files.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 611aa7450..42e815cc2 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -58,4 +58,19 @@ namespace vcpkg {namespace Files
 
         return current_dir;
     }
+
+    void recursive_find_files_with_extension_in_dir(const fs::path& dir, const std::string& extension, std::vector<fs::path>* output)
+    {
+        recursive_find_matching_paths_in_dir(dir, [&extension](const fs::path& current)
+                                             {
+                                                 return !fs::is_directory(current) && current.extension() == extension;
+                                             }, output);
+    }
+
+    std::vector<fs::path> recursive_find_files_with_extension_in_dir(const fs::path& dir, const std::string& extension)
+    {
+        std::vector<fs::path> v;
+        recursive_find_files_with_extension_in_dir(dir, extension, &v);
+        return v;
+    }
 }}
-- 
cgit v1.2.3


From 0b996a002ec6d90d8a132e7603553b60b332c9fe Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 29 Nov 2016 18:08:00 -0800
Subject: [Files] Add functions to get all files of a dir recursively or
 non-recursively

---
 toolsrc/src/vcpkg_Files.cpp | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 42e815cc2..bb34915d7 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -73,4 +73,34 @@ namespace vcpkg {namespace Files
         recursive_find_files_with_extension_in_dir(dir, extension, &v);
         return v;
     }
+
+    void recursive_find_all_files_in_dir(const fs::path& dir, std::vector<fs::path>* output)
+    {
+        recursive_find_matching_paths_in_dir(dir, [&](const fs::path& current)
+        {
+            return !fs::is_directory(current);
+        }, output);
+    }
+
+    std::vector<fs::path> recursive_find_all_files_in_dir(const fs::path& dir)
+    {
+        std::vector<fs::path> v;
+        recursive_find_all_files_in_dir(dir, &v);
+        return v;
+    }
+
+    void non_recursive_find_all_files_in_dir(const fs::path& dir, std::vector<fs::path>* output)
+    {
+        non_recursive_find_matching_paths_in_dir(dir, [&](const fs::path& current)
+        {
+            return !fs::is_directory(current);
+        }, output);
+    }
+
+    std::vector<fs::path> non_recursive_find_all_files_in_dir(const fs::path& dir)
+    {
+        std::vector<fs::path> v;
+        non_recursive_find_all_files_in_dir(dir, &v);
+        return v;
+    }
 }}
-- 
cgit v1.2.3


From 35152bb4fddc63f6166611a6a01fe7429e955743 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 29 Nov 2016 18:08:53 -0800
Subject: Use new Files functions

---
 toolsrc/src/vcpkg_Files.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index bb34915d7..86e7080e4 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -77,9 +77,9 @@ namespace vcpkg {namespace Files
     void recursive_find_all_files_in_dir(const fs::path& dir, std::vector<fs::path>* output)
     {
         recursive_find_matching_paths_in_dir(dir, [&](const fs::path& current)
-        {
-            return !fs::is_directory(current);
-        }, output);
+                                             {
+                                                 return !fs::is_directory(current);
+                                             }, output);
     }
 
     std::vector<fs::path> recursive_find_all_files_in_dir(const fs::path& dir)
@@ -92,9 +92,9 @@ namespace vcpkg {namespace Files
     void non_recursive_find_all_files_in_dir(const fs::path& dir, std::vector<fs::path>* output)
     {
         non_recursive_find_matching_paths_in_dir(dir, [&](const fs::path& current)
-        {
-            return !fs::is_directory(current);
-        }, output);
+                                                 {
+                                                     return !fs::is_directory(current);
+                                                 }, output);
     }
 
     std::vector<fs::path> non_recursive_find_all_files_in_dir(const fs::path& dir)
-- 
cgit v1.2.3


From 0042316c4b57cf91ded8e474a8dda354340e7381 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 29 Nov 2016 18:08:53 -0800
Subject: Introduce filesystem_fs.h

---
 toolsrc/src/vcpkg_Files.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 86e7080e4..b86edb4ab 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -1,10 +1,7 @@
 #include "vcpkg_Files.h"
 #include <fstream>
-#include <filesystem>
 #include <regex>
 
-namespace fs = std::tr2::sys;
-
 namespace vcpkg {namespace Files
 {
     static const std::regex FILESYSTEM_INVALID_CHARACTERS_REGEX = std::regex(R"([\/:*?"<>|])");
-- 
cgit v1.2.3


From ae379fedea589552ad7c98eb350c492ce830fb48 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Wed, 30 Nov 2016 14:08:43 -0800
Subject: Move print_paths() to Files::

---
 toolsrc/src/vcpkg_Files.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index b86edb4ab..698579736 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -1,6 +1,7 @@
 #include "vcpkg_Files.h"
 #include <fstream>
 #include <regex>
+#include "vcpkg_System.h"
 
 namespace vcpkg {namespace Files
 {
@@ -100,4 +101,14 @@ namespace vcpkg {namespace Files
         non_recursive_find_all_files_in_dir(dir, &v);
         return v;
     }
+
+    void print_paths(const std::vector<fs::path>& paths)
+    {
+        System::println("");
+        for (const fs::path& p : paths)
+        {
+            System::println("    %s", p.generic_string());
+        }
+        System::println("");
+    }
 }}
-- 
cgit v1.2.3


From e4548a8cf46b20b8e89ab75ee9201e3b244484ba Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 15 Dec 2016 18:19:22 -0800
Subject: Add Files::read_all_lines() and Files::write_all_lines()

---
 toolsrc/src/vcpkg_Files.cpp | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 698579736..889ceb055 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -42,6 +42,35 @@ namespace vcpkg {namespace Files
         return std::move(output);
     }
 
+    expected<std::vector<std::string>> read_all_lines(const fs::path& file_path)
+    {
+        std::fstream file_stream(file_path, std::ios_base::in | std::ios_base::binary);
+        if (file_stream.fail())
+        {
+            return std::errc::no_such_file_or_directory;
+        }
+
+        std::vector<std::string> output;
+        std::string line;
+        while (std::getline(file_stream, line))
+        {
+            output.push_back(line);
+        }
+        file_stream.close();
+
+        return std::move(output);
+    }
+
+    void write_all_lines(const fs::path& file_path, const std::vector<std::string>& lines)
+    {
+        std::fstream output(file_path, std::ios_base::out | std::ios_base::binary | std::ios_base::trunc);
+        for (const std::string& line : lines)
+        {
+            output << line << "\n";
+        }
+        output.close();
+    }
+
     fs::path find_file_recursively_up(const fs::path& starting_dir, const std::string& filename)
     {
         fs::path current_dir = starting_dir;
-- 
cgit v1.2.3


From fdec39f452df368a0dd9184cd556607857605832 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 16 Dec 2016 19:37:11 -0800
Subject: Use check_exit() instead of check_throw()

---
 toolsrc/src/vcpkg_Files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 889ceb055..853a57d16 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -9,7 +9,7 @@ namespace vcpkg {namespace Files
 
     void check_is_directory(const fs::path& dirpath)
     {
-        Checks::check_throw(fs::is_directory(dirpath), "The path %s is not a directory", dirpath.string());
+        Checks::check_exit(fs::is_directory(dirpath), "The path %s is not a directory", dirpath.string());
     }
 
     bool has_invalid_chars_for_filesystem(const std::string s)
-- 
cgit v1.2.3


From b666e90c32e58a673331b303e64e299cc1168aa2 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 16 Dec 2016 19:38:02 -0800
Subject: Pass by ref

---
 toolsrc/src/vcpkg_Files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 853a57d16..9e7002a37 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -12,7 +12,7 @@ namespace vcpkg {namespace Files
         Checks::check_exit(fs::is_directory(dirpath), "The path %s is not a directory", dirpath.string());
     }
 
-    bool has_invalid_chars_for_filesystem(const std::string s)
+    bool has_invalid_chars_for_filesystem(const std::string& s)
     {
         return std::regex_search(s, FILESYSTEM_INVALID_CHARACTERS_REGEX);
     }
-- 
cgit v1.2.3


From aad0cc4c042aad87b2b52eded0e465ed01e799c1 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 16 Dec 2016 19:40:58 -0800
Subject: Files::get_contents() -> Files::read_contents()

---
 toolsrc/src/vcpkg_Files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 9e7002a37..48283e43f 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -17,7 +17,7 @@ namespace vcpkg {namespace Files
         return std::regex_search(s, FILESYSTEM_INVALID_CHARACTERS_REGEX);
     }
 
-    expected<std::string> get_contents(const fs::path& file_path) noexcept
+    expected<std::string> read_contents(const fs::path& file_path) noexcept
     {
         std::fstream file_stream(file_path, std::ios_base::in | std::ios_base::binary);
         if (file_stream.fail())
-- 
cgit v1.2.3


From 0b5e2e9e76e66b566cf4d3f68146fdbdff2bac05 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 5 Jan 2017 12:47:08 -0800
Subject: Use nested namespace definition

---
 toolsrc/src/vcpkg_Files.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 48283e43f..1d4faa773 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -3,7 +3,7 @@
 #include <regex>
 #include "vcpkg_System.h"
 
-namespace vcpkg {namespace Files
+namespace vcpkg::Files
 {
     static const std::regex FILESYSTEM_INVALID_CHARACTERS_REGEX = std::regex(R"([\/:*?"<>|])");
 
@@ -140,4 +140,4 @@ namespace vcpkg {namespace Files
         }
         System::println("");
     }
-}}
+}
-- 
cgit v1.2.3


From 050e4a0f7a8156bd862f95c06ea298ab6697e147 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 27 Jan 2017 12:49:09 -0800
Subject: Introduce precompiled headers

---
 toolsrc/src/vcpkg_Files.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 1d4faa773..87700238d 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -1,6 +1,5 @@
+#include "pch.h"
 #include "vcpkg_Files.h"
-#include <fstream>
-#include <regex>
 #include "vcpkg_System.h"
 
 namespace vcpkg::Files
-- 
cgit v1.2.3