else:
base_dir = '.git'
-head_link = os.path.join(base_dir, 'HEAD')
#
# Classes
def _output(cmd):
p=popen2.Popen3(cmd, True)
- string = p.fromchild.read()
+ output = p.fromchild.read()
if p.wait():
raise GitException, '%s failed' % str(cmd)
- return string
+ return output
def _output_one_line(cmd, file_desc = None):
p=popen2.Popen3(cmd, True)
for line in file_desc:
p.tochild.write(line)
p.tochild.close()
- string = p.fromchild.readline().strip()
+ output = p.fromchild.readline().strip()
if p.wait():
raise GitException, '%s failed' % str(cmd)
- return string
+ return output
def _output_lines(cmd):
p=popen2.Popen3(cmd, True)
if not files:
files = []
- if rev2:
+ if rev1 and rev2:
diff_str = _output(['git-diff-tree', '-p', rev1, rev2] + files)
- else:
+ elif rev1 or rev2:
refresh_index()
- diff_str = _output(['git-diff-index', '-p', rev1] + files)
+ if rev2:
+ diff_str = _output(['git-diff-index', '-p', '-R', rev2] + files)
+ else:
+ diff_str = _output(['git-diff-index', '-p', rev1] + files)
+ else:
+ diff_str = ''
if out_fd:
out_fd.write(diff_str)
p=popen2.Popen3('git-apply --stat')
diff(files, rev1, rev2, p.tochild)
p.tochild.close()
- str = p.fromchild.read().rstrip()
+ diff_str = p.fromchild.read().rstrip()
if p.wait():
raise GitException, 'git.diffstat failed'
- return str
+ return diff_str
def files(rev1, rev2):
"""Return the files modified between rev1 and rev2
"""
- str = ''
+ result = ''
for line in _output_lines('git-diff-tree -r %s %s' % (rev1, rev2)):
- str += '%s %s\n' % tuple(line.rstrip().split(' ',4)[-1].split('\t',1))
+ result += '%s %s\n' % tuple(line.rstrip().split(' ',4)[-1].split('\t',1))
- return str.rstrip()
+ return result.rstrip()
def barefiles(rev1, rev2):
"""Return the files modified between rev1 and rev2, without status info
"""
- str = ''
+ result = ''
for line in _output_lines('git-diff-tree -r %s %s' % (rev1, rev2)):
- str += '%s\n' % line.rstrip().split(' ',4)[-1].split('\t',1)[-1]
+ result += '%s\n' % line.rstrip().split(' ',4)[-1].split('\t',1)[-1]
- return str.rstrip()
+ return result.rstrip()
def checkout(files = None, tree_id = None, force = False):
"""Check out the given or all files
__set_head(tree_id)
-def reset(tree_id = None):
+def reset(files = None, tree_id = None):
"""Revert the tree changes relative to the given tree_id. It removes
any local changes
"""
if not tree_id:
tree_id = get_head()
- cache_files = __tree_status(tree_id = tree_id)
+ cache_files = __tree_status(files, tree_id)
rm_files = [x[1] for x in cache_files if x[0] in ['D']]
- checkout(tree_id = tree_id, force = True)
- __set_head(tree_id)
-
+ checkout(files, tree_id, True)
# checkout doesn't remove files
map(os.remove, rm_files)
+ # if the reset refers to the whole tree, switch the HEAD as well
+ if not files:
+ __set_head(tree_id)
+
def pull(repository = 'origin', refspec = None):
"""Pull changes from the remote repository. At the moment, just
use the 'git pull' command
return False
return True
- refresh_index()
-
if base:
orig_head = get_head()
switch(base)
+ else:
+ refresh_index() # needed since __apply_patch() doesn't do it
if not __apply_patch():
if base: