[PATCH 15 of 15] fixed some typos

Nicolas Dumazet nicdumz at gmail.com
Mon Jul 12 06:11:56 CDT 2010


Hello!

2010/7/12 Pradeepkumar Gayam <in3xes at gmail.com>:
> # HG changeset patch
> # User Pradeepkumar Gayam <in3xes at gmail.com>
> # Date 1278929816 -19800
> # Branch stable
> # Node ID 1ea9133f0c06ca08281fe2df2de364a1ed0d35d9
> # Parent  139c4be10f57966809a1b4fdc6d60116b554905d
> fixed some typos

Thanks for your work.

It would be nicer to fold those typos into the previous patches that
caused them.
For example, correct the sshrepo bit in patch #13 inside of having an
extra patch #15.

This way patch #13 is "perfect" (does not contain syntax errors) and
is easier to review for reviewers.

If you did not do it because you find it difficult to selectively fold
parts of a patch into an earlier patch (advanced MQ handling), I think
that we, (or I) can help you to do it on IRC.

Regards,

> diff -r 139c4be10f57 -r 1ea9133f0c06 mercurial/httprepo.py
> --- a/mercurial/httprepo.py     Mon Jul 12 13:47:50 2010 +0530
> +++ b/mercurial/httprepo.py     Mon Jul 12 15:46:56 2010 +0530
> @@ -244,7 +244,7 @@
>             try:
>                 if pdelta:
>                     resp = self.do_read(
> -                        'unbundle', data=fp, parentdelta='parentdelta'
> +                        'unbundle', data=fp, parentdelta='parentdelta',
>                         headers={'Content-Type': 'application/mercurial-0.1'},
>                         heads=' '.join(map(hex, heads)))
>                 else:
> diff -r 139c4be10f57 -r 1ea9133f0c06 mercurial/localrepo.py
> --- a/mercurial/localrepo.py    Mon Jul 12 13:47:50 2010 +0530
> +++ b/mercurial/localrepo.py    Mon Jul 12 15:46:56 2010 +0530
> @@ -1235,13 +1235,14 @@
>         Return an integer: see push().
>         '''
>         lock = remote.lock()
> -        pdelta = rempte.capable('parentdelta')
> +        pdelta = remote.capable('parentdelta')
>         try:
>             ret = discovery.prepush(self, remote, force, revs, newbranch, pdelta)
>             if ret[0] is not None:
>                 cg, remote_heads = ret
>                 # we return an integer indicating remote head count change
> -                return remote.addchangegroup(cg, 'push', self.url(), lock=lock,pdelta)
> +                return remote.addchangegroup(cg, 'push', self.url(), lock=lock,
> +                                             pdelta=pdelta)
>             # and here we return 0 for "nothing to push" or 1 for
>             # "something to push but I refuse"
>             return ret[1]
> diff -r 139c4be10f57 -r 1ea9133f0c06 mercurial/sshrepo.py
> --- a/mercurial/sshrepo.py      Mon Jul 12 13:47:50 2010 +0530
> +++ b/mercurial/sshrepo.py      Mon Jul 12 15:46:56 2010 +0530
> @@ -264,7 +264,7 @@
>         similar to unbundle(). DEPRECATED, since it requires locking the
>         remote.'''
>         if pdelta:
> -            d = self.call("addchangegroup", parentdelta='parentdelta'))
> +            d = self.call("addchangegroup", parentdelta='parentdelta')
>         else:
>             d = self.call("addchangegroup")
>
> diff -r 139c4be10f57 -r 1ea9133f0c06 mercurial/sshserver.py
> --- a/mercurial/sshserver.py    Mon Jul 12 13:47:50 2010 +0530
> +++ b/mercurial/sshserver.py    Mon Jul 12 15:46:56 2010 +0530
> @@ -158,9 +158,9 @@
>     def do_addchangegroup(self):
>         '''DEPRECATED'''
>
> -        args = self.getarg()
> +        argmnts = self.getarg()
>         pdelta = False
> -        if args not None and 'parentdelta' in args:
> +        if argmnts is not None and 'parentdelta' in argmnts:
>             pdelta = True
>         if not self.lock:
>             self.respond("not locked")
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>



-- 
Nicolas Dumazet — NicDumZ


More information about the Mercurial-devel mailing list