Commits

Nathan Durnan committed 60d9384 Merge

Merge with Release Beta 0.1

Comments (0)

Files changed (4)

-_HgPreBackup.au3,1326140619.53
-HgPreBackup_x86.exe,1326140610.0
-HgPreBackup_x64.exe,1326140616.98
+HgPreBackup.ico,1325031982.39
+HgPreBackup_x86.exe,1326143563.0
+HgPreBackup_x64.exe,1326143569.48
 .hgsub,1325791137.19
 HgPreBackupSettings.ini,1325896705.95
 .hgsubstate,1325791876.03
-.hgtags,1326140993.42
-HgPreBackup.ico,1325031982.39
+README.rst,1325791389.33
+_HgPreBackup.au3,1326143572.69
 HgPreBackup.svg,1325032006.66
 .hgignore,1325796114.66
-README.rst,1325791389.33
-.hgtimestamp,1326140993.42
+.hgtimestamp,1326143599.42

HgPreBackup_x64.exe

Binary file modified.

HgPreBackup_x86.exe

Binary file modified.
 #AutoIt3Wrapper_Compression=4
 #AutoIt3Wrapper_Res_Comment=Automated tool to create/update Mercurial Repository clones for backups.
 #AutoIt3Wrapper_Res_Description=Mercurial Repository Pre-Backup Tool
-#AutoIt3Wrapper_Res_Fileversion=0.1.0.6
+#AutoIt3Wrapper_Res_Fileversion=0.1.0.7
 #AutoIt3Wrapper_Res_Field=FileVersion Notes|Beta Test
 #AutoIt3Wrapper_Res_Fileversion_AutoIncrement=p
 #AutoIt3Wrapper_Res_Language=1033
 	#Region - Evaluate Source Repositories
 	_LogFileAddMessage($Gh_LogFile, "Searching for Repositories at " & $Gs_RepoHomeDir)
 	_SearchFolderForRepositories($Gs_RepoHomeDir, $Ga_RepoList, $Ga_RepoValidErr)
-	_LogFileAddMessage($Gh_LogFile, "* " & $Ga_RepoList[0] & "Repositories Found *")
+	_LogFileAddMessage($Gh_LogFile, "* " & $Ga_RepoList[0] & " Repositories Found *")
 	#EndRegion - Evaluate Source Repositories
 	ConsoleWrite("========== Backup ==========" & @CRLF)
 	_LogFileAddMessage($Gh_LogFile, "Beginning Clone/Pull Operations")
 		$optIN_bQuiet = False)
 	Local $myReturn = 0, $myError = 0, $myExtended = 0 ;These variables will be used for the function's return statement.
 	Local $sConsoleCommand, $sConsoleOutput = "", $sTemp = ""
-	Local $hMyApp, $myHandle, $myExitCode
+	Local $hMyApp, $myHandle, $myExitCode, $myTempError
 
 	$sConsoleCommand = $Gs_HgPath & ' ' & $IN_sCommand & ' "' & $IN_sRepoPath & '"' & $optIN_sOptions & $HG_OPT_TIME
 	If Not $optIN_bQuiet Then
 		Do ;Read from output stream until nothing more to read.
 			$sConsoleOutput &= $sTemp
 			$sTemp = StdoutRead($hMyApp)
-		Until @error ;encountered end of output stream!
+			$myTempError = @error ;NOTE: check @error IMMEDIATELY after function call!!!
+			Sleep(10) ;give the processor a break!
+		Until $myTempError ;encountered end of output stream!
 		While ProcessExists($hMyApp)
 			Sleep(20)
 		WEnd ;wait until process closes
 	Else ;error detected with Mercurial
 		$myResult = $myResult And FileWriteLine($IN_hLogFile, "| Mercurial Verion...: (could not verify Mercurial!)")
 	EndIf ;check for Mercurial error
-	$myResult = $myResult And FileWriteLine($IN_hLogFile, "| Elapsed Time.......: " & StringFormat('%.3f',_Timer_Diff($Gf_TimeStart)/1000) & " seconds")
+	Local $fTimerElapsed = _Timer_Diff($Gf_TimeStart)/1000
+	If ($fTimerElapsed > 90) Then
+		Local $iMinutes = Mod($fTimerElapsed, 60)
+		Local $fSeconds = $fTimerElapsed - ($iMinutes * 60)
+		$myResult = $myResult And FileWriteLine($IN_hLogFile, "| Elapsed Time.......: " & _
+				$iMinutes & " minutes, " & StringFormat('%.3f',$fSeconds) & " seconds")
+	Else ;time is small enough to express in just seconds.
+		$myResult = $myResult And FileWriteLine($IN_hLogFile, "| Elapsed Time.......: " & _
+				StringFormat('%.3f',$fTimerElapsed) & " seconds")
+	EndIf ;check elapsed time magnitude.
 	;__________________
 	;==== SETTINGS ====
 	$myResult = $myResult And FileWriteLine($IN_hLogFile, "| ________")