changeset 398:50c8d033638b

pull: more conservative count of new heads Testing against the k-9 repository I realized I am counting too many references as changed after a pull.
author Brendan Cully <brendan@kublai.com>
date Fri, 20 May 2011 09:47:50 -0700
parents 60d181f9ecc3
children 132fb69af782
files hggit/git_handler.py
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -120,11 +120,10 @@
 
         def remoteref(ref):
             rn = remote_name or 'default'
-            if ref.startswith('refs/tags/'):
-                return ref
             return 'refs/remotes/' + rn + ref[10:]
 
-        modheads = set([refs[k] for k in refs if k != 'HEAD'
+        modheads = set([refs[k] for k in refs if k.startswith('refs/heads/')
+                        and not k.endswith('^{}')
                         and refs[k] != oldrefs.get(remoteref(k))])
 
         if not modheads: