[PATCH 16 of 19] mq: remove redundant explicit invocations of savedirty

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1326245802 -3600
# Node ID 9ff0a0a1fe41ffec86acc76362b29c086151026d
# Parent  8bccb99f4ff21f335503798db047cf27c79cd77c
mq: remove redundant explicit invocations of savedirty

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -637,7 +637,6 @@
                 self.applieddirty = True
             if err:
                 return (err, head)
-        self.savedirty()
         return (0, head)
 
     def patch(self, repo, patchfile):
@@ -666,7 +665,6 @@
                 ret = self._apply(repo, series, list, update_status,
                                   strict, patchdir, merge, all_files=all_files)
                 tr.close()
-                self.savedirty()
                 return ret
             except:
                 try:
@@ -1519,7 +1517,6 @@
             except:
                 ctx = repo[cparents[0]]
                 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
-                self.savedirty()
                 self.ui.warn(_('refresh interrupted while patch was popped! '
                                '(revert --all, qpush to recover)\n'))
                 raise
@@ -1882,7 +1879,6 @@
     use the :hg:`qfinish` command."""
     q = repo.mq
     q.delete(repo, patches, opts)
-    q.savedirty()
     return 0
 
 @command("qapplied",
@@ -1988,12 +1984,9 @@
     Returns 0 if import succeeded.
     """
     q = repo.mq
-    try:
-        q.qimport(repo, filename, patchname=opts.get('name'),
-              existing=opts.get('existing'), force=opts.get('force'),
-              rev=opts.get('rev'), git=opts.get('git'))
-    finally:
-        q.savedirty()
+    q.qimport(repo, filename, patchname=opts.get('name'),
+          existing=opts.get('existing'), force=opts.get('force'),
+          rev=opts.get('rev'), git=opts.get('git'))
 
     if opts.get('push') and not opts.get('rev'):
         return q.push(repo, None)
@@ -2010,7 +2003,6 @@
     Returns 0 if initialization succeeded."""
     q = repo.mq
     r = q.init(repo, create)
-    q.savedirty()
     if r:
         if not os.path.exists(r.wjoin('.hgignore')):
             fp = r.wopener('.hgignore', 'w')
@@ -2238,7 +2230,6 @@
         opts['msg'] = msg
     setupheaderopts(ui, opts)
     q.new(repo, patch, *args, **opts)
-    q.savedirty()
     return 0
 
 @command("^qrefresh",
@@ -2294,9 +2285,7 @@
     setupheaderopts(ui, opts)
     wlock = repo.wlock()
     try:
-        ret = q.refresh(repo, pats, msg=message, **opts)
-        q.savedirty()
-        return ret
+        return q.refresh(repo, pats, msg=message, **opts)
     finally:
         wlock.release()
 
@@ -2390,7 +2379,6 @@
     try:
         q.refresh(repo, msg=message, git=diffopts.git)
         q.delete(repo, patches, opts)
-        q.savedirty()
     finally:
         wlock.release()
 
@@ -2405,11 +2393,9 @@
     q = repo.mq
     patch = q.lookup(patch)
     if q.isapplied(patch):
-        ret = q.pop(repo, patch, force=opts.get('force'))
+        return q.pop(repo, patch, force=opts.get('force'))
     else:
-        ret = q.push(repo, patch, force=opts.get('force'))
-    q.savedirty()
-    return ret
+        return q.push(repo, patch, force=opts.get('force'))
 
 @command("qguard",
          [('l', 'list', None, _('list all patches and guards')),
@@ -2481,7 +2467,6 @@
         if idx is None:
             raise util.Abort(_('no patch named %s') % patch)
         q.setguards(idx, args)
-        q.savedirty()
     else:
         status(q.series.index(q.lookup(patch)))
 
@@ -2559,10 +2544,9 @@
             return 1
         mergeq = queue(ui, repo.path, newpath)
         ui.warn(_("merging with queue at: %s\n") % mergeq.path)
-    ret = q.push(repo, patch, force=opts.get('force'), list=opts.get('list'),
-                 mergeq=mergeq, all=opts.get('all'), move=opts.get('move'),
-                 exact=opts.get('exact'))
-    return ret
+    return q.push(repo, patch, force=opts.get('force'), list=opts.get('list'),
+                  mergeq=mergeq, all=opts.get('all'), move=opts.get('move'),
+                  exact=opts.get('exact'))
 
 @command("^qpop",
          [('a', 'all', None, _('pop all patches')),
@@ -2589,7 +2573,6 @@
         q = repo.mq
     ret = q.pop(repo, patch, force=opts.get('force'), update=localupdate,
                 all=opts.get('all'))
-    q.savedirty()
     return ret
 
 @command("qrename|qmv", [], _('hg qrename PATCH1 [PATCH2]'))
@@ -2649,8 +2632,6 @@
         finally:
             wlock.release()
 
-    q.savedirty()
-
 @command("qrestore",
          [('d', 'delete', None, _('delete save entry')),
           ('u', 'update', None, _('update queue working directory'))],
@@ -2664,7 +2645,6 @@
     q = repo.mq
     q.restore(repo, rev, delete=opts.get('delete'),
               qupdate=opts.get('update'))
-    q.savedirty()
     return 0
 
 @command("qsave",
@@ -2703,7 +2683,6 @@
     if opts.get('empty'):
         del q.applied[:]
         q.applieddirty = True
-        q.savedirty()
     return 0
 
 @command("strip",
@@ -2787,7 +2766,6 @@
                     start = i
                     break
             del q.applied[start:end]
-            q.savedirty()
 
     revs = list(rootnodes)
     if update and opts.get('keep'):
@@ -2853,7 +2831,6 @@
         old_guarded = [i for i in xrange(len(q.applied)) if
                        not q.pushable(i)[0]]
         q.setactive(args)
-        q.savedirty()
         if not args:
             ui.status(_('guards deactivated\n'))
         if not opts.get('pop') and not opts.get('reapply'):
@@ -2908,13 +2885,9 @@
                 else:
                     q.pop(repo, str(i - 1))
                 break
-    if popped:
-        try:
-            if reapply:
-                ui.status(_('reapplying unguarded patches\n'))
-                q.push(repo, reapply)
-        finally:
-            q.savedirty()
+    if popped and reapply:
+        ui.status(_('reapplying unguarded patches\n'))
+        q.push(repo, reapply)
 
 @command("qfinish",
          [('a', 'applied', None, _('finish all applied changesets'))],
@@ -2953,7 +2926,6 @@
         ui.warn(_('warning: uncommitted changes in the working directory\n'))
 
     q.finish(repo, revs)
-    q.savedirty()
     return 0
 
 @command("qqueue",