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 0f2c40a2c8e8c1088dc5b647f2e6c60a64a68fe3..770d69fc4fbcfcfb6f447c15e55d2cd09f7ceae9 100644 (file)
--- 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)
         sys.stdout.flush()
 
         git.merge(bottom, git.get_head(), top)

+
+        print 'done'

     else:
         message = commit.get_log()
         author_name, author_email, author_date = \
     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)
                              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()
         
     print_crt_patch()