Some new options to distinguish date and title, +American spelling of color

ChangeLog

@@ -1,3 +1,17 @@
+0.50:
+ * Right mouse button rotation now pivots around the camera.
+ * Added --no-time-travel option (Lars Schmertmann).
+ * Added --dir-name-position option (Lars Schmertmann).
+ * Added --file-extension-fallback option (Lars Schmertmann).
+ * Added --user-show-filter option (Victor Lopez).
+ * Fixed a bug in the Mercurial log parser that caused changes to be missed.
+ * Fixed file removal being cancelled by an action with an earlier timestamp.
+ * Fixed a bug in the log file format detection that could result in the wrong
+   first entry being displayed for a custom log.
+
+0.49:
+ * Fixed compatibility with GLM 0.9.9.0.
+
 0.48:
  * Can now generate logs from git sub module directories.
 

INSTALL

@@ -27,8 +27,6 @@ Optional:
 
 SDL Image 2.0 needs to have been built with support PNG and JPEG images.
 
-GLM is a header only library that you can get from http://glm.g-truc.net/ if your distribution does not include it.
-
 2. Building
 ===========
 
@@ -65,8 +63,8 @@ If you already have these fonts, you can configure Gource to use them with:
 
     ./configure --enable-ttf-font-dir=/path/to/freefont/
 
-Gource includes a copy of the TinyXML library. To make Gource build against
-the system library of TinyXML use:
+Gource includes a copy of TinyXML. To build against the system version of the
+library use:
 
     ./configure --with-tinyxml
 

README

@@ -34,7 +34,7 @@ card to run.
 3. Using Gource
 ===============
 
-gource <options> <path>
+gource [options] [path]
 
 options:
 
@@ -66,7 +66,7 @@ options:
     --transparent
             Make the background transparent. Only really useful for screenshots.
 
-    --start-date 'YYYY-MM-DD hh:mm:ss +tz'
+    --start-date "YYYY-MM-DD hh:mm:ss +tz"
             Start with the first entry after the supplied date and optional time.
 
             If a time zone offset isn't specified the local time zone is used.
@@ -77,7 +77,7 @@ options:
                 "2012-06-30 12:00"
                 "2012-06-30 12:00:00 +12"
 
-    --stop-date 'YYYY-MM-DD hh:mm:ss +tz'
+    --stop-date "YYYY-MM-DD hh:mm:ss +tz"
             Stop after the last entry prior to the supplied date and optional time.
 
             Uses the same format as --start-date.
@@ -106,6 +106,9 @@ options:
         --realtime
             Realtime playback speed.
 
+        --no-time-travel
+            Use the time of the last commit if the time of a commit is in the past.
+
     -c, --time-scale SCALE
             Change simulation time scale.
 
@@ -116,7 +119,7 @@ options:
     -e, --elasticity FLOAT
             Elasticity of nodes.
 
-    -b, --background-colour FFFFFF
+    -b, --background, --background-colour, --background-color FFFFFF
             Background colour in hex.
 
     --background-image IMAGE
@@ -134,9 +137,21 @@ options:
     --font-size SIZE
             Font size used by the date and title.
 
-    --font-colour FFFFFF
+    --title-size SIZE
+            Font size used by just the title.
+
+    --font-colour, --font-color FFFFFF
             Font colour used by the date and title in hex.
 
+    --title-colour, --title-color FFFFFF
+            Font colour used by just the title in hex.
+
+    --date-height-pad VALUE
+            Value to add to the y position of the date.
+
+    --title-height-pad VALUE
+            Value to add to the y position of the title.
+
     --key
             Show file extension key.
 
@@ -166,44 +181,54 @@ options:
     --highlight-users
             Highlight the names of all users.
 
-    --highlight-colour FFFFFF
+    --highlight-colour, --highlight-color FFFFFF
             Font colour for highlighted users in hex.
 
-    --selection-colour FFFFFF
+    --selection-colour, --selection-color FFFFFF
             Font colour for selected users and files.
 
-    --filename-colour FFFFFF
+    --filename-colour, --filename-color FFFFFF
             Font colour for filenames.
 
-    --dir-colour FFFFFF
+    --dir-colour, --dir-color FFFFFF
             Font colour for directories.
 
     --dir-name-depth DEPTH
             Draw names of directories down to a specific depth in the tree.
 
+    --dir-name-position FLOAT
+            Position along edge of the directory name
+            (between 0.1 and 1.0, default is 0.5).
+
     --filename-time SECONDS
             Duration to keep filenames on screen (>= 2.0).
 
     --file-extensions
             Show filename extensions only.
 
+    --file-extension-fallback
+            Use filename as extension if the extension is missing or empty.
+
     --file-filter REGEX
-            Filter out any files matching a specified regular expression.
+            Filter out file paths matching the specified regular expression.
 
     --file-show-filter REGEX
-            Show only files matching this regular expression.
+            Show only file paths matching the specified regular expression.
 
     --user-filter REGEX
-            Filter out any users matching a specified regular expression.
+            Filter usernames matching the specified regular expression.
+
+    --user-show-filter REGEX
+            Show only usernames matching the specified regular expression.
 
     --user-image-dir DIRECTORY
             Directory containing .jpg or .png images of users
-            (eg 'Full Name.png') to use as avatars.
+            (eg "Full Name.png") to use as avatars.
 
     --default-user-image IMAGE
             Path of .jpg or .png to use as the default user image.
 
-    --colour-images
+    --colour-images, --color-images
             Colourize user images.
 
     --crop AXIS
@@ -264,7 +289,7 @@ options:
             users     - user avatars
             usernames - names of users
 
-            Separate multiple elements with commas (eg 'mouse,progress')
+            Separate multiple elements with commas (eg "mouse,progress")
 
     --hash-seed SEED
             Change the seed of hash function.
@@ -275,7 +300,7 @@ options:
     --caption-size SIZE
             Caption size.
 
-    --caption-colour FFFFFF
+    --caption-colour, --caption-color FFFFFF
             Caption colour in hex.
 
     --caption-duration SECONDS

autogen.sh

@@ -4,7 +4,7 @@ if (autoreconf -f -i) ; then
 	echo "Initializing submodules..."
 	if (git submodule init) ; then
 		echo "Updating submodules..."
-		if (git submodule update) ; then
+		if (git submodule update --init --recursive) ; then
 			echo "Run './configure && make' to continue."
 		else
 			echo "Error: could not update submodules!"

configure.ac

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.61)
 
-AC_INIT(Gource, 0.48, [[email protected]])
+AC_INIT(Gource, 0.50, [[email protected]])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/main.h])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign subdir-objects])
@@ -53,14 +53,13 @@ AX_BOOST_FILESYSTEM
 CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
 LIBS="$LIBS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB"
 
-#GLM
-AC_CHECK_HEADER([glm/glm.hpp],, AC_MSG_ERROR(GLM headers are required. Please see INSTALL))
-
 #see if ttf-font-dir option is enabled
 AC_ARG_ENABLE(ttf-font-dir,[AS_HELP_STRING([--enable-ttf-font-dir=DIR],[directory containing GNU FreeFont TTF fonts])],[gourcefontdir="$enableval"],[gourcefontdir=""])
 AM_CONDITIONAL([FONTDIR], [test "x$gourcefontdir" != "x"])
 AC_SUBST(gourcefontdir)
 
+#GLM
+AC_CHECK_HEADER([glm/glm.hpp],, AC_MSG_ERROR(GLM headers are required. Please see INSTALL))
 
 #see if building against system TinyXML library
 use_tinyxml_system_library=no

data/gource.1

@@ -3,7 +3,7 @@
 Gource - a software version control visualization
 .SH SYNOPSIS
 \fIgource\fR
-<options> <path>
+[options] [path]
 .SH DESCRIPTION
 \fIgource\fR is an OpenGL-based 3D visualisation tool for source control repositories.
 
@@ -36,7 +36,7 @@ Frameless window.
 \fB\-\-transparent\fR
 Make the background transparent. Only really useful for screenshots.
 .TP
-\fB\-\-start\-date 'YYYY\-MM\-DD hh:mm:ss +tz'\fR
+\fB\-\-start\-date "YYYY\-MM\-DD hh:mm:ss +tz"\fR
 Start with the first entry after the supplied date and optional time.
 
 If a time zone offset isn't specified the local time zone is used.
@@ -47,7 +47,7 @@ Example accepted formats:
     "2012-06-30 12:00"
     "2012-06-30 12:00:00 +12"
 .TP
-\fB\-\-stop\-date 'YYYY\-MM\-DD hh:mm:ss +tz'\fR
+\fB\-\-stop\-date "YYYY\-MM\-DD hh:mm:ss +tz"\fR
 Stop at the last entry prior to the supplied date and optional time.
 
 Uses the same format as \-\-start\-date.
@@ -76,6 +76,9 @@ Speed of simulation in seconds per day.
 \fB\-\-realtime\fR
 Realtime playback speed.
 .TP
+\fB\-\-no\-time\-travel\fR
+Use the time of the last commit if the time of a commit is in the past.
+.TP
 \fB\-c, \-\-time\-scale SCALE\fR
 Change simulation time scale.
 .TP
@@ -148,23 +151,32 @@ Font colour for directories.
 \fB\-\-dir\-name\-depth DEPTH\fR
 Draw names of directories down to a specific depth in the tree.
 .TP
+\fB\-\-dir\-name\-position FLOAT
+Position along edge of the directory name (between 0.1 and 1.0, default is 0.5).
+.TP
 \fB\-\-filename\-time SECONDS\fR
 Duration to keep filenames on screen (>= 2.0).
 .TP
 \fB\-\-file\-extensions\fR
 Show filename extensions only.
 .TP
+\fB\-\-file\-extension\-fallback\fR
+Use filename as extension if the extension is missing or empty.
+.TP
 \fB\-\-file\-filter REGEX\fR
-Filter out any files matching a specified regular expression.
+Filter out file paths matching the specified regular expression.
 .TP
 \fB\-\-file\-show\-filter REGEX\fR
-Show only files matching this regular expression.
+Show only file paths matching the specified regular expression.
 .TP
 \fB\-\-user\-filter REGEX\fR
-Filter out any usernames matching a specified regular expression.
+Filter usernames matching the specified regular expression.
+.TP
+\fB\-\-user\-show\-filter REGEX\fR
+Show only usernames matching the specified regular expression.
 .TP
 \fB\-\-user\-image\-dir DIRECTORY\fR
-Directory containing .jpg or .png images of users (eg 'Full Name.png') to use as avatars.
+Directory containing .jpg or .png images of users (eg "Full Name.png") to use as avatars.
 .TP
 \fB\-\-default\-user\-image IMAGE\fR
 Path of .jpg to use as the default user image.
@@ -226,7 +238,7 @@ Hide one or more display elements from the list below:
     users     \- user avatars
     usernames \- names of users
 
-Separate multiple elements with commas (eg 'mouse,progress')
+Separate multiple elements with commas (eg "mouse,progress")
 
 .TP
 \fB\-\-hash\-seed SEED\fR