PQM

Merge lp://staging/~oddbloke/pqm/merge-directives into lp://staging/pqm

merge-directives
Merge into trunk

Proposed by Dan Watkins on 2008-08-24

Status:

Work in progress

Proposed branch:

lp://staging/~oddbloke/pqm/merge-directives

Merge into:

lp://staging/pqm

Prerequisite:

lp://staging/~oddbloke/pqm/fix-tests

Diff against target:

793 lines (+488/-20) (has conflicts)

7 files modified

.bzrignore (+1/-0)
pqm/__init__.py (+79/-0)
pqm/script.py (+164/-8)
pqm/tests/test_pqm.py (+201/-4)
tests/Makefile.am (+2/-1)
tests/bzr-merge-2.sh (+20/-0)
tests/test-framework (+21/-7)

Text conflict in pqm/__init__.py
Text conflict in pqm/script.py
Text conflict in pqm/tests/test_pqm.py

To merge this branch:

bzr merge lp://staging/~oddbloke/pqm/merge-directives

Wishlist

Triaged

Link a bug report

Reviewer	Review Type	Date Requested	Status
Robert Collins			Needs Resubmitting on 2009-03-26
Review via email: mp+833@code.staging.launchpad.net

This proposal supersedes a proposal from 2008-07-09.

Revision history for this message

Robert Collins (lifeless) wrote on 2008-08-21: Posted in a previous version of this proposal

overall good.

A few issues:

- uses more shell tests rather than python unit tests
- the new Command class won't render correctly in the web GUI
- I don't like the merge_callback lambda usage, its unobvious and doesn't seem necessary.

overall - resubmit

review: Disapprove

Revision history for this message

Dan Watkins (oddbloke) wrote on 2008-08-24:

To address Robert's issues:

> - uses more shell tests rather than python unit tests
I'm not sure what the Python tests are missing. If you could give me some suggestions, I'd be happy to put them into practice.

> - the new Command class won't render correctly in the web GUI
Fixed.

> - I don't like the merge_callback lambda usage, its unobvious and doesn't seem necessary.
I agree. Fixed. In the process, replay merge became its own Command (rather than being a part of CommandRunner) to stop my head exploding because of the broken merge abstraction we had.

Revision history for this message

Robert Collins (lifeless) wrote on 2008-08-24:

On Sun, 2008-08-24 at 03:29 +0000, Daniel Watkins wrote:
> To address Robert's issues:
>
> > - uses more shell tests rather than python unit tests
> I'm not sure what the Python tests are missing. If you could give me some suggestions, I'd be happy to put them into practice.

Well, there are new shell tests; either they are redundant (in which
case, remove em :)) or they test something not tested in the python
tests (in which case move them into python tests).

> > - the new Command class won't render correctly in the web GUI
> Fixed.
>
> > - I don't like the merge_callback lambda usage, its unobvious and doesn't seem necessary.
> I agree. Fixed. In the process, replay merge became its own Command (rather than being a part of CommandRunner) to stop my head exploding because of the broken merge abstraction we had.

Cool - thanks.

-Rob

--
GPG key available at: <http://www.robertcollins.net/keys.txt>.

Revision history for this message

Tim Penhey (thumper) wrote on 2008-11-26:

Were you going to remove the shell tests?

Revision history for this message

Dan Watkins (oddbloke) wrote on 2008-11-26:

On Wed, 2008-11-26 at 06:40 +0000, Tim Penhey wrote:
> Were you going to remove the shell tests?
I believe the intent is to replace them with Python unit tests, in time.

Revision history for this message

Tim Penhey (thumper) wrote on 2008-11-26:

On Wed, 26 Nov 2008 22:51:31 Daniel Watkins wrote:
> On Wed, 2008-11-26 at 06:40 +0000, Tim Penhey wrote:
> > Were you going to remove the shell tests?
>
> I believe the intent is to replace them with Python unit tests, in
> time.

OK, I'll look to include this in my integration branch shortly (not
tonight).

Revision history for this message

Robert Collins (lifeless) wrote on 2009-03-26:

Needs conflicts fixing at minimum.

review: Needs Resubmitting

Unmerged revisions

181. By Dan Watkins on 2008-08-23: Readded replay merge as ReplayMergeCommand.
180. By Dan Watkins on 2008-08-23: Removed use of merge_callback.
179. By Dan Watkins on 2008-08-23: Refactored merge code from Command to MergeCommand.
178. By Dan Watkins on 2008-08-23: Removed replay legacy command.
177. By Dan Watkins on 2008-08-23: ExtendedMergeCommands now work with the UI correctly.
176. By Dan Watkins on 2008-08-23: Merged pqm.dev r183.
175. By Dan Watkins on 2008-07-17: Fixed failing tests.
174. By Dan Watkins on 2008-07-17: Merged pqm.dev r182, without fixing tests.
173. By Dan Watkins on 2008-07-09: Fixed issues with PGP headers and footers in merge directive mail.
172. By Dan Watkins on 2008-07-09: Modified test to step around issues with detecting which VCS a branch uses.