gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1293741 - in /gump/live: ./ python/gump/core/language/java.py python/gump/core/model/module.py python/gump/core/update/bzr.py python/gump/core/update/darcs.py python/gump/core/update/git.py python/gump/core/update/hg.py
Date Sun, 26 Feb 2012 04:47:04 GMT
Author: bodewig
Date: Sun Feb 26 04:47:04 2012
New Revision: 1293741

URL: http://svn.apache.org/viewvc?rev=1293741&view=rev
Log:
merge initial branch support for git from trunk

Modified:
    gump/live/   (props changed)
    gump/live/python/gump/core/language/java.py   (props changed)
    gump/live/python/gump/core/model/module.py
    gump/live/python/gump/core/update/bzr.py   (props changed)
    gump/live/python/gump/core/update/darcs.py   (props changed)
    gump/live/python/gump/core/update/git.py
    gump/live/python/gump/core/update/hg.py   (props changed)

Propchange: gump/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 26 04:47:04 2012
@@ -1 +1 @@
-/gump/trunk:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707,1103277,1172201,1172422,1208954,1208959,1209032
+/gump/trunk:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707,1103277,1172201,1172422,1208954,1208959,1209032,1293538

Propchange: gump/live/python/gump/core/language/java.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 26 04:47:04 2012
@@ -1 +1 @@
-/gump/trunk/python/gump/core/language/java.py:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707,1103277,1172201,1172422,1208954,1208959,1209032
+/gump/trunk/python/gump/core/language/java.py:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707,1103277,1172201,1172422,1208954,1208959,1209032,1293538

Modified: gump/live/python/gump/core/model/module.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/module.py?rev=1293741&r1=1293740&r2=1293741&view=diff
==============================================================================
--- gump/live/python/gump/core/model/module.py (original)
+++ gump/live/python/gump/core/model/module.py Sun Feb 26 04:47:04 2012
@@ -26,7 +26,7 @@ from gump.core.model.misc import Resulta
 from gump.core.model.object import NamedModelObject, ModelObject
 from gump.core.model.project import Project, ProjectSummary
 from gump.core.model.repository import SCM_TYPE_ARTIFACTS, SCM_TYPE_CVS, \
-    SCM_TYPE_P4, SUPPORTED_SCMS
+    SCM_TYPE_GIT, SCM_TYPE_P4, SUPPORTED_SCMS
 from gump.core.model.state import REASON_CONFIG_FAILED, REASON_PACKAGE, \
     STATE_COMPLETE, STATE_FAILED
 from gump.core.model.stats import Statable, Statistics
@@ -48,6 +48,8 @@ def create_scm_instance(scm_type, dom, r
         return ModuleP4(dom, repo)
     elif scm_type == SCM_TYPE_ARTIFACTS:
         return ModuleArtifacts(dom, repo)
+    elif scm_type == SCM_TYPE_GIT:
+        return ModuleGit(dom, repo)
     return ModuleScm(dom, repo)
 
 
@@ -227,6 +229,17 @@ class ModuleArtifacts(ModelObject):
     def getGroup(self):
         return self.group
 
+class ModuleGit(ModuleScm):
+    """
+    Describes the properties of a module's <git element
+    """
+    def __init__(self, dom, repository):
+        ModuleScm.__init__(self,  dom,  repository)
+        self.branch = self.getDomAttributeValue('branch') or 'master'
+
+    def getBranch(self):
+        return self.branch
+
 class Module(NamedModelObject, Statable, Resultable, Positioned):
     """Set of Modules (which contain projects)"""
     def __init__(self, name, dom, owner):

Propchange: gump/live/python/gump/core/update/bzr.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 26 04:47:04 2012
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/bzr.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707,1103277,1172201,1172422,1208954,1208959,1209032
+/gump/trunk/python/gump/core/update/bzr.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707,1103277,1172201,1172422,1208954,1208959,1209032,1293538

Propchange: gump/live/python/gump/core/update/darcs.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 26 04:47:04 2012
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/darcs.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707,1103277,1172201,1172422,1208954,1208959,1209032
+/gump/trunk/python/gump/core/update/darcs.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707,1103277,1172201,1172422,1208954,1208959,1209032,1293538

Modified: gump/live/python/gump/core/update/git.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/update/git.py?rev=1293741&r1=1293740&r2=1293741&view=diff
==============================================================================
--- gump/live/python/gump/core/update/git.py (original)
+++ gump/live/python/gump/core/update/git.py Sun Feb 26 04:47:04 2012
@@ -47,6 +47,8 @@ class GitUpdater(ScmUpdater):
                   module.getWorkspace().getSourceControlStagingDirectory())
         cmd.addParameter('clone')
         maybe_make_quiet(module, cmd)
+        cmd.addParameter('--branch')
+        cmd.addParameter(module.getScm().getBranch())
         cmd.addParameter(module.getScm().getRootUrl())
         cmd.addParameter(module.getName())
         return cmd
@@ -61,6 +63,7 @@ class GitUpdater(ScmUpdater):
         cmd.addParameter('pull')
         maybe_make_quiet(module, cmd)
         cmd.addParameter(module.getScm().getRootUrl())
+        cmd.addParameter(module.getScm().getBranch())
         return cmd
 
     def workspaceMatchesModule(self, module):

Propchange: gump/live/python/gump/core/update/hg.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 26 04:47:04 2012
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/hg.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707,1103277,1172201,1172422,1208954,1208959,1209032
+/gump/trunk/python/gump/core/update/hg.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707,1103277,1172201,1172422,1208954,1208959,1209032,1293538



Mime
View raw message