git-p4: Fix git-p4 submit to include only changed files in the perforce submit template.

Parse the files section in the "p4 change -o" output and remove lines with file changes in unrelated depot paths.

Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 3cbb2da221618a67fda6991317352e330c6db8ba..805d632a682e3b999d90f575443e00ed92eccc5b 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -390,6 +390,30 @@ class P4Submit(Command):
 
         return result
 
 
         return result
 

+    def prepareSubmitTemplate(self):
+        # remove lines in the Files section that show changes to files outside the depot path we're committing into
+        template = ""
+        inFilesSection = False
+        for line in read_pipe_lines("p4 change -o"):
+            if inFilesSection:
+                if line.startswith("\t"):
+                    # path starts and ends with a tab
+                    path = line[1:]
+                    lastTab = path.rfind("\t")
+                    if lastTab != -1:
+                        path = path[:lastTab]
+                        if not path.startswith(self.depotPath):
+                            continue
+                else:
+                    inFilesSection = False
+            else:
+                if line.startswith("Files:"):
+                    inFilesSection = True
+
+            template += line
+
+        return template
+

     def applyCommit(self, id):
         if self.directSubmit:
             print "Applying local change in working directory/index"
     def applyCommit(self, id):
         if self.directSubmit:
             print "Applying local change in working directory/index"


@@ -467,7 +491,7 @@ class P4Submit(Command):
                 logMessage = logMessage.replace("\n", "\r\n")
             logMessage = logMessage.strip()
 
                 logMessage = logMessage.replace("\n", "\r\n")
             logMessage = logMessage.strip()
 

-        template = read_pipe("p4 change -o")
+        template = self.prepareSubmitTemplate()

 
         if self.interactive:
             submitTemplate = self.prepareLogMessage(template, logMessage)
 
         if self.interactive:
             submitTemplate = self.prepareLogMessage(template, logMessage)


@@ -558,24 +582,24 @@ class P4Submit(Command):
             return False
 
         [upstream, settings] = findUpstreamBranchPoint()
             return False
 
         [upstream, settings] = findUpstreamBranchPoint()

-        depotPath = settings['depot-paths'][0]
+        self.depotPath = settings['depot-paths'][0]

         if len(self.origin) == 0:
             self.origin = upstream
 
         if self.verbose:
             print "Origin branch is " + self.origin
 
         if len(self.origin) == 0:
             self.origin = upstream
 
         if self.verbose:
             print "Origin branch is " + self.origin
 

-        if len(depotPath) == 0:
+        if len(self.depotPath) == 0:

             print "Internal error: cannot locate perforce depot path from existing branches"
             sys.exit(128)
 
             print "Internal error: cannot locate perforce depot path from existing branches"
             sys.exit(128)
 

-        self.clientPath = p4Where(depotPath)
+        self.clientPath = p4Where(self.depotPath)

 
         if len(self.clientPath) == 0:
 
         if len(self.clientPath) == 0:

-            print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
+            print "Error: Cannot locate perforce checkout of %s in client view" % self.depotPath

             sys.exit(128)
 
             sys.exit(128)
 

-        print "Perforce checkout for depot path %s located at %s" % (depotPath, self.clientPath)
+        print "Perforce checkout for depot path %s located at %s" % (self.depotPath, self.clientPath)

         self.oldWorkingDirectory = os.getcwd()
 
         if self.directSubmit:
         self.oldWorkingDirectory = os.getcwd()
 
         if self.directSubmit: