From ca12db1aaef6f8de35cd4d672f8463a68e585aa9 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 18 Nov 2012 12:19:57 +0000 Subject: [PATCH] 2012-11-18 13:15 UTC+0100 Viktor Szakats (harbour syenar.net) * bin/commit.hb + support HBCOMMIT_USER envvar to configure commmiter user / e-mail. * ChangeLog ! wrong commit e-mail fixed yet again. I start to badly miss local branches (a la Git!), as I need to keep juggling with 3-4 local sandboxes to separate different change sessions. --- harbour/ChangeLog | 33 ++++++++++++++++++++++----------- harbour/bin/commit.hb | 12 +++++++----- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ce47f77a06..cc1cfbf788 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-18 13:15 UTC+0100 Viktor Szakats (harbour syenar.net) + * bin/commit.hb + + support HBCOMMIT_USER envvar to configure commmiter + user / e-mail. + + * ChangeLog + ! wrong commit e-mail fixed yet again. I start to badly + miss local branches (a la Git!), as I need to keep + juggling with 3-4 local sandboxes to separate different + change sessions. + 2012-11-18 12:55 UTC+0100 Viktor Szakats (harbour syenar.net) * website/samples/*.*.html % pointed compatibility .js link to the project's cloud server @@ -69,7 +80,7 @@ * doc/Makefile - deleted obsolete welcome message -2012-11-18 02:07 UTC+0100 Viktor Szakats (vszakats syenar.net) +2012-11-18 02:07 UTC+0100 Viktor Szakats (harbour syenar.net) - doc/readme.txt + doc/welcome.txt * doc/Makefile @@ -270,7 +281,7 @@ + changed to use absolute paths to refer to common page elements -2012-11-17 16:29 UTC+0100 Viktor Szakats (vszakats syenar.net) +2012-11-17 16:29 UTC+0100 Viktor Szakats (harbour syenar.net) * website/samples.html - website/samples/dosshell.html - website/samples/dosshell.prg.html @@ -287,7 +298,7 @@ - website/samples/screenshots/testcgi.gif * synced files with /tests dir -2012-11-17 14:56 UTC+0100 Viktor Szakats (vszakats syenar.net) +2012-11-17 14:56 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbodbc/hbodbc.hbp * contrib/hbodbc/odbc.c * contrib/hbodbc/todbc.prg @@ -301,7 +312,7 @@ * contrib/hbsqlit3/core.c ! minor in comment -2012-11-17 14:23 UTC+0100 Viktor Szakats (vszakats syenar.net) +2012-11-17 14:23 UTC+0100 Viktor Szakats (harbour syenar.net) * extras/hbdoc/hbdoc.css * website/css/styles.css % minor optimization @@ -315,13 +326,13 @@ * website/samples/*.html ! svn charset prop set to UTF-8 -2012-11-17 14:12 UTC+0100 Viktor Szakats (vszakats syenar.net) +2012-11-17 14:12 UTC+0100 Viktor Szakats (harbour syenar.net) * doc/en/lang.txt * doc/en/var.txt ! changed docs for non-existent HB_ISBYREF() to HB_PISBYREF() ! deleted 'include/' references -2012-11-17 13:52 UTC+0100 Viktor Szakats (vszakats syenar.net) +2012-11-17 13:52 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbct/doc/en/charonly.txt * contrib/hbct/doc/en/ctmath2.txt * doc/en/hashes.txt @@ -362,12 +373,12 @@ ; Please make real test. I made this modifications without any real test. I do not have access to any ODBC server here. -2012-11-16 18:05 UTC+0100 Viktor Szakats (vszakats syenar.net) +2012-11-16 18:05 UTC+0100 Viktor Szakats (harbour syenar.net) * extras/httpsrv/home/counter.html * extras/httpsrv/home/testxmldb.html ! restored some .html files that contain JS code -2012-11-16 18:01 UTC+0100 Viktor Szakats (vszakats syenar.net) +2012-11-16 18:01 UTC+0100 Viktor Szakats (harbour syenar.net) + tests/fixcase.hb + added automatic case fixer. It's ugly code and has some hard-coded exception, some of them @@ -380,7 +391,7 @@ (as opposed to Directory()). This was a good side-effect in this particular case though. -2012-11-16 17:50 UTC+0100 Viktor Szakats (vszakats syenar.net) +2012-11-16 17:50 UTC+0100 Viktor Szakats (harbour syenar.net) * extras/hbvpdf/hbvpdf.hbx ! two more corrections @@ -466,7 +477,7 @@ * extras/hbvpdf/hbvpdf.hbx ! correction -2012-11-16 16:06 UTC+0100 Viktor Szakats (vszakats syenar.net) +2012-11-16 16:06 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/gtwvg/class.prg * contrib/gtwvg/paint.prg * contrib/gtwvg/parthdlr.prg @@ -2263,7 +2274,7 @@ * applied some non-space formattings and changes to make it format better using uncrustify -2012-11-09 13:08 UTC+0100 Viktor Szakats (vszakats syenar.net) +2012-11-09 13:08 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/xhb/hbcompat.ch * contrib/xhb/htmutil.prg * contrib/xhb/stream.prg diff --git a/harbour/bin/commit.hb b/harbour/bin/commit.hb index f94b5ddcf7..22d7f1f40d 100644 --- a/harbour/bin/commit.hb +++ b/harbour/bin/commit.hb @@ -26,8 +26,8 @@ * */ -#define _MY_NAME_ "Firstname Lastname (me domain.net)" -#define _CONFIGF_ ".hbcommit" +#define _CONFIGFIL_ ".hbcommit" +#define _CONFIGENV_ "HBCOMMIT_USER" #pragma warninglevel=3 #pragma -km+ @@ -54,10 +54,12 @@ PROCEDURE Main() // ; - IF hb_FileExists( _CONFIGF_ ) - cMyName := AllTrim( hb_MemoRead( _CONFIGF_ ) ) + IF ! Empty( GetEnv( _CONFIGENV_ ) ) + cMyName := GetEnv( _CONFIGENV_ ) + ELSEIF hb_FileExists( _CONFIGFIL_ ) + cMyName := AllTrim( hb_MemoRead( _CONFIGFIL_ ) ) ELSE - cMyName := _MY_NAME_ + cMyName := "Firstname Lastname (me domain.net)" ENDIF nOffset := hb_UTCOffset()