Re: [RFC PATCH] Record a single transaction for conflicting push operations

From: Karl Wiberg <kha@treskal.com>
Date: Dec 19, 2009, 23:50 UTC
Message-ID: <b8197bcb0912191550u300a9c20o351eba66c85292bb@mail.gmail.com>
In-Reply-To: <b0943d9e0912180749ga8857d9j975e119937db9674@mail.gmail.com>

On Fri, Dec 18, 2009 at 4:49 PM, Catalin Marinas <catalin.marinas@gmail.com> wrote:

Show 15 quoted lines

> @@ -371,12 +369,10 @@ class StackTransaction(object):
>             # We've just caused conflicts, so we must allow them in
>             # the final checkout.
>             self.__allow_conflicts = lambda trans: True
> -
> -            # Save this update so that we can run it a little later.
> -            self.__conflicting_push = update
> +            self.__patches = _TransPatchMap(self.__stack)
> +            update()
>             self.__halt("%d merge conflict(s)" % len(self.__conflicts))
>         else:
> -            # Update immediately.
>             update()
>
>     def push_tree(self, pn):

Better. But couldn't you remove the update function completely and just inline the code in it, since it's called immediately?

-- 
Karl Wiberg, kha@treskal.com
   subrabbit.wordpress.com
   www.treskal.com/kalle