* utils/hbmk2/hbmk2.*.po
* utils/hbmk2/hbmk2.prg
+ do not share plugin variables (hbmk[ "vars" ])
between different plugins. It avoids potentially nasty
issues with plugins stepping onto each other's toes.
[INCOMPATIBLE - though it's unlikely anyone is
affected. If you must communicate between plugins,
use public function or variable.]
+ clarified in help that -icon might not work on all
platforms/compilers and detailed Windows implementation
(in particular it's disabled on bcc/bcc64 and on
mingw it won't work when a manual .rc is specified,
also on some (old?) msvc versions. Consult your
C compiler's Windows resource handling limitations.)
+ clarified in help the syntax of filters
+ clarified in help that .hbp references are handled as
sub-projects
+ clarification to command substitution macro
+ clarification to filter syntax note
! strict parameter checks in all public shell APIs to
avoid RTEs inside hbmk2 due to faulty API usage by scripts
* utils/hbmk2/examples/plug_bis.hb
* updated according to latest plugin changes
* include/harbour.hbx
* include/hbapi.h
* src/vm/debug.c
* src/vm/hvm.c
+ added internal function hb_vmInternalsEnabled()
to query whether potentially sensitive internals
are allowed to be accessed by public Harbour APIs
+ added .prg level function __vmNoInternals()
to disable potentially sensitive internals
by default accessible via public APIs.
Intentionally a one-way function: once disabled,
it cannot be reenabled from .prg or .c level.
NOTE: It will break Harbour debug functionality,
so it'd will be useful for hbrun scripts and
release (non-debug) builds.
+ modified internal __dbg*() functions to return
dummy values when internals are disabled via
__vmNoInternals() functions. While the function
return types are kept, apps relying on their
specific values and certain relationships between
them might break.
; NOTE: In the future, some more internals might
be protected by this setting (f.e. low-level
object and class functions and some API from
hbdebug lib)
; Please review
* tests/debugtst.prg
! fixed to compile warning-free without lowering
warning level
! fixed to run RTE-free with internals disabled
* bin/3rdpatch.hb
* bin/commit.hb
* config/postinst.hb
* contrib/make.hb
* contrib/hbtest/hbtest.ch
* src/debug/*.prg
* src/rtl/tclass.prg
* utils/hbmk2/examples/plug_bis.hb
* utils/hbmk2/examples/plug_tpl.hb
* use short form #pragmas (the ones identical
to Harbour options)
; NOTE: Except -l which works reversed compared
to cmdline -l option. TOFIX? (I tried and failed)
* src/rtl/hbi18n2.prg
* contrib/xhb/tfile.prg
* use F_ERROR instead of -1 literal
* contrib/xhb/xhbtedit.prg
! replaced dirty xhb extension with std SubStr() call
Reported by Tony Quick
[pls report such bugs on Harbour devl list]
* contrib/hbodbc/todbc.prg
! Don't continue ::Open() when SQLExecDir() have error
Fix from xhb via Vicente Guerra, with cleanups.
* tests/multifnc/multifnc.hbp
+ added comment
+ support for watcom
* tests/multifnc/t1.prg
! missing file ending EOL
* tests/*.prg
* extras/gtwvw/tests/wvwtest9.prg
* formatting
229 lines
5.5 KiB
Plaintext
229 lines
5.5 KiB
Plaintext
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Commit preparer
|
|
*
|
|
* Copyright 2012 Viktor Szakats (harbour syenar.net)
|
|
* www - http://harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
|
|
* their web site at http://www.gnu.org/).
|
|
*
|
|
*/
|
|
|
|
#define _CONFIGFIL_ ".hbcommit"
|
|
#define _CONFIGENV_ "HBCOMMIT_USER"
|
|
|
|
#pragma -w3
|
|
#pragma -km+
|
|
#pragma -ko+
|
|
|
|
PROCEDURE Main()
|
|
|
|
LOCAL cVCS := VCSDetect()
|
|
|
|
LOCAL aChanges := DoctorChanges( cVCS, Changes( cVCS ) )
|
|
LOCAL cLog
|
|
LOCAL cLogNew
|
|
LOCAL cLine
|
|
LOCAL nOffset
|
|
LOCAL cHit
|
|
LOCAL nPos
|
|
LOCAL cMyName
|
|
LOCAL cOldLang
|
|
LOCAL cLogName
|
|
|
|
IF Empty( aChanges )
|
|
OutStd( hb_ProgName() + ": no changes" + hb_eol() )
|
|
RETURN
|
|
ENDIF
|
|
|
|
// ;
|
|
|
|
IF ! Empty( GetEnv( _CONFIGENV_ ) )
|
|
cMyName := GetEnv( _CONFIGENV_ )
|
|
ELSEIF hb_FileExists( _CONFIGFIL_ )
|
|
cMyName := AllTrim( hb_MemoRead( _CONFIGFIL_ ) )
|
|
ELSE
|
|
cMyName := "Firstname Lastname (me domain.net)"
|
|
ENDIF
|
|
|
|
nOffset := hb_UTCOffset()
|
|
|
|
cLogNew := hb_StrFormat( "%1$s UTC%2$s%3$02d%4$02d %5$s", ;
|
|
hb_TToC( hb_DateTime(), "YYYY-MM-DD", "HH:MM" ), ;
|
|
iif( nOffset < 0, "-", "+" ), ;
|
|
Int( nOffset / 3600 ), ;
|
|
Int( ( ( nOffset / 3600 ) - Int( nOffset / 3600 ) ) * 60 ), ;
|
|
cMyName ) + hb_eol()
|
|
|
|
FOR EACH cLine IN aChanges
|
|
cLogNew += cLine + hb_eol()
|
|
NEXT
|
|
|
|
// ;
|
|
|
|
IF ! hb_FileExists( cLogName := "ChangeLog.txt" )
|
|
IF ! hb_FileExists( cLogName := "ChangeLog" )
|
|
OutStd( hb_ProgName() + ": can't find ChangeLog file" + hb_eol() )
|
|
RETURN
|
|
ENDIF
|
|
ENDIF
|
|
|
|
cLog := MemoRead( cLogName )
|
|
cOldLang := hb_cdpSelect( "EN" )
|
|
cHit := hb_AtX( "\n[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] UTC[\-+][0-9][0-9][0-9][0-9] ", cLog )
|
|
IF Empty( cHit )
|
|
cHit := ""
|
|
ENDIF
|
|
hb_cdpSelect( cOldLang )
|
|
|
|
nPos := At( AllTrim( cHit ), cLog )
|
|
IF nPos > 0
|
|
cLog := Left( cLog, nPos - 1 ) + cLogNew + hb_eol() + SubStr( cLog, nPos )
|
|
ELSE
|
|
cLog += hb_eol() + cLogNew
|
|
ENDIF
|
|
|
|
hb_MemoWrit( cLogName, cLog )
|
|
|
|
RETURN
|
|
|
|
STATIC FUNCTION VCSDetect()
|
|
|
|
DO CASE
|
|
CASE hb_DirExists( ".svn" ) ; RETURN "svn"
|
|
CASE hb_DirExists( ".git" ) ; RETURN "git"
|
|
/* to make it work in an unmodified GIT repo. Ideally, all
|
|
files/dirs should be moved one dir up, removing the top
|
|
'harbour' directory. */
|
|
CASE hb_DirExists( ".." + hb_ps() + ".git" ) ; RETURN "git"
|
|
ENDCASE
|
|
|
|
RETURN ""
|
|
|
|
STATIC FUNCTION DoctorChanges( cVCS, aChanges )
|
|
|
|
LOCAL cLine
|
|
LOCAL cStart
|
|
LOCAL aNew := {}
|
|
|
|
ASort( aChanges,,, {| x, y | x < y } )
|
|
|
|
DO CASE
|
|
CASE cVCS == "svn"
|
|
|
|
FOR EACH cLine IN aChanges
|
|
IF ! Empty( cLine ) .AND. SubStr( cLine, 8, 1 ) == " "
|
|
cStart := Left( cLine, 1 )
|
|
SWITCH cStart
|
|
CASE "M"
|
|
CASE " " /* modified props */
|
|
cStart := "*"
|
|
EXIT
|
|
CASE "A"
|
|
cStart := "+"
|
|
EXIT
|
|
CASE "D"
|
|
cStart := "-"
|
|
EXIT
|
|
CASE "X"
|
|
cStart := ""
|
|
EXIT
|
|
OTHERWISE
|
|
cStart := "?"
|
|
ENDSWITCH
|
|
IF ! Empty( cStart )
|
|
AAdd( aNew, " " + cStart + " " + StrTran( SubStr( cLine, 8 + 1 ), "\", "/" ) )
|
|
ENDIF
|
|
ENDIF
|
|
NEXT
|
|
|
|
CASE cVCS == "git"
|
|
|
|
FOR EACH cLine IN aChanges
|
|
IF ! Empty( cLine ) .AND. SubStr( cLine, 3, 1 ) == " "
|
|
cStart := Left( cLine, 1 )
|
|
SWITCH cStart
|
|
CASE " "
|
|
CASE "?"
|
|
cStart := ""
|
|
EXIT
|
|
CASE "M"
|
|
CASE "R"
|
|
CASE "U"
|
|
cStart := "*"
|
|
EXIT
|
|
CASE "A"
|
|
CASE "C"
|
|
cStart := "+"
|
|
EXIT
|
|
CASE "D"
|
|
cStart := "-"
|
|
EXIT
|
|
OTHERWISE
|
|
cStart := "?"
|
|
ENDSWITCH
|
|
IF ! Empty( cStart )
|
|
AAdd( aNew, " " + cStart + " " + StrTran( SubStr( cLine, 3 + 1 ), "\", "/" ) )
|
|
ENDIF
|
|
ENDIF
|
|
NEXT
|
|
|
|
ENDCASE
|
|
|
|
RETURN aNew
|
|
|
|
|
|
STATIC FUNCTION Shell()
|
|
|
|
LOCAL cShell
|
|
|
|
#if defined( __PLATFORM__UNIX )
|
|
cShell := GetEnv( "SHELL" )
|
|
#else
|
|
cShell := GetEnv( "COMSPEC" )
|
|
#endif
|
|
|
|
IF ! Empty( cShell )
|
|
#if defined( __PLATFORM__UNIX )
|
|
cShell += " -c"
|
|
#else
|
|
cShell += " /c"
|
|
#endif
|
|
ENDIF
|
|
|
|
RETURN cShell
|
|
|
|
STATIC FUNCTION CmdEscape( cCmd )
|
|
#if defined( __PLATFORM__UNIX )
|
|
cCmd := Chr( 34 ) + cCmd + Chr( 34 )
|
|
#endif
|
|
RETURN cCmd
|
|
|
|
STATIC FUNCTION Changes( cVCS )
|
|
|
|
LOCAL cStdOut := ""
|
|
|
|
DO CASE
|
|
CASE cVCS == "svn" ; hb_processRun( Shell() + " " + CmdEscape( "svn status -q" ),, @cStdOut )
|
|
CASE cVCS == "git" ; hb_processRun( Shell() + " " + CmdEscape( "git status -s" ),, @cStdOut )
|
|
ENDCASE
|
|
|
|
RETURN hb_ATokens( StrTran( cStdOut, Chr( 13 ) ), Chr( 10 ) )
|