--- a/mercurial/patch.py Sat Jun 02 15:35:53 2012 -0500
+++ b/mercurial/patch.py Fri Jun 01 17:05:31 2012 -0700
@@ -12,7 +12,7 @@
from i18n import _
from node import hex, nullid, short
import base85, mdiff, scmutil, util, diffhelpers, copies, encoding, error
-import collections, context
+import context
gitre = re.compile('diff --git a/(.*) b/(.*)')
@@ -1597,7 +1597,7 @@
def lrugetfilectx():
cache = {}
- order = collections.deque()
+ order = util.deque()
def getfilectx(f, ctx):
fctx = ctx.filectx(f, filelog=cache.get(f))
if f not in cache: