From ad480a6ef8bedfdac6f0dc1d8e07867c67389faf Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Mon, 3 Oct 2016 22:06:22 +0100
Subject: [PATCH] announce: Automatically generate the diff URL from the
 previous and current version.

---
 announce.py    | 20 ++++++++++++++------
 xep-README.xml |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/announce.py b/announce.py
index e4fb393d..e39ea678 100755
--- a/announce.py
+++ b/announce.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 
 # File: announce.py
-# Version: 0.8
+# Version: 0.9
 # Description: a script for announcing XEPs
-# Last Modified: 2006-10-03
+# Last Modified: 2016-10-03
 # Author: Peter Saint-Andre (stpeter@jabber.org)
 # License: public domain
-# HowTo: ./announce.py xepnum diffs
+# HowTo: ./announce.py xepnum
 
 ## LICENSE ##
 #
@@ -57,10 +57,8 @@ now = int(time.time())
 # READ IN ARGS: 
 #
 # 1. XEP number
-# 2. URL for source control diffs
 
 xepnum = sys.argv[1];
-diffs = sys.argv[2];
 
 xepfile = 'xep-' + xepnum + '.xml'
 
@@ -84,7 +82,8 @@ statusNode = (headerNode.getElementsByTagName("status")[0])
 xepstatus = getText(statusNode.childNodes)
 typeNode = (headerNode.getElementsByTagName("type")[0])
 xeptype = getText(typeNode.childNodes)
-revNode = (headerNode.getElementsByTagName("revision")[0])
+revNodes = headerNode.getElementsByTagName("revision")
+revNode = revNodes[0]
 versionNode = (revNode.getElementsByTagName("version")[0])
 version = getText(versionNode.childNodes)
 dateNode = (revNode.getElementsByTagName("date")[0])
@@ -120,6 +119,15 @@ elif (xepstatus == "Obsolete"):
 elif (xepstatus == "Deferred"):
     xepflag = "defer"
 
+# generate the diffs URL
+if len(revNodes) > 1:
+    prevRevNode = revNodes[1]
+    prevVersionNode = (prevRevNode.getElementsByTagName("version")[0])
+    prevVersion = getText(prevVersionNode.childNodes)
+    diffs = 'http://xmpp.org/extensions/diff/api/xep/' + xepnum + '/diff/' + prevVersion + '/vs/' + version
+else:
+    diffs = 'N/A'
+
 ## SEND MAIL:
 #
 # From: editor@xmpp.org
diff --git a/xep-README.xml b/xep-README.xml
index 853ad320..676b22bf 100644
--- a/xep-README.xml
+++ b/xep-README.xml
@@ -170,7 +170,7 @@ $ # or "export PATH=/usr/local/virtualenv/gen/bin:$PATH
 $ ./archive.sh 0353 0.1
 $ hg pull && hg update
 $ ./gen.py xep-0353.xml
-$ ./announce.py 0353 http://xmpp.org/extensions/diff/api/xep/0353/diff/0.1/vs/0.2
+$ ./announce.py 0353
 ]]></code>
 </section2>