Re: [StGit PATCH] Convert "sink" to the new infrastructure

From: Karl Hasselström <kha@treskal.com>
Date: Sep 18, 2008, 07:24 UTC
Message-ID: <20080918072450.GB12550@diana.vm.bytemark.co.uk>
In-Reply-To: <b0943d9e0809170909j4fce34acr8f0b844d0cb5281d@mail.gmail.com>

On 2008-09-17 17:09:46 +0100, Catalin Marinas wrote:

Show 8 quoted lines

> I'm still confused by this and I don't think your new flag would
> help. The meaning of stop_before_conflict is that it won't push the
> conflicting patch but actually leave the stack with several patches
> pushed or popped.
>
> What I want for sink (and float afterwards) is by default to cancel
> the whole transaction if there is a conflict and revert the stack to
> it's original state prior to the "stg sink" command.

Ah, OK. Then I think you want something like this:

  try:
      trans.reorder_patches(applied, unapplied, hidden, iw)
  except transaction.TransactionHalted:
      if not options.conflict:
          trans.abort(iw)
          raise common.CmdException(
              'Operation rolled back -- would result in conflicts')
  return trans.run(iw)

But with a better error message ...

StackTransaction.abort() doesn't have much in the way of documentation, unfortunately, but what it does is to check out the tree we started with. (Nothing else is necessary, since we never touch any refs and stuff until the end of StackTransaction.run(). And the only case where we touch the tree is when we need to fall back to merge-recursive.)

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle