Merge pull request acaudwell#338 from onlyJakob/author-time

add author-time option

Author: acaudwell

README.md

@@ -109,6 +109,9 @@ options:
         --no-time-travel
             Use the time of the last commit if the time of a commit is in the past.
 
+        --author-time
+            Use the timestamp of the author instead of the timestamp of the committer.
+
     -c, --time-scale SCALE
             Change simulation time scale. This affects the movement speed of user avatars.
 

data/gource.1

@@ -91,6 +91,9 @@ Realtime playback speed.
 \fB\-\-no\-time\-travel\fR
 Use the time of the last commit if the time of a commit is in the past.
 .TP
+\fB\-\-author\-time\fR
+Use the timestamp of the author instead of the timestamp of the committer.
+.TP
 \fB\-c, \-\-time\-scale SCALE\fR
 Change simulation time scale. This affects the movement speed of user avatars.
 

src/formats/git.cpp

@@ -88,7 +88,6 @@ void GitCommitLog::readGitVersion() {
 std::string GitCommitLog::logCommand() {
 
     std::string log_command = "git log "
-    "--pretty=format:user:%aN%n%ct "
     "--reverse --raw --encoding=UTF-8 "
     "--no-renames";
 
@@ -101,7 +100,13 @@ std::string GitCommitLog::logCommand() {
        || git_version_major > 2
        || (git_version_major == 2 && git_version_minor >= 10))
     {
-        log_command.append(" --no-show-signature");
+        log_command += " --no-show-signature";
+    }
+
+    if(gGourceSettings.author_time) {
+        log_command += " --pretty=format:user:%aN%n%at";
+    } else {
+        log_command += " --pretty=format:user:%aN%n%ct";
     }
 
     if(!gGourceSettings.start_date.empty()) {

src/gource_settings.cpp

@@ -77,6 +77,8 @@ void GourceSettings::help(bool extended_help) {
     printf("      --realtime                   Realtime playback speed\n");
     printf("      --no-time-travel             Use the time of the last commit if the\n");
     printf("                                   time of a commit is in the past\n");
+    printf("      --author-time                Use the timestamp of the author instead of\n");
+    printf("                                   the timestamp of the committer\n");
     printf("  -c, --time-scale SCALE           Change simulation time scale (default: 1.0)\n");
     printf("  -e, --elasticity FLOAT           Elasticity of nodes (default: 0.0)\n\n");
 
@@ -274,6 +276,7 @@ GourceSettings::GourceSettings() {
     arg_types["file-extensions"]         = "bool";
     arg_types["file-extension-fallback"] = "bool";
     arg_types["fixed-user-size"]         = "bool";
+    arg_types["author-time"]             = "bool";
     arg_types["key"]                     = "bool";
     arg_types["ffp"]                     = "bool";
 
@@ -395,6 +398,7 @@ void GourceSettings::setGourceDefaults() {
     dont_stop       = false;
     no_time_travel  = false;
     fixed_user_size = false;
+    author_time     = false;
 
     show_key = false;
 
@@ -1378,6 +1382,10 @@ void GourceSettings::importGourceSettings(ConfFile& conffile, ConfSection* gourc
         fixed_user_size = true;
     }
 
+    if(gource_settings->getBool("author-time")) {
+        author_time = true;
+    }
+
     if((entry = gource_settings->getEntry("max-files")) != 0) {
 
         if(!entry->hasValue()) conffile.entryException(entry, "specify max-files (number)");

src/gource_settings.h

@@ -71,6 +71,7 @@ class GourceSettings : public SDLAppSettings {
     bool dont_stop;
     bool no_time_travel;
     bool fixed_user_size;
+    bool author_time;
 
     float auto_skip_seconds;
     float days_per_second;