Staging
v0.5.1
https://github.com/git/git
Revision b2c2e4c22c6a4fe151f02380d247cf3d9a9d5d1e authored by Jakub Narebski on 24 January 2010, 18:05:23 UTC, committed by Junio C Hamano on 25 January 2010, 01:48:08 UTC
In Internet Explorer 8 (IE8) the 'blame_incremental' view, which uses
JavaScript to generate blame info using AJAX, sometimes hang at the
beginning (at 0%) of blaming, e.g. for larger files with long history
like git's own gitweb/gitweb.perl.

The error shown by JavaScript console is "Unspecified error" at char:2
of the following line in gitweb/gitweb.js:

  if (xhr.readyState === 3 && xhr.status !== 200) {

Debugging it using IE8 JScript debuger shown that the error occurs
when trying to access xhr.status (xhr is XMLHttpRequest object).
Watch for xhr object shows 'Unspecified error.' as "value" of
xhr.status, and trying to access xhr.status from console throws error.

This bug is some intermittent bug, depending on XMLHttpRequest timing,
as it doesn't occur in all cases.  It is probably caused by the fact
that handleResponse is called from timer (pollTimer), to work around
the fact that some browsers call onreadystatechange handler only once
for each state change, and not like required for 'blame_incremental'
as soon as new data is available from server.  It looks like xhr
object is not properly initialized; still it is a bug to throw an
error when accessing xhr.status (and not use 'null' or 'undefined' as
value).

Work around this bug in IE8 by using try-catch block when accessing
xhr.status.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 026680f
Raw File
Tip revision: b2c2e4c22c6a4fe151f02380d247cf3d9a9d5d1e authored by Jakub Narebski on 24 January 2010, 18:05:23 UTC
gitweb.js: Workaround for IE8 bug
Tip revision: b2c2e4c
git-notes.sh
#!/bin/sh

USAGE="(edit [-F <file> | -m <msg>] | show) [commit]"
. git-sh-setup

test -z "$1" && usage
ACTION="$1"; shift

test -z "$GIT_NOTES_REF" && GIT_NOTES_REF="$(git config core.notesref)"
test -z "$GIT_NOTES_REF" && GIT_NOTES_REF="refs/notes/commits"

MESSAGE=
while test $# != 0
do
	case "$1" in
	-m)
		test "$ACTION" = "edit" || usage
		shift
		if test "$#" = "0"; then
			die "error: option -m needs an argument"
		else
			if [ -z "$MESSAGE" ]; then
				MESSAGE="$1"
			else
				MESSAGE="$MESSAGE

$1"
			fi
			shift
		fi
		;;
	-F)
		test "$ACTION" = "edit" || usage
		shift
		if test "$#" = "0"; then
			die "error: option -F needs an argument"
		else
			if [ -z "$MESSAGE" ]; then
				MESSAGE="$(cat "$1")"
			else
				MESSAGE="$MESSAGE

$(cat "$1")"
			fi
			shift
		fi
		;;
	-*)
		usage
		;;
	*)
		break
		;;
	esac
done

COMMIT=$(git rev-parse --verify --default HEAD "$@") ||
die "Invalid commit: $@"

case "$ACTION" in
edit)
	if [ "${GIT_NOTES_REF#refs/notes/}" = "$GIT_NOTES_REF" ]; then
		die "Refusing to edit notes in $GIT_NOTES_REF (outside of refs/notes/)"
	fi

	MSG_FILE="$GIT_DIR/new-notes-$COMMIT"
	GIT_INDEX_FILE="$MSG_FILE.idx"
	export GIT_INDEX_FILE

	trap '
		test -f "$MSG_FILE" && rm "$MSG_FILE"
		test -f "$GIT_INDEX_FILE" && rm "$GIT_INDEX_FILE"
	' 0

	CURRENT_HEAD=$(git show-ref "$GIT_NOTES_REF" | cut -f 1 -d ' ')
	if [ -z "$CURRENT_HEAD" ]; then
		PARENT=
	else
		PARENT="-p $CURRENT_HEAD"
		git read-tree "$GIT_NOTES_REF" || die "Could not read index"
	fi

	if [ -z "$MESSAGE" ]; then
		GIT_NOTES_REF= git log -1 $COMMIT | sed "s/^/#/" > "$MSG_FILE"
		if [ ! -z "$CURRENT_HEAD" ]; then
			git cat-file blob :$COMMIT >> "$MSG_FILE" 2> /dev/null
		fi
		core_editor="$(git config core.editor)"
		${GIT_EDITOR:-${core_editor:-${VISUAL:-${EDITOR:-vi}}}} "$MSG_FILE"
	else
		echo "$MESSAGE" > "$MSG_FILE"
	fi

	grep -v ^# < "$MSG_FILE" | git stripspace > "$MSG_FILE".processed
	mv "$MSG_FILE".processed "$MSG_FILE"
	if [ -s "$MSG_FILE" ]; then
		BLOB=$(git hash-object -w "$MSG_FILE") ||
			die "Could not write into object database"
		git update-index --add --cacheinfo 0644 $BLOB $COMMIT ||
			die "Could not write index"
	else
		test -z "$CURRENT_HEAD" &&
			die "Will not initialise with empty tree"
		git update-index --force-remove $COMMIT ||
			die "Could not update index"
	fi

	TREE=$(git write-tree) || die "Could not write tree"
	NEW_HEAD=$(echo Annotate $COMMIT | git commit-tree $TREE $PARENT) ||
		die "Could not annotate"
	git update-ref -m "Annotate $COMMIT" \
		"$GIT_NOTES_REF" $NEW_HEAD $CURRENT_HEAD
;;
show)
	git rev-parse -q --verify "$GIT_NOTES_REF":$COMMIT > /dev/null ||
		die "No note for commit $COMMIT."
	git show "$GIT_NOTES_REF":$COMMIT
;;
*)
	usage
esac
back to top