My main reason is for the automatic invocation of the interactive merge
when I don't know what patch I have to deal with. The other reasons is
for people working over slow filesystems (NFS) where a three-way merging
may take a significant amount of time.
Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxxxx>
---
stgit/lib/transaction.py | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/stgit/lib/transaction.py b/stgit/lib/transaction.py
index 4148ff3..582ee72 100644
--- a/stgit/lib/transaction.py
+++ b/stgit/lib/transaction.py
@@ -302,6 +302,7 @@ class StackTransaction(object):
"""Attempt to push the named patch. If this results in conflicts,
halts the transaction. If index+worktree are given, spill any
conflicts to them."""
+ out.start('Pushing patch "%s"' % pn)
orig_cd = self.patches[pn].data
cd = orig_cd.set_committer(None)
oldparent = cd.parent
@@ -330,12 +331,12 @@ class StackTransaction(object):
iw.merge(base, ours, theirs, interactive = interactive)
tree = iw.index.write_tree()
self.__current_tree = tree
- s = ' (modified)'
+ s = 'modified'
except git.MergeConflictException, e:
tree = ours
merge_conflict = True
self.__conflicts = e.conflicts
- s = ' (conflict)'
+ s = 'conflict'
except git.MergeException, e:
self.__halt(str(e))
cd = cd.set_tree(tree)
@@ -345,12 +346,12 @@ class StackTransaction(object):
self.head = comm
else:
comm = None
- s = ' (unmodified)'
+ s = 'unmodified'
if already_merged:
- s = ' (merged)'
+ s = 'merged'
elif not merge_conflict and cd.is_nochange():
- s = ' (empty)'
- out.info('Pushed %s%s' % (pn, s))
+ s = 'empty'
+ out.done(s)
def update():
if comm:
self.patches[pn] = comm
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html