Re: [Hooke] Hooke restructuring

ms

unread,

Jun 3, 2010, 10:05:53 AM6/3/10

to W. Trevor King, hookes...@googlegroups.com

Hi,

On 03/06/10 13:38, W. Trevor King wrote:
> On Fri, May 14, 2010 at 10:07:46AM -0400, W. Trevor King wrote:
>> I'm tempted to make the new illysam base the last illysam trunk
>> commit, since it's the oldest of those three dates.
>
> On Fri, May 14, 2010 at 10:13:49AM -0400, rsch...@alcor.concordia.ca wrote:
>> Sounds good to me;-)
>
> Done in my repository:
> http://www.physics.drexel.edu/~wking/code/hg/hgwebdir.cgi/hooke/
>
> I never heard from Massimo, but I suppose that means he's not too
> strongly against the rebasing ;).
>

Sorry everyone! It's a hell of a period -I have a talk at the end of the
month and I have to finalize a computational protein aggregation model
for that date (plus other stuff)...

Would you mind reminding me exactly what you mean by "rebasing"? :) Are
you (Trevor) and illysam going to merge? That would be wonderful.

About previous issues: I am unsure about moving to Mercurial -primarily
because almost all devels I know are familiar with SVN only. I'd like
it, but can we stick to SVN for a while?

Trevor, I'll give you the commit bit ASAP.

cheers,
m.

W. Trevor King

unread,

Jun 3, 2010, 1:28:20 PM6/3/10

to hookes...@googlegroups.com

On Thu, Jun 03, 2010 at 03:05:53PM +0100, ms wrote:
> Would you mind reminding me exactly what you mean by "rebasing"? :) Are
> you (Trevor) and illysam going to merge? That would be wonderful.

Sorry, I never filled you in on the two emails you missed. I've
attached the text to this one.

> About previous issues: I am unsure about moving to Mercurial -primarily
> because almost all devels I know are familiar with SVN only. I'd like
> it, but can we stick to SVN for a while?

It's really easy to do basic stuff in Mercurial. Check out the
excellent docs:
http://mercurial.selenic.com/learn/
http://hginit.com/
Or this compact svn-to-hg dictionary
http://nedbatchelder.com/text/hgsvn.html

However, I'm in no huge hurry. So long as we're careful about futher
branching in the SVN repository, it should be easy to keep pulling the
changes into the Mercurial repo. Pushing Mercurial updates back into
the SVN repo will also be easy enough if you don't care about tracking
file renames etc in the SVN version.

> Trevor, I'll give you the commit bit ASAP.

Great :)

--
This email may be signed or encrypted with GPG (http://www.gnupg.org).
The GPG signature (if present) will be attached as 'signature.asc'.
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy

My public key is at http://www.physics.drexel.edu/~wking/pubkey.txt

W. Trevor King

unread,

Jun 3, 2010, 2:28:27 PM6/3/10

to hookes...@googlegroups.com

On Thu, Jun 03, 2010 at 01:28:20PM -0400, W. Trevor King wrote:
> Sorry, I never filled you in on the two emails you missed. I've
> attached the text to this one.

Oops, here they are.

mail1

mail2

W. Trevor King

unread,

Jul 31, 2010, 3:38:21 PM7/31/10

to hookes...@googlegroups.com

On Thu, Jun 03, 2010 at 01:28:20PM -0400, W. Trevor King wrote:
> On Thu, Jun 03, 2010 at 03:05:53PM +0100, ms wrote:
> > Would you mind reminding me exactly what you mean by "rebasing"? :) Are
> > you (Trevor) and illysam going to merge? That would be wonderful.

I've had some time to work on the GUI portion of my CLI/GUI merged
Hooke this past week, translating Rolf's GUI code onto my engine/ui
architecture. Currently working panels:
commands, output, playlist, plot, propertyeditor

Take a look and let me know what you think.
http://www.physics.drexel.edu/~wking/code/hg/hgwebdir.cgi/hooke/

Oh, most of the plugins still haven't been translated, since I'm just
pushing through stuff I need for my own analysis at the moment. Once
that gets going, I'll have time to go through and clean up the other
plugins/panels. It's pretty easy to translate individual plugins,
it's just that there are so many of them and the old implementation
isn't always as clean as I'd like ;).

Cheers,
Trevor

m.s.

unread,

Aug 2, 2010, 11:27:07 AM8/2/10

to Hooke

On Jul 31, 8:38 pm, "W. Trevor King" <tvr...@gmail.com> wrote:
> On Thu, Jun 03, 2010 at 01:28:20PM -0400, W. Trevor King wrote:
> > On Thu, Jun 03, 2010 at 03:05:53PM +0100, ms wrote:
> > > Would you mind reminding me exactly what you mean by "rebasing"? :) Are
> > > you (Trevor) and illysam going to merge? That would be wonderful.
>
> I've had some time to work on the GUI portion of my CLI/GUI merged
> Hooke this past week, translating Rolf's GUI code onto my engine/ui
> architecture. Currently working panels:
> commands, output, playlist, plot, propertyeditor
>
> Take a look and let me know what you think.
> http://www.physics.drexel.edu/~wking/code/hg/hgwebdir.cgi/hooke/

I haven't tried it yet, but this is great news! When do you think you
can commit a testing branch in the SVN tree? Rolf, comments?

cheers,
M.

W. Trevor King

unread,

Aug 2, 2010, 7:51:45 PM8/2/10

to hookes...@googlegroups.com

On Mon, Aug 02, 2010 at 08:27:07AM -0700, m.s. wrote:
> When do you think you can commit a testing branch in the SVN tree?

Committed my current Mercurial tip as r273. Due to Mercurial <-> SVN
issues, any changes made to that branch from the SVN side will be a
pain to merge back into my Mercurial repo, so if you want to make
changes, please either use Mercurial on the repo at
http://www.physics.drexel.edu/~wking/code/hg/hgwebdir.cgi/hooke/
or email me patches. I'll push an update to SVN within a few days of
each Mercurial update.

W. Trevor King

unread,

Aug 22, 2010, 11:00:25 AM8/22/10

to hookes...@googlegroups.com

With the new YAML playlists,
http://groups.google.com/group/hookesoftware/browse_thread/thread/c0b720051a4f4681/

Perhaps the merge should wait a week or two for any additional bugs to
surface while amantedpaz and I beat out any outstanding issues with
velocity clamp analysis
http://code.google.com/p/hooke/issues/detail?id=40
although I can't imagine anything big enough to block the merge would
come up. Actually, the "merge" won't be particularly interesting,
since it will just replace the current trunk/default tip with my code,
as I've already merged the tips of all the other branches.
wking@thialfi hooke $ hg branches
wtk 714:8d2db52043a5
illysam 367:73fc951770f5 (inactive)
fft 284:34cbab99b0a2 (inactive)
default 152:98423149f185 (inactive)

If someone could share a typical analysis procedure for force clamp
data, or submit data for drivers without samples (HDF5, MFP1D, MCS),
that would allow for more extensive testing. As it stands, I'll just
wait for "my X is not supported" bug reports.

I also still need to go through and remove plugins and commands that
are no longer useful.

If someone wants to go through and review the core code (everything
except the disabled hooke/plugins/ and hooke/drivers/), now would be a
good time ;).

ms

unread,

Aug 22, 2010, 1:40:40 PM8/22/10

to hookes...@googlegroups.com

Excellent! Give me a week time to get to it!

m.

Reply all

Reply to author

Forward