/head: changeset 33
Updated.
This commit is contained in:
@ -119,8 +119,6 @@ class BaseFolder:
|
||||
if applyto == None:
|
||||
applyto = [dest]
|
||||
|
||||
print "Pass 1"
|
||||
|
||||
# Pass 1 -- Look for messages in self with a negative uid.
|
||||
# These are messages in Maildirs that were not added by us.
|
||||
# Try to add them to the dests, and once that succeeds, get the
|
||||
@ -130,7 +128,7 @@ class BaseFolder:
|
||||
for uid in self.getmessagelist().keys():
|
||||
if uid >= 0:
|
||||
continue
|
||||
print "Uploading new message %d" % uid
|
||||
__main__.ui.copyingmessage(uid, self, applyto)
|
||||
successobject = None
|
||||
successuid = None
|
||||
message = self.getmessage(uid)
|
||||
@ -153,8 +151,6 @@ class BaseFolder:
|
||||
# Did not find any server to take this message. Ignore.
|
||||
pass
|
||||
|
||||
print "Pass 2"
|
||||
|
||||
# Pass 2 -- Look for messages present in self but not in dest.
|
||||
# If any, add them to dest.
|
||||
|
||||
@ -162,7 +158,7 @@ class BaseFolder:
|
||||
if uid < 0: # Ignore messages that pass 1 missed.
|
||||
continue
|
||||
if not uid in dest.getmessagelist():
|
||||
print "Uploading new message %d" % uid
|
||||
__main__.ui.copyingmessage(uid, self, applyto)
|
||||
message = self.getmessage(uid)
|
||||
flags = self.getmessageflags(uid)
|
||||
for object in applyto:
|
||||
@ -173,8 +169,6 @@ class BaseFolder:
|
||||
self.deletemessage(uid)
|
||||
uid = newuid
|
||||
|
||||
print "Pass 3"
|
||||
|
||||
# Pass 3 -- Look for message present in dest but not in self.
|
||||
# If any, delete them.
|
||||
|
||||
@ -182,7 +176,7 @@ class BaseFolder:
|
||||
if uid < 0:
|
||||
continue
|
||||
if not uid in self.getmessagelist():
|
||||
print "Deleting message %d" % uid
|
||||
__main__.ui.deletingmessage(uid, applyto)
|
||||
for object in applyto:
|
||||
object.deletemessage(uid)
|
||||
|
||||
@ -190,8 +184,6 @@ class BaseFolder:
|
||||
# (except for potential negative uids that couldn't be placed
|
||||
# anywhere)
|
||||
|
||||
print "Pass 4"
|
||||
|
||||
# Pass 4 -- Look for any flag identity issues -- set dest messages
|
||||
# to have the same flags that we have here.
|
||||
|
||||
@ -203,13 +195,13 @@ class BaseFolder:
|
||||
|
||||
addflags = [x for x in selfflags if x not in destflags]
|
||||
if len(addflags):
|
||||
print "Adding flags to %d" % uid, addflags
|
||||
__main__.ui.addingflags(uid, addflags, applyto)
|
||||
for object in applyto:
|
||||
object.addmessageflags(uid, addflags)
|
||||
|
||||
delflags = [x for x in destflags if x not in selfflags]
|
||||
if len(delflags):
|
||||
print "Deleting flags from %d" % uid, delflags
|
||||
__main__.ui.deletingflags(uid, delflags, applyto)
|
||||
for object in applyto:
|
||||
object.deletemessageflags(uid, delflags)
|
||||
|
||||
|
Reference in New Issue
Block a user