Merge pull request #264 from jdmansour/fix-reset-regression

Fix regression: can't reset some files anymore

Author: yuvipanda

nbgitpuller/pull.py

@@ -170,9 +170,11 @@ def reset_deleted_files(self):
             'git', 'ls-files', '--deleted', '-z'
         ], cwd=self.repo_dir).decode().strip().split('\0')
 
+        upstream_deleted = self.find_upstream_changed('D')
         for filename in deleted_files:
-            if filename:  # Filter out empty lines
-                yield from execute_cmd(['git', 'checkout', '--', filename], cwd=self.repo_dir)
+            # Filter out empty lines, and files that were deleted in the remote
+            if filename and filename not in upstream_deleted:
+                yield from execute_cmd(['git', 'checkout', 'origin/{}'.format(self.branch_name), '--', filename], cwd=self.repo_dir)
 
     def repo_is_dirty(self):
         """
@@ -196,13 +198,13 @@ def find_upstream_changed(self, kind):
         Return list of files that have been changed upstream belonging to a particular kind of change
         """
         output = subprocess.check_output([
-            'git', 'log', '..origin/{}'.format(self.branch_name),
-            '--oneline', '--name-status'
+            'git', 'diff', '..origin/{}'.format(self.branch_name),
+            '--name-status'
         ], cwd=self.repo_dir).decode()
         files = []
         for line in output.split('\n'):
             if line.startswith(kind):
-                files.append(os.path.join(self.repo_dir, line.split('\t', 1)[1]))
+                files.append(line.split('\t', 1)[1])
 
         return files
 
@@ -237,6 +239,7 @@ def rename_local_untracked(self):
         # Find what files have been added!
         new_upstream_files = self.find_upstream_changed('A')
         for f in new_upstream_files:
+            f = os.path.join(self.repo_dir, f)
             if os.path.exists(f):
                 # If there's a file extension, put the timestamp before that
                 ts = datetime.datetime.now().strftime('__%Y%m%d%H%M%S')

tests/test_gitpuller.py

@@ -351,6 +351,34 @@ def test_reset_file():
             assert puller.read_file('README.md') == pusher.read_file('README.md') == '1'
             assert puller.read_file('unicode🙂.txt') == pusher.read_file('unicode🙂.txt') == '2'
 
+
+def test_reset_file_after_changes():
+    """
+    Test that we get the latest version of a file if we:
+    - change the file locally
+    - sync, so the change is preserved
+    - delete the file, in order to reset it
+    - sync again
+    """
+    with Remote() as remote, Pusher(remote) as pusher:
+        pusher.push_file('README.md', 'original')
+
+        with Puller(remote) as puller:
+            puller.write_file('README.md', 'local change')
+            pusher.push_file('README.md', 'remote change')
+            puller.pull_all()
+
+            # It should keep the local change
+            assert puller.read_file('README.md') == 'local change'
+
+            # Delete the local file manually and pull
+            os.remove(os.path.join(puller.path, 'README.md'))
+            puller.pull_all()
+
+            # It should restore the remote change
+            assert puller.read_file('README.md') == 'remote change'
+
+
 def test_delete_conflicted_file():
     """
     Test that after deleting a file that had a conflict, we can still pull
@@ -374,6 +402,25 @@ def test_delete_conflicted_file():
             puller.pull_all()
 
 
+def test_delete_remotely_modify_locally():
+    """
+    Test that we can delete a file upstream, and edit it at the same time locally
+    """
+    with Remote() as remote, Pusher(remote) as pusher:
+        pusher.push_file('README.md', 'new')
+
+        with Puller(remote) as puller:
+            # Delete the file remotely
+            pusher.git('rm', 'README.md')
+            pusher.git('commit', '-m', 'Deleted file')
+            
+            # Edit locally
+            pusher.push_file('README.md', 'HELLO')
+            puller.pull_all()
+
+            assert puller.read_file('README.md') == 'HELLO'
+
+
 def test_delete_locally_and_remotely():
     """
     Test that sync works after deleting a file locally and remotely