Skip to content

C
core
Kaydet (Commit) d8aa5dfa authored tarafından Vladimir Glazunov's avatar Vladimir Glazunov
Dosyalara gözat
Seçenekler

#i107041# use user defined SOURCE_ROOT as default hg_root

üst 125d4ada
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
solenv/bin/modules/SourceConfig.pm
Dosyayı görüntüle @ d8aa5dfa
...@@ -216,6 +216,8 @@ sub get_config_file { ...@@ -216,6 +216,8 @@ sub get_config_file {
}; };
sub get_hg_root { sub get_hg_root {
my $self = shift;
return $self->{USER_SOURCE_ROOT} if (defined $self->{USER_SOURCE_ROOT});
my $hg_root; my $hg_root;
if (open(COMMAND, "hg root 2>&1 |")) { if (open(COMMAND, "hg root 2>&1 |")) {
foreach (<COMMAND>) { foreach (<COMMAND>) {
...@@ -236,12 +238,7 @@ sub get_hg_root { ...@@ -236,12 +238,7 @@ sub get_hg_root {
sub read_config_file { sub read_config_file {
my $self = shift; my $self = shift;
if (!$self->{SOURCE_CONFIG_FILE}) { if (!$self->{SOURCE_CONFIG_FILE}) {
my $repository_root; my $repository_root = get_hg_root($self);
if (defined $self->{USER_SOURCE_ROOT}) {
$repository_root = $self->{USER_SOURCE_ROOT};
} else {
$repository_root = get_hg_root();
};
${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root; ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root;
return; return;
}; };
...@@ -281,7 +278,7 @@ sub read_config_file { ...@@ -281,7 +278,7 @@ sub read_config_file {
close SOURCE_CONFIG_FILE; close SOURCE_CONFIG_FILE;
if (!scalar keys %{$self->{REPOSITORIES}}) { if (!scalar keys %{$self->{REPOSITORIES}}) {
# Fallback - default repository is the directory where is our module... # Fallback - default repository is the directory where is our module...
my $hg_root = get_hg_root(); my $hg_root = get_hg_root($self);
${$self->{REPOSITORIES}}{File::Basename::basename($hg_root)} = $hg_root; ${$self->{REPOSITORIES}}{File::Basename::basename($hg_root)} = $hg_root;
}; };
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment