diff -r 3d14c1217117 -r 0ca8410ea345 mercurial/patch.py --- a/mercurial/patch.py Sat May 16 09:03:21 2015 +0200 +++ b/mercurial/patch.py Sat May 16 11:28:04 2015 -0700 @@ -6,6 +6,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. +import collections import cStringIO, email, os, errno, re, posixpath, copy import tempfile, zlib, shutil # On python2.4 you have to import these by name or they fail to @@ -2102,7 +2103,7 @@ def lrugetfilectx(): cache = {} - order = util.deque() + order = collections.deque() def getfilectx(f, ctx): fctx = ctx.filectx(f, filelog=cache.get(f)) if f not in cache: