git-p4: sort client views by reverse View number

ggibbons · gitster · commit df5ed9077f18 · 2012-01-03T14:10:02.000-08:00
Correct view sorting to support the Perforce order,
where client views are ordered and later views
override earlier view mappings.

[pw: one test now succeeds]

Signed-off-by: Gary Gibbons &lt;ggibbons@perforce.com&gt;
Signed-off-by: Pete Wyckoff &lt;pw@padd.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
@@ -1924,10 +1924,17 @@ class P4Sync(Command, P4UserMap):
                     else:
                         include = len(v)
 
-                    temp[v] = (include, cv)
+                    # store the View #number for sorting
+                    # and the View string itself (this last for documentation)
+                    temp[v] = (include, cv, int(k[4:]),k)
 
         self.clientSpecDirs = temp.items()
-        self.clientSpecDirs.sort( lambda x, y: abs( y[1][0] ) - abs( x[1][0] ) )
+        # Perforce ViewNN with higher #numbers override those with lower
+        # reverse sort on the View #number
+        self.clientSpecDirs.sort( lambda x, y:  y[1][2] -  x[1][2]  )
+        if self.verbose:
+            for val in self.clientSpecDirs:
+                    print "clientSpecDirs: %s %s" % (val[0],val[1])
 
     def run(self, args):
         self.depotPaths = []
diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh
@@ -133,7 +133,7 @@ test_expect_failure 'single file map' '
 	git_verify $files
 '
 
-test_expect_failure 'later mapping takes precedence (entire repo)' '
+test_expect_success 'later mapping takes precedence (entire repo)' '
 	client_view "//depot/dir1/... //client/cli1/..." \
 		    "//depot/... //client/cli2/..." &&
 	files="cli2/dir1/file11 cli2/dir1/file12

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ test_expect_failure 'single file map' '`
`133`	`133`	`git_verify $files`
`134`	`134`	`'`
`135`	`135`
`136`		`-test_expect_failure 'later mapping takes precedence (entire repo)' '`
	`136`	`+test_expect_success 'later mapping takes precedence (entire repo)' '`
`137`	`137`	`client_view "//depot/dir1/... //client/cli1/..." \`
`138`	`138`	`"//depot/... //client/cli2/..." &&`
`139`	`139`	`files="cli2/dir1/file11 cli2/dir1/file12`