From: PCMan <pcm...@gm...> - 2012-09-15 16:02:12
|
>On Sat, Sep 15, 2012 at 5:49 PM, Andrej N. Gritsenko <an...@re...> wrote: > Hello! > > PCMan has written on Saturday, 15 September, at 11:25: >>BTW, the search branch of pcmanfm is done using git merge. >>Andriy will hate this very much, but the merge was done before he >>suggest using git rebase. >>I don't know how to convert the merged result to use git rebase instead. >>If someone knows how to do it, please help. > > It can be done very easy: > > 1) backup your working tree > 2) remake it with rebase: > git checkout search > git reset --hard <last commit before your merge> > <the rebase itself as I've written to you before> > 3) sync if resulting tree is different from backup (not sync .git/ dir > of course!) and make update commit if need > 4) replace the search branch on remote with fixed one > > I'll try to find that commit a bit later if you don't do that yoursef > before that. > > Andriy. Thanks for your help. I worked on the search2 branch you created instead. Now the "search" branches of both pcmanfm and libfm are pushed to online git repo. Implementation of most of the features required by file searching are finished now. Access the new tool at "Tool/File Search" menu of pcmanfm. TODO: 1. searching based on mtime did not work reliably. There might be something wrong when calculating the timestamps? Check this later 2. The search result should always be shown in "detailed list" mode regardless of the default view mode set in config. 3. We need to add a column to the detailed list view to show the folders containing the found files. This column should only be shown for search://, not other folders, though. 4. Add a "Search files" item to popup menus of folders. When the preceding 4 things are done, we don't need other file searching utility in LXDE. The file searching feature built into PCManFM is powerful enough and can totally replace gnome-search-tool or catfish. Please help test the source code in our git repo if your're interested. Cheers! |