From f02be96172f8cf36e052ff86678646b1991ed283 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20K=C3=A5gedal?= Date: Wed, 19 Dec 2007 18:00:11 +0000 Subject: [PATCH] Leave working dir and index alone after failed (conflicting) push MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This leaves the index and working tree in the state that merge-recursive left it, with unmerged files in different stages, and the non-conflicting changes in the index. Signed-off-by: David Kågedal Signed-off-by: Karl Hasselström --- stgit/git.py | 20 +------------------- stgit/stack.py | 16 +++++++++++----- t/t0002-status.sh | 17 +++++++++-------- t/t1205-push-subdir.sh | 2 +- 4 files changed, 22 insertions(+), 33 deletions(-) diff --git a/stgit/git.py b/stgit/git.py index 70c2d91..4bd17b1 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -736,25 +736,7 @@ def merge_recursive(base, head1, head2): # error and we have to abort the merge raise GitException, err_output - # merge the unmerged files - errors = False - for path in files: - # remove additional files that might be generated for some - # newer versions of GIT - for suffix in [base, head1, head2]: - if not suffix: - continue - fname = path + '~' + suffix - if os.path.exists(fname): - os.remove(fname) - - stages = files[path] - if gitmergeonefile.merge(stages['1'][1], stages['2'][1], - stages['3'][1], path, stages['1'][0], - stages['2'][0], stages['3'][0]) != 0: - errors = True - - if errors: + if files: raise GitException, 'GIT index merging failed (possible conflicts)' def merge(base, head1, head2): diff --git a/stgit/stack.py b/stgit/stack.py index 26a2b58..d4ea802 100644 --- a/stgit/stack.py +++ b/stgit/stack.py @@ -754,6 +754,7 @@ class Series(PatchSet): config.remove_section('branch.%s.stgit' % self.get_name()) def refresh_patch(self, files = None, message = None, edit = False, + empty = False, show_patch = False, cache_update = True, author_name = None, author_email = None, @@ -797,9 +798,16 @@ class Series(PatchSet): if not bottom: bottom = patch.get_bottom() + if empty: + tree_id = git.get_commit(bottom).get_tree() + else: + tree_id = None + commit_id = git.commit(files = files, message = descr, parents = [bottom], cache_update = cache_update, + tree_id = tree_id, + set_head = True, allowempty = True, author_name = author_name, author_email = author_email, @@ -1116,12 +1124,10 @@ class Series(PatchSet): log = 'push' self.refresh_patch(bottom = head, cache_update = False, log = log) else: - # we store the correctly merged files only for - # tracking the conflict history. Note that the - # git.merge() operations should always leave the index - # in a valid state (i.e. only stage 0 files) + # we make the patch empty, with the merged state in the + # working tree. self.refresh_patch(bottom = head, cache_update = False, - log = 'push(c)') + empty = True, log = 'push(c)') raise StackException, str(ex) return modified diff --git a/t/t0002-status.sh b/t/t0002-status.sh index 43e1ca0..24f42cc 100755 --- a/t/t0002-status.sh +++ b/t/t0002-status.sh @@ -107,12 +107,10 @@ test_expect_success 'Make a conflicting patch' ' ' cat > expected.txt < output.txt && diff -u expected.txt output.txt @@ -121,7 +119,7 @@ test_expect_success 'Status after conflicting push' ' cat > expected.txt < output.txt && diff -u expected.txt output.txt ' @@ -129,12 +127,13 @@ test_expect_success 'Status of file' ' cat > expected.txt < output.txt && diff -u expected.txt output.txt ' cat > expected.txt < output.txt && @@ -142,6 +141,7 @@ test_expect_success 'Status of other file' ' ' cat > expected.txt < expected.txt < output.txt && diff -u expected.txt output.txt @@ -162,7 +163,7 @@ test_expect_success 'Status after deleting a file' ' cat > expected.txt <