##// END OF EJS Templates
Update extdiff for recent refactoring
Brendan Cully -
r2902:2fe4d99a default
parent child Browse files
Show More
@@ -33,7 +33,7 b''
33 from mercurial.demandload import demandload
33 from mercurial.demandload import demandload
34 from mercurial.i18n import gettext as _
34 from mercurial.i18n import gettext as _
35 from mercurial.node import *
35 from mercurial.node import *
36 demandload(globals(), 'mercurial:commands,util os shutil tempfile')
36 demandload(globals(), 'mercurial:commands,cmdutil,util os shutil tempfile')
37
37
38 def dodiff(ui, repo, diffcmd, pats, opts):
38 def dodiff(ui, repo, diffcmd, pats, opts):
39 def snapshot_node(files, node):
39 def snapshot_node(files, node):
@@ -79,7 +79,7 b' def dodiff(ui, repo, diffcmd, pats, opts'
79 return dirname
79 return dirname
80
80
81 node1, node2 = commands.revpair(ui, repo, opts['rev'])
81 node1, node2 = commands.revpair(ui, repo, opts['rev'])
82 files, matchfn, anypats = commands.matchpats(repo, pats, opts)
82 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
83 modified, added, removed, deleted, unknown = repo.status(
83 modified, added, removed, deleted, unknown = repo.status(
84 node1, node2, files, match=matchfn)[:5]
84 node1, node2, files, match=matchfn)[:5]
85 if not (modified or added or removed):
85 if not (modified or added or removed):
General Comments 0
You need to be logged in to leave comments. Login now