DROP task: Port Revision Tags to Drupal 6

Rob Loach - February 19, 2008 - 20:51
Project:Revision tags
Version:5.x-1.x-dev
Component:Code
Category:task
Priority:normal
Assigned:franskuipers
Status:closed
Description

Now that Drupal 6 is out, it would be a good time to port this module to Drupal 6....

#1

Rob Loach - February 19, 2008 - 21:11
Title:Port Revision Tags to Drupal 6» DROP task: Port Revision Tags to Drupal 6

This is now a DROP Task.

This would include:

  1. Port the module to Drupal 6
  2. Post a correct patch in this issue
  3. Communicate with one of the module's developers to have it committed to the Drupal CVS (HEAD or DRUPAL-6--1)

#2

franskuipers - February 26, 2008 - 18:40
Assigned to:Anonymous» franskuipers

Here is the converted revisiontags.
The revisiontags_views.module is not 6.x ready yet, will wait until views 2.0 for 6.x is in late BETA.
No functional changes made.

Patch is against HEAD CVS version.
Please download and test it.

AttachmentSize
revisiontags-6.x-0.2.patch 8.44 KB

#3

Rob Loach - February 26, 2008 - 19:10
Status:active» needs work

Very nice! A couple things:

  1. Make sure to create the patch from the revisiontags directory, not the modules directory (this might help)
  2. I like what you did with the menu
  3. Nice job on getting hook_theme in there

You're very close, just need to create the patch correctly. Keep it up, Frans!

AttachmentSize
revisiontags.install.rej_.txt 1.48 KB

#4

franskuipers - February 27, 2008 - 05:00

Thanks Rob,

I have a problem with checking out revisiontags......
Both the .module and .install are adding CRLF when I checkout from CVS. So I get an empty line after every line. I used TortoiseCVS on Windows and can not find out whats wrong, even with all the help on the d.o. website.
If I look in the cvs.d.o repository, I don't see the empty lines?

I had to make the patch on the commandline with cvs diff -u -w revisiontags >output-file (so I did it from the directory, not the modules directory.

If somebody can help me out, please.....

#5

Rob Loach - February 27, 2008 - 13:22

I had the same problems when I first started. If you use TortoiseCVS to create the patch, you can make it from the revisiontags directory, but you'll have to get rid of those line breaks using a program like PSPad. If you open it up in an advanced text editor, you should be able to change the line breaks from Windows line breaks, to UNIX line breaks. This should effectively solve your CRLF problem.

  1. Check out the module using TortoiseCVS
  2. Make changes to the module and make sure it works correctly
  3. Make the patch from the revisiontags directory using TortoiseCVS
  4. Fix the CRLF problem in the patch by resaving the patch with UNIX line breaks using a program like PSPad
  5. Upload the patch

This should solve your problem. Keep it up Frans! You're doing an excellent job.

#6

franskuipers - February 28, 2008 - 07:09

To show you which problem I have on my Vista system:

I followed exactly your steps. I only added one (1) Empty line in the 4 files with PSPad (I already was using that:-) and saved the files.

See the attached file with the problem, please.
You will see, it is behaving well with the both .info files, but NOT with .install and .module.
I am not talking about changing LF in CRLF, but about changing LF in CRLF+CRLF !!

I have attached the .patch file after adding one empty line in each file, and the just checked out .install file.

Thanks for your help!

AttachmentSize
revisiontags.patch 19.12 KB
revisiontags.install.txt 396 bytes

#7

franskuipers - March 3, 2008 - 16:25

OK, my conclusion is, tortioseCVS (I suspect CVSNT) is doing some strange things on Vista (TortoiseCVS is warning you when you install it on Vista :-)

So, I did all the steps with Eclipse on Vista. I tried to patch a newly checked out (with Eclipse) revisiontags with the attached patch, and don't get any .rej files.

Please test patch and module.

(Yes, I know the .module is complete replaced, not really a diff file. I am sure the CVS is wrong, but nobody is able to help with this problem :-) If you want to see the changed lines in this module, please have a look at the revisiontags-6.x-0.2.patch file I uploaded earlier.

AttachmentSize
revisiontags.6.x-0.4.patch 20.17 KB

#8

robertDouglass - March 7, 2008 - 21:50

@franskuipers: I'm really sorry but I can't get this patch to apply. Can you work on it a bit more? I don't know exactly what the problem is. If you just zip up your completed D6 version of the revision tags module I'll look at it.

#9

franskuipers - March 10, 2008 - 05:19

Hi Robert,

Did you try it on a fresh checkout from CVS HEAD?

Here is the zip file. Thanks for looking at it.

AttachmentSize
revisiontags.zip 11.86 KB

#10

Rob Loach - March 10, 2008 - 14:37

Sorry about not responding earlier, was busy at Drupalcon.... The patch you posted gives me some HUNK fails from CVS head. I'll try out the zip you posted though.

AttachmentSize
revisiontags.module.rej_.txt 17.1 KB

#11

Rob Loach - March 10, 2008 - 15:37

"notice: Undefined variable: output in revisiontags.module on line 135"..... If you stick a $output = ''; at the top of the function, it'll fix this problem.

Very nicely done, Frans. If you have any more troubles with TortoiseCVS, then please let me know. It would be good to get that patch working.

#12

franskuipers - March 11, 2008 - 09:33

Hi Rob,

Thanks for the compliment.

Here is the new patch with the addition of $output = '';

I don't feel its a problem with Vista and TortoiseCVS anymore. Think about it, the patch for revisiontags_views.info is exactly as expected, but both revisiontags.module and revisiontags.info are always going wrong. As well in TortioseCVS as in Eclipse.

I tried it again in Eclipse:

  1. Revert to base (lose all changes)
  2. Added only the line $output = "";
  3. Make Patch (as well in TortioseCVS as in Eclipse)

In both patches I get the complete files replaced, not only the added line.

Yes, I would like the patch to work in all environments, and will do everything in my power to make it happen.

AttachmentSize
revisiontags.6.x-0.5.patch 20.19 KB

#13

franskuipers - March 13, 2008 - 12:00

I don't give up..........

Downloaded Cygwin with patch, cvs and diffutils.
Checkout a fresh revisiontags.
Copied changed files into directory.
Exec a cvs diff -pu . >revisiontags.6.x-0.6.patch.

Was surprised i got only changed lines in revisiontags module.

BTW: in cygwin, on a fresh checkout, I can run my last uploaded patch without rejects, so I am not sure you don't get rejects.

BTW-2: was surprised i still had to convert line-ends to Unix style after running the cvs diff in cygwin?

Rob, please try this attachment.

Frans

AttachmentSize
revisiontags.6.x-0.6.patch 8.73 KB

#14

robertDouglass - March 13, 2008 - 12:04
Status:needs work» fixed

Thank you very much. I made one more small E_ALL bugfix and committed. This module is looking for a new maintainer. Franskuipers, are you interested?

#15

Anonymous (not verified) - March 27, 2008 - 12:12
Status:fixed» closed

Automatically closed -- issue fixed for two weeks with no activity.

 
 

Drupal is a registered trademark of Dries Buytaert.