[meld] vc.git: Use new run helper
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] vc.git: Use new run helper
- Date: Sun, 4 Oct 2015 03:06:06 +0000 (UTC)
commit 992c04986138a16173f8c1163c7036c68ea54c05
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Oct 4 09:28:40 2015 +1000
vc.git: Use new run helper
meld/vc/git.py | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 2754e2f..9dea5da 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -186,11 +186,9 @@ class Vc(_vc.Vc):
runner(command, files, refresh=True, working_dir=self.root)
def remerge_with_ancestor(self, local, base, remote):
- args = [self.CMD, "merge-file", "-p", "--diff3", local, base, remote]
- process = subprocess.Popen(args, cwd=self.location,
- stdout=subprocess.PIPE)
+ proc = self.run("merge-file", "-p", "--diff3", local, base, remote)
vc_file = StringIO.StringIO(
- _vc.base_from_diff3(process.stdout.read()))
+ _vc.base_from_diff3(proc.stdout.read()))
prefix = 'meld-tmp-%s-' % _vc.CONFLICT_MERGED
with tempfile.NamedTemporaryFile(prefix=prefix, delete=False) as f:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]