[COGITO PATCH] value too great for base (error token is "-0800")

[COGITO PATCH] value too great for base (error token is "-0800")

[Pavel Roskin]

Hello!

The current cogito has problems with timezones that are too far from the
Greenwich meridian :-)

Bash interprets numbers beginning with 0 as octals.  Therefore, we need
to strip leading zeroes or zeroes following "-".  But if we get too
zealous and strip all digits, we'll need to restore one 0.  I tried to
write for sed portably, so I avoided some optimizations, such as
s/^-\?$/0/

Signed-off-by: Pavel Roskin <proski@gnu.org>

diff --git a/cg-Xlib b/cg-Xlib
--- a/cg-Xlib
+++ b/cg-Xlib
@@ -65,7 +65,7 @@ showdate () {
 	[ "$format" ] || format=-R
 	sec=${date[0]}; tz=${date[1]}
 	if [ "$has_gnudate" ]; then
-	        dtz=${tz/+/}
+	        dtz=$(echo $tz | sed 's/^+//;s/^0*//;s/^-0*/-/;s/^$/0/;s/^-$/0/')
 		lsec=$(($dtz / 100 * 3600 + $dtz % 100 * 60 + $sec))
 	        pdate="$(date -ud "1970-01-01 UTC + $lsec sec" "$format" 2>/dev/null)"
 	else

-- 
Regards,
Pavel Roskin

[PATCH 3/6] Make showdate use "Linus format"

[Dan Holmsand]

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

This makes showdate use the same date format as
git-rev-list --pretty, and gives some speedup. It might also
be more portable.

Note that this changes the calling convention: the previous
version used seconds from $1, but timezone from the global
variable $date. cg-mkpatch is modified to the new way.

Also fixes bash's belief that number literals starting with
zero are octal.

Signed-off-by: Dan Holmsand <holmsand@gmail.com>
---

[-- Attachment #2: 3-showdate.patch.txt --]
[-- Type: text/plain, Size: 1421 bytes --]

 cg-Xlib    |   18 ++++++++----------
 cg-mkpatch |    2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/cg-Xlib b/cg-Xlib
--- a/cg-Xlib
+++ b/cg-Xlib
@@ -60,19 +60,17 @@ stat () {
 }
 
 showdate () {
-	date="$1"
-	format="$2"
-	[ "$format" ] || format=-R
-	sec=${date[0]}; tz=${date[1]}
+	local secs=$1 tzhours=${2:0:3} tzmins=${2:0:1}${2:3} format=$3
+	# bash doesn't like leading zeros
+	[ "${tzhours:1:1}" = 0 ] && tzhours=${2:0:1}${2:2:1}
+	secs=$((secs + tzhours * 3600 + tzmins * 60))
 	if [ "$has_gnudate" ]; then
-	        dtz=${tz/+/}
-		lsec=$(($dtz / 100 * 3600 + $dtz % 100 * 60 + $sec))
-	        pdate="$(date -ud "1970-01-01 UTC + $lsec sec" "$format" 2>/dev/null)"
+		[ "$format" ] || format="+%a %b %-d %H:%M:%S %Y $2"
+		LANG=C date -ud "1970-01-01 UTC + $secs sec" "$format"
 	else
-		# FIXME: $format
-	        pdate="$(date -u -r ${date[0]} 2>/dev/null)"
+		[ "$format" ] || format="+%a %b %d %H:%M:%S %Y $2"
+		date -u -r $secs "$format"
 	fi
-	echo "${pdate/+0000/$tz}"
 }
 
 # Usage: tree_timewarp [--no-head-update] DIRECTION_STR ROLLBACK_BOOL BASE BRANCH
diff --git a/cg-mkpatch b/cg-mkpatch
--- a/cg-mkpatch
+++ b/cg-mkpatch
@@ -52,7 +52,7 @@ showpatch () {
 		case "$key" in
 		"author"|"committer")
 			date=(${rest#*> })
-			pdate="$(showdate $date)"
+			pdate="$(showdate ${date[*]})"
 			[ "$pdate" ] && rest="${rest%> *}> $pdate"
 			echo $key $rest >>$header
 			;;

[ANNOUNCE] Cogito-0.11.3

[Petr Baudis]

  Hello,

  it turned out that Cogito was so broken w.r.t. three-way merging that
I had to really release a bugfix version. So this version contains some
cleanups of the merge script, some more portability fixes (it actually
runs on Debian old stable now!), and especially few bugfixes - cg-log
works with individual files passed to it now, and merging should
hopefully work correctly now too.

  You know what to do. :-)


Junio C Hamano:
  Add read-tree -m 3-way merge tests.

Linus Torvalds:
  One more time.. Clean up git-merge-one-file-script
  Fix up git-merge-one-file-script
  Merge my and Petr's git-merge-one-file-script modifications
  Make sure we error out if we can't remove a file on automatic merges.

Petr Baudis:
  cogito-0.11.3
  Fix cg-merge's three-way content merge
  Support for compilation w/o OpenSSL
  Portable stub for the stat call
  Fix cg-diff -p to work with no -r specified
  git-merge-one-file-script cleanups from Cogito
  Further converge git-merge-one-file-script and cg-Xmergefile
  Remove useless ret=0 in the onefile merge scripts
  Make git-merge-one-file-script and cg-Xmergefile converge even more
  Fix cg-log called on specified files
  Tidy up some rev-list-related stuff
  Fix git-merge-one-file permissions auto-merging

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
<Espy> be careful, some twit might quote you out of context..

Re: [ANNOUNCE] Cogito-0.11.3

[Konstantin Antselovich]

Petr Baudis wrote:
>   Hello,
> 
>   it turned out that Cogito was so broken w.r.t. three-way merging that
> I had to really release a bugfix version. So this version contains some
> cleanups of the merge script, some more portability fixes (it actually
> runs on Debian old stable now!), and especially few bugfixes - cg-log
> works with individual files passed to it now, and merging should
> hopefully work correctly now too.
> 
>   You know what to do. :-)

Hi Petr,

I have updated to Cogito-0.11.3, it compiles and runs
but make test returns multiple error messages (see below)

Rgds,
Konstantin



*** t6001-rev-list-merge-order.sh ***
fatal: merge order sort unsupported, OpenSSL not linked
fatal: merge order sort unsupported, OpenSSL not linked
*   ok 1: Testing that the rev-list has correct number of entries
* FAIL 2: Testing that --merge-order produces the correct result diff
expected-merge-order actual-merge-order
*   ok 3: Testing that --merge-order produces as many or fewer
discontinuities
fatal: merge order sort unsupported, OpenSSL not linked
* FAIL 4: Testing multiple heads diff expected-merge-order-1
actual-merge-order-1
fatal: merge order sort unsupported, OpenSSL not linked
* FAIL 5: Testing stop diff expected-merge-order-2 actual-merge-order-2
fatal: merge order sort unsupported, OpenSSL not linked
* FAIL 6: Testing stop in linear epoch diff expected-merge-order-3
actual-merge-order-3
fatal: merge order sort unsupported, OpenSSL not linked
* FAIL 7: Testing start in linear epoch, stop after non-linear epoch
diff expected-merge-order-4 actual-merge-order-4
* FAIL 8: Testing duplicated start arguments diff expected-merge-order-4
actual-merge-order-5
* FAIL 9: Testing exclusion near merge git-rev-list --merge-order $a4
^$c3 2>/dev/null
* failed 7 among 9 test(s)
make[1]: *** [all] Error 1
make[1]: Leaving directory `/home/konstantin/git/cogito/t'
make: *** [test] Error 2



> 


-- 
Konstantin Antselovich
mailto: konstantin@antselovich.com
http://konstantin.antselovich.com

Re: [ANNOUNCE] Cogito-0.11.3

[Dan Holmsand]

Konstantin Antselovich wrote:
> I have updated to Cogito-0.11.3, it compiles and runs
> but make test returns multiple error messages (see below)

There's a typo in rev-list.c. This fixes the tests for me:

diff --git a/rev-list.c b/rev-list.c
--- a/rev-list.c
+++ b/rev-list.c
@@ -218,7 +218,7 @@ int main(int argc, char **argv)
                         list = limit_list(list);
                 show_commit_list(list);
         } else {
-#ifdef NO_OPENSSL
+#ifndef NO_OPENSSL
                 if (sort_list_in_merge_order(list, &process_commit)) {
                           die("merge order sort failed\n");
                 }

Re: [ANNOUNCE] Cogito-0.11.3

[Chris Wright]

* Dan Holmsand (holmsand@gmail.com) wrote:
> Konstantin Antselovich wrote:
> >I have updated to Cogito-0.11.3, it compiles and runs
> >but make test returns multiple error messages (see below)
> 
> There's a typo in rev-list.c. This fixes the tests for me:

This patch is white space damaged.  I fixed it, and added it to the
cogito-0.11.3 rpm.  Below is the refreshed patch.

thanks,
-chris
--

From: Dan Holmsand <holmsand@gmail.com>

There's a typo in rev-list.c. This fixes the tests for me:

diff --git a/rev-list.c b/rev-list.c
--- a/rev-list.c
+++ b/rev-list.c
@@ -218,7 +218,7 @@ int main(int argc, char **argv)
 			list = limit_list(list);
 		show_commit_list(list);
 	} else {
-#ifdef NO_OPENSSL
+#ifndef NO_OPENSSL
 		if (sort_list_in_merge_order(list, &process_commit)) {
 			  die("merge order sort failed\n");
 		}

Re: [ANNOUNCE] Cogito-0.11.3

[Chris Wright]

* Chris Wright (chrisw@osdl.org) wrote:
> * Dan Holmsand (holmsand@gmail.com) wrote:
> > Konstantin Antselovich wrote:
> > >I have updated to Cogito-0.11.3, it compiles and runs
> > >but make test returns multiple error messages (see below)
> > 
> > There's a typo in rev-list.c. This fixes the tests for me:
> 
> This patch is white space damaged.  I fixed it, and added it to the
> cogito-0.11.3 rpm.  Below is the refreshed patch.

Looks like showdate() is having some minor trouble.  A simple cg-log
gave me errors indicating the tz is being interpreted as octal.
There's probably a better way, but bruteforce works ;-) This patch is
in the RPM packages which are now uploading.

thanks,
-chris
--

Strip leading zero from timezone to keep it from being interpreted as
octal causing error such as:

/usr/lib/cogito/cg-Xlib: line 69: 0800: value too great for base (error token is "0800")

Signed-off-by: Chris Wright <chrisw@osdl.org>

--- a/cg-Xlib
+++ b/cg-Xlib
@@ -65,7 +65,9 @@ showdate () {
 	[ "$format" ] || format=-R
 	sec=${date[0]}; tz=${date[1]}
 	if [ "$has_gnudate" ]; then
-	        dtz=${tz/+/}
+	        dtz=${tz/-0/-}
+	        dtz=${dtz/+/}
+	        dtz=${dtz/#0/}
 		lsec=$(($dtz / 100 * 3600 + $dtz % 100 * 60 + $sec))
 	        pdate="$(date -ud "1970-01-01 UTC + $lsec sec" "$format" 2>/dev/null)"
 	else

[PATCH] Fix cogito handling of timezones

[Frank Sorenson]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Current cogito behavior treats the timezone offset as if it's decimal,
but most zone offsets begin with a 0.  As a result, the computation
in cg-Xlib uses the zone offset as an octal number.  -0700 looks like
4 1/2 hours offset, rather than 7, and -0800 is an invalid octal
number.

This patch fixes the behavior to strip off leading 0s.  It's ugly,
but it should produce the right values until someone with better
bash scripting skills than I can fix it.

Signed-off-by: Frank Sorenson <frank@tuxrocks.com>

diff --git a/cg-Xlib b/cg-Xlib
- --- a/cg-Xlib
+++ b/cg-Xlib
@@ -6,6 +6,8 @@
 # This file provides a library containing common code shared with all the
 # Cogito programs.
 
+shopt -s extglob
+
 _cg_cmd=${0##*/}
 
 _git=${GIT_DIR:-.git}
@@ -51,8 +53,12 @@ showdate () {
 	[ "$format" ] || format=-R
 	sec=${date[0]}; tz=${date[1]}
 	if [ "$has_gnudate" ]; then
- -	        dtz=${tz/+/}
- -		lsec=$(($dtz / 100 * 3600 + $dtz % 100 * 60 + $sec))
+		sign=${tz%%[0-9]*}
+		sign=${sign:?+}
+		dtz=${tz/[+-]}
+		dtz=${dtz##*(0)}
+		dtz=${dtz:?0}
+		lsec=$(($sec + $dtz % 100 $sign $dtz / 100 * 3600))
 	        pdate="$(date -ud "1970-01-01 UTC + $lsec sec" "$format" 2>/dev/null)"
 	else
 		# FIXME: $format


Frank
- -- 
Frank Sorenson - KD7TZK
Systems Manager, Computer Science Department
Brigham Young University
frank@tuxrocks.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCp7oXaI0dwg4A47wRAnOFAJ4jsaQodgxOr3gp8jMYhOxuJ98GFgCgnclC
Zd68hflXn8pV39zBF4YOlUc=
=C+hn
-----END PGP SIGNATURE-----

Re: [PATCH] Fix cogito handling of timezones

[Petr Baudis]

Dear diary, on Thu, Jun 09, 2005 at 05:40:07AM CEST, I got a letter
where Frank Sorenson <frank@tuxrocks.com> told me that...
> Current cogito behavior treats the timezone offset as if it's decimal,
> but most zone offsets begin with a 0.  As a result, the computation
> in cg-Xlib uses the zone offset as an octal number.  -0700 looks like
> 4 1/2 hours offset, rather than 7, and -0800 is an invalid octal
> number.
> 
> This patch fixes the behavior to strip off leading 0s.  It's ugly,
> but it should produce the right values until someone with better
> bash scripting skills than I can fix it.
> 
> Signed-off-by: Frank Sorenson <frank@tuxrocks.com>
> 
> diff --git a/cg-Xlib b/cg-Xlib
> --- a/cg-Xlib
> +++ b/cg-Xlib
> @@ -51,8 +53,12 @@ showdate () {
>  	[ "$format" ] || format=-R
>  	sec=${date[0]}; tz=${date[1]}
>  	if [ "$has_gnudate" ]; then
> -	        dtz=${tz/+/}
> -		lsec=$(($dtz / 100 * 3600 + $dtz % 100 * 60 + $sec))
> +		sign=${tz%%[0-9]*}
> +		sign=${sign:?+}
> +		dtz=${tz/[+-]}
> +		dtz=${dtz##*(0)}
> +		dtz=${dtz:?0}
> +		lsec=$(($sec + $dtz % 100 $sign $dtz / 100 * 3600))

It looks ok, but shouldn't this be
+		lsec=$(($sec + $dtz % 100 * 60 $sign $dtz / 100 * 3600))

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
<Espy> be careful, some twit might quote you out of context..

Re: [PATCH] Fix cogito handling of timezones

[Frank Sorenson]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Petr Baudis wrote:

> It looks ok, but shouldn't this be
> +		lsec=$(($sec + $dtz % 100 * 60 $sign $dtz / 100 * 3600))

Ah, yes, of course.  I see that Dan Holmsand has also sent a patch (3/6)
to fix this.  I haven't tested his very much, but it looks like a
cleaner and more comprehensive solution.  Sigh.

Frank
- -- 
Frank Sorenson - KD7TZK
Systems Manager, Computer Science Department
Brigham Young University
frank@tuxrocks.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCqFAtaI0dwg4A47wRAlaEAJ0Ui38Yrwp7r0QUseI5/7n4kbnRaACfZBv0
M5TClhJuvD2y7fz/Fm9pNes=
=SOdU
-----END PGP SIGNATURE-----

Re: [PATCH] Fix cogito handling of timezones

[Petr Baudis]

  Hello,

  FYI, from the contestants for the octal fix, I've chosen to take Dan's
solution - not that I'd think it's the best, but it's simple and
mainly I'm taking other Dan's changes and I don't like solving
conflicts.

> +	local secs=$1 tzhours=${2:0:3} tzmins=${2:0:1}${2:3} format=$3
> +	# bash doesn't like leading zeros
> +	[ "${tzhours:1:1}" = 0 ] && tzhours=${2:0:1}${2:2:1}
> +	secs=$((secs + tzhours * 3600 + tzmins * 60))

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
<Espy> be careful, some twit might quote you out of context..

Re: [PATCH 3/6] Make showdate use "Linus format"

[Petr Baudis]

Thanks, applied.

Dear diary, on Thu, Jun 09, 2005 at 01:19:30PM CEST, I got a letter
where Dan Holmsand <holmsand@gmail.com> told me that...
> This makes showdate use the same date format as
> git-rev-list --pretty, and gives some speedup. It might also
> be more portable.

I dropped the format change bit, because I really think the Linus' date
format is bad. The current standardized, international and most widely
used (even your mailer agent used it in your Date: header) date format
is RFC 822, so please let's stick with it. It's perfect for our use, and
better human-readable too. The date part isn't split all around but
concentrated in the first half while the second half is dedicated to
time.

> Note that this changes the calling convention: the previous
> version used seconds from $1, but timezone from the global
> variable $date. cg-mkpatch is modified to the new way.

You forgot to modify cg-log accordingly. (I fixed that.)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
<Espy> be careful, some twit might quote you out of context..

Re: [PATCH 3/6] Make showdate use "Linus format"

[Dan Holmsand]

Petr Baudis wrote:
> Thanks, applied.
> 
> Dear diary, on Thu, Jun 09, 2005 at 01:19:30PM CEST, I got a letter
> where Dan Holmsand <holmsand@gmail.com> told me that...
> 
>>This makes showdate use the same date format as
>>git-rev-list --pretty, and gives some speedup. It might also
>>be more portable.
> 
> 
> I dropped the format change bit, because I really think the Linus' date
> format is bad. The current standardized, international and most widely
> used (even your mailer agent used it in your Date: header) date format
> is RFC 822, so please let's stick with it. It's perfect for our use, and
> better human-readable too. The date part isn't split all around but
> concentrated in the first half while the second half is dedicated to
> time.

Ok, I really have nothing against RFC822. But if Linus' format is bad, 
then git-rev-list --pretty should be fixed (or, rather, date.c). It 
doesn't make any sense to me to have different formats between cogito 
and core git.

And I'd really, really like to use as much of git-rev-list --pretty 
output as possible in cg-log. That makes the whole thing some orders of 
magnitude faster, and thus more usable.

>>Note that this changes the calling convention: the previous
>>version used seconds from $1, but timezone from the global
>>variable $date. cg-mkpatch is modified to the new way.
> 
> 
> You forgot to modify cg-log accordingly. (I fixed that.)

Thanks. I did the "hope he takes my other patch too" thing... Sorry 
'bout that.

/dan