<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6d3399671bf32148e1aaa1bfd8f04045a2a0c63a">https://github.com/macports/macports-ports/commit/6d3399671bf32148e1aaa1bfd8f04045a2a0c63a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6d3399671bf stgit: update to 0.23
</span>6d3399671bf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6d3399671bf32148e1aaa1bfd8f04045a2a0c63a
</span>Author: Vadim-Valdis Yudaev <judaew@judaew.com>
AuthorDate: Thu Aug 27 02:40:25 2020 +0300
<span style='display:block; white-space:pre;color:#404040;'> stgit: update to 0.23
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * bump python version to 3.8
</span><span style='display:block; white-space:pre;color:#404040;'> * fix installing doc in html_man_docs variant
</span><span style='display:block; white-space:pre;color:#404040;'> * remove using of patches
</span><span style='display:block; white-space:pre;color:#404040;'> * add maintainer's github handle
</span>---
devel/stgit/Portfile | 41 ++++++----------
devel/stgit/files/gerrit-integration.diff | 78 -------------------------------
devel/stgit/files/template.diff | 14 ------
3 files changed, 15 insertions(+), 118 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/stgit/Portfile b/devel/stgit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 501d6a9b0a7..06463c0eaf3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/stgit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/stgit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,17 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span> PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name stgit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.17.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup stacked-git stgit 0.23 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories devel python
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-3
</span> platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span> supported_archs noarch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {judaew.com:judaew @judaew} openmaintainer
</span>
description Push/pop utility on top of GIT
long_description StGIT is a Python application providing similar \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,33 +28,20 @@ long_description StGIT is a Python application providing similar \
</span> Cogito tool but it is not recommended to mix them with \
the StGIT commands.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://procode.org/stgit/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://repo.or.cz/stgit.git/snapshot/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 60261f23324c1bb6c5165cc23a9280850ef23c34 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 467e2271fb48d73733aa756ed68e53525bce7c4d52a12901f3fca310ba17e310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://stacked-git.github.io
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname 48e5cef14cea5c810833d119900cd484c2a6ca85
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir stgit-48e5cef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 166d780c5f57b1fd0dec5338a17234c9c2e43a37 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 17c2b2e02341468f4d5f8d4d79c36f7fdb7febe18177277ca472502f673c50fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 314721
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 38
</span> depends_run port:git
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles gerrit-integration.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/stgit/templates.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set stgdocs "${worksrcpath}/Documentation/\[a-z\]*.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set stgdocs "${worksrcpath}/Documentation/stg.txt"
</span> set stgman ""
post-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "PYTHON=${prefix}/bin/python2.7 make all"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "PYTHON=${python.bin} make all"
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +49,7 @@ post-destroot {
</span> ${destroot}${prefix}/share/
# Install what little documentation there is
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} COPYING README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} COPYING \
</span> ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 {*}[glob ${stgdocs}] \
${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +66,7 @@ variant html_man_docs \
</span> lappend stgman ${worksrcpath}/Documentation/*.1
depends_build-append port:asciidoc port:xmlto
post-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "PYTHON=${prefix}/bin/python2.7 make all doc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "PYTHON=${python.bin} make doc -j${build.jobs} V=1"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/stgit/files/gerrit-integration.diff b/devel/stgit/files/gerrit-integration.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ec067b1b4bf..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/stgit/files/gerrit-integration.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,78 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f82a2263762a955518e2efb7616f7d58a300819c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jamie Madill <jmadill@chromium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 27 Nov 2013 13:20:27 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Honor commit-msg hook for 'new' and 'edit'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The commit-msg hook is important for gerrit users, where it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-generates a Change-Id.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: Ic1fde9e13e5e903ac8807be37feb7a88a9844dce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/stgit/commands/new.py b/stgit/commands/new.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d5c5382..3328042 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/stgit/commands/new.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/stgit/commands/new.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from stgit.commands import common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from stgit.lib import git as gitlib, transaction
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from stgit.config import config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from stgit.lib import edit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- help = 'Create a new, empty patch'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kind = 'patch'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,6 +70,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- author = gitlib.Person.author(), committer = gitlib.Person.committer())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd = common.update_commit_data(cd, options)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # run the commit-msg hook
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd = cd.set_message(edit.run_commit_msg_hook(stack.repository, cd.message))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if options.save_template:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- options.save_template(cd.message)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return utils.STGIT_SUCCESS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/stgit/lib/edit.py b/stgit/lib/edit.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c8d29f6..5993754 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/stgit/lib/edit.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/stgit/lib/edit.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,31 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from stgit import utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from stgit.commands import common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from stgit.lib import git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from stgit import run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from tempfile import NamedTemporaryFile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def run_commit_msg_hook(repo, message):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """Run the commit-msg git hook manually when editing a patch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Return the edited commit message, or the original message if there
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is no commit-msg hook."""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hook_path = os.path.join(repo.directory, 'hooks', 'commit-msg')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not os.access(hook_path, os.X_OK):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # message hook exists, make a temporary file and run on the temp file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tf = NamedTemporaryFile("w", delete=False)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tf.write(message)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tf.close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ run.Run('bash', hook_path, tf.name).run()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ new_msg = open(tf.name, 'r').read()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.remove(tf.name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return new_msg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def update_patch_description(repo, cd, text, contains_diff):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Update the given L{CommitData<stgit.lib.git.CommitData>} with the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (git.Date.maybe(authdate), 'set_date')]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if val != None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a = getattr(a, setter)(val)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd = cd.set_message(message).set_author(a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd = cd.set_message(run_commit_msg_hook(repo, message)).set_author(a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- failed_diff = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if diff:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tree = repo.apply(cd.parent.data.tree, diff, quiet = False)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/stgit/files/template.diff b/devel/stgit/files/template.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5b0379e2bfe..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/stgit/files/template.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urNp stgit-0.17.1.orig/stgit/templates.py stgit-0.17.1/stgit/templates.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- stgit-0.17.1.orig/stgit/templates.py 2006-07-11 12:21:38.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ stgit-0.17.1/stgit/templates.py 2016-11-01 19:01:47.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,9 @@ def get_template(tfile):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.path.join(os.path.expanduser('~'), '.stgit', 'templates',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tfile),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.path.join(sys.prefix, 'share', 'stgit', 'templates',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tfile) ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tfile),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.path.join("@@PREFIX@@", 'share', 'stgit', 'templates',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tfile)]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmpl = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for t in tmpl_list:
</span></pre><pre style='margin:0'>
</pre>