X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/6f48e5f8db212cc241511aa03ed47534580357b2..7354d6941b555dd15a0fe9c9e46d4394cf92f01f:/stgit/git.py diff --git a/stgit/git.py b/stgit/git.py index 7bb41c5..3137797 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ -import sys, os, glob, popen2 +import sys, os, popen2 from stgit.utils import * @@ -114,7 +114,7 @@ def get_conflicts(): return None def _input(cmd, file_desc): - p = popen2.Popen3(cmd) + p = popen2.Popen3(cmd, True) while True: line = file_desc.readline() if not line: @@ -125,14 +125,14 @@ def _input(cmd, file_desc): raise GitException, '%s failed' % str(cmd) def _output(cmd): - p=popen2.Popen3(cmd) + p=popen2.Popen3(cmd, True) string = p.fromchild.read() if p.wait(): raise GitException, '%s failed' % str(cmd) return string def _output_one_line(cmd, file_desc = None): - p=popen2.Popen3(cmd) + p=popen2.Popen3(cmd, True) if file_desc != None: for line in file_desc: p.tochild.write(line) @@ -143,7 +143,7 @@ def _output_one_line(cmd, file_desc = None): return string def _output_lines(cmd): - p=popen2.Popen3(cmd) + p=popen2.Popen3(cmd, True) lines = p.fromchild.readlines() if p.wait(): raise GitException, '%s failed' % str(cmd) @@ -175,7 +175,7 @@ def __tree_status(files = [], tree_id = 'HEAD', unknown = False, noexclude = True): """Returns a list of pairs - [status, filename] """ - os.system('git-update-index --refresh > /dev/null') + refresh_index() cache_files = [] @@ -236,6 +236,9 @@ def get_head_file(): def set_head_file(ref): """Resets HEAD to point to a new 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: raise GitException, 'Could not set head to "%s"' % ref @@ -256,6 +259,11 @@ def __clear_head_cache(): __head = None +def refresh_index(): + """Refresh index with stat() information from the working directory. + """ + __run('git-update-index -q --unmerged --refresh') + def rev_parse(git_id): """Parse the string and return a verified SHA1 id """ @@ -285,7 +293,7 @@ def create_branch(new_branch, tree_id = None): # a checkout isn't needed if new branch points to the current head if tree_id: - git.switch(tree_id) + switch(tree_id) if os.path.isfile(os.path.join(base_dir, 'MERGE_HEAD')): os.remove(os.path.join(base_dir, 'MERGE_HEAD')) @@ -293,12 +301,15 @@ def create_branch(new_branch, tree_id = None): def switch_branch(name): """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 tree_id = rev_parse(new_head + '^0') 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 @@ -315,6 +326,20 @@ def delete_branch(name): raise GitException, 'Branch "%s" does not exist' % name os.remove(os.path.join(base_dir, branch_head)) +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): + raise GitException, 'Branch "%s" does not exist' % from_name + to_head = os.path.join('refs', 'heads', to_name) + if branch_exists(to_head): + raise GitException, 'Branch "%s" already exists' % to_name + + if get_head_file() == from_name: + set_head_file(to_head) + os.rename(os.path.join(base_dir, from_head), os.path.join(base_dir, to_head)) + def add(names): """Add the files or recursively add the directory contents """ @@ -342,11 +367,6 @@ def add(names): def rm(files, force = False): """Remove a file from the repository """ - if force: - git_opt = '--force-remove' - else: - git_opt = '--remove' - if not force: for f in files: if os.path.exists(f): @@ -445,12 +465,13 @@ def merge(base, head1, head2): """Perform a 3-way merge between base, head1 and head2 into the local tree """ + refresh_index() if __run('git-read-tree -u -m', [base, head1, head2]) != 0: raise GitException, 'git-read-tree failed (local changes maybe?)' # this can fail if there are conflicts - if os.system('git-merge-index -o -q gitmergeonefile.py -a') != 0: - raise GitException, 'git-merge-cache failed (possible conflicts)' + if __run('git-merge-index -o -q gitmergeonefile.py -a') != 0: + raise GitException, 'git-merge-index failed (possible conflicts)' def status(files = [], modified = False, new = False, deleted = False, conflict = False, unknown = False, noexclude = False): @@ -487,7 +508,7 @@ def diff(files = [], rev1 = 'HEAD', rev2 = None, out_fd = None): if rev2: diff_str = _output(['git-diff-tree', '-p', rev1, rev2] + files) else: - os.system('git-update-index --refresh > /dev/null') + refresh_index() diff_str = _output(['git-diff-index', '-p', rev1] + files) if out_fd: @@ -547,6 +568,7 @@ def checkout(files = [], tree_id = None, force = False): def switch(tree_id): """Switch the tree to the given id """ + refresh_index() if __run('git-read-tree -u -m', [get_head(), tree_id]) != 0: raise GitException, 'git-read-tree failed (local changes maybe?)' @@ -596,7 +618,7 @@ def apply_patch(filename = None, base = None): return False return True - os.system('git-update-index --refresh > /dev/null') + refresh_index() if base: orig_head = get_head()