commit fab4e18432bae0f11a9ed3d5c682c2442d2ef007 breaks pull request updates

Thomas De Schampheleire patrickdepinguin at gmail.com
Tue Jan 27 10:04:59 EST 2015


Hi Mads,

I just updated to the latest tip of kallithea, and now see that
updating a pull request with a new descendant does not work.
Kallithea detects there is a new descendant (text 'This pull request
can be updated with changes on default:') is shown, but no commits are
shown.

In commit fab4e18432bae0f11a9ed3d5c682c2442d2ef007, you added:

show = set(org_scm_instance._repo.revs('::%ld & !::%s & !::%s',
avail_revs, revs[0], c.a_branch_name))

but the c.a_branch_name is 'default' in my case, while the avail_revs
are also on default. This causes anything on the default branch to be
ignored.

If I remove the last '& !::default' clause, I get the expected list.

Could you clarify the reason for this extra clause, what branch you
expect there?
I assume that just removing the clause does not match your own use case?

Thanks,
Thomas


More information about the kallithea-general mailing list