git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use .mklog name and email settings, or git settings 

2014-11-25  Tom de Vries  <tom@codesourcery.com>
	    Peter Bergner  <bergner@vnet.ibm.com>

	* mklog: Handle .mklog.  Use git setting independent of presence .git
	directory.

Co-Authored-By: Peter Bergner <bergner@vnet.ibm.com>

From-SVN: r218050
This commit is contained in:
Tom de Vries 2014-11-25 16:45:13 +00:00 committed by Tom de Vries
parent 743c11344e
commit fdb424cfea
2 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/ChangeLog
View File

@ -1,3 +1,9 @@
2014-11-25 Tom de Vries <tom@codesourcery.com>
Peter Bergner <bergner@vnet.ibm.com>
* mklog: Handle .mklog. Use git setting independent of presence .git
directory.
2014-11-14 Tom de Vries <tom@codesourcery.com> 2014-11-14 Tom de Vries <tom@codesourcery.com>
* mklog: Move reading of .diff file up and add comment. Copy diff_lines * mklog: Move reading of .diff file up and add comment. Copy diff_lines

56
contrib/mklog
View File

@ -29,32 +29,46 @@
use File::Temp; use File::Temp;
use File::Copy qw(cp mv); use File::Copy qw(cp mv);
# Change these settings to reflect your profile.
$username = $ENV{'USER'};
$name = `finger $username | grep -o 'Name: .*'`;
@n = split(/: /, $name);
$name = $n[1]; chop($name);
$addr = $username . "\@my.domain.org";
$date = `date +%Y-%m-%d`; chop ($date); $date = `date +%Y-%m-%d`; chop ($date);
$dot_mklog_format_msg =
"The .mklog format is:\n"
. "NAME = ...\n"
. "EMAIL = ...\n";
# Create a .mklog to reflect your profile, if necessary.
my $conf = "$ENV{HOME}/.mklog";
if (-f "$conf") {
open (CONF, "$conf")
or die "Could not open file '$conf' for reading: $!\n";
while (<CONF>) {
if (m/^\s*NAME\s*=\s*(.*?)\s*$/) {
$name = $1;
} elsif (m/^\s*EMAIL\s*=\s*(.*?)\s*$/) {
$addr = $1;
}
}
if (!($name && $addr)) {
die "Could not read .mklog settings.\n"
. $dot_mklog_format_msg;
}
} else {
$name = `git config user.name`;
chomp($name);
$addr = `git config user.email`;
chomp($addr);
if (!($name && $addr)) {
die "Could not read git user.name and user.email settings.\n"
. "Please add missing git settings, or create a .mklog file in"
. " $ENV{HOME}.\n"
. $dot_mklog_format_msg;
}
}
$gcc_root = $0; $gcc_root = $0;
$gcc_root =~ s/[^\\\/]+$/../; $gcc_root =~ s/[^\\\/]+$/../;
# if this is a git tree then take name and email from the git configuration
if (-d "$gcc_root/.git") {
$gitname = `git config user.name`;
chomp($gitname);
if ($gitname) {
$name = $gitname;
}
$gitaddr = `git config user.email`;
chomp($gitaddr);
if ($gitaddr) {
$addr = $gitaddr;
}
}
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Program starts here. You should not need to edit anything below this # Program starts here. You should not need to edit anything below this
# line. # line.