extdiff: un-nested two functions

The functions in extdiff that create temporary repo copies for are useful in other extensions, so the change moves them at the module level.

hgext/extdiff.py

@@ -53,8 +53,8 from mercurial.node import *
 from mercurial import cmdutil, util
 import os, shutil, tempfile
 
-def dodiff(ui, repo, diffcmd, diffopts, pats, opts):
-    def snapshot_node(files, node):
+
+def snapshot_node(ui, repo, files, node, tmproot):
         '''snapshot files as of some revision'''
         mf = repo.changectx(node).manifest()
         dirname = os.path.basename(repo.root)
@@ -80,7 +80,8 def dodiff(ui, repo, diffcmd, diffopts,
             open(dest, 'wb').write(data)
         return dirname
 
-    def snapshot_wdir(files):
+
+def snapshot_wdir(ui, repo, files, tmproot):
         '''snapshot files from working directory.
         if not using snapshot, -I/-X does not work and recursive diff
         in tools like kdiff3 and meld displays too many files.'''
@@ -104,6 +105,8 def dodiff(ui, repo, diffcmd, diffopts,
                 fp.write(chunk)
         return dirname
 
+
+def dodiff(ui, repo, diffcmd, diffopts, pats, opts):
     node1, node2 = cmdutil.revpair(repo, opts['rev'])
     files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
     modified, added, removed, deleted, unknown = repo.status(
@@ -113,11 +116,11 def dodiff(ui, repo, diffcmd, diffopts,
 
     tmproot = tempfile.mkdtemp(prefix='extdiff.')
     try:
-        dir1 = snapshot_node(modified + removed, node1)
+        dir1 = snapshot_node(ui, repo, modified + removed, node1, tmproot)
         if node2:
-            dir2 = snapshot_node(modified + added, node2)
+            dir2 = snapshot_node(ui, repo, modified + added, node2, tmproot)
         else:
-            dir2 = snapshot_wdir(modified + added)
+            dir2 = snapshot_wdir(ui, repo, modified + added, tmproot)
         cmdline = ('%s %s %s %s' %
                    (util.shellquote(diffcmd), ' '.join(diffopts),
                     util.shellquote(dir1), util.shellquote(dir2)))