Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/changegroup.py
changeset 32870 b441296f8e9c
parent 32869 5281129eb92c
child 32926 038bfc384271 
--- a/mercurial/changegroup.py	Thu Jun 15 13:42:41 2017 -0700
+++ b/mercurial/changegroup.py	Thu Jun 15 13:47:54 2017 -0700
@@ -349,16 +349,16 @@
                 revisions += newrevs
                 files += newfiles
 
-                dh = 0
+                deltaheads = 0
                 if oldheads:
                     heads = cl.heads()
-                    dh = len(heads) - len(oldheads)
+                    deltaheads = len(heads) - len(oldheads)
                     for h in heads:
                         if h not in oldheads and repo[h].closesbranch():
-                            dh -= 1
+                            deltaheads -= 1
                 htext = ""
-                if dh:
-                    htext = _(" (%+d heads)") % dh
+                if deltaheads:
+                    htext = _(" (%+d heads)") % deltaheads
 
                 repo.ui.status(_("added %d changesets"
                                  " with %d changes to %d files%s\n")
@@ -429,10 +429,10 @@
         finally:
             repo.ui.flush()
         # never return 0 here:
-        if dh < 0:
-            return dh - 1
+        if deltaheads < 0:
+            return deltaheads - 1
         else:
-            return dh + 1
+            return deltaheads + 1
 
 class cg2unpacker(cg1unpacker):
     """Unpacker for cg2 streams.
mercurial