cmds: handle Windows network paths when rebasing

We need to always replace "\\" with "/" on Windows.
Adjust unix_path() so that the backslash-to-forward-slash
replacement is done before any other munging is performed.

Closes git-cola#463
Reported-by: Johannes Loehnert <[email protected]>
Signed-off-by: David Aguilar <[email protected]>

Author: davvid

cola/cmds.py

@@ -1181,14 +1181,14 @@ def do(self):
 def unix_path(path, is_win32=utils.is_win32):
     """Git for Windows requires unix paths, so force them here
     """
-    unix_path = path
     if is_win32():
+        path = path.replace('\\', '/')
         first = path[0]
         second = path[1]
         if second == ':':  # sanity check, this better be a Windows-style path
-            unix_path = '/' + first + path[2:].replace('\\', '/')
+            path = '/' + first + path[2:]
 
-    return unix_path
+    return path
 
 
 class GitXBaseContext(object):

test/cmds_test.py

@@ -34,6 +34,12 @@ def test_unix_path_win32(self):
         actual = cmds.unix_path(path, is_win32=lambda: True)
         self.assertEqual(expect, actual)
 
+    def test_unix_path_network_win32(self):
+        path = r'\\Z\Program Files\git-cola\bin\git-dag'
+        expect = '//Z/Program Files/git-cola/bin/git-dag'
+        actual = cmds.unix_path(path, is_win32=lambda: True)
+        self.assertEqual(expect, actual)
+
     def test_unix_path_is_a_noop_on_sane_platforms(self):
         path = r'/:we/don\t/need/no/stinking/badgers!'
         expect = path