[WIP]Start replacing Dir.chdir with paths

Joshua Liebowitz · Joshua Liebowitz · commit 3d789f7c5595 · 2018-06-25T11:07:21.000-07:00
Instead of using chdir blocks, we should use absolute paths so that we can enable threaded usage of the library Fixes #355
diff --git a/lib/git.rb b/lib/git.rb
@@ -108,7 +108,7 @@ def self.export(repository, name, options = {})
     options.delete(:remote)
     repo = clone(repository, name, {:depth => 1}.merge(options))
     repo.checkout("origin/#{options[:branch]}") if options[:branch]
-    Dir.chdir(repo.dir.to_s) { FileUtils.rm_r '.git' }
+    FileUtils.rm_r(File.join(repo.dir.to_s, '.git'))
   end
   
   # Same as g.config, but forces it to be at the global level
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -144,9 +144,7 @@ def repo
     
     # returns the repository size in bytes
     def repo_size
-      Dir.chdir(repo.path) do
-        return `du -s`.chomp.split.first.to_i
-      end
+      return `du -s #{repo.path}`.chomp.split.first.to_i
     end
     
     def set_index(index_file, check = true)
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -310,7 +310,7 @@ def branches_all
     def list_files(ref_dir)
       dir = File.join(@git_dir, 'refs', ref_dir)
       files = []
-      Dir.chdir(dir) { files = Dir.glob('**/*').select { |f| File.file?(f) } } rescue nil
+      files = Dir.glob(File.join(dir, '**/*')).select { |f| File.file?(f) }
       files
     end
 
@@ -442,11 +442,7 @@ def config_get(name)
         command('config', ['--get', name])
       end
 
-      if @git_dir
-        Dir.chdir(@git_dir, &do_get)
-      else
-        build_list.call
-      end
+      do_get.call(@git_dir)
     end
 
     def global_config_get(name)
@@ -458,11 +454,7 @@ def config_list
         parse_config_list command_lines('config', ['--list'])
       end
 
-      if @git_dir
-        Dir.chdir(@git_dir, &build_list)
-      else
-        build_list.call
-      end
+      build_list.call(@git_dir)
     end
 
     def global_config_list
diff --git a/lib/git/status.rb b/lib/git/status.rb
@@ -171,14 +171,14 @@ def construct_status
 
     def fetch_untracked
       ignore = @base.lib.ignored_files
-
-      Dir.chdir(@base.dir.path) do
-        Dir.glob('**/*', File::FNM_DOTMATCH) do |file|
-          next if @files[file] || File.directory?(file) ||
-                  ignore.include?(file) || file =~ %r{^.git\/.+}
-
-          @files[file] = { path: file, untracked: true }
-        end
+      root_base_dir_path_length = File.join(@base.dir.path, '/').length
+      Dir.glob(File.join(@base.dir.path, '**/*'), File::FNM_DOTMATCH) do |file|
+        # Strip off the `base.dir.path` to make these relative paths
+        relative_file_name = file.slice(root_base_dir_path_length..file.length)
+        next if @files[relative_file_name] || File.directory?(file) ||
+                ignore.include?(relative_file_name) || relative_file_name =~ %r{^.git\/.+}
+
+        @files[relative_file_name] = { path: relative_file_name, untracked: true }
       end
     end
 
