bf

vdelachaux · Mar 11, 2020 · 436621c · 436621c
1 parent c6d2101
commit 436621c
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,6 @@ DEV/
 *__Orphan__*
 ehthumbs.db
 Thumbs.db
-
 Resources/php.ini
 Project/Trash/
+*.bbprojectd/
diff --git a/Info.plist b/Info.plist
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0">  <dict>    <key>NSHumanReadableCopyright</key>    <string>© 2020</string>    <key>CFBundleVersion</key>    <string>14</string>    <key>CFBundleDisplayName</key>    <string>4DPop</string>    <key>CFBundleGetInfoString</key>    <string>4DPop Git</string>    <key>CFBundleLongVersionString</key>    <string>18R3</string>    <key>CFBundleShortVersionString</key>    <string>18R3</string>    <key>CFBundleName</key>    <string>4DPop Git</string>  </dict></plist>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0">  <dict>    <key>CFBundleName</key>    <string>4DPop Git</string>    <key>CFBundleShortVersionString</key>    <string>18R3</string>    <key>CFBundleLongVersionString</key>    <string>18R3</string>    <key>CFBundleGetInfoString</key>    <string>4DPop Git</string>    <key>CFBundleDisplayName</key>    <string>4DPop</string>    <key>CFBundleVersion</key>    <string>15</string>    <key>NSHumanReadableCopyright</key>    <string>© 2020</string>  </dict></plist>

diff --git a/Project/Sources/Forms/GITLAB/form.4DForm b/Project/Sources/Forms/GITLAB/form.4DForm
@@ -286,7 +286,7 @@
 							"footer": {
 								"name": "Footer2"
 							},
-							"dataSource": "This:C1470.path",
+							"dataSource": "Replace string:C233(This:C1470.path;\"\\\"\";\"\")",
 							"enterable": false
 						}
 					]

diff --git a/Project/Sources/Methods/GITLAB_REFRESH.4dm b/Project/Sources/Methods/GITLAB_REFRESH.4dm
@@ -253,7 +253,8 @@ If ($oTarget.button#Null:C1517)
 
 				Else 
 
-					ST SET TEXT:C1115($t;String:C10($o.error);ST Start text:K78:15;ST End text:K78:16)
+					$o:=$o.history.pop()
+					ST SET TEXT:C1115($t;String:C10($o.cmd)+"\r\r"+String:C10($o.error);ST Start text:K78:15;ST End text:K78:16)
 					ST SET ATTRIBUTES:C1093($t;ST Start text:K78:15;ST End text:K78:16;\
 						Attribute text color:K65:7;"red")
 

diff --git a/Project/Sources/Methods/GITLAB_resolvePath.4dm b/Project/Sources/Methods/GITLAB_resolvePath.4dm
@@ -38,6 +38,8 @@ Else
 End if 
 
   // ----------------------------------------------------
+$t_path:=Replace string:C233($t_path;"\"";"")
+
 Case of 
 
 		  //———————————————————————————————————————————

diff --git a/Project/Sources/Methods/git.4dm b/Project/Sources/Methods/git.4dm
@@ -212,11 +212,11 @@ Else
 
 				If ($2.option#Null:C1517)
 
-					$o.execute("diff "+$2.option+" '"+$2.path+"'")
+					$o.execute("diff "+$2.option+" -- "+$2.path)
 
 				Else 
 
-					$o.execute("diff '"+$2.path+"'")
+					$o.execute("diff -- "+$2.path)
 
 				End if 
 

diff --git a/Project/Sources/Methods/method with space.4dm b/Project/Sources/Methods/method with space.4dm
diff --git a/Resources/InfoPlist.strings b/Resources/InfoPlist.strings
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?xml version="1.0" encoding="UTF-8" standalone="no" ?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0"> <dict> <key>NSHumanReadableCopyright</key> <string>© 2020</string> <key>CFBundleVersion</key> <string>14</string> <key>CFBundleDisplayName</key> <string>4DPop</string> <key>CFBundleGetInfoString</key> <string>4DPop Git</string> <key>CFBundleLongVersionString</key> <string>18R3</string> <key>CFBundleShortVersionString</key> <string>18R3</string> <key>CFBundleName</key> <string>4DPop Git</string> </dict></plist>
		<?xml version="1.0" encoding="UTF-8" standalone="no" ?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0"> <dict> <key>CFBundleName</key> <string>4DPop Git</string> <key>CFBundleShortVersionString</key> <string>18R3</string> <key>CFBundleLongVersionString</key> <string>18R3</string> <key>CFBundleGetInfoString</key> <string>4DPop Git</string> <key>CFBundleDisplayName</key> <string>4DPop</string> <key>CFBundleVersion</key> <string>15</string> <key>NSHumanReadableCopyright</key> <string>© 2020</string> </dict></plist>
Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,8 @@ Else @@
     End if
       // ----------------------------------------------------
+    $t_path:=Replace string:C233($t_path;"\"";"")
     Case of
     		  //———————————————————————————————————————————
@@ Expand Down @@