# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1454625917 28800
#      Thu Feb 04 14:45:17 2016 -0800
# Node ID a8805edec6460792848863fb5773297bbb360d28
# Parent  d42bf856ee0973105bb4d09f00f5405cf812b4c8
pushrebase: fix changegroup format picking to account for new upstream api

Summary:
Upstream has changed _packermap to be hidden behind supportedversions(). We need
to use that, otherwise we'll potentially reply with the wrong changegroup type.

Test Plan: Ran the tests

Reviewers: mitrandir

Differential Revision: https://phabricator.fb.com/D2903217

diff --git a/pushrebase.py b/pushrebase.py
--- a/pushrebase.py
+++ b/pushrebase.py
@@ -417,7 +417,7 @@
     cgversions = set(reply.capabilities.get('changegroup'))
     if not cgversions:
         cgversions.add('01')
-    version = max(cgversions & set(changegroup._packermap.keys()))
+    version = max(cgversions & set(changegroup.supportedversions(repo)))
 
     cg = changegroup.getlocalchangegroupraw(repo,
                                             'rebase:reply',