Merge branch 'hook-local-vars'

[sup] / bin / sup-sync

diff --git a/bin/sup-sync b/bin/sup-sync
index b743c1c13e3cdf9f73d6d24a5c88882985c30681..003a72d9c320e97d80687effb750654e0bc337aa 100755 (executable)
--- a/bin/sup-sync
+++ b/bin/sup-sync
@@ -112,7 +112,7 @@ else
 end
 
 seen = {}
-index.lock_or_die
+index.lock_interactively or exit
 begin
   index.load
 
@@ -174,7 +174,12 @@ begin
       ## decide what to do based on message labels and the operation we're performing
       dothis, new_labels = case
       when (op == :restore) && restored_state[m.id] && old_m && (old_m.labels != restored_state[m.id])
+        num_restored += 1
         [:update_message_state, restored_state[m.id]]
+      when (op == :restore) && restored_state[m.id] && !old_m
+        num_restored += 1
+        m.labels = restored_state[m.id]
+        :add_message
       when op == :discard
         if old_m && (old_m.labels != m.labels)
           [:update_message_state, m.labels]