Patch by Andreas Färber:
CopySetHaikuRevision: Added support for extracting the svn revision number from an hg repository. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35926 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
4fc2c378e1
commit
9d123fc2e8
|
@ -315,6 +315,10 @@ rule CopySetHaikuRevision target : source
|
|||
local gitIndex = <haiku-rootdir-git>index ;
|
||||
SEARCH on $(gitIndex) = [ FDirName $(HAIKU_TOP) .git ] ;
|
||||
Depends $(target) : $(gitIndex) ;
|
||||
} else if [ Glob [ FDirName $(HAIKU_TOP) .hg ] : store ] {
|
||||
local hgStore = <haiku-rootdir-hg>store ;
|
||||
SEARCH on $(hgStore) = [ FDirName $(HAIKU_TOP) .hg ] ;
|
||||
Depends $(target) : $(hgStore) ;
|
||||
}
|
||||
|
||||
HAIKU_INCLUDE_IN_IMAGE on $(target)
|
||||
|
@ -342,6 +346,14 @@ actions CopySetHaikuRevision1
|
|||
grep "git-svn-id:" | cut -d '@' -f 2 |
|
||||
awk '{printf $1}'`
|
||||
fi
|
||||
if [ "$revision" = 0 -o "$revision" = "" ]; then
|
||||
# Try searching hg log for last svn commit
|
||||
# Extract from "(svn r12345) ..." line
|
||||
revision=`(cd $(HAIKU_TOP) &&
|
||||
hg log --no-merges --template "{desc|firstline}\n") 2> /dev/null |
|
||||
grep --max-count=1 "(svn r" |
|
||||
sed -n -e 's,(svn r\(.*\)).*,\1,p'`
|
||||
fi
|
||||
if [ "$revision" = "" ]; then
|
||||
revision=0
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue