Commits

Anonymous committed 6cdff88

Only pass options to revert that it actually needs.
Reusing the options dict created for the 'shelve' command seems risky.

Comments (0)

Files changed (1)

         self.currentpatch=name
         self.persiststate()
 
-    def cleanup(self, repo, pats=[], opts={}):
+    def cleanup(self, repo, pats, opts):
         '''removes all changes from the working copy and makes it so
         there isn't a patch applied'''
-        node = repo.dirstate.parents()[0]
-        opts['date'] = None
-        opts['all'] = True # Just to trick revert
-        opts['rev'] = node
-        commands.revert(self.ui, repo, *pats, **opts)
+
+        revertopts = { 'include': opts['include'],
+                       'exclude': opts['exclude'],
+                       'date': None,
+                       'all': True,
+                       'rev': '.',
+                     }
+        commands.revert(self.ui, repo, *pats, **revertopts)
         self.applied = ''
         self.persiststate()
 
                 s.persiststate()
             ui.status(_('patch %s refreshed\n') % (s.applied))
         else:
-            s.cleanup(repo, pats=pats, opts=opts)
+            s.cleanup(repo, pats, opts)
             ui.status(_('patch %s shelved\n' % (s.currentpatch)))
     os.chdir(cwd)