merged master

ralsina · ralsina · commit f38312542a9a · 2015-07-23T21:31:31.000-03:00
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -8,6 +8,7 @@ Bugfixes
 --------
 
 * Don't auto-rebuild on changes to ".foo" or "foo~" or changes in folders.
+* auto should also rebuild in response to move events
 * Don’t get metadata from file if compiler-specific metadata exist (Issue #1904)
 * Fix PRETTY_URLS prompt for Windows (Issue #1901)
 * Fix reST and Markdown title extraction from documents (Issue #1895, #1898)
diff --git a/nikola/plugins/command/auto/__init__.py b/nikola/plugins/command/auto/__init__.py
@@ -264,8 +264,11 @@ def do_rebuild(self, event):
             print(errord)
 
     def do_refresh(self, event):
-        self.logger.info('REFRESHING: {0}'.format(event.src_path))
-        p = os.path.relpath(event.src_path, os.path.abspath(self.site.config['OUTPUT_FOLDER']))
+        # Move events have a dest_path, some editors like gedit use a
+        # move on larger save operations for write protection
+        event_path = event.dest_path if event.dest_path else event.src_path
+        self.logger.info('REFRESHING: {0}'.format(event_path))
+        p = os.path.relpath(event_path, os.path.abspath(self.site.config['OUTPUT_FOLDER']))
         refresh_signal.send(path=p)
 
     def serve_static(self, environ, start_response):
