Refactor the Commitdata class to CommitData

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/commands/coalesce.py b/stgit/commands/coalesce.py
index 412968ad5b796b9ebed63b106b297396a28b654b..1a349348df66bcaf9c00c61bf360d37276d689fc 100644 (file)
--- a/stgit/commands/coalesce.py
+++ b/stgit/commands/coalesce.py
@@ -42,7 +42,7 @@ class SaveTemplateDone(Exception):
 
 def _coalesce_patches(trans, patches, msg, save_template):
     cd = trans.patches[patches[0]].data
 
 def _coalesce_patches(trans, patches, msg, save_template):
     cd = trans.patches[patches[0]].data

-    cd = git.Commitdata(tree = cd.tree, parents = cd.parents)
+    cd = git.CommitData(tree = cd.tree, parents = cd.parents)

     for pn in patches[1:]:
         c = trans.patches[pn]
         tree = trans.stack.repository.simple_merge(
     for pn in patches[1:]:
         c = trans.patches[pn]
         tree = trans.stack.repository.simple_merge(

diff --git a/stgit/commands/new.py b/stgit/commands/new.py
index bfa7b6cd693b1eb52c019053e1d8b6485fbd1887..15bb2e0f426b366e8a042d236d04dc98ef8b0357 100644 (file)
--- a/stgit/commands/new.py
+++ b/stgit/commands/new.py
@@ -59,7 +59,7 @@ def func(parser, options, args):
         parser.error('incorrect number of arguments')
 
     head = directory.repository.refs.get(directory.repository.head)
         parser.error('incorrect number of arguments')
 
     head = directory.repository.refs.get(directory.repository.head)

-    cd = gitlib.Commitdata(
+    cd = gitlib.CommitData(

         tree = head.data.tree, parents = [head], message = '',
         author = gitlib.Person.author(), committer = gitlib.Person.committer())
 
         tree = head.data.tree, parents = [head], message = '',
         author = gitlib.Person.author(), committer = gitlib.Person.committer())
 

diff --git a/stgit/lib/git.py b/stgit/lib/git.py
index f046e12b9c4d6e546c8f26153b2d421df0cb5a2b..b3181cbe02d595e40de34849d2f38a89f00b702d 100644 (file)
--- a/stgit/lib/git.py
+++ b/stgit/lib/git.py
@@ -154,7 +154,7 @@ class Tree(Repr):
     def __str__(self):
         return 'Tree<%s>' % self.sha1
 
     def __str__(self):
         return 'Tree<%s>' % self.sha1
 

-class Commitdata(Repr):
+class CommitData(Repr):

     """Immutable."""
     def __init__(self, tree = NoValue, parents = NoValue, author = NoValue,
                  committer = NoValue, message = NoValue, defaults = NoValue):
     """Immutable."""
     def __init__(self, tree = NoValue, parents = NoValue, author = NoValue,
                  committer = NoValue, message = NoValue, defaults = NoValue):


@@ -199,7 +199,7 @@ class Commitdata(Repr):
             parents = None
         else:
             parents = [p.sha1 for p in self.parents]
             parents = None
         else:
             parents = [p.sha1 for p in self.parents]

-        return ('Commitdata<tree: %s, parents: %s, author: %s,'
+        return ('CommitData<tree: %s, parents: %s, author: %s,'

                 ' committer: %s, message: "%s">'
                 ) % (tree, parents, self.author, self.committer, self.message)
     @classmethod
                 ' committer: %s, message: "%s">'
                 ) % (tree, parents, self.author, self.committer, self.message)
     @classmethod


@@ -233,7 +233,7 @@ class Commit(Repr):
     @property
     def data(self):
         if self.__data == None:
     @property
     def data(self):
         if self.__data == None:

-            self.__data = Commitdata.parse(
+            self.__data = CommitData.parse(

                 self.__repository,
                 self.__repository.cat_object(self.sha1))
         return self.__data
                 self.__repository,
                 self.__repository.cat_object(self.sha1))
         return self.__data

diff --git a/stgit/lib/stack.py b/stgit/lib/stack.py
index af1c9944f24188412a13f3d7cad84fcdfc1127b8..5876a3eedfeec8d44ec078116943f566e5407d8f 100644 (file)
--- a/stgit/lib/stack.py
+++ b/stgit/lib/stack.py
@@ -32,7 +32,7 @@ class Patch(object):
                 old_log = [self.__stack.repository.refs.get(self.__log_ref)]
             except KeyError:
                 old_log = []
                 old_log = [self.__stack.repository.refs.get(self.__log_ref)]
             except KeyError:
                 old_log = []

-            cd = git.Commitdata(tree = new_commit.data.tree, parents = old_log,
+            cd = git.CommitData(tree = new_commit.data.tree, parents = old_log,

                                 message = '%s\t%s' % (msg, new_commit.sha1))
             c = self.__stack.repository.commit(cd)
             self.__stack.repository.refs.set(self.__log_ref, c, msg)
                                 message = '%s\t%s' % (msg, new_commit.sha1))
             c = self.__stack.repository.commit(cd)
             self.__stack.repository.refs.set(self.__log_ref, c, msg)