"""Commit objects factory. Save/look-up them in the __commits
dictionary
"""
+ global __commits
+
if id_hash in __commits:
return __commits[id_hash]
else:
"""
return len(__tree_status()) != 0
+# HEAD value cached
+__head = None
+
def get_head():
"""Verifies the HEAD and returns the SHA1 id that represents it
"""
- return rev_parse('HEAD')
+ global __head
+
+ if not __head:
+ __head = rev_parse('HEAD')
+ return __head
def get_head_file():
"""Returns the name of the file pointed to by the HEAD link
def __set_head(val):
"""Sets the HEAD value
"""
- if __run('git-update-ref HEAD', [val]) != 0:
- raise GitException, 'Could not update HEAD to "%s".' % val
+ global __head
+
+ if not __head or __head != val:
+ if __run('git-update-ref HEAD', [val]) != 0:
+ raise GitException, 'Could not update HEAD to "%s".' % val
+ __head = val
+
+def __clear_head_cache():
+ """Sets the __head to None so that a re-read is forced
+ """
+ global __head
+
+ __head = None
def rev_parse(git_id):
"""Parse the string and return a verified SHA1 id
"""
- return _output_one_line(['git-rev-parse', '--verify', git_id])
+ try:
+ return _output_one_line(['git-rev-parse', '--verify', git_id])
+ except GitException:
+ raise GitException, 'Unknown revision: %s' % git_id
def add(names):
"""Add the files or recursively add the directory contents
"""Pull changes from the remote repository. At the moment, just
use the 'git pull' command
"""
+ # 'git pull' updates the HEAD
+ __clear_head_cache()
+
args = [repository]
if refspec:
args.append(refspec)
if __run('git pull', args) != 0:
raise GitException, 'Failed "git pull %s"' % repository
-def apply_patch(filename = None):
- """Apply a patch onto the current index. There must not be any
- local changes in the tree, otherwise the command fails
+def apply_patch(filename = None, base = None):
+ """Apply a patch onto the current or given index. There must not
+ be any local changes in the tree, otherwise the command fails
"""
+ def __apply_patch():
+ if filename:
+ return __run('git-apply --index', [filename]) == 0
+ else:
+ try:
+ _input('git-apply --index', sys.stdin)
+ except GitException:
+ return False
+ return True
+
os.system('git-update-index --refresh > /dev/null')
- if filename:
- if __run('git-apply --index', [filename]) != 0:
- raise GitException, 'Patch does not apply cleanly'
- else:
- _input('git-apply --index', sys.stdin)
+ if base:
+ orig_head = get_head()
+ switch(base)
+
+ if not __apply_patch():
+ if base:
+ switch(orig_head)
+ raise GitException, 'Patch does not apply cleanly'
+ elif base:
+ top = commit(message = 'temporary commit used for applying a patch',
+ parents = [base])
+ switch(orig_head)
+ merge(base, orig_head, top)
def clone(repository, local_dir):
"""Clone a remote repository. At the moment, just use the