# HG changeset patch # User Nicolas Dumazet # Date 1279025470 -32400 # Branch stable # Node ID 37bc136601fe2d4811359c1b31eeb938fd4c0d55 # Parent 92342fa9fbd83933f2bf6f74db23ce91c61c37c9 mq: qrepo.add(mq.added) inside save_dirty inside of doing it manually This should make the MQ API more transparent: callers only have to call save_dirty, and no mq.added magic or knowledge is required. diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -476,6 +476,11 @@ write_list(self.full_series, self.series_path) if self.guards_dirty: write_list(self.active_guards, self.guards_path) + if self.added: + qrepo = self.qrepo() + if qrepo: + qrepo[None].add(self.added) + self.added = [] def removeundo(self, repo): undo = repo.sjoin('undo') @@ -1809,10 +1814,6 @@ git=opts['git']) finally: q.save_dirty() - 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) diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -364,10 +364,6 @@ repo.mq.qimport(repo, (), patchname=mqrebase[rev][0], git=mqrebase[rev][1],rev=[str(state[rev])]) repo.mq.save_dirty() - qrepo = repo.mq.qrepo() - if qrepo: - qrepo[None].add(repo.mq.added) - repo.mq.added = [] def storestatus(repo, originalwd, target, state, collapse, keep, keepbranches, external):