This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository maintenancescripts. from e3440f1 git/hooks/update-irkerhook_only: for new branches/tags, write out an initial message containing a file change summary for all exclusively new commits and then handle each exclusively new commit in the usual way. new 0496873 git/hooks/update-script._irkerhook.py_: fix string literal in replacement string for branch/tag regular expression. new 1e4bf5e git/hooks/update-script._irkerhook.py_: fix capturing in branch/tag regular expression. new 22fb214 git/hooks/update-script._irkerhook.py_: to generate a diff spanning multiple commits in gitweb, we need to use the hp parameter. new ce1e927 git/hooks/update-script._irkerhook.py_: actually fetch the parent of the first uniquely new commit. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: git/hooks/update-script._irkerhook.py_ | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 04968739d5a9df1a651e49b0d1afc1f93757f809 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 2 11:06:03 2020 +0100 git/hooks/update-script._irkerhook.py_: fix string literal in replacement string for branch/tag regular expression. --- git/hooks/update-script._irkerhook.py_ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/hooks/update-script._irkerhook.py_ b/git/hooks/update-script._irkerhook.py_ index 0661e6a..078d333 100755 --- a/git/hooks/update-script._irkerhook.py_ +++ b/git/hooks/update-script._irkerhook.py_ @@ -361,7 +361,7 @@ class GitExtractor(GenericExtractor): if self.rebase != '': commit.logmsg = (u"%(cyan)sRebase detected.%(reset)s\nOld ref: " + self.rebase + "\nNew HEAD: " + commit.commit + "\nPlease check the URL for more information.") % self.__dict__ if self.new: - ref_type = re.sub(r"^refs/([^/])*/.*", '\1', self.refname) + ref_type = re.sub(r"^refs/([^/])*/.*", r'\1', self.refname) ref_type_dict = { "heads": "branch", "tags": "tag" } commit.logmsg = (u"%(cyan)sNew " + ref_type_dict.get(ref_type, "unknown target") + " \"" + commit.branch +"\" created.%(reset)s New commit description(s) follow:\n") % self.__dict__ # This discards the part of the author's address after @. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 1e4bf5e2883fd24823664eec98eb9e724300840b Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 2 11:08:50 2020 +0100 git/hooks/update-script._irkerhook.py_: fix capturing in branch/tag regular expression. --- git/hooks/update-script._irkerhook.py_ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/hooks/update-script._irkerhook.py_ b/git/hooks/update-script._irkerhook.py_ index 078d333..6299a6e 100755 --- a/git/hooks/update-script._irkerhook.py_ +++ b/git/hooks/update-script._irkerhook.py_ @@ -361,7 +361,7 @@ class GitExtractor(GenericExtractor): if self.rebase != '': commit.logmsg = (u"%(cyan)sRebase detected.%(reset)s\nOld ref: " + self.rebase + "\nNew HEAD: " + commit.commit + "\nPlease check the URL for more information.") % self.__dict__ if self.new: - ref_type = re.sub(r"^refs/([^/])*/.*", r'\1', self.refname) + ref_type = re.sub(r"^refs/([^/]*)/.*", r'\1', self.refname) ref_type_dict = { "heads": "branch", "tags": "tag" } commit.logmsg = (u"%(cyan)sNew " + ref_type_dict.get(ref_type, "unknown target") + " \"" + commit.branch +"\" created.%(reset)s New commit description(s) follow:\n") % self.__dict__ # This discards the part of the author's address after @. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 22fb21468ecb642680655278511db2660b292c5e Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 2 11:13:11 2020 +0100 git/hooks/update-script._irkerhook.py_: to generate a diff spanning multiple commits in gitweb, we need to use the hp parameter. Keep hb around for merge bases (i.e., useful in case of rebases). --- git/hooks/update-script._irkerhook.py_ | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git/hooks/update-script._irkerhook.py_ b/git/hooks/update-script._irkerhook.py_ index 6299a6e..babaaae 100755 --- a/git/hooks/update-script._irkerhook.py_ +++ b/git/hooks/update-script._irkerhook.py_ @@ -371,8 +371,10 @@ class GitExtractor(GenericExtractor): commit.author = commit.mail.split("@")[0] commit.author_date, commit.commit_date = \ do("git log -1 '--pretty=format:%ai|%ci' " + shellquote(commit.commit)).split("|") - if self.rebase != '' or self.new: + if self.rebase != '': commit.commit = commit.commit + ";hb=" + parent + if self.new: + commit.commit = commit.commit + ";hp=" + parent return commit class SvnExtractor(GenericExtractor): -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit ce1e9271cfc83b3e005f7d9f41a761c33ec65b24 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 2 11:35:20 2020 +0100 git/hooks/update-script._irkerhook.py_: actually fetch the parent of the first uniquely new commit. This is way trickier than it sounds, because it could be... anything. A merge, a grafted commit, or other stuff. We'll try to guess and use the very first parent. --- git/hooks/update-script._irkerhook.py_ | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/git/hooks/update-script._irkerhook.py_ b/git/hooks/update-script._irkerhook.py_ index babaaae..94b2735 100755 --- a/git/hooks/update-script._irkerhook.py_ +++ b/git/hooks/update-script._irkerhook.py_ @@ -336,7 +336,14 @@ class GitExtractor(GenericExtractor): parent = '' if self.new: # Generate a list of changed files that are part of uniquely new commits. - parent = do("git rev-list --reverse -n 1 " + shellquote(commit.commit) + " --not --branches=" + shellquote("*") + " --tags=" + shellquote("*")) + parent = do("git rev-list --reverse " + shellquote(commit.commit) + " --not --branches=" + shellquote("*") + " --tags=" + shellquote("*")).split("\n") + # Take the first element only (oldest uniquely new commit). + parent = parent[0] + # Fetch its parent. That's a tricky operation. rev-parse won't do + # for grafted commits, so try to use something... safe. I guess. + parent = do("git cat-file -p " + shellquote(parent) + " | awk " + shellquote ('NR > 1 {if(/^parent/){print $2; next}{exit}}')).split() + # Take the first parent, again. + parent = parent[0] commit.files = do("git diff-tree -r --name-only " + shellquote(parent) + " " + shellquote(commit.commit)) elif self.rebase == '': commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit)) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git