# HG changeset patch
# User Nicolas Dumazet <nicdumz.commits@gmail.com>
# Date 1278924923 -32400
# Node ID 958022f0f1d57c2cd39d9afa4e0b1f355769d598
# Parent  dec57aa0f8ca0ac5a329593fecaded96f4860f36
mq: reset self.added after the mq transaction instead of inside qimport

It seems wiser to reset mq.added at the end of the mq transaction instead of at
the beginning of a qimport call: this way, calling several times qimport()
without saving mq state in-between does not overwrite the previous value of
mq.added (this happens, for example in rebase, where we import several patches
in a batch before calling .save_dirty() )

diff -r dec57aa0f8ca -r 958022f0f1d5 hgext/mq.py
--- a/hgext/mq.py	Thu Jul 08 15:44:14 2010 +0200
+++ b/hgext/mq.py	Mon Jul 12 17:55:23 2010 +0900
@@ -1623,7 +1623,6 @@
         if (len(files) > 1 or len(rev) > 1) and patchname:
             raise util.Abort(_('option "-n" not valid when importing multiple '
                                'patches'))
-        self.added = []
         if rev:
             # If mq patches are applied, we can only import revisions
             # that form a linear path to qbase.
@@ -1813,6 +1812,7 @@
         qrepo = q.qrepo()
         if qrepo:
             qrepo[None].add(q.added)
+        q.added = []
 
     if opts.get('push') and not opts.get('rev'):
         return q.push(repo, None)