Mercurial > hg > easyhg-kdiff3

comparison kdiff3/src/kdiff3_part.cpp @ 73:f7dad0aa6146

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
KDiff3-0.9.90-Qt4
author joachim99
date Sun, 14 May 2006 20:09:06 +0000
parents 5bbfe4784324
children
comparison
equal deleted inserted replaced
72:2bb0f4dc64c0 73:f7dad0aa6146
176 176
177 ::system( cmd.ascii() ); 177 ::system( cmd.ascii() );
178 178
179 m_widget->slotFileOpen2( fileName1, tempFileName, "", "", 179 m_widget->slotFileOpen2( fileName1, tempFileName, "", "",
180 "", version2.isEmpty() ? fileName2 : "REV:"+version2+":"+fileName2, "", 0 ); // alias names 180 "", version2.isEmpty() ? fileName2 : "REV:"+version2+":"+fileName2, "", 0 ); // alias names
181 std::cerr << "KDiff3: f1:" << fileName1.latin1() <<"<->"<<tempFileName.latin1()<< std::endl; 181 // std::cerr << "KDiff3: f1:" << fileName1.latin1() <<"<->"<<tempFileName.latin1()<< std::endl;
182 // FileAccess::removeFile( tempFileName ); 182 FileAccess::removeTempFile( tempFileName );
183 } 183 }
184 else if ( version2.isEmpty() && f2.exists() ) 184 else if ( version2.isEmpty() && f2.exists() )
185 { 185 {
186 // Reverse patch 186 // Reverse patch
187 // patch -f -u -R --ignore-whitespace -i [inputfile] -o [outfile] [patchfile] 187 // patch -f -u -R --ignore-whitespace -i [inputfile] -o [outfile] [patchfile]
191 191
192 ::system( cmd.ascii() ); 192 ::system( cmd.ascii() );
193 193
194 m_widget->slotFileOpen2( tempFileName, fileName2, "", "", 194 m_widget->slotFileOpen2( tempFileName, fileName2, "", "",
195 version1.isEmpty() ? fileName1 : "REV:"+version1+":"+fileName1, "", "", 0 ); // alias name 195 version1.isEmpty() ? fileName1 : "REV:"+version1+":"+fileName1, "", "", 0 ); // alias name
196 std::cerr << "KDiff3: f2:" << fileName2.latin1() <<"<->"<<tempFileName.latin1()<< std::endl; 196 // std::cerr << "KDiff3: f2:" << fileName2.latin1() <<"<->"<<tempFileName.latin1()<< std::endl;
197 FileAccess::removeTempFile( tempFileName );
197 } 198 }
198 else if ( !version1.isEmpty() && !version2.isEmpty() ) 199 else if ( !version1.isEmpty() && !version2.isEmpty() )
199 { 200 {
200 std::cerr << "KDiff3: f1/2:" << fileName1.latin1() <<"<->"<<fileName2.latin1()<< std::endl; 201 std::cerr << "KDiff3: f1/2:" << fileName1.latin1() <<"<->"<<fileName2.latin1()<< std::endl;
201 // Assuming that files are on CVS: Try to get them 202 // Assuming that files are on CVS: Try to get them
213 "REV:"+version1+":"+fileName1, 214 "REV:"+version1+":"+fileName1,
214 "REV:"+version2+":"+fileName2, 215 "REV:"+version2+":"+fileName2,
215 "", 0 216 "", 0
216 ); 217 );
217 218
218 std::cerr << "KDiff3: f1/2:" << tempFileName1.latin1() <<"<->"<<tempFileName2.latin1()<< std::endl; 219 // std::cerr << "KDiff3: f1/2:" << tempFileName1.latin1() <<"<->"<<tempFileName2.latin1()<< std::endl;
219 // FileAccess::removeFile( tempFileName1 ); 220 FileAccess::removeTempFile( tempFileName1 );
220 // FileAccess::removeFile( tempFileName2 ); 221 FileAccess::removeTempFile( tempFileName2 );
221 return true; 222 return true;
222 } 223 }
223 else 224 else
224 { 225 {
225 KMessageBox::sorry(m_widget, i18n("Couldn't find files for comparison.")); 226 KMessageBox::sorry(m_widget, i18n("Couldn't find files for comparison."));