Ticket #180 (new enhancement)

Opened 10 months ago

Last modified 3 months ago

buildbot try does the wrong thing with mercurial queues

Reported by: dsallings Assigned to: dsallings
Priority: major Milestone: undecided
Component: vc-support Version: 0.7.6
Keywords: Cc: afri, dustin, dsallings

Description

We'd like to be able to use buildbot try and mercurial queues. It's a pretty simple change to make:

Instead of asking for the tree identity, ask for the identity of the qparent. If there's not a qparent, ask for the current identity (as is done now). Then always diff against the discovered patch level.

A patch is attached that seems to do the job well.

Attachments

try-mq.diff (0.8 kB) - added by dsallings on 02/07/08 23:37:20.
try with mq support
180-testcase.diff (3.2 kB) - added by Ben on 08/21/08 15:55:36.
draft of testcase

Change History

02/07/08 23:37:20 changed by dsallings

  • attachment try-mq.diff added.

try with mq support

07/21/08 05:03:46 changed by afri

  • cc set to afri.

08/19/08 01:17:35 changed by Ben

  • cc changed from afri to afri, dustin.

Seems reasonable to me, any objections to that one ?

For the non Mercurial aware, this patch means that if you have any pending patch (as opposed to normal changeset) on your repository, the diff is done with those actual pending patches. If not, revert back to the current modif on the working dir.

08/19/08 13:35:12 changed by dustin

  • status changed from new to closed.
  • resolution set to fixed.

http://repo.or.cz/w/buildbot.git?a=shortlog;h=refs/remotes/dustin/bug180

(note: I have no way to test this, as I don't use hg -- I'm going on Ben's "seems reasonable")

08/20/08 07:21:15 changed by Ben

  • status changed from closed to reopened.
  • resolution deleted.

Note that a test case would be nice ...

I'll try to combine one tonight.

08/21/08 15:53:03 changed by Ben

  • owner set to dsallings.
  • status changed from reopened to new.

I cannot make my testsuite working ...

So I leave the ticket open, untill *someone* fix the testsuite or the patch ....

Here is where I am so far (see patch actually)

08/21/08 15:55:36 changed by Ben

  • attachment 180-testcase.diff added.

draft of testcase

08/21/08 15:57:18 changed by Ben

  • type changed from defect to enhancement.

to finish for today, it's more a wish than a defect ...

08/30/08 13:18:00 changed by dustin

  • keywords changed from mercurial try to review.

08/30/08 13:50:13 changed by dustin

  • cc changed from afri, dustin to afri, dustin, dsallings.
  • keywords deleted.

OK, this patch is available in integrated form at:

http://repo.or.cz/w/buildbot.git?a=shortlog;h=refs/remotes/dustin/bug180

Since this is a "draft", I haven't pulled it into the dev tree yet, and will un-mark it for review. 

===============================================================================
[ERROR]: buildbot.test.test_vc.Mercurial.testTryMq

Traceback (most recent call last):
  File "/home/dustin/devel/projects/buildbot/t/buildbot/buildbot/test/test_vc.py", line 345, in check
    + ": see logs for stdout")
exceptions.RuntimeError: command ['/usr/bin/hg', 'qnew', '-f', 'patch.diff'] finished with exit code 255: see logs for stdout

By the way, dsallings, what is your full name and email address, so I can give you credit?

08/30/08 14:22:11 changed by dsallings

Great, thanks. Dustin Sallings <dustin@spy.net>

08/31/08 09:28:59 changed by dsallings

I just realized this was showing an error. I haven't used hg with buildbot in a while, but I was using it with this recipe. Is it actually failing? If so, does the log show anything?