|
|
|
@ -791,7 +791,7 @@ TQString SvnActions::getInfo(const TQString& _what,const svn::Revision&rev,const
|
|
|
|
text+=rb+i18n("Lock comment")+cs+
|
|
|
|
text+=rb+i18n("Lock comment")+cs+
|
|
|
|
(*it).lockEntry().Comment()+re;
|
|
|
|
(*it).lockEntry().Comment()+re;
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
svn::SharedPointer<svn::tqStatus> d;
|
|
|
|
svn::SharedPointer<svn::Status> d;
|
|
|
|
if (checkReposLockCache(_what,d)&& d && d->lockEntry().Locked()) {
|
|
|
|
if (checkReposLockCache(_what,d)&& d && d->lockEntry().Locked()) {
|
|
|
|
text+=rb+i18n("Lock token")+cs+(d->lockEntry().Token())+re;
|
|
|
|
text+=rb+i18n("Lock token")+cs+(d->lockEntry().Token())+re;
|
|
|
|
text+=rb+i18n("Owner")+cs+(d->lockEntry().Owner())+re;
|
|
|
|
text+=rb+i18n("Owner")+cs+(d->lockEntry().Owner())+re;
|
|
|
|
@ -876,7 +876,7 @@ void SvnActions::slotProperties()
|
|
|
|
TQValueList<TQString> delList;
|
|
|
|
TQValueList<TQString> delList;
|
|
|
|
dlg.changedItems(setList,delList);
|
|
|
|
dlg.changedItems(setList,delList);
|
|
|
|
changeProperties(setList,delList,k->fullName());
|
|
|
|
changeProperties(setList,delList,k->fullName());
|
|
|
|
k->refreshtqStatus();
|
|
|
|
k->refreshStatus();
|
|
|
|
EMIT_FINISHED;
|
|
|
|
EMIT_FINISHED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -972,18 +972,18 @@ bool SvnActions::makeCommit(const svn::Targets&targets)
|
|
|
|
for (unsigned int i = 0; i < _Cache.count();++i) {
|
|
|
|
for (unsigned int i = 0; i < _Cache.count();++i) {
|
|
|
|
_p = _Cache[i]->path();
|
|
|
|
_p = _Cache[i]->path();
|
|
|
|
if (_Cache[i]->isRealVersioned()&& (
|
|
|
|
if (_Cache[i]->isRealVersioned()&& (
|
|
|
|
_Cache[i]->texttqStatus()==svn_wc_status_modified||
|
|
|
|
_Cache[i]->textStatus()==svn_wc_status_modified||
|
|
|
|
_Cache[i]->texttqStatus()==svn_wc_status_added||
|
|
|
|
_Cache[i]->textStatus()==svn_wc_status_added||
|
|
|
|
_Cache[i]->texttqStatus()==svn_wc_status_replaced||
|
|
|
|
_Cache[i]->textStatus()==svn_wc_status_replaced||
|
|
|
|
_Cache[i]->texttqStatus()==svn_wc_status_deleted||
|
|
|
|
_Cache[i]->textStatus()==svn_wc_status_deleted||
|
|
|
|
_Cache[i]->proptqStatus()==svn_wc_status_modified
|
|
|
|
_Cache[i]->propStatus()==svn_wc_status_modified
|
|
|
|
) ) {
|
|
|
|
) ) {
|
|
|
|
if (_Cache[i]->texttqStatus()==svn_wc_status_deleted) {
|
|
|
|
if (_Cache[i]->textStatus()==svn_wc_status_deleted) {
|
|
|
|
_check.append(Logmsg_impl::logActionEntry(_p,i18n("Delete"),Logmsg_impl::logActionEntry::DELETE));
|
|
|
|
_check.append(Logmsg_impl::logActionEntry(_p,i18n("Delete"),Logmsg_impl::logActionEntry::DELETE));
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
_check.append(Logmsg_impl::logActionEntry(_p,i18n("Commit"),Logmsg_impl::logActionEntry::COMMIT));
|
|
|
|
_check.append(Logmsg_impl::logActionEntry(_p,i18n("Commit"),Logmsg_impl::logActionEntry::COMMIT));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (_Cache[i]->texttqStatus()==svn_wc_status_missing) {
|
|
|
|
} else if (_Cache[i]->textStatus()==svn_wc_status_missing) {
|
|
|
|
_uncheck.append(Logmsg_impl::logActionEntry(_p,i18n("Delete and Commit"),Logmsg_impl::logActionEntry::MISSING_DELETE));
|
|
|
|
_uncheck.append(Logmsg_impl::logActionEntry(_p,i18n("Delete and Commit"),Logmsg_impl::logActionEntry::MISSING_DELETE));
|
|
|
|
} else if (!_Cache[i]->isVersioned()) {
|
|
|
|
} else if (!_Cache[i]->isVersioned()) {
|
|
|
|
_uncheck.append(Logmsg_impl::logActionEntry(_p,i18n("Add and Commit"),Logmsg_impl::logActionEntry::ADD_COMMIT));
|
|
|
|
_uncheck.append(Logmsg_impl::logActionEntry(_p,i18n("Add and Commit"),Logmsg_impl::logActionEntry::ADD_COMMIT));
|
|
|
|
@ -1459,7 +1459,7 @@ void SvnActions::prepareUpdate(bool ask)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rdlg->setStartOnly(true);
|
|
|
|
rdlg->setStartOnly(true);
|
|
|
|
/* just here cause tqlayout has changed meanwhile */
|
|
|
|
/* just here cause tqlayout has changed meanwhile */
|
|
|
|
dlg->resize( TQSize(120,60).expandedTo(dlg->tqminimumSizeHint()) );
|
|
|
|
dlg->resize( TQSize(120,60).expandedTo(dlg->minimumSizeHint()) );
|
|
|
|
int result;
|
|
|
|
int result;
|
|
|
|
if ((result=dlg->exec())==TQDialog::Accepted) {
|
|
|
|
if ((result=dlg->exec())==TQDialog::Accepted) {
|
|
|
|
Rangeinput_impl::revision_range range = rdlg->getRange();
|
|
|
|
Rangeinput_impl::revision_range range = rdlg->getRange();
|
|
|
|
@ -1521,7 +1521,7 @@ void SvnActions::makeAdd(bool rec)
|
|
|
|
#if 0
|
|
|
|
#if 0
|
|
|
|
while ((cur=liter.current())!=0){
|
|
|
|
while ((cur=liter.current())!=0){
|
|
|
|
++liter;
|
|
|
|
++liter;
|
|
|
|
//cur->refreshtqStatus();
|
|
|
|
//cur->refreshStatus();
|
|
|
|
|
|
|
|
|
|
|
|
//emit sigRefreshCurrent(static_cast<FileListViewItem*>(cur->parent()));
|
|
|
|
//emit sigRefreshCurrent(static_cast<FileListViewItem*>(cur->parent()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -2295,15 +2295,15 @@ void SvnActions::makeUnlock(const TQStringList&what,bool breakit)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*!
|
|
|
|
/*!
|
|
|
|
\fn SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist)
|
|
|
|
\fn SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist)
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
bool SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all)
|
|
|
|
bool SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
bool display_ignores = Kdesvnsettings::display_ignored_files();
|
|
|
|
bool display_ignores = Kdesvnsettings::display_ignored_files();
|
|
|
|
return maketqStatus(what,dlist,where,rec,all,display_ignores);
|
|
|
|
return makeStatus(what,dlist,where,rec,all,display_ignores);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all,bool display_ignores,bool updates)
|
|
|
|
bool SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all,bool display_ignores,bool updates)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
bool disp_remote_details = Kdesvnsettings::details_on_remote_listing();
|
|
|
|
bool disp_remote_details = Kdesvnsettings::details_on_remote_listing();
|
|
|
|
TQString ex;
|
|
|
|
TQString ex;
|
|
|
|
@ -2326,7 +2326,7 @@ void SvnActions::checkAddItems(const TQString&path,bool print_error_box)
|
|
|
|
svn::StatusEntries rlist;
|
|
|
|
svn::StatusEntries rlist;
|
|
|
|
TQStringList displist;
|
|
|
|
TQStringList displist;
|
|
|
|
svn::Revision where = svn::Revision::HEAD;
|
|
|
|
svn::Revision where = svn::Revision::HEAD;
|
|
|
|
if (!maketqStatus(path,dlist,where,true,true,false,false)) {
|
|
|
|
if (!makeStatus(path,dlist,where,true,true,false,false)) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (unsigned int i = 0; i<dlist.size();++i) {
|
|
|
|
for (unsigned int i = 0; i<dlist.size();++i) {
|
|
|
|
@ -2402,7 +2402,7 @@ void SvnActions::stopFillCache()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
delete m_FCThread;
|
|
|
|
delete m_FCThread;
|
|
|
|
m_FCThread = 0;
|
|
|
|
m_FCThread = 0;
|
|
|
|
emit sigCachetqStatus(-1,-1);
|
|
|
|
emit sigCacheStatus(-1,-1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -2446,14 +2446,14 @@ void SvnActions::checkModthread()
|
|
|
|
for (unsigned int i = 0; i < m_CThread->getList().count();++i) {
|
|
|
|
for (unsigned int i = 0; i < m_CThread->getList().count();++i) {
|
|
|
|
svn::StatusPtr ptr = m_CThread->getList()[i];
|
|
|
|
svn::StatusPtr ptr = m_CThread->getList()[i];
|
|
|
|
if (m_CThread->getList()[i]->isRealVersioned()&& (
|
|
|
|
if (m_CThread->getList()[i]->isRealVersioned()&& (
|
|
|
|
m_CThread->getList()[i]->texttqStatus()==svn_wc_status_modified||
|
|
|
|
m_CThread->getList()[i]->textStatus()==svn_wc_status_modified||
|
|
|
|
m_CThread->getList()[i]->texttqStatus()==svn_wc_status_added||
|
|
|
|
m_CThread->getList()[i]->textStatus()==svn_wc_status_added||
|
|
|
|
m_CThread->getList()[i]->texttqStatus()==svn_wc_status_deleted||
|
|
|
|
m_CThread->getList()[i]->textStatus()==svn_wc_status_deleted||
|
|
|
|
m_CThread->getList()[i]->texttqStatus()==svn_wc_status_replaced||
|
|
|
|
m_CThread->getList()[i]->textStatus()==svn_wc_status_replaced||
|
|
|
|
m_CThread->getList()[i]->proptqStatus()==svn_wc_status_modified
|
|
|
|
m_CThread->getList()[i]->propStatus()==svn_wc_status_modified
|
|
|
|
) ) {
|
|
|
|
) ) {
|
|
|
|
m_Data->m_Cache.insertKey(ptr,ptr->path());
|
|
|
|
m_Data->m_Cache.insertKey(ptr,ptr->path());
|
|
|
|
} else if (m_CThread->getList()[i]->texttqStatus()==svn_wc_status_conflicted) {
|
|
|
|
} else if (m_CThread->getList()[i]->textStatus()==svn_wc_status_conflicted) {
|
|
|
|
m_Data->m_conflictCache.insertKey(ptr,ptr->path());
|
|
|
|
m_Data->m_conflictCache.insertKey(ptr,ptr->path());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -2478,11 +2478,11 @@ void SvnActions::checkUpdateThread()
|
|
|
|
bool newer=false;
|
|
|
|
bool newer=false;
|
|
|
|
for (unsigned int i = 0; i < m_UThread->getList().count();++i) {
|
|
|
|
for (unsigned int i = 0; i < m_UThread->getList().count();++i) {
|
|
|
|
svn::StatusPtr ptr = m_UThread->getList()[i];
|
|
|
|
svn::StatusPtr ptr = m_UThread->getList()[i];
|
|
|
|
if (ptr->validRepostqStatus()) {
|
|
|
|
if (ptr->validReposStatus()) {
|
|
|
|
m_Data->m_UpdateCache.insertKey(ptr,ptr->path());
|
|
|
|
m_Data->m_UpdateCache.insertKey(ptr,ptr->path());
|
|
|
|
ptr->texttqStatus();
|
|
|
|
ptr->textStatus();
|
|
|
|
ptr->proptqStatus();
|
|
|
|
ptr->propStatus();
|
|
|
|
if (!(ptr->validLocaltqStatus())) {
|
|
|
|
if (!(ptr->validLocalStatus())) {
|
|
|
|
newer = true;
|
|
|
|
newer = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -2514,7 +2514,7 @@ bool SvnActions::checkUpdatesRunning()
|
|
|
|
|
|
|
|
|
|
|
|
void SvnActions::addModifiedCache(const svn::StatusPtr&what)
|
|
|
|
void SvnActions::addModifiedCache(const svn::StatusPtr&what)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (what->texttqStatus()==svn_wc_status_conflicted) {
|
|
|
|
if (what->textStatus()==svn_wc_status_conflicted) {
|
|
|
|
m_Data->m_conflictCache.insertKey(what,what->path());
|
|
|
|
m_Data->m_conflictCache.insertKey(what,what->path());
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
m_Data->m_Cache.insertKey(what,what->path());
|
|
|
|
m_Data->m_Cache.insertKey(what,what->path());
|
|
|
|
@ -2539,9 +2539,9 @@ bool SvnActions::checkReposLockCache(const TQString&path)
|
|
|
|
return m_Data->m_repoLockCache.findSingleValid(path,false);
|
|
|
|
return m_Data->m_repoLockCache.findSingleValid(path,false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool SvnActions::checkReposLockCache(const TQString&path,svn::SharedPointer<svn::tqStatus>&t)
|
|
|
|
bool SvnActions::checkReposLockCache(const TQString&path,svn::SharedPointer<svn::Status>&t)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
/// @todo create a method where svn::tqStatus* will be a parameter so no copy is needed but just reading content
|
|
|
|
/// @todo create a method where svn::Status* will be a parameter so no copy is needed but just reading content
|
|
|
|
return m_Data->m_repoLockCache.findSingleValid(path,t);
|
|
|
|
return m_Data->m_repoLockCache.findSingleValid(path,t);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -2599,7 +2599,7 @@ void SvnActions::customEvent(TQCustomEvent * e)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
} else if (e&&e->type()==EVENT_LOGCACHE_STATUS && m_FCThread && m_FCThread->running()) {
|
|
|
|
} else if (e&&e->type()==EVENT_LOGCACHE_STATUS && m_FCThread && m_FCThread->running()) {
|
|
|
|
FillCacheStatusEvent*fev=(FillCacheStatusEvent*)e;
|
|
|
|
FillCacheStatusEvent*fev=(FillCacheStatusEvent*)e;
|
|
|
|
emit sigCachetqStatus(fev->current(),fev->max());
|
|
|
|
emit sigCacheStatus(fev->current(),fev->max());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -2638,11 +2638,11 @@ void SvnActions::removeFromUpdateCache(const TQStringList&what,bool exact_only)
|
|
|
|
|
|
|
|
|
|
|
|
bool SvnActions::isUpdated(const TQString&path)const
|
|
|
|
bool SvnActions::isUpdated(const TQString&path)const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
svn::SharedPointer<svn::tqStatus> d;
|
|
|
|
svn::SharedPointer<svn::Status> d;
|
|
|
|
return m_Data->m_UpdateCache.findSingleValid(path,d);
|
|
|
|
return m_Data->m_UpdateCache.findSingleValid(path,d);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool SvnActions::getUpdated(const TQString&path,svn::SharedPointer<svn::tqStatus>&d)const
|
|
|
|
bool SvnActions::getUpdated(const TQString&path,svn::SharedPointer<svn::Status>&d)const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return m_Data->m_UpdateCache.findSingleValid(path,d);
|
|
|
|
return m_Data->m_UpdateCache.findSingleValid(path,d);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Timothy Pearson
13 years ago