[Ncep.list.nems.announce] nems r99545: Update to match git master
Samuel.Trahan at noaa.gov
Samuel.Trahan at noaa.gov
Fri Jan 12 18:28:06 UTC 2018
Friendly NEMS developers,
This is an automated email about a NEMS commit.
Project: nems
URL: https://svnemc.ncep.noaa.gov/projects/nems/trunk
Revision: 99545
Author: samuel.trahan at noaa.gov
Date: 2018-01-12T18:17:04.785906Z
Message:
Update to match git master
See attached file for full differences.
First 4000 bytes of differences:
Index: checkout/tests/rtreportimpl
===================================================================
--- checkout/tests/rtreportimpl (revision 99527)
+++ checkout/tests/rtreportimpl (revision 99545)
@@ -60,15 +60,15 @@
checkout_top=os.path.dirname(os.path.dirname(os.path.dirname(
os.path.realpath(__file__))))
-if os.path.exists(".svn"):
- rtreport( 'Repository information:')
- rtreport()
- rtreport()
- rtreport( 'REPO TOP:')
- svn=alias(exe('svn'))
- info=alias(svn['info'])
- try:
- with produtil.cd.NamedDir(checkout_top):
+rtreport( 'Repository information:')
+rtreport()
+rtreport()
+try:
+ with produtil.cd.NamedDir(checkout_top):
+ if os.path.exists(os.path.join(checkout_top,'.svn')):
+ rtreport( 'REPO TOP:')
+ svn=alias(exe('svn'))
+ info=alias(svn['info'])
rtreport(runstr(info['.']))
status=runstr(svn['status',checkout_top])
for line in status.splitlines():
@@ -77,8 +77,12 @@
continue
rtreport('EXTERNAL %s:'%(m.group(1),))
rtreport(runstr(info[os.path.join(checkout_top,m.group(1))]))
- except(ValueError,KeyError,ExitStatusException,EnvironmentError) as e:
- print 'WARNING: Could not complete subversion checks: '+str(e)
+ else:
+ git_info=exe(os.path.abspath(os.path.join(
+ os.path.dirname(__file__),'git_info.sh')))
+ rtreport(runstr(git_info))
+except(ValueError,KeyError,ExitStatusException,EnvironmentError) as e:
+ print 'WARNING: Could not complete subversion checks: '+str(e)
itest=0
success=True
Index: checkout/tests
===================================================================
--- checkout/tests (revision 99527)
+++ checkout/tests (revision 99545)
Property changes on: checkout/tests
___________________________________________________________________
Modified: svn:externals
## -1 +1 ##
-produtil -r99526 https://svnemc.ncep.noaa.gov/projects/nceplibs/produtil/branches/regtests-run
+produtil -r99544 https://svnemc.ncep.noaa.gov/projects/nceplibs/produtil/branches/regtests-run
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /nems/branches/git-support/tests:r99539-99544
Index: checkout/doc
===================================================================
--- checkout/doc (revision 99527)
+++ checkout/doc (revision 99545)
Property changes on: checkout/doc
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /nems/branches/git-support/doc:r99539-99544
Index: checkout/src/makefile
===================================================================
--- checkout/src/makefile (revision 99527)
+++ checkout/src/makefile (revision 99545)
@@ -376,8 +376,15 @@
#
WHOAMI := $(shell whoami)
CMP_DATE := $(shell date)
-SVN_REV := $(shell svnversion -n .)
-SVN_URL := $(shell svn info | grep URL | cut -f 2 -d ' ')
+
+SVN_URL := $(shell git remote show origin | grep 'Fetch URL:' | sed 's,^[^:]*: ,,g' )
+SVN_REV := $(shell git show HEAD | head -1 | cut -f 2 -d ' ' | cut -c1-12 )
+
+ifeq ($(SVN_URL),)
+ SVN_REV := $(shell svnversion -n .)
+ SVN_URL := $(shell svn info | grep URL | cut -f 2 -d ' ' | head -1 )
+endif
+
CMP_YEAR := $(shell date +"%Y" )
CMP_JD := $(shell date +"%j" )
Index: checkout/src
===================================================================
--- checkout/src (revision 99527)
+++ checkout/src (revision 99545)
Property changes on: checkout/src
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /nems/branches/git-support/src:r99539-99544
Index: checkout
===================================================================
--- checkout (revision 99527)
+++ checkout (revision 99545)
Property changes on: checkout
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged
... see attachment for the rest ...
-------------- next part --------------
Index: checkout/tests/rtreportimpl
===================================================================
--- checkout/tests/rtreportimpl (revision 99527)
+++ checkout/tests/rtreportimpl (revision 99545)
@@ -60,15 +60,15 @@
checkout_top=os.path.dirname(os.path.dirname(os.path.dirname(
os.path.realpath(__file__))))
-if os.path.exists(".svn"):
- rtreport( 'Repository information:')
- rtreport()
- rtreport()
- rtreport( 'REPO TOP:')
- svn=alias(exe('svn'))
- info=alias(svn['info'])
- try:
- with produtil.cd.NamedDir(checkout_top):
+rtreport( 'Repository information:')
+rtreport()
+rtreport()
+try:
+ with produtil.cd.NamedDir(checkout_top):
+ if os.path.exists(os.path.join(checkout_top,'.svn')):
+ rtreport( 'REPO TOP:')
+ svn=alias(exe('svn'))
+ info=alias(svn['info'])
rtreport(runstr(info['.']))
status=runstr(svn['status',checkout_top])
for line in status.splitlines():
@@ -77,8 +77,12 @@
continue
rtreport('EXTERNAL %s:'%(m.group(1),))
rtreport(runstr(info[os.path.join(checkout_top,m.group(1))]))
- except(ValueError,KeyError,ExitStatusException,EnvironmentError) as e:
- print 'WARNING: Could not complete subversion checks: '+str(e)
+ else:
+ git_info=exe(os.path.abspath(os.path.join(
+ os.path.dirname(__file__),'git_info.sh')))
+ rtreport(runstr(git_info))
+except(ValueError,KeyError,ExitStatusException,EnvironmentError) as e:
+ print 'WARNING: Could not complete subversion checks: '+str(e)
itest=0
success=True
Index: checkout/tests
===================================================================
--- checkout/tests (revision 99527)
+++ checkout/tests (revision 99545)
Property changes on: checkout/tests
___________________________________________________________________
Modified: svn:externals
## -1 +1 ##
-produtil -r99526 https://svnemc.ncep.noaa.gov/projects/nceplibs/produtil/branches/regtests-run
+produtil -r99544 https://svnemc.ncep.noaa.gov/projects/nceplibs/produtil/branches/regtests-run
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /nems/branches/git-support/tests:r99539-99544
Index: checkout/doc
===================================================================
--- checkout/doc (revision 99527)
+++ checkout/doc (revision 99545)
Property changes on: checkout/doc
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /nems/branches/git-support/doc:r99539-99544
Index: checkout/src/makefile
===================================================================
--- checkout/src/makefile (revision 99527)
+++ checkout/src/makefile (revision 99545)
@@ -376,8 +376,15 @@
#
WHOAMI := $(shell whoami)
CMP_DATE := $(shell date)
-SVN_REV := $(shell svnversion -n .)
-SVN_URL := $(shell svn info | grep URL | cut -f 2 -d ' ')
+
+SVN_URL := $(shell git remote show origin | grep 'Fetch URL:' | sed 's,^[^:]*: ,,g' )
+SVN_REV := $(shell git show HEAD | head -1 | cut -f 2 -d ' ' | cut -c1-12 )
+
+ifeq ($(SVN_URL),)
+ SVN_REV := $(shell svnversion -n .)
+ SVN_URL := $(shell svn info | grep URL | cut -f 2 -d ' ' | head -1 )
+endif
+
CMP_YEAR := $(shell date +"%Y" )
CMP_JD := $(shell date +"%j" )
Index: checkout/src
===================================================================
--- checkout/src (revision 99527)
+++ checkout/src (revision 99545)
Property changes on: checkout/src
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /nems/branches/git-support/src:r99539-99544
Index: checkout
===================================================================
--- checkout (revision 99527)
+++ checkout (revision 99545)
Property changes on: checkout
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /nems/branches/git-support:r99539-99544
More information about the Ncep.list.nems.announce
mailing list