Mercurial > hg
comparison hgext/convert/p4.py @ 25760:648323f41a89
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 08 Jul 2015 16:43:49 -0500 |
parents | 17a9da909186 501c51d60792 |
children | 220d9ae6a9a8 |
comparison
equal
deleted
inserted
replaced
25759:ff11c1565c04 | 25760:648323f41a89 |
---|---|
208 | 208 |
209 if code == "error": | 209 if code == "error": |
210 raise IOError(d["generic"], data) | 210 raise IOError(d["generic"], data) |
211 | 211 |
212 elif code == "stat": | 212 elif code == "stat": |
213 if d.get("action") == "purge": | 213 action = d.get("action") |
214 if action in ["purge", "delete", "move/delete"]: | |
214 return None, None | 215 return None, None |
215 p4type = self.re_type.match(d["type"]) | 216 p4type = self.re_type.match(d["type"]) |
216 if p4type: | 217 if p4type: |
217 mode = "" | 218 mode = "" |
218 flags = (p4type.group(1) or "") + (p4type.group(3) or "") | 219 flags = (p4type.group(1) or "") + (p4type.group(3) or "") |