Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use local timezone for commit (add --use-localtime option) #149

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

use local timezone for commit (add --use-localtime option) #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a94c26
use localtime
m-tmatma Jan 3, 2023
61b9d30
add --use-localtime option
m-tmatma Jan 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ static const CommandLineOption options[] = {
{"--svn-ignore", "Import svn-ignore-properties via .gitignore"},
{"--propcheck", "Check for svn-properties except svn-ignore"},
{"--fast-import-timeout SECONDS", "number of seconds to wait before terminating fast-import, 0 to wait forever"},
{"--use-localtime", "use local time for commit"},
{"-h, --help", "show help"},
{"-v, --version", "show version"},
CommandLineLastOption
Expand Down
23 changes: 21 additions & 2 deletions src/repository.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <QDir>
#include <QFile>
#include <QLinkedList>
#include <time.h>

static const int maxSimultaneousProcesses = 100;

Expand Down Expand Up @@ -1077,10 +1078,19 @@ bool FastImportRepository::Transaction::commitNote(const QByteArray &noteText, b
message = "Appending Git note for current " + commitRef + "\n";
}

QString timezone;
if(CommandLineParser::instance()->contains("use-localtime")) {
struct tm lt = {0};
localtime_r((const time_t*)&datetime, &lt);
timezone.sprintf( "%+02d%02d", lt.tm_gmtoff / 3600, (lt.tm_gmtoff / 60) % 60 );
} else {
timezone = "+0000";
}

QByteArray s("");
s.append("commit refs/notes/commits\n");
s.append("mark :" + QByteArray::number(maxMark) + "\n");
s.append("committer " + author + " " + QString::number(datetime) + " +0000" + "\n");
s.append("committer " + author + " " + QString::number(datetime) + " " + timezone + "\n");
s.append("data " + QString::number(message.length()) + "\n");
s.append(message + "\n");
s.append("N inline " + commitRef + "\n");
Expand Down Expand Up @@ -1148,10 +1158,19 @@ int FastImportRepository::Transaction::commit()
if (!branchRef.startsWith("refs/"))
branchRef.prepend("refs/heads/");

QString timezone;
if(CommandLineParser::instance()->contains("use-localtime")) {
struct tm lt = {0};
localtime_r((const time_t*)&datetime, &lt);
timezone.sprintf( "%+02d%02d", lt.tm_gmtoff / 3600, (lt.tm_gmtoff / 60) % 60 );
} else {
timezone = "+0000";
}

QByteArray s("");
s.append("commit " + branchRef + "\n");
s.append("mark :" + QByteArray::number(mark) + "\n");
s.append("committer " + author + " " + QString::number(datetime).toUtf8() + " +0000" + "\n");
s.append("committer " + author + " " + QString::number(datetime).toUtf8() + " " + timezone + "\n");
s.append("data " + QString::number(message.length()) + "\n");
s.append(message + "\n");
repository->fastImport.write(s);
Expand Down