same_as_p4_reconcile.git

@@ -17,9 +17,10 @@ from argparse import ArgumentParser

 import subprocess

 import shutil

 import filecmp

+from typing import Optional, List

-def call(cmd_array, changelist, preview):

+def call(cmd_array: List[str], changelist: str, preview: bool) -> int:

     """ If not preview, makes the call."""

     ret = 0

     if not preview:

@@ -31,7 +32,7 @@ def call(cmd_array, changelist, preview):

     return ret

-def add_changelist_to_cmd(cmd, changelist):

+def add_changelist_to_cmd(cmd: List[str], changelist: Optional[str]) -> List[str]:

     """Injects "-c changelist" to the p4 command."""

     if changelist is None:

         return cmd

@@ -40,12 +41,12 @@ def add_changelist_to_cmd(cmd, changelist):

     return cmd

-def do_diff_by_name(preview, changelist, source_dir, p4_dir):

+def do_diff_by_name(preview: bool, changelist: str, source_dir: str, p4_dir: str) -> None:

     do_diff(preview, changelist, filecmp.dircmp(p4_dir, source_dir))

     delete_empty_directories(p4_dir)

-def delete_empty_directories(top):

+def delete_empty_directories(top: str) -> None:

     """ p4 deletes could leave us with empty hierarchies. """

     for root, dirs, files in os.walk(top, topdown=False):

         for name in dirs:

@@ -55,7 +56,7 @@ def delete_empty_directories(top):

                 pass

-def do_diff(preview, changelist, d):

+def do_diff(preview: bool, changelist:str, d: filecmp.dircmp) -> None:

     for f in d.right_only:

         if os.path.isfile(os.path.join(d.right, f)):

             if not preview: