From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Nov 2015 23:32:27 +0000 (-0800)
Subject: Merge branch 'ld/p4-import-labels' into maint
X-Git-Tag: v2.6.3~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/04bba3a12b27f592d6d0b8f8af28b2697e55532d?hp=-c

Merge branch 'ld/p4-import-labels' into maint

Correct "git p4 --detect-labels" so that it does not fail to create
a tag that points at a commit that is also being imported.

* ld/p4-import-labels:
git-p4: fix P4 label import for unprocessed commits
git-p4: do not terminate creating tag for unknown commit
git-p4: failing test for ignoring invalid p4 labels
---

04bba3a12b27f592d6d0b8f8af28b2697e55532d
diff --combined git-p4.py
index 0093fa3d83,2018011ae5..2677c89c06
--- a/git-p4.py
+++ b/git-p4.py
@@@ -1950,14 -1950,10 +1950,14 @@@ class View(object)
              if "unmap" in res:
                  # it will list all of them, but only one not unmap-ped
                  continue
 +            if gitConfigBool("core.ignorecase"):
 +                res['depotFile'] = res['depotFile'].lower()
              self.client_spec_path_cache[res['depotFile']] = self.convert_client_path(res["clientFile"])
  
          # not found files or unmap files set to ""
          for depotFile in fileArgs:
 +            if gitConfigBool("core.ignorecase"):
 +                depotFile = depotFile.lower()
              if depotFile not in self.client_spec_path_cache:
                  self.client_spec_path_cache[depotFile] = ""
  
@@@ -1966,9 -1962,6 +1966,9 @@@
             depot file should live.  Returns "" if the file should
             not be mapped in the client."""
  
 +        if gitConfigBool("core.ignorecase"):
 +            depot_path = depot_path.lower()
 +
          if depot_path in self.client_spec_path_cache:
              return self.client_spec_path_cache[depot_path]
  
@@@ -2329,8 -2322,11 +2329,11 @@@ class P4Sync(Command, P4UserMap)
          else:
              return "%s <a@b>" % userid
  
-     # Stream a p4 tag
      def streamTag(self, gitStream, labelName, labelDetails, commit, epoch):
+         """ Stream a p4 tag.
+         commit is either a git commit, or a fast-import mark, ":<p4commit>"
+         """
+ 
          if verbose:
              print "writing tag %s for commit %s" % (labelName, commit)
          gitStream.write("tag %s\n" % labelName)
@@@ -2381,7 -2377,7 +2384,7 @@@
              self.clientSpecDirs.update_client_spec_path_cache(files)
  
          self.gitStream.write("commit %s\n" % branch)
- #        gitStream.write("mark :%s\n" % details["change"])
+         self.gitStream.write("mark :%s\n" % details["change"])
          self.committedChanges.add(int(details["change"]))
          committer = ""
          if author not in self.users:
@@@ -2500,13 -2496,19 +2503,19 @@@
              if change.has_key('change'):
                  # find the corresponding git commit; take the oldest commit
                  changelist = int(change['change'])
-                 gitCommit = read_pipe(["git", "rev-list", "--max-count=1",
-                      "--reverse", ":/\[git-p4:.*change = %d\]" % changelist])
-                 if len(gitCommit) == 0:
-                     print "could not find git commit for changelist %d" % changelist
-                 else:
-                     gitCommit = gitCommit.strip()
+                 if changelist in self.committedChanges:
+                     gitCommit = ":%d" % changelist       # use a fast-import mark
                      commitFound = True
+                 else:
+                     gitCommit = read_pipe(["git", "rev-list", "--max-count=1",
+                         "--reverse", ":/\[git-p4:.*change = %d\]" % changelist], ignore_error=True)
+                     if len(gitCommit) == 0:
+                         print "importing label %s: could not find git commit for changelist %d" % (name, changelist)
+                     else:
+                         commitFound = True
+                         gitCommit = gitCommit.strip()
+ 
+                 if commitFound:
                      # Convert from p4 time format
                      try:
                          tmwhen = time.strptime(labelDetails['Update'], "%Y/%m/%d %H:%M:%S")