Merge pull request #1131 from efiop/master

dvc: list changed files
This commit is contained in:
Ruslan Kuprieiev
2018-09-18 13:14:39 +03:00
committed by GitHub
3 changed files with 51 additions and 11 deletions
+31 -2
View File
@@ -34,7 +34,7 @@ class Project(object):
self.dvc_dir = os.path.join(self.root_dir, self.DVC_DIR)
self.config = Config(self.dvc_dir)
self.scm = SCM(self.root_dir)
self.scm = SCM(self.root_dir, project=self)
self.lock = Lock(self.dvc_dir)
# NOTE: storing state and link_state in the repository itself to avoid
# any possible state corruption in 'shared cache dir' scenario.
@@ -48,10 +48,21 @@ class Project(object):
self.updater = Updater(self.dvc_dir)
self.prompt = Prompt()
self._files_to_git_add = []
self._ignore()
self.updater.check()
def _remind_to_git_add(self):
if len(self._files_to_git_add) == 0:
return
msg = '\nTo track the changes with git run:\n\n'
msg += '\tgit add ' + " ".join(self._files_to_git_add)
self.logger.info(msg)
@staticmethod
def init(root_dir=os.curdir, no_scm=False, force=False):
"""
@@ -69,10 +80,10 @@ class Project(object):
import shutil
from dvc.scm import SCM, Base
from dvc.config import Config
from dvc.logger import Logger
root_dir = os.path.abspath(root_dir)
dvc_dir = os.path.join(root_dir, Project.DVC_DIR)
scm = SCM(root_dir)
if type(scm) == Base and not no_scm:
msg = "{} is not tracked by any supported scm tool(e.g. git)."
@@ -93,6 +104,8 @@ class Project(object):
if scm.ignore_file():
scm.add([os.path.join(dvc_dir, scm.ignore_file())])
Logger.info('You can now commit the changes to git.')
return proj
def destroy(self):
@@ -148,6 +161,7 @@ class Project(object):
fnames = [fname]
stages = []
self._files_to_git_add = []
with self.state:
for f in fnames:
stage = Stage.loads(project=self,
@@ -160,6 +174,8 @@ class Project(object):
stage.dump()
stages.append(stage)
self._remind_to_git_add()
return stages
def remove(self, target, outs_only=False):
@@ -185,6 +201,7 @@ class Project(object):
[from_path])[0]
found = False
self._files_to_git_add = []
with self.state:
for stage in self.stages():
for out in stage.outs:
@@ -215,6 +232,8 @@ class Project(object):
stage.dump()
self._remind_to_git_add()
if not found:
msg = 'Unable to find dvcfile with output \'{}\''
raise DvcException(msg.format(from_path))
@@ -241,12 +260,15 @@ class Project(object):
self._check_output_duplication(stage.outs)
self._files_to_git_add = []
with self.state:
if not no_exec:
stage.run()
stage.dump()
self._remind_to_git_add()
return stage
def imp(self, url, out):
@@ -257,10 +279,14 @@ class Project(object):
self._check_output_duplication(stage.outs)
self._files_to_git_add = []
with self.state:
stage.run()
stage.dump()
self._remind_to_git_add()
return stage
def _reproduce_stage(self, stages, node, force, dry, interactive):
@@ -298,6 +324,7 @@ class Project(object):
core = config._config[config.SECTION_CORE]
interactive = core.get(config.SECTION_CORE_INTERACTIVE, False)
self._files_to_git_add = []
with self.state:
if recursive:
ret = self._reproduce_stages(G,
@@ -313,6 +340,8 @@ class Project(object):
dry,
interactive)
self._remind_to_git_add()
return ret
def _reproduce_stages(self, G, stages, node, force, dry, interactive):
+18 -9
View File
@@ -14,8 +14,9 @@ class FileNotInRepoError(DvcException):
class Base(object):
def __init__(self, root_dir=os.curdir):
self.root_dir = os.path.abspath(os.path.realpath(root_dir))
def __init__(self, root_dir=os.curdir, project=None):
self.project = project
self.root_dir = root_dir
@staticmethod
def is_repo(root_dir):
@@ -78,15 +79,16 @@ class Git(Base):
GITIGNORE = '.gitignore'
GIT_DIR = '.git'
def __init__(self, root_dir=os.curdir):
super(Git, self).__init__(root_dir)
def __init__(self, root_dir=os.curdir, project=None):
super(Git, self).__init__(root_dir, project=project)
import git
from git.exc import InvalidGitRepositoryError
try:
self.repo = git.Repo(root_dir)
except InvalidGitRepositoryError:
raise SCMError('{} is not a git repository'.format(root_dir))
msg = '{} is not a git repository'
raise SCMError(msg.format(root_dir))
# NOTE: fixing LD_LIBRARY_PATH for binary built by PyInstaller.
# http://pyinstaller.readthedocs.io/en/stable/runtime-information.html
@@ -136,7 +138,11 @@ class Git(Base):
if len(ignore_list) > 0:
content = '\n' + content
open(gitignore, 'a').write(content)
with open(gitignore, 'a') as fd:
fd.write(content)
if self.project is not None:
self.project._files_to_git_add.append(os.path.relpath(gitignore))
def ignore_remove(self, path):
entry, gitignore = self._get_gitignore(path)
@@ -152,6 +158,9 @@ class Git(Base):
with open(gitignore, 'w') as fd:
fd.writelines(filtered)
if self.project is not None:
self.project._files_to_git_add.append(os.path.relpath(gitignore))
def add(self, paths):
# NOTE: GitPython is not currently able to handle index version >= 3.
# See https://github.com/iterative/dvc/issues/610 for more details.
@@ -202,8 +211,8 @@ class Git(Base):
os.chmod(hook, 0o777)
def SCM(root_dir=os.curdir, no_scm=False):
def SCM(root_dir, no_scm=False, project=None):
if Git.is_repo(root_dir):
return Git(root_dir)
return Git(root_dir, project=project)
return Base(root_dir)
return Base(root_dir, project=project)
+2
View File
@@ -366,6 +366,8 @@ class Stage(object):
with open(fname, 'w') as fd:
yaml.safe_dump(self.dumpd(), fd, default_flow_style=False)
self.project._files_to_git_add.append(os.path.relpath(fname))
def save(self):
for dep in self.deps:
dep.save()