Adam Simpkins 9980907d1e fix checkout to always report the specific list of files with conflicts ... Summary: This fixes the checkout code to always recurse into directories with conflicts, and accurately list all individual files with conflicts. Previously the checkout code always avoided recursing into unloaded directory inodes that were affected by the checkout. Since the inode was not loaded we can easily replace it without recursing into it. Unfortunately this resulted in an inaccurate conflict list--we would report the directory itself as a conflict. This is insufficient for our mercurial extension, which needs to know the specific list of files with conflicts, so it can ask mercurial to perform conflict resolution on them. Reviewed By: bolinfest Differential Revision: D4672373 fbshipit-source-id: ff400a4a6e25b8b0754c66cb067a69d553a5c98b		2017-03-09 20:57:27 -08:00
..
test	fix checkout to always report the specific list of files with conflicts	2017-03-09 20:57:27 -08:00
CheckoutAction.cpp	handle forced checkout of newly added files with conflicts	2017-02-22 12:21:48 -08:00
CheckoutAction.h	handle forced checkout of newly added files with conflicts	2017-02-22 12:21:48 -08:00
CheckoutContext.cpp	implement EdenMount::checkout()	2017-02-15 20:33:31 -08:00
CheckoutContext.h	implement EdenMount::checkout()	2017-02-15 20:33:31 -08:00
Dirstate.cpp	store overlay files using inode numbers instead of paths	2017-02-10 14:17:52 -08:00
Dirstate.h	implement Future-based recursive Inode lookup	2017-01-25 16:56:12 -08:00
DirstatePersistence.cpp	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00
DirstatePersistence.h	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00
EdenDispatcher.cpp	add symlink support to the overlay	2017-03-02 08:18:45 -08:00
EdenDispatcher.h	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00
EdenMount.cpp	add an EdenMount::resetCommit() method	2017-03-02 14:24:10 -08:00
EdenMount.h	add an EdenMount::resetCommit() method	2017-03-02 14:24:10 -08:00
EdenMounts.cpp	store overlay files using inode numbers instead of paths	2017-02-10 14:17:52 -08:00
EdenMounts.h	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00
FileData.cpp	store overlay files using inode numbers instead of paths	2017-02-10 14:17:52 -08:00
FileData.h	add an EdenMount::resetCommit() method	2017-03-02 14:24:10 -08:00
FileHandle.cpp	remove the remaining calls to getPathBuggy()	2017-02-17 18:44:32 -08:00
FileHandle.h	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00
FileInode.cpp	add an EdenMount::resetCommit() method	2017-03-02 14:24:10 -08:00
FileInode.h	update unlink() to load the child inode before removing it	2017-03-08 17:09:36 -08:00
InodeBase.cpp	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00
InodeBase.h	remove the remaining calls to getPathBuggy()	2017-02-17 18:44:32 -08:00
InodeError.cpp	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00
InodeError.h	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00
InodeMap.cpp	implement EdenMount::checkout()	2017-02-15 20:33:31 -08:00
InodeMap.h	store overlay files using inode numbers instead of paths	2017-02-10 14:17:52 -08:00
InodePtr-defs.h	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00
InodePtr.cpp	update unlink() to load the child inode before removing it	2017-03-08 17:09:36 -08:00
InodePtr.h	update unlink() to load the child inode before removing it	2017-03-08 17:09:36 -08:00
InodePtrFwd.h	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00
Overlay.cpp	store overlay files using inode numbers instead of paths	2017-02-10 14:17:52 -08:00
Overlay.h	store overlay files using inode numbers instead of paths	2017-02-10 14:17:52 -08:00
overlay.thrift	store overlay files using inode numbers instead of paths	2017-02-10 14:17:52 -08:00
ParentInodeInfo.h	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00
TARGETS	enable StreamingEdenService	2017-03-01 23:12:50 -08:00
TreeInode.cpp	fix checkout to always report the specific list of files with conflicts	2017-03-09 20:57:27 -08:00
TreeInode.h	update unlink() to load the child inode before removing it	2017-03-08 17:09:36 -08:00
TreeInodeDirHandle.cpp	remove the remaining calls to getPathBuggy()	2017-02-17 18:44:32 -08:00
TreeInodeDirHandle.h	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00