X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/774fc1e90859cc68926f4357347b0624d43f746f..2c5d22429b0b9e35684af0812228aea41b8425ce:/stgit/git.py diff --git a/stgit/git.py b/stgit/git.py index 6b14a74..b7f3269 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -117,13 +117,23 @@ def _input(cmd, file_desc): p.tochild.write(line) p.tochild.close() if p.wait(): - raise GitException, '%s failed' % str(cmd) + raise GitException, '%s failed (%s)' % (str(cmd), + p.childerr.read().strip()) + +def _input_str(cmd, string): + p = popen2.Popen3(cmd, True) + p.tochild.write(string) + p.tochild.close() + if p.wait(): + raise GitException, '%s failed (%s)' % (str(cmd), + p.childerr.read().strip()) def _output(cmd): p=popen2.Popen3(cmd, True) output = p.fromchild.read() if p.wait(): - raise GitException, '%s failed' % str(cmd) + raise GitException, '%s failed (%s)' % (str(cmd), + p.childerr.read().strip()) return output def _output_one_line(cmd, file_desc = None): @@ -134,14 +144,16 @@ def _output_one_line(cmd, file_desc = None): p.tochild.close() output = p.fromchild.readline().strip() if p.wait(): - raise GitException, '%s failed' % str(cmd) + raise GitException, '%s failed (%s)' % (str(cmd), + p.childerr.read().strip()) return output def _output_lines(cmd): p=popen2.Popen3(cmd, True) lines = p.fromchild.readlines() if p.wait(): - raise GitException, '%s failed' % str(cmd) + raise GitException, '%s failed (%s)' % (str(cmd), + p.childerr.read().strip()) return lines def __run(cmd, args=None): @@ -225,7 +237,8 @@ def get_head(): def get_head_file(): """Returns the name of the file pointed to by the HEAD link """ - return os.path.basename(_output_one_line('git-symbolic-ref HEAD')) + return strip_prefix('refs/heads/', + _output_one_line('git-symbolic-ref HEAD')) def set_head_file(ref): """Resets HEAD to point to a new ref @@ -233,7 +246,8 @@ def set_head_file(ref): # head cache flushing is needed since we might have a different value # in the new head __clear_head_cache() - if __run('git-symbolic-ref HEAD', [ref]) != 0: + if __run('git-symbolic-ref HEAD', + [os.path.join('refs', 'heads', ref)]) != 0: raise GitException, 'Could not set head to "%s"' % ref def __set_head(val): @@ -272,6 +286,7 @@ def rev_parse(git_id): def branch_exists(branch): """Existence check for the named branch """ + branch = os.path.join('refs', 'heads', branch) for line in _output_lines('git-rev-parse --symbolic --all 2>&1'): if line.strip() == branch: return True @@ -282,12 +297,11 @@ def branch_exists(branch): def create_branch(new_branch, tree_id = None): """Create a new branch in the git repository """ - new_head = os.path.join('refs', 'heads', new_branch) - if branch_exists(new_head): + if branch_exists(new_branch): raise GitException, 'Branch "%s" already exists' % new_branch current_head = get_head() - set_head_file(new_head) + set_head_file(new_branch) __set_head(current_head) # a checkout isn't needed if new branch points to the current head @@ -297,22 +311,22 @@ def create_branch(new_branch, tree_id = None): if os.path.isfile(os.path.join(basedir.get(), 'MERGE_HEAD')): os.remove(os.path.join(basedir.get(), 'MERGE_HEAD')) -def switch_branch(name): +def switch_branch(new_branch): """Switch to a git branch """ global __head - new_head = os.path.join('refs', 'heads', name) - if not branch_exists(new_head): - raise GitException, 'Branch "%s" does not exist' % name + if not branch_exists(new_branch): + raise GitException, 'Branch "%s" does not exist' % new_branch - tree_id = rev_parse(new_head + '^{commit}') + tree_id = rev_parse(os.path.join('refs', 'heads', new_branch) + + '^{commit}') if tree_id != get_head(): refresh_index() if __run('git-read-tree -u -m', [get_head(), tree_id]) != 0: raise GitException, 'git-read-tree failed (local changes maybe?)' __head = tree_id - set_head_file(new_head) + set_head_file(new_branch) if os.path.isfile(os.path.join(basedir.get(), 'MERGE_HEAD')): os.remove(os.path.join(basedir.get(), 'MERGE_HEAD')) @@ -320,25 +334,23 @@ def switch_branch(name): def delete_branch(name): """Delete a git branch """ - branch_head = os.path.join('refs', 'heads', name) - if not branch_exists(branch_head): + if not branch_exists(name): raise GitException, 'Branch "%s" does not exist' % name - os.remove(os.path.join(basedir.get(), branch_head)) + remove_file_and_dirs(os.path.join(basedir.get(), 'refs', 'heads'), + name) def rename_branch(from_name, to_name): """Rename a git branch """ - from_head = os.path.join('refs', 'heads', from_name) - if not branch_exists(from_head): + if not branch_exists(from_name): raise GitException, 'Branch "%s" does not exist' % from_name - to_head = os.path.join('refs', 'heads', to_name) - if branch_exists(to_head): + if branch_exists(to_name): raise GitException, 'Branch "%s" already exists' % to_name if get_head_file() == from_name: - set_head_file(to_head) - os.rename(os.path.join(basedir.get(), from_head), \ - os.path.join(basedir.get(), to_head)) + set_head_file(to_name) + rename(os.path.join(basedir.get(), 'refs', 'heads'), + from_name, to_name) def add(names): """Add the files or recursively add the directory contents @@ -460,7 +472,7 @@ def commit(message, files = None, parents = None, allowempty = False, return commit_id -def apply_diff(rev1, rev2, check_index = True): +def apply_diff(rev1, rev2, check_index = True, files = None): """Apply the diff between rev1 and rev2 onto the current index. This function doesn't need to raise an exception since it is only used for fast-pushing a patch. If this operation fails, @@ -470,10 +482,18 @@ def apply_diff(rev1, rev2, check_index = True): index_opt = '--index' else: index_opt = '' - cmd = 'git-diff-tree -p %s %s | git-apply %s 2> /dev/null' \ - % (rev1, rev2, index_opt) - return os.system(cmd) == 0 + if not files: + files = [] + + diff_str = diff(files, rev1, rev2) + if diff_str: + try: + _input_str('git-apply %s' % index_opt, diff_str) + except GitException: + return False + + return True def merge(base, head1, head2): """Perform a 3-way merge between base, head1 and head2 into the @@ -612,8 +632,8 @@ def checkout(files = None, tree_id = None, force = False): if not files: files = [] - if tree_id and __run('git-read-tree', [tree_id]) != 0: - raise GitException, 'Failed git-read-tree -m %s' % tree_id + if tree_id and __run('git-read-tree --reset', [tree_id]) != 0: + raise GitException, 'Failed git-read-tree --reset %s' % tree_id checkout_cmd = 'git-checkout-index -q -u' if force: @@ -643,7 +663,13 @@ def reset(files = None, tree_id = None, check_out = True): tree_id = get_head() if check_out: + cache_files = __tree_status(files, tree_id) + # files which were added but need to be removed + rm_files = [x[1] for x in cache_files if x[0] in ['A']] + 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: