summaryrefslogtreecommitdiff
path: root/repo
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2010-03-28 01:42:17 -0400
committerEric S. Raymond <esr@thyrsus.com>2010-03-28 01:42:17 -0400
commit469bc2fc2c6c4edd00d16ca289fc2e9223e18df5 (patch)
tree5ac338cf88dd33c2a8cdf190a26e5a0003d485f9 /repo
parentae3a966f046722439d34d27d5e82b93059a382b7 (diff)
downloadgpsd-469bc2fc2c6c4edd00d16ca289fc2e9223e18df5.tar.gz
Show shortened version of refname in log.
Diffstat (limited to 'repo')
-rwxr-xr-xrepo/hooks/ciabot.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/repo/hooks/ciabot.py b/repo/hooks/ciabot.py
index fe33aa90..50388b07 100755
--- a/repo/hooks/ciabot.py
+++ b/repo/hooks/ciabot.py
@@ -93,7 +93,7 @@ def report(refname, merged):
except:
url = urlprefix + merged
- refname = os.path.basename(refname)
+ shortref = os.path.basename(refname)
# Compute a shortnane for the revision
rev = do("git describe ${merged} 2>/dev/null") or merged[:12]
@@ -130,7 +130,7 @@ def report(refname, merged):
</generator>
<source>
<project>%(project)s</project>
- <branch>%(repo)s:%(refname)s</branch>
+ <branch>%(repo)s:%(shortref)s</branch>
</source>
<timestamp>%(ts)s</timestamp>
<body>
@@ -162,8 +162,6 @@ Subject: DeliverXML
print message
if __name__ == "__main__":
- sys.stderr.write("ciabot.py version 2.\n")
-
# Call this script with -n to dump the notification mail to stdout
if sys.argv[1] == '-n':
mailit = False