Merge pull request #1021 from efiop/master

dvc: properly resolve dvc name for external local files

Author: efiop

dvc/stage.py

@@ -231,7 +231,8 @@ def _stage_fname_cwd(cls, fname, cwd, outs, add):
         if not fname:
             fname = path.basename(out.path) + cls.STAGE_FILE_SUFFIX
 
-        cwd = path.dirname(out.path) if not cwd or add else cwd
+        if not cwd or (add and out.is_local):
+            cwd = path.dirname(out.path)
 
         return (fname, cwd)
 

tests/test_add.py

@@ -1,6 +1,8 @@
 import os
 import stat
 import shutil
+import filecmp
+import tempfile
 
 from dvc.main import main
 from dvc.utils import file_md5
@@ -96,6 +98,22 @@ def test(self):
         self.assertEqual(stage.relpath, self.DATA_SUB + '.dvc')
 
 
+class TestAddExternalLocalFile(TestDvc):
+    def test(self):
+        dname = tempfile.mkdtemp()
+        fname = os.path.join(dname, 'foo')
+        shutil.copyfile(self.FOO, fname)
+
+        stage = self.dvc.add(fname)
+        self.assertNotEqual(stage, None)
+        self.assertEqual(len(stage.deps), 0)
+        self.assertEqual(len(stage.outs), 1)
+        self.assertEqual(stage.relpath, 'foo.dvc')
+        self.assertEqual(len(os.listdir(dname)), 1)
+        self.assertTrue(os.path.isfile(fname))
+        self.assertTrue(filecmp.cmp(fname, 'foo', shallow=False))
+
+
 class TestCmdAdd(TestDvc):
     def test(self):
         ret = main(['add',