Patchwork convert: handle deleted files when converting from Perforce (issue4743)

login
register
mail settings
Submitter Eugene Baranov
Date July 3, 2015, 5:16 p.m.
Message ID <CAPEtdqwT5NAfwyHHQaTFbauCK4sguiTtBdvBKLovUc_zQg7xuQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/9895/
State Superseded
Headers show

Comments

Eugene Baranov - July 3, 2015, 5:16 p.m.
# HG changeset patch
# User Eugene Baranov <eug.baranov@gmail.com>
# Date 1435943458 -3600
#      Fri Jul 03 18:10:58 2015 +0100
# Branch stable
# Node ID b3db00879bbc85d1946d49c5df7832578efeb86e
# Parent  6047b60cdd0984b60191bdb3b272d87c2691ffe4
convert: handle deleted files when converting from Perforce (issue4743)
Matt Mackall - July 7, 2015, 7:37 p.m.
On Fri, 2015-07-03 at 18:16 +0100, Eugene Baranov wrote:
> # HG changeset patch
> # User Eugene Baranov <eug.baranov@gmail.com>
> # Date 1435943458 -3600
> #      Fri Jul 03 18:10:58 2015 +0100
> # Branch stable
> # Node ID b3db00879bbc85d1946d49c5df7832578efeb86e
> # Parent  6047b60cdd0984b60191bdb3b272d87c2691ffe4
> convert: handle deleted files when converting from Perforce (issue4743)

Queued for stable, thanks. Congratulations on your first Mercurial
patch!
Eugene Baranov - July 8, 2015, 8:49 a.m.
Hmm, I think something went wrong when importing changeset since for
some reason https://selenic.com/repo/hg/rev/97fd07e38b83 doesn't
actually contain any changes: "diffstat0 files changed, 0
insertions(+), 0 deletions(-)"

On 7 July 2015 at 20:37, Matt Mackall <mpm@selenic.com> wrote:
> On Fri, 2015-07-03 at 18:16 +0100, Eugene Baranov wrote:
>> # HG changeset patch
>> # User Eugene Baranov <eug.baranov@gmail.com>
>> # Date 1435943458 -3600
>> #      Fri Jul 03 18:10:58 2015 +0100
>> # Branch stable
>> # Node ID b3db00879bbc85d1946d49c5df7832578efeb86e
>> # Parent  6047b60cdd0984b60191bdb3b272d87c2691ffe4
>> convert: handle deleted files when converting from Perforce (issue4743)
>
> Queued for stable, thanks. Congratulations on your first Mercurial
> patch!
>
> --
> Mathematics is the supreme nostalgia of our time.
>

Patch

diff --git a/hgext/convert/p4.py b/hgext/convert/p4.py
--- a/hgext/convert/p4.py
+++ b/hgext/convert/p4.py
@@ -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: