changeset 25745:501c51d60792 stable

convert: handle deleted files when converting from Perforce (issue4743)
author Eugene Baranov <eug.baranov@gmail.com>
date Fri, 03 Jul 2015 18:10:58 +0100
parents 97fd07e38b83
children 648323f41a89 96a38d44ba09
files hgext/convert/p4.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/p4.py	Fri Jul 03 18:10:58 2015 +0100
+++ b/hgext/convert/p4.py	Fri Jul 03 18:10:58 2015 +0100
@@ -164,7 +164,8 @@
                 raise IOError(d["generic"], data)
 
             elif code == "stat":
-                if d.get("action") == "purge":
+                action = d.get("action")
+                if action in ["purge", "delete", "move/delete"]:
                     return None, None
                 p4type = self.re_type.match(d["type"])
                 if p4type: