summaryrefslogtreecommitdiff
path: root/mercurial/treediscovery.py
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@baserock.org>2011-10-01 20:49:36 +0000
committerLorry <lorry@roadtrain.codethink.co.uk>2012-09-27 13:27:51 +0000
commit921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch)
tree3c4a89176ea67fe4c7bf7b375488361a823c95fa /mercurial/treediscovery.py
parent9039c805b0a7e36220101323f82735f08a104b37 (diff)
downloadmercurial-tarball-master.tar.gz
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'mercurial/treediscovery.py')
-rw-r--r--mercurial/treediscovery.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mercurial/treediscovery.py b/mercurial/treediscovery.py
index 09a4afb..49011c9 100644
--- a/mercurial/treediscovery.py
+++ b/mercurial/treediscovery.py
@@ -56,11 +56,11 @@ def findcommonincoming(repo, remote, heads=None, force=False):
# a 'branch' here is a linear segment of history, with four parts:
# head, root, first parent, second parent
# (a branch always has two parents (or none) by definition)
- unknown = util.deque(remote.branches(unknown))
+ unknown = remote.branches(unknown)
while unknown:
r = []
while unknown:
- n = unknown.popleft()
+ n = unknown.pop(0)
if n[0] in seen:
continue