diff --git a/dvc/command/checkout.py b/dvc/command/checkout.py index b135642ab..bdc2dd93b 100644 --- a/dvc/command/checkout.py +++ b/dvc/command/checkout.py @@ -4,6 +4,7 @@ from dvc.command.base import CmdBase, DvcLock from dvc.logger import Logger from dvc.system import System + class CmdCheckout(CmdBase): def __init__(self, settings): super(CmdCheckout, self).__init__(settings) @@ -34,6 +35,30 @@ class CmdCheckout(CmdBase): def run(self): with DvcLock(self.is_locker, self.git): - items = self.settings.path_factory.all_existing_data_items() - self.checkout(items) + curr_commit = self.git.curr_commit + prev_items = [] + try: + self.git.checkout_previous() + prev_items = self.settings.path_factory.all_existing_data_items() + except Exception as ex: + Logger.error(u'Unable to get '.format(ex)) + return 1 + finally: + self.git.checkout(curr_commit) + + curr_items = self.settings.path_factory.all_existing_data_items() + self.checkout(curr_items) + + self.remove_files(list(set(prev_items) - set(curr_items))) return 0 + + @staticmethod + def remove_files(removed_items_set): + for item in removed_items_set: + Logger.info(u'Removing data file not from the current branch {}'.format(item.data.relative)) + os.remove(item.data.relative) + dir = os.path.dirname(item.data.relative) + if not os.listdir(dir): + Logger.info(u'Removing directory not from the current branch {}'.format(dir)) + os.removedirs(dir) + pass diff --git a/dvc/git_wrapper.py b/dvc/git_wrapper.py index e142bc8b6..391805ab4 100644 --- a/dvc/git_wrapper.py +++ b/dvc/git_wrapper.py @@ -299,6 +299,18 @@ class GitWrapper(GitWrapperI): Logger.debug('[dvc-git] Checkout file {} before last merge. Command: {}'.format(fname, cmd)) Executor.exec_cmd_only_success(cmd.split()) + @staticmethod + def checkout(commit): + Logger.debug('[dvc-git] Checkout {}'.format(commit)) + cmd = 'git checkout {}'.format(commit) + Executor.exec_cmd(cmd.split()) + + @staticmethod + def checkout_previous(): + Logger.debug('[dvc-git] Checkout previous') + cmd = 'git checkout -' + Executor.exec_cmd(cmd.split()) + def separate_dependency_files_and_dirs(self, code_dependencies): code_files = [] code_dirs = []