Re: [PATCH 4/8] git-p4: accommodate new move/delete type in p4
On Sat, Feb 5, 2011 at 11:52 PM, Pete Wyckoff <pw@padd.com> wrote:
Show 6 quoted lines
> Change 562d53f (2010-11-21) recognized the new move/delete type
> for git-p4 sync, but it can also show up in an initial clone and
> labels output. Instead of replicating this in three places,
> hoist the definition somewhere global.
>
> Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-By: Tor Arvid Lund <torarvid@gmail.com>
Show 57 quoted lines
> ---
> contrib/fast-import/git-p4 | 12 +++++++-----
> 1 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
> index d2ba215..db19b17 100755
> --- a/contrib/fast-import/git-p4
> +++ b/contrib/fast-import/git-p4
> @@ -834,6 +834,8 @@ class P4Submit(Command):
> return True
>
> class P4Sync(Command):
> + delete_actions = ( "delete", "move/delete", "purge" )
> +
> def __init__(self):
> Command.__init__(self)
> self.options = [
> @@ -1038,10 +1040,10 @@ class P4Sync(Command):
>
> if includeFile:
> filesForCommit.append(f)
> - if f['action'] not in ('delete', 'move/delete', 'purge'):
> - filesToRead.append(f)
> - else:
> + if f['action'] in self.delete_actions:
> filesToDelete.append(f)
> + else:
> + filesToRead.append(f)
>
> # deleted files...
> for f in filesToDelete:
> @@ -1127,7 +1129,7 @@ class P4Sync(Command):
>
> cleanedFiles = {}
> for info in files:
> - if info["action"] in ("delete", "purge"):
> + if info["action"] in self.delete_actions:
> continue
> cleanedFiles[info["depotFile"]] = info["rev"]
>
> @@ -1453,7 +1455,7 @@ class P4Sync(Command):
> if change > newestRevision:
> newestRevision = change
>
> - if info["action"] in ("delete", "purge"):
> + if info["action"] in self.delete_actions:
> # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
> #fileCnt = fileCnt + 1
> continue
> --
> 1.7.2.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>Tor Arvid Lund <torarvid@gmail.com>