Change lcd/cd to lcd/tcd/cd based change directory workflow

autoload/magit/git.vim

@@ -50,15 +50,15 @@ endfunction
 function! magit#git#is_work_tree(path)
 	let dir = getcwd()
 	try
-		call magit#utils#lcd(a:path)
+		call magit#utils#chdir(a:path)
 		let top_dir=magit#utils#strip(
 					\ system(g:magit_git_cmd . " rev-parse --show-toplevel")) . "/"
 		if ( v:shell_error != 0 )
 			return ''
 		endif
 		return top_dir
 	finally
-		call magit#utils#lcd(dir)
+		call magit#utils#chdir(dir)
 	endtry
 endfunction
 
@@ -68,7 +68,7 @@ endfunction
 function! magit#git#set_top_dir(path)
 	let dir = getcwd()
 	try
-		call magit#utils#lcd(a:path)
+		call magit#utils#chdir(a:path)
 		let top_dir=magit#utils#strip(
 					\ system(g:magit_git_cmd . " rev-parse --show-toplevel")) . "/"
 		if ( v:shell_error != 0 )
@@ -81,7 +81,7 @@ function! magit#git#set_top_dir(path)
 		let b:magit_top_dir=top_dir
 		let b:magit_git_dir=git_dir
 	finally
-		call magit#utils#lcd(dir)
+		call magit#utils#chdir(dir)
 	endtry
 endfunction
 

autoload/magit/state.vim

@@ -273,7 +273,7 @@ function! magit#state#update() dict
 
 	let dir = getcwd()
 	try
-		call magit#utils#lcd(magit#git#top_dir())
+		call magit#utils#chdir(magit#git#top_dir())
 		call magit#utils#refresh_submodule_list()
 		for [mode, diff_dict_mode] in items(self.dict)
 			let status_list = magit#git#get_status()
@@ -288,7 +288,7 @@ function! magit#state#update() dict
 			endfor
 		endfor
 	finally
-		call magit#utils#lcd(dir)
+		call magit#utils#chdir(dir)
 	endtry
 
 	" remove files that have changed their mode or been committed/deleted/discarded...

autoload/magit/utils.vim

@@ -20,12 +20,43 @@ function! magit#utils#is_submodule(dirname)
 	return ( index(s:submodule_list, a:dirname) != -1 )
 endfunction
 
-" s:magit_cd_cmd: plugin variable to choose lcd/cd command, 'lcd' if exists,
-" 'cd' otherwise
-let s:magit_cd_cmd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-" magit#utils#lcd: helper function to lcd. use cd if lcd doesn't exists
-function! magit#utils#lcd(dir)
-	execute s:magit_cd_cmd . a:dir
+" magit#utils#chdir will change the directory respecting
+" local/tab-local/global directory settings.
+function! magit#utils#chdir(dir)
+  " This is a dirty hack to fix tcd breakages on neovim.
+  " Future work should be based on nvim API and has a `if has('nvim')` check.
+  if has('nvim')
+    let chdir = haslocaldir() ? 'lcd' : haslocaldir(-1, 0) ? 'tcd' : 'cd'
+  else
+    let chdir = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
+  endif
+  execute chdir . ' ' . a:dir
+endfunction
+
+" magit#utils#pushd_root goes to git root directory, saving current directory
+" prior to changing the cwd.
+function! magit#utils#pushd_root()
+  if has('nvim')
+    let cwd = haslocaldir(-1, 0) ? getcwd(-1, 0) : getcwd()
+  else
+    let cwd = getcwd()
+  endif
+
+  let root = magit#git#top_dir()
+
+  if root !=? cwd
+    call magit#utils#chdir(root)
+    let g:_vimagit_cwd = cwd
+  endif
+endfunction
+
+
+" magit#utils#popd_cwd returns to previous directory
+function! magit#utils#popd_cwd()
+  if exists('g:_vimagit_cwd')
+    call magit#utils#chdir(g:_vimagit_cwd)
+    unlet g:_vimagit_cwd
+  endif
 endfunction
 
 " magit#utils#clear_undo: this function clear local undo history.
@@ -53,9 +84,8 @@ endfunction
 " param[in] ...: command + optional args
 " return: command output as a string
 function! magit#utils#system(...)
-	let dir = getcwd()
 	try
-		execute s:magit_cd_cmd . magit#git#top_dir()
+    call magit#utils#pushd_root()
 		" List as system() input is since v7.4.247, it is safe to check
 		" systemlist, which is sine v7.4.248
 		if exists('*systemlist')
@@ -75,7 +105,7 @@ function! magit#utils#system(...)
 			endif
 		endif
 	finally
-		execute s:magit_cd_cmd . dir
+    call magit#utils#popd_cwd()
 	endtry
 endfunction
 
@@ -86,17 +116,16 @@ endfunction
 " param[in] ...: command + optional args to execute, args can be List or String
 " return: command output as a list
 function! magit#utils#systemlist(...)
-	let dir = getcwd()
 	try
-		execute s:magit_cd_cmd . magit#git#top_dir()
+		call magit#utils#pushd_root()
 		" systemlist since v7.4.248
 		if exists('*systemlist')
 			return call('systemlist', a:000)
 		else
 			return split(call('magit#utils#system', a:000), '\n')
 		endif
 	finally
-		execute s:magit_cd_cmd . dir
+		call magit#utils#popd_cwd()
 	endtry
 endfunction