Mercurial > hgsubversion

diff hg_delta_editor.py @ 41:496c0354019c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improved handling of copies from outside of trunk.
author Augie Fackler <durin42@gmail.com>
date Sun, 26 Oct 2008 22:39:17 -0500
parents b3c7b844b782
children af7ac6c03452
line wrap: on
line diff
--- a/hg_delta_editor.py
+++ b/hg_delta_editor.py
@@ -532,8 +532,10 @@ class HgChangeReceiver(delta.Editor):
                 self.commit_branches_empty[branch] = True
             else:
                 self.commit_branches_empty[branch] = False
-        if not (self._is_path_valid(path) and copyfrom_path and
-                self._is_path_valid(copyfrom_path)):
+        if not self._is_path_valid(path) or not copyfrom_path:
+            return
+        if copyfrom_path and not self._is_path_valid(copyfrom_path):
+            self.missing_plaintexts.add('%s/' % path)
             return
 
         cp_f, br_from = self._path_and_branch_for_path(copyfrom_path)