[gitg/wip/albfan/smart-commit-config] Read setup for smart commits from git config
- From: Alberto Fanjul <albfan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg/wip/albfan/smart-commit-config] Read setup for smart commits from git config
- Date: Mon, 27 Dec 2021 09:11:13 +0000 (UTC)
commit 9dfef5c1a660405726e21dc8d02bd8beedd65015
Author: Alberto Fanjul <albertofanjul gmail com>
Date: Mon Dec 27 10:10:33 2021 +0100
Read setup for smart commits from git config
Allow to use a global config ~/.gitconfig from standard git config
Ignore color in subject (not allowed by Gtk.Label)
libgitg/gitg-diff-view-commit-details.vala | 97 ++++++++++++++----------------
libgitg/gitg-diff-view.vala | 53 ++++++++--------
2 files changed, 73 insertions(+), 77 deletions(-)
---
diff --git a/libgitg/gitg-diff-view-commit-details.vala b/libgitg/gitg-diff-view-commit-details.vala
index 7fb01686..19d15eb3 100644
--- a/libgitg/gitg-diff-view-commit-details.vala
+++ b/libgitg/gitg-diff-view-commit-details.vala
@@ -117,8 +117,6 @@ class Gitg.DiffViewCommitDetails : Gtk.Grid
}
}
- public string config_file { get; construct set; }
-
private bool d_use_gravatar;
public bool use_gravatar
@@ -131,9 +129,13 @@ class Gitg.DiffViewCommitDetails : Gtk.Grid
}
}
+ public Gitg.Repository? repository {get; set; }
+
private Gee.HashMap<Ggit.OId, Gtk.RadioButton> d_parents_map;
private GLib.Regex regex_url = /\w+:(\/?\/?)[^\s]+/;
+ private Ggit.Config config {get; set;}
+ private GLib.Regex regex_custom_links = /gitg\.custom-link\.(.+)\.regex/;
construct
{
@@ -185,7 +187,7 @@ class Gitg.DiffViewCommitDetails : Gtk.Grid
return;
}
- d_label_subject.label = subject_to_markup(commit.get_subject());
+ d_label_subject.set_markup(subject_to_markup(commit.get_subject()));
d_label_sha1.label = commit.get_id().to_string();
var author = commit.get_author();
@@ -258,7 +260,7 @@ class Gitg.DiffViewCommitDetails : Gtk.Grid
private string subject_to_markup(string subject_text)
{
- return Markup.escape_text(parse_links_on_subject(subject_text));
+ return parse_links_on_subject(subject_text);
}
private string parse_links_on_subject(string subject_text)
@@ -276,7 +278,7 @@ class Gitg.DiffViewCommitDetails : Gtk.Grid
matchInfo.next();
}
- result = parse_ini_file(result);
+ result = parse_smart_text(result);
}
catch(Error e)
{
@@ -284,71 +286,62 @@ class Gitg.DiffViewCommitDetails : Gtk.Grid
return result;
}
- private string parse_ini_file(string subject_text)
+ private string parse_smart_text(string subject_text)
{
string result = subject_text;
- if (config_file!=null)
+ if (repository != null)
{
+ result = subject_text.dup();
try
{
- debug ("parsing %s", config_file);
- GLib.KeyFile file = new GLib.KeyFile();
- if (file.load_from_file(config_file , GLib.KeyFileFlags.NONE))
- {
- result = subject_text.dup();
- foreach (string group in file.get_groups())
+ var conf = repository.get_config().snapshot();
+ conf.match_foreach(regex_custom_links, (match_info, value) => {
+ string group = match_info.fetch(1);
+ debug ("found custom-link group: %s", group);
+ debug (value == null ? "es nulo": "es vacio");
+ string custom_link_regexp = value;
+ string replacement_key =
"gitg.custom-link.%s.replacement".printf(group);
+ try
{
- if (group.has_prefix("gitg.custom-link"))
- {
- string custom_link_regexp = file.get_string (group,
"regexp");
- string custom_link_replacement = file.get_string
(group, "replacement");
- debug ("found group: %s", custom_link_regexp);
- bool custom_color = file.has_key (group, "color");
- string color = null;
- if (custom_color)
- {
- string custom_link_color = file.get_string
(group, "color");
- color = custom_link_color;
- }
+ string custom_link_replacement =
conf.get_string(replacement_key);
- var custom_regex = new Regex (custom_link_regexp);
- try
- {
- GLib.MatchInfo matchInfo;
+ var custom_regex = new Regex (custom_link_regexp);
+ try
+ {
+ GLib.MatchInfo matchInfo;
- custom_regex.match (subject_text, 0, out
matchInfo);
+ custom_regex.match (subject_text, 0, out matchInfo);
- while (matchInfo.matches ())
+ while (matchInfo.matches ())
+ {
+ string text = matchInfo.fetch(0);
+ string link = text.dup();
+ debug ("found: %s", link);
+ if (custom_link_replacement != null)
{
- string text = matchInfo.fetch(0);
- string link = text.dup();
- debug ("found: %s", link);
- if (custom_link_replacement != null)
- {
- link =
custom_regex.replace(link, text.length, 0, custom_link_replacement);
- }
- if (color != null) {
- result = result.replace(text,
"<a href=\"%s\" title=\"%s\" style=\"color:%s\">%s</a>".printf(link, link, color, text));
- } else {
- result = result.replace(text,
"<a href=\"%s\" title=\"%s\">%s</a>".printf(link, link, text));
- }
-
- matchInfo.next();
+ link = custom_regex.replace(link,
text.length, 0, custom_link_replacement);
}
- }
- catch(Error e)
- {
+ result = result.replace(text, "<a href=\"%s\"
title=\"%s\">%s</a>".printf(link, link, text));
+
+ matchInfo.next();
}
}
+ catch(Error e)
+ {
+ }
+ } catch (Error e)
+ {
+ warning ("Cannot read git config: %s", e.message);
}
- }
- } catch (Error e)
+ return 0;
+ });
+ }
+ catch(Error e)
{
- warning ("Cannot read %s %s", config_file, e.message);
+ warning ("Cannot read git config: %s", e.message);
}
}
return result;
-
}
private void update_avatar()
diff --git a/libgitg/gitg-diff-view.vala b/libgitg/gitg-diff-view.vala
index 778345ff..86c87f70 100644
--- a/libgitg/gitg-diff-view.vala
+++ b/libgitg/gitg-diff-view.vala
@@ -127,19 +127,19 @@ public class Gitg.DiffView : Gtk.Grid
private Repository? d_repository;
+ private GLib.Regex regex_custom_links = /gitg\.custom-link\.(.+)\.regex/;
+
public Repository? repository {
get { return d_repository; }
set {
d_repository = value;
if (d_repository!=null)
{
- config_file = "%s/.git/config".printf(d_repository.get_workdir().get_path());
- d_commit_details.config_file = config_file;
+ d_commit_details.repository = d_repository;
}
}
}
public bool new_is_workdir { get; set; }
- private string config_file;
private GLib.Regex regex_url = /\w+:(\/?\/?)[^\s]+/;
@@ -576,7 +576,7 @@ public class Gitg.DiffView : Gtk.Grid
apply_link_tags(buffer, regex_url, null, d_color_link, false, false);
- read_ini_file(buffer);
+ parse_smart_text(buffer);
d_text_view_message.visible = (message != "");
}
@@ -594,39 +594,42 @@ public class Gitg.DiffView : Gtk.Grid
}
}
- private void read_ini_file(Gtk.TextBuffer buffer)
+ private void parse_smart_text(Gtk.TextBuffer buffer)
{
- if (config_file != null)
+ if (repository != null)
{
+ var conf = repository.get_config().snapshot();
try
{
- GLib.KeyFile file = new GLib.KeyFile();
- if (file.load_from_file(config_file , GLib.KeyFileFlags.NONE))
- {
- foreach (string group in file.get_groups())
+ conf.match_foreach(regex_custom_links, (match_info, value) => {
+ string group = match_info.fetch(1);
+ debug ("found custom-link group: %s", group);
+ string custom_link_regexp = value;
+ string replacement_key =
"gitg.custom-link.%s.replacement".printf(group);
+ try
{
- if (group.has_prefix("gitg.custom-link"))
+ string custom_link_replacement =
conf.get_string(replacement_key);
+ string color_key = "gitg.custom-link.%s.color".printf(group);
+ string custom_color = conf.get_string(color_key);
+ Gdk.RGBA color = d_color_link;
+ bool is_custom_color = custom_color != null;
+ if (is_custom_color)
{
- string custom_link_regexp = file.get_string (group,
"regexp");
- string custom_link_replacement = file.get_string
(group, "replacement");
- bool custom_color = file.has_key (group, "color");
- Gdk.RGBA color = d_color_link;
- if (custom_color)
- {
- string custom_link_color = file.get_string
(group, "color");
- color = Gdk.RGBA();
- color.parse(custom_link_color);
- }
- apply_link_tags(buffer, new Regex
(custom_link_regexp), custom_link_replacement, color, custom_color, true);
+ color = Gdk.RGBA();
+ color.parse(custom_color);
}
+ apply_link_tags(buffer, new Regex (custom_link_regexp),
custom_link_replacement, color, is_custom_color, true);
+ } catch (Error e)
+ {
+ warning ("Cannot read git config: %s", e.message);
}
- }
+ return 0;
+ });
} catch (Error e)
{
- warning ("Cannot read %s: %s", config_file, e.message);
+ warning ("Cannot read git config: %s", e.message);
}
}
-
}
private void auto_change_expanded(bool expanded)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
