From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Thu, 27 Oct 2005 19:47:24 +0000 (+0100)
Subject: Notify when a cherry-picked commit was modified by 'pick'
X-Git-Tag: v0.8~42
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/5f9ce58710eac055cc4513329c1472ea9b5e1074

Notify when a cherry-picked commit was modified by 'pick'

The logic is similar to the 'push' command one (i.e. it is reported as
modified if a three-way merge is needed).

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---

diff --git a/stgit/commands/pick.py b/stgit/commands/pick.py
index 0f2c40a..770d69f 100644
--- a/stgit/commands/pick.py
+++ b/stgit/commands/pick.py
@@ -81,6 +81,8 @@ def func(parser, options, args):
         sys.stdout.flush()
 
         git.merge(bottom, git.get_head(), top)
+
+        print 'done'
     else:
         message = commit.get_log()
         author_name, author_email, author_date = \
@@ -94,8 +96,13 @@ def func(parser, options, args):
                              author_name = author_name,
                              author_email = author_email,
                              author_date = author_date)
-        crt_series.push_patch(patch)
+        modified = crt_series.push_patch(patch)
 
-    print 'done'
+        if crt_series.empty_patch(patch):
+            print 'done (empty patch)'
+        elif modified:
+            print 'done (modified)'
+        else:
+            print 'done'
         
     print_crt_patch()