180503 - Bonsai's query doesn't show checkins made via cvs import

Status: RESOLVED FIXED

(Webtools Graveyard :: Bonsai, defect)

Description

[Dave Miller [:justdave]]

If I merge a vendor branch via cvs import, neither the checkin comments nor the
diffs are viewable in Bonsai.

Comment 1

[Dave Miller [:justdave]]

I'm currently involved in a project that is branching slightly from an open
source version of the same project, and maintaining a copy of it in our own CVS
server.  We've been doing weekly imports from the open source version so we can
stay close to the tip and make sure some of our changes can be contributed back
to open source eventually.  It's very hard to see how the imports are affecting
our existing code if we can't see which files got merged or view the diffs easily.

If I knew more about how CVS works I'd hack this myself, but I don't unfortunately.

Comment 2

[cls]

Attachment: wip

This patch mostly works but it needs a lot more testing.  For some odd reason,
cvs puts all of the import info in the log message so it has to be parsed out
of there. 

A current known issue that I'm too tired to track down atm is that
occassionally importing a "new" (I made no changes to the file) version causes
the checkin for a previous import to disappear.  The previous import doesn't
show up in bonsai's queries even though the revision info on the file shows all
import tags.  I haven't been able to consistently reproduce it but I'm sure
it's operator error as I don't do cvs imports.

Comment 3

[cls]

Attachment: v1.2

I think I resolved the main problem with the previous patch.  When files are
changed & imported, their revision number is bumped.  If the file isn't changed
& imported, the existing branched revision number gets the new tag but the file
still shows up in the updated list (ie, 'U file' appears in the description
log).  

For changed imported files, this new patch checks to see if there's an existing
tag with the current tag's revision number.  If there is, then the file hasn't
changed so we don't add it to the checkin list.  This means that only the
changed files will show up in the bonsai queries but the full list of imported
files will be in the description log.  This might be a bit confusing.

Comment 4

[cls]

Attachment: v1.3

Minor cleanup

Comment 5

[Justin Wood (:Callek)]

hmm, chris any chance of getting this fixed on trunk bonsai.  Whiteboard claims it was fixed in a branch of yours a while ago.

Comment 6

[Mike Taylor [:bear]]

Attachment: cleaned up the patch to work against latest trunk

This is just a pass to make the patch work with the existing cvs trunk code.

Still need to install and test it.

Comment 7

[Mike Taylor [:bear]]

Attachment: cleaned up the patch to work against latest trunk

that's why I shouldn't modify code after midnight -- forgot the trailing ;

Comment 8

[Mike Taylor [:bear]]

I applied the patch to my test cvs bonsai and ran a number of "cvs import" commands and they all look good.  The output generated by the new code matches what is normally generated by dolog for new files and directories.

Now to read the code in detail :)

Comment 9

[cls]

IIRC, one of the main problems with getting the patch approved for checkin was that the format of the import message wasn't properly documented.  What I hacked together seems to work for now but there's no guarantee of future compatibility.

Comment 10

[Mike Taylor [:bear]]

cls,

if you add some sort of document string to the patch I can review it and get the ball rolling to get this into the source tree.

Comment 11

[Mike Taylor [:bear]]

just got the thumbs up for me to review it since the change I made was to un-bitrot it by updating the use statement.

cls, if you do post some documentation, I'll add it.

Comment 12

[Mike Taylor [:bear]]

patch landed in revision 1.23 of webtools/bonsai/dolog.pl