mercurial/exchange.py
changeset 23139 e53f6b72a0e4
parent 23082 0fc4686de1d7
child 23177 706547a14b8b
--- a/mercurial/exchange.py	Sun Nov 02 13:08:46 2014 +0900
+++ b/mercurial/exchange.py	Thu Apr 17 22:47:38 2014 +0200
@@ -298,7 +298,7 @@
     else:
         # adds changeset we are going to push as draft
         #
-        # should not be necessary for pushblishing server, but because of an
+        # should not be necessary for publishing server, but because of an
         # issue fixed in xxxxx we have to do it anyway.
         fdroots = list(unfi.set('roots(%ln  + %ln::)',
                        outgoing.missing, droots))
@@ -448,7 +448,7 @@
     cg = changegroup.getlocalchangegroup(pushop.repo, 'push', pushop.outgoing)
     cgpart = bundler.newpart('B2X:CHANGEGROUP', data=cg.getchunks())
     def handlereply(op):
-        """extract addchangroup returns from server reply"""
+        """extract addchangegroup returns from server reply"""
         cgreplies = op.records.getreplies(cgpart.id)
         assert len(cgreplies['changegroup']) == 1
         pushop.cgresult = cgreplies['changegroup'][0]['return']
@@ -702,7 +702,7 @@
                     pushop.ui.warn(msg)
 
         else:
-            # fallback to independant pushkey command
+            # fallback to independent pushkey command
             for newremotehead in outdated:
                 r = pushop.remote.pushkey('phases',
                                           newremotehead.hex(),