Add experimental support for learning svn revision number in git-svn based repositories. Fancy.
svn:r17581
This commit is contained in:
parent
d7563ee231
commit
240ee1866b
|
@ -15,6 +15,7 @@ Changes in version 0.2.1.9-alpha - 200?-??-??
|
|||
automatically stop Tor from starting. Instead, we retry failed
|
||||
dns_inits() every 10 minutes, and change the exit policy to reject *:*
|
||||
until one succeeds. Fixes bug 691.
|
||||
- Detect svn revision properly when we're using git-svn.
|
||||
|
||||
o Minor features (controller):
|
||||
- New CONSENSUS_ARRIVED event to note when a new consensus has
|
||||
|
|
|
@ -55,11 +55,18 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i
|
|||
tor_main.o: micro-revision.i
|
||||
|
||||
micro-revision.i: FORCE
|
||||
@svkdir=$$SVKROOT; \
|
||||
if test "x$$svkdir" = x ; then \
|
||||
svkdir=$$HOME/.svk; \
|
||||
fi; \
|
||||
if test -d ../../.svn && test -x "`which svn 2>&1;true`" ; then \
|
||||
@svkdir=$$SVKROOT; \
|
||||
if test "x$$svkdir" = x ; then \
|
||||
svkdir=$$HOME/.svk; \
|
||||
fi; \
|
||||
if test -d ../../.git && test -x "`which git 2>&1;true`" ; then \
|
||||
if test -d ../../.git/svn && test -x "`which git-svn 2>&1;true`" ; then \
|
||||
git-svn info ../../README | \
|
||||
sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' \
|
||||
> micro-revision.tmp \
|
||||
|| true; \
|
||||
fi; \
|
||||
elif test -d ../../.svn && test -x "`which svn 2>&1;true`" ; then \
|
||||
svn info ../.. | \
|
||||
sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.tmp \
|
||||
|| true; \
|
||||
|
|
Loading…
Reference in New Issue