From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 May 2015 21:23:48 +0000 (-0700)
Subject: Merge branch 'va/p4-client-path'
X-Git-Tag: v2.5.0-rc0~133
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/04959836795da4c82bc9b12bebdfb294ea12943f?hp=-c

Merge branch 'va/p4-client-path'

git p4 attempts to better handle branches in Perforce.

* va/p4-client-path:
git-p4: improve client path detection when branches are used
t9801: check git-p4's branch detection with client spec enabled
---

04959836795da4c82bc9b12bebdfb294ea12943f
diff --combined git-p4.py
index a57a28f4ba,34e4fdd8fa..41a77e6648
--- a/git-p4.py
+++ b/git-p4.py
@@@ -368,7 -368,7 +368,7 @@@ def getP4OpenedType(file)
      # Returns the perforce file type for the given file.
  
      result = p4_read_pipe(["opened", wildcard_encode(file)])
 -    match = re.match(".*\((.+)\)\r?$", result)
 +    match = re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result)
      if match:
          return match.group(1)
      else:
@@@ -502,12 -502,14 +502,14 @@@ def p4Cmd(cmd)
  def p4Where(depotPath):
      if not depotPath.endswith("/"):
          depotPath += "/"
-     depotPath = depotPath + "..."
-     outputList = p4CmdList(["where", depotPath])
+     depotPathLong = depotPath + "..."
+     outputList = p4CmdList(["where", depotPathLong])
      output = None
      for entry in outputList:
          if "depotFile" in entry:
-             if entry["depotFile"] == depotPath:
+             # Search for the base client side depot path, as long as it starts with the branch's P4 path.
+             # The base path always ends with "/...".
+             if entry["depotFile"].find(depotPath) == 0 and entry["depotFile"][-4:] == "/...":
                  output = entry
                  break
          elif "data" in entry:
@@@ -740,43 -742,17 +742,43 @@@ def createOrUpdateBranchesFromOrigin(lo
  def originP4BranchesExist():
          return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
  
 -def p4ChangesForPaths(depotPaths, changeRange):
 +def p4ChangesForPaths(depotPaths, changeRange, block_size):
      assert depotPaths
 -    cmd = ['changes']
 -    for p in depotPaths:
 -        cmd += ["%s...%s" % (p, changeRange)]
 -    output = p4_read_pipe_lines(cmd)
 +    assert block_size
 +
 +    # Parse the change range into start and end
 +    if changeRange is None or changeRange == '':
 +        changeStart = '@1'
 +        changeEnd = '#head'
 +    else:
 +        parts = changeRange.split(',')
 +        assert len(parts) == 2
 +        changeStart = parts[0]
 +        changeEnd = parts[1]
  
 +    # Accumulate change numbers in a dictionary to avoid duplicates
      changes = {}
 -    for line in output:
 -        changeNum = int(line.split(" ")[1])
 -        changes[changeNum] = True
 +
 +    for p in depotPaths:
 +        # Retrieve changes a block at a time, to prevent running
 +        # into a MaxScanRows error from the server.
 +        start = changeStart
 +        end = changeEnd
 +        get_another_block = True
 +        while get_another_block:
 +            new_changes = []
 +            cmd = ['changes']
 +            cmd += ['-m', str(block_size)]
 +            cmd += ["%s...%s,%s" % (p, start, end)]
 +            for line in p4_read_pipe_lines(cmd):
 +                changeNum = int(line.split(" ")[1])
 +                new_changes.append(changeNum)
 +                changes[changeNum] = True
 +            if len(new_changes) == block_size:
 +                get_another_block = True
 +                end = '@' + str(min(new_changes))
 +            else:
 +                get_another_block = False
  
      changelist = changes.keys()
      changelist.sort()
@@@ -1653,7 -1629,10 +1655,10 @@@ class P4Submit(Command, P4UserMap)
          if self.useClientSpec:
              self.clientSpecDirs = getClientSpec()
  
-         if self.useClientSpec:
+         # Check for the existance of P4 branches
+         branchesDetected = (len(p4BranchesInGit().keys()) > 1)
+ 
+         if self.useClientSpec and not branchesDetected:
              # all files are relative to the client spec
              self.clientPath = getClientRoot()
          else:
@@@ -1937,10 -1916,7 +1942,10 @@@ class P4Sync(Command, P4UserMap)
                  optparse.make_option("--import-labels", dest="importLabels", action="store_true"),
                  optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",
                                       help="Import into refs/heads/ , not refs/remotes"),
 -                optparse.make_option("--max-changes", dest="maxChanges"),
 +                optparse.make_option("--max-changes", dest="maxChanges",
 +                                     help="Maximum number of changes to import"),
 +                optparse.make_option("--changes-block-size", dest="changes_block_size", type="int",
 +                                     help="Internal block size to use when iteratively calling p4 changes"),
                  optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',
                                       help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),
                  optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',
@@@ -1969,7 -1945,6 +1974,7 @@@
          self.syncWithOrigin = True
          self.importIntoRemotes = True
          self.maxChanges = ""
 +        self.changes_block_size = 500
          self.keepRepoPath = False
          self.depotPaths = None
          self.p4BranchesInGit = []
@@@ -2616,7 -2591,7 +2621,7 @@@
          branchPrefix = self.depotPaths[0] + branch + "/"
          range = "@1,%s" % maxChange
          #print "prefix" + branchPrefix
 -        changes = p4ChangesForPaths([branchPrefix], range)
 +        changes = p4ChangesForPaths([branchPrefix], range, self.changes_block_size)
          if len(changes) <= 0:
              return False
          firstChange = changes[0]
@@@ -3032,7 -3007,7 +3037,7 @@@
                  if self.verbose:
                      print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
                                                                self.changeRange)
 -                changes = p4ChangesForPaths(self.depotPaths, self.changeRange)
 +                changes = p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size)
  
                  if len(self.maxChanges) > 0:
                      changes = changes[:min(int(self.maxChanges), len(changes))]