projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix test case for some sed
[git.git]
/
gitMergeCommon.py
diff --git
a/gitMergeCommon.py
b/gitMergeCommon.py
index
1b5bddd
..
fdbf9e4
100644
(file)
--- a/
gitMergeCommon.py
+++ b/
gitMergeCommon.py
@@
-1,3
+1,7
@@
+#
+# Copyright (C) 2005 Fredrik Kuivinen
+#
+
import sys, re, os, traceback
from sets import Set
import sys, re, os, traceback
from sets import Set
@@
-103,7
+107,10
@@
def isSha(obj):
return (type(obj) is str and bool(shaRE.match(obj))) or \
(type(obj) is int and obj >= 1)
return (type(obj) is str and bool(shaRE.match(obj))) or \
(type(obj) is int and obj >= 1)
-class Commit:
+class Commit(object):
+ __slots__ = ['parents', 'firstLineMsg', 'children', '_tree', 'sha',
+ 'virtual']
+
def __init__(self, sha, parents, tree=None):
self.parents = parents
self.firstLineMsg = None
def __init__(self, sha, parents, tree=None):
self.parents = parents
self.firstLineMsg = None