diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index 7e8855c617ac3391a698e61023d9ca465b4b295e..fdbf9e4778fd7d44667e475ba659d64986b2e097 100644 (file)
--- a/gitMergeCommon.py
+++ b/gitMergeCommon.py
+#
+# Copyright (C) 2005 Fredrik Kuivinen
+#
+
import sys, re, os, traceback
from sets import Set
import sys, re, os, traceback
from sets import Set
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
# Write the empty tree to the object database and return its SHA1
def writeEmptyTree():
# Write the empty tree to the object database and return its SHA1
def writeEmptyTree():
- tmpIndex = os.environ['GIT_DIR'] + '/merge-tmp-index'
+ tmpIndex = os.environ.get('GIT_DIR', '.git') + '/merge-tmp-index'
def delTmpIndex():
try:
os.unlink(tmpIndex)
def delTmpIndex():
try:
os.unlink(tmpIndex)