From: "Karl Hasselström" <kha@treskal.com>
To: "Catalin Marinas" <catalin.marinas@gmail.com>,
"David Kågedal" <davidk@lysator.liu.se>
Cc: git@vger.kernel.org
Subject: [StGIT PATCH 4/6] Simplify merge_recursive
Date: Sun, 26 Aug 2007 22:42:54 +0200 [thread overview]
Message-ID: <20070826204254.16700.14590.stgit@yoghurt> (raw)
In-Reply-To: <20070826203745.16700.5655.stgit@yoghurt>
From: David Kågedal <davidk@lysator.liu.se>
Listing the unmerged files is unnecessary, since the information
isn't really used anyway. Just note if the merge failed or succeeded.
Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
stgit/git.py | 32 +-------------------------------
1 files changed, 1 insertions(+), 31 deletions(-)
diff --git a/stgit/git.py b/stgit/git.py
index 82cb211..173cc4b 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -642,40 +642,10 @@ def merge_recursive(base, head1, head2):
"""
refresh_index()
- err_output = None
- # this operation tracks renames but it is slower (used in
- # general when pushing or picking patches)
try:
# discard output to mask the verbose prints of the tool
GRun('git-merge-recursive', base, '--', head1, head2).discard_output()
- except GitRunException, ex:
- err_output = str(ex)
- pass
-
- # check the index for unmerged entries
- files = {}
-
- for line in GRun('git-ls-files', '--unmerged', '--stage', '-z'
- ).raw_output().split('\0'):
- if not line:
- continue
-
- mode, hash, stage, path = stages_re.findall(line)[0]
-
- if not path in files:
- files[path] = {}
- files[path]['1'] = ('', '')
- files[path]['2'] = ('', '')
- files[path]['3'] = ('', '')
-
- files[path][stage] = (mode, hash)
-
- if err_output and not files:
- # if no unmerged files, there was probably a different type of
- # error and we have to abort the merge
- raise GitException, err_output
-
- if files:
+ except GitRunException:
raise GitException, 'GIT index merging failed (possible conflicts)'
def merge(base, head1, head2):
next prev parent reply other threads:[~2007-08-26 20:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-26 20:42 [StGIT PATCH 0/6] David's conflict series using my subprocess stuff Karl Hasselström
2007-08-26 20:42 ` [StGIT PATCH 1/6] Split git.merge into two functions Karl Hasselström
2007-08-26 20:42 ` [StGIT PATCH 2/6] Leave working dir and index alone after failed (conflicting) push Karl Hasselström
2007-08-26 20:42 ` [StGIT PATCH 3/6] Added a test case to check what happens when push finds a conflict Karl Hasselström
2007-08-26 20:42 ` Karl Hasselström [this message]
2007-08-26 20:42 ` [StGIT PATCH 5/6] Use the output from merge-recursive to list conflicts Karl Hasselström
2007-08-26 20:43 ` [StGIT PATCH 6/6] Better error message if merge fails Karl Hasselström
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070826204254.16700.14590.stgit@yoghurt \
--to=kha@treskal.com \
--cc=catalin.marinas@gmail.com \
--cc=davidk@lysator.liu.se \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).