From vss2svn-commits at lists.pumacode.org Wed Sep 6 11:22:01 2006 From: vss2svn-commits at lists.pumacode.org (vss2svn-commits@lists.pumacode.org) Date: Wed Sep 6 11:22:10 2006 Subject: r264 - toby: /trunk/script/vss2svn.pl Message-ID: <20060906152201.C863A54496@cp.thetahost.com> Author: toby Date: Wed Sep 6 11:21:57 2006 New Revision: 264 Log: vss2svn.pl: patch from Werner to prevent out-of-order actions of the same priority performed in the same second Modified: trunk/script/vss2svn.pl Modified: trunk/script/vss2svn.pl ============================================================================== --- trunk/script/vss2svn.pl (original) +++ trunk/script/vss2svn.pl Wed Sep 6 11:21:57 2006 @@ -696,7 +696,7 @@ my($sth, $row, $action, $handler, $physinfo, $itempaths, $allitempaths); my $sql = 'SELECT * FROM PhysicalAction ORDER BY timestamp ASC, ' - . 'itemtype ASC, priority ASC, sortkey ASC'; + . 'itemtype ASC, priority ASC, sortkey ASC, action_id ASC'; $sth = $gCfg{dbh}->prepare($sql); $sth->execute(); From vss2svn-commits at lists.pumacode.org Fri Sep 15 16:04:29 2006 From: vss2svn-commits at lists.pumacode.org (vss2svn-commits@lists.pumacode.org) Date: Fri Sep 15 16:04:37 2006 Subject: r265 - luedi: in /trunk/ssphys/SSPhysLib: SSCommentObject.h SSVersionObject.h Message-ID: <20060915200430.65F5554B2A@cp.thetahost.com> Author: luedi Date: Fri Sep 15 16:04:26 2006 New Revision: 265 Log: BuildFixes for GCC 4.1.1, FC5 Modified: trunk/ssphys/SSPhysLib/SSCommentObject.h trunk/ssphys/SSPhysLib/SSVersionObject.h Modified: trunk/ssphys/SSPhysLib/SSCommentObject.h ============================================================================== --- trunk/ssphys/SSPhysLib/SSCommentObject.h (original) +++ trunk/ssphys/SSPhysLib/SSCommentObject.h Fri Sep 15 16:04:26 2006 @@ -17,7 +17,7 @@ SSCommentObject(SSRecordPtr pRecord); virtual ~SSCommentObject(); - std::string SSCommentObject::GetComment () const; + std::string GetComment () const; virtual void Accept (ISSObjectVisitor& rVisitor, const ISSContext* pCtx = NULL) const { rVisitor.Apply (*this, pCtx); } Modified: trunk/ssphys/SSPhysLib/SSVersionObject.h ============================================================================== --- trunk/ssphys/SSPhysLib/SSVersionObject.h (original) +++ trunk/ssphys/SSPhysLib/SSVersionObject.h Fri Sep 15 16:04:26 2006 @@ -357,7 +357,7 @@ return action; } - std::string GetFileName () const { return std::string (m_Action.filename); } + std::string GetFileName () const { return std::string (SSItemAction::m_Action.filename); } virtual void ToXml (XMLNode* pParent) const; virtual void Dump (std::ostream& os) const; @@ -413,7 +413,7 @@ return action; } - std::string GetFileName () const { return std::string (m_Action.filename); } + std::string GetFileName () const { return std::string (SSItemAction::m_Action.filename); } virtual void ToXml (XMLNode* pParent) const; virtual void Dump (std::ostream& os) const; From vss2svn-commits at lists.pumacode.org Tue Sep 19 19:20:57 2006 From: vss2svn-commits at lists.pumacode.org (vss2svn-commits@lists.pumacode.org) Date: Tue Sep 19 19:21:03 2006 Subject: r266 - shiva: /branches/Ken/restore-widetime/ Message-ID: <20060919232059.E5C7F54BE0@cp.thetahost.com> Author: shiva Date: Tue Sep 19 19:20:50 2006 New Revision: 266 Log: Ken's latest fixes for RestoredProject, poor timestamp resolution, and control characters in metadata. Added: branches/Ken/restore-widetime/ - copied from r265, trunk/ From vss2svn-commits at lists.pumacode.org Tue Sep 19 19:24:22 2006 From: vss2svn-commits at lists.pumacode.org (vss2svn-commits@lists.pumacode.org) Date: Tue Sep 19 19:24:24 2006 Subject: r267 - shiva: /branches/Ken/restore-widetime/ssphys/utils/tinyxml.cpp Message-ID: <20060919232422.B050354BE0@cp.thetahost.com> Author: shiva Date: Tue Sep 19 19:24:22 2006 New Revision: 267 Log: Drop and warn about control characters in metadata. Modified: branches/Ken/restore-widetime/ssphys/utils/tinyxml.cpp Modified: branches/Ken/restore-widetime/ssphys/utils/tinyxml.cpp ============================================================================== --- branches/Ken/restore-widetime/ssphys/utils/tinyxml.cpp (original) +++ branches/Ken/restore-widetime/ssphys/utils/tinyxml.cpp Tue Sep 19 19:24:22 2006 @@ -28,6 +28,7 @@ #ifdef TIXML_USE_STL #include #include +#include #endif @@ -112,6 +113,7 @@ } else if (iscntrl (c)) // ( c < 32) { +#if 0 // Easy pass at non-alpha/numeric/symbol // Below 32 is symbolic. char buf[ 32 ]; @@ -124,7 +126,15 @@ //*ME: warning C4267: convert 'size_t' to 'int' //*ME: Int-Cast to make compiler happy ... - outString->append( buf, (int)strlen( buf ) ); + outString->append( buf, (int)strlen( buf ) ); +#else + std::cerr << "WARNING: control character 0x" + << std::hex << std::setw(2) << std::setfill('0') << (unsigned)c + << " in text input at character " + << std::dec << std::setw(0) << i + << std::endl; + +#endif ++i; } else From vss2svn-commits at lists.pumacode.org Tue Sep 19 19:36:26 2006 From: vss2svn-commits at lists.pumacode.org (vss2svn-commits@lists.pumacode.org) Date: Tue Sep 19 19:36:31 2006 Subject: r268 - shiva: /branches/Ken/restore-widetime/script/vss2svn.pl Message-ID: <20060919233627.060E454BE0@cp.thetahost.com> Author: shiva Date: Tue Sep 19 19:36:23 2006 New Revision: 268 Log: Increase timestamp tolerance to 72 hours. Order multiple results by difference in time (patch from Dukhat). Modified: branches/Ken/restore-widetime/script/vss2svn.pl Modified: branches/Ken/restore-widetime/script/vss2svn.pl ============================================================================== --- branches/Ken/restore-widetime/script/vss2svn.pl (original) +++ branches/Ken/restore-widetime/script/vss2svn.pl Tue Sep 19 19:36:23 2006 @@ -533,7 +533,7 @@ # parent rows. There's no definitive way to find matching rows, but joining # on physname, actiontype, timestamp, and author gets us close. The problem # is that the "two" actions may not have happened in the exact same second, - # so we need to also look for any that are up to two seconds apart and hope + # so we need to also look for any that are some time apart and hope # we don't get the wrong row. $parentdata = 0 unless defined $parentdata; @@ -547,16 +547,16 @@ parentdata = ? AND physname = ? AND actiontype = ? - AND (ABS(? - timestamp) < 21600) + AND (ABS(? - timestamp) < 259200) AND author = ? ORDER BY - timestamp -EOSQL - - # timestamp test is within 21600 seconds equals 6 hours (allows for + ABS(? - timestamp) +EOSQL + + # timestamp test is within 72 hours (empirical, allows for # really bad Windows clocks, timezones, and WAN delays) my $sth = $gCfg{dbh}->prepare($sql); - $sth->execute( $parentdata, @{ $parentrec }{qw(physname actiontype timestamp author)} ); + $sth->execute( $parentdata, @{ $parentrec }{qw(physname actiontype timestamp author timestamp)} ); return $sth->fetchall_arrayref( {} ); } # End GetChildRecs From vss2svn-commits at lists.pumacode.org Tue Sep 19 19:43:43 2006 From: vss2svn-commits at lists.pumacode.org (vss2svn-commits@lists.pumacode.org) Date: Tue Sep 19 19:43:44 2006 Subject: r269 - shiva: in /branches/Ken/restore-widetime/script: Vss2Svn/ActionHandler.pm vss2svn.pl Message-ID: <20060919234343.4B6D254BE0@cp.thetahost.com> Author: shiva Date: Tue Sep 19 19:43:42 2006 New Revision: 269 Log: Handle RestoredProject with _restore_handler. Modified: branches/Ken/restore-widetime/script/Vss2Svn/ActionHandler.pm branches/Ken/restore-widetime/script/vss2svn.pl Modified: branches/Ken/restore-widetime/script/Vss2Svn/ActionHandler.pm ============================================================================== --- branches/Ken/restore-widetime/script/Vss2Svn/ActionHandler.pm (original) +++ branches/Ken/restore-widetime/script/Vss2Svn/ActionHandler.pm Tue Sep 19 19:43:42 2006 @@ -12,6 +12,7 @@ BRANCH => \&_branch_handler, MOVE => \&_move_handler, RESTORE => \&_restore_handler, + RESTOREDPROJECT => \&_restore_handler, DELETE => \&_delete_handler, RECOVER => \&_recover_handler, PIN => \&_pin_handler, Modified: branches/Ken/restore-widetime/script/vss2svn.pl ============================================================================== --- branches/Ken/restore-widetime/script/vss2svn.pl (original) +++ branches/Ken/restore-widetime/script/vss2svn.pl Tue Sep 19 19:43:42 2006 @@ -1303,10 +1303,14 @@ # RollBack is the item view on the activity and BranchFile is the parent side # ==> map RollBack to BRANCH, so that we can join the two actions in the # MergeParentData step - + # RestoredProject seems to act like CreatedProject, except that the + # project was recreated from an archive file, and its timestamp is + # the time of restoration. Timestamps of the child files retain + # their original values. %gActionType = ( CreatedProject => {type => 1, action => 'ADD'}, AddedProject => {type => 1, action => 'ADD'}, + RestoredProject => {type => 1, action => 'RESTOREDPROJECT'}, RenamedProject => {type => 1, action => 'RENAME'}, MovedProjectTo => {type => 1, action => 'MOVE'}, MovedProjectFrom => {type => 1, action => 'MOVE_FROM'}, From vss2svn-commits at lists.pumacode.org Tue Sep 19 20:53:51 2006 From: vss2svn-commits at lists.pumacode.org (vss2svn-commits@lists.pumacode.org) Date: Tue Sep 19 20:53:55 2006 Subject: r270 - shiva: in /branches/Ken/restore-widetime/ssphys: ./ config/ Message-ID: <20060920005351.9A8A654BE2@cp.thetahost.com> Author: shiva Date: Tue Sep 19 20:53:46 2006 New Revision: 270 Log: Add automake files to svn:ignore. Modified: branches/Ken/restore-widetime/ssphys/ (props changed) branches/Ken/restore-widetime/ssphys/config/ (props changed) Propchange: branches/Ken/restore-widetime/ssphys/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Sep 19 20:53:46 2006 @@ -1,7 +1,21 @@ +svn-* +*.bak *.ncb *.opt -*.bak *.suo +.deps +.libs +aclocal.m4 +autom4te.cache +bin +config.log +config.status +configure +libtool +Makefile +Makefile.in +ssphys +svnwcrev.sh tmp version.h -bin + Propchange: branches/Ken/restore-widetime/ssphys/config/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Sep 19 20:53:46 2006 @@ -1,0 +1,7 @@ +svn-* +depcomp +missing +config.guess +config.sub +ltmain.sh +install-sh From vss2svn-commits at lists.pumacode.org Mon Sep 25 18:49:12 2006 From: vss2svn-commits at lists.pumacode.org (vss2svn-commits@lists.pumacode.org) Date: Mon Sep 25 18:49:23 2006 Subject: r271 - shiva: /branches/Ken/restore-widetime/ssphys/utils/tinyxml.cpp Message-ID: <20060925224913.33C4A544F3@cp.thetahost.com> Author: shiva Date: Mon Sep 25 18:49:08 2006 New Revision: 271 Log: Remove temporary #if0 from r267. Modified: branches/Ken/restore-widetime/ssphys/utils/tinyxml.cpp Modified: branches/Ken/restore-widetime/ssphys/utils/tinyxml.cpp ============================================================================== --- branches/Ken/restore-widetime/ssphys/utils/tinyxml.cpp (original) +++ branches/Ken/restore-widetime/ssphys/utils/tinyxml.cpp Mon Sep 25 18:49:08 2006 @@ -113,28 +113,12 @@ } else if (iscntrl (c)) // ( c < 32) { -#if 0 - // Easy pass at non-alpha/numeric/symbol - // Below 32 is symbolic. - char buf[ 32 ]; - - #if defined(TIXML_SNPRINTF) - TIXML_SNPRINTF( buf, sizeof(buf), "&#x%02X;", (unsigned) ( c & 0xff ) ); - #else - sprintf( buf, "&#x%02X;", (unsigned) ( c & 0xff ) ); - #endif - - //*ME: warning C4267: convert 'size_t' to 'int' - //*ME: Int-Cast to make compiler happy ... - outString->append( buf, (int)strlen( buf ) ); -#else std::cerr << "WARNING: control character 0x" << std::hex << std::setw(2) << std::setfill('0') << (unsigned)c << " in text input at character " << std::dec << std::setw(0) << i << std::endl; -#endif ++i; } else