Review Request 123963: First bits of refactorings. Skeleton of interface for KDevelop. Build system. CompilationDatabase for CMake projects and ClangTool.

Milian Wolff mail at milianw.de
Mon Jul 6 20:34:29 UTC 2015 


> On July 6, 2015, 2:33 p.m., Milian Wolff wrote:
> > refactoring/renamevardeclrefactoring.cpp, line 44
> > <https://git.reviewboard.kde.org/r/123963/diff/9/?file=382502#file382502line44>
> >
> >     this change is already part of https://git.reviewboard.kde.org/r/124200/ no? you are really messing up the diffs here, and always just paste one huge diff of everything. that does not help at all. Do you know how to rebase changes locally? I'd assume you'd have a local branch where you have one commit per review you post. Then you create one diff per commit and then show these for review. My nitpicks should then be squashed into the commits and the diff reuploaded...
> 
> Maciej Poleski wrote:
>     How rebasing can help this? The problem is I have two commits:
>     
>     B
>     A
>     
>     I make review for A, then for B (rbtool creates diff with all local changes, if i create patch myself then review board rejects diff).
>     
>     Then we have some fixes for A (from review). I commit new revision.
>     
>     C (fixes for A)
>     B
>     A
>     
>     When I update review with new fixes, then changes from B are also pulled in. What is more if I push, also B will land on repo.
>     
>     How to handle this problem?
> 
> Milian Wolff wrote:
>     you rebase interactively, then reorder the commits such that C follows A directly, then squash it into A, giving just A, B.
> 
> Maciej Poleski wrote:
>     `git rebase tooling -i` says `noop`. Not surprising - man says about branches and origins. I have one branch (tooling) with all commits. If I detach head to commit "on different branch" - I guess git will forget about detached head and lose history (or simply refuse to perform one of required steps)
> 
> Maciej Poleski wrote:
>     stackoverflow helped, still don't know how to squash them, but history is modified in a way i expeced
> 
> Milian Wolff wrote:
>     the following is untested, better do this in a separate branch:
>     
>         git checkout -b test-rebase
>         git rebase -i origin/master
>         # now in your editor, reorder the commits (you seem to have done that)
>         # then change the first column of a patch you want to squash from 'p' to 'f'
>         # the editor should at the bottom also give you a list of commands
> 
> Maciej Poleski wrote:
>     I'm working on separate branch (tooling). This branch detached from master at 30.05.2015. master was merged to this branch at 20.06.2015 (just before I made changes to ClangSupport). I squashed commits after this merge and before introduction of RefactoringManager. I have problems with squashing changes before merge. The merge itself is a problem. Do You have some advice for this?

I don't want you to waste too much time on it, but you could create a new branch (tracking master) and then cherry-pick your commits in there and drop the old branch then rename the new branch. In the future, you'd then rebase it on master. But that won't work nicely if you want to publish your branch, as you'd potentially rewrite history and that is not allowed on KDE git. So probably just ignore this stuff, and concentrate on your actual problem at hand: getting refactoring features in.

In the future though, you could use git commit --amend and similar to keep the history clean.


- Milian


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/123963/#review82133
-----------------------------------------------------------


On July 2, 2015, 9:43 p.m., Maciej Poleski wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/123963/
> -----------------------------------------------------------
> 
> (Updated July 2, 2015, 9:43 p.m.)
> 
> 
> Review request for KDevelop.
> 
> 
> Repository: kdev-clang
> 
> 
> Description
> -------
> 
> First bits of refactorings.
> Skeleton of interface for KDevelop.
> Build system (really nasty, linked DSO has 18MiB).
> CompilationDatabase for CMake projects and ClangTool (with cache, but without cache updates).
> Interface is not frozen for now.
> 
> Currently building of refactorings is enabled only if Clang 3.6.x is found. In other case build system behaves exactly as current master.
> 
> Refactorings require some contextual informations about projects. I made draft of interface with should feature:
>  - Stable ABI - dlopen (or equivalent) a DSO and if succeed (binary is still compatible with Clang libraries ABI), dlsym (or equivalent) some functions which are to provide all refactorings features
>  - Prototypes (with some implementation) of functions constituting API between KDevelop and refactorings backend
>  - It may be considered to use Qt plugin system to provide implementation of this (or equivalent) interface. This would be more expensive, but also more portable
>  - In worst case this library (static version) can be used with additional driver to make stand-alone executable providing all refactorings features (but it would require additional marshaling and hamper cooperation with user (how to provide UI in such a case?))
> 
> Handling dependencies between Clang/LLVM libraries is a nightmare. I extended FindClang.cmake to find much more libraries and used them to link with first pieces of my code. This is huge, requires additional libraries like zlib and even ordering of dependencies can cause linker errors.
> 
> Interface is not finished
> 
> 
> Diffs
> -----
> 
>   CMakeLists.txt 875172a8407f4bd9faf330f032a280fa66c2b16f 
>   clangsupport.h 8ed1ec90bbbc41d7c7a94d926e0951c729a6194c 
>   clangsupport.cpp e22c55426a2e839ec11cbe0b2fe1e13721b0583a 
>   cmake/FindClang.cmake 6c9bd6ef0242319122dcc7e6fd6cea8d9f0cbfbb 
>   refactoring/CMakeLists.txt PRE-CREATION 
>   refactoring/documentcache.h PRE-CREATION 
>   refactoring/documentcache.cpp PRE-CREATION 
>   refactoring/interface.h PRE-CREATION 
>   refactoring/interface.cpp PRE-CREATION 
>   refactoring/kdevrefactorings.h PRE-CREATION 
>   refactoring/kdevrefactorings.cpp PRE-CREATION 
>   refactoring/kdevrefactorings_disabled.h PRE-CREATION 
>   refactoring/nooprefactoring.h PRE-CREATION 
>   refactoring/nooprefactoring.cpp PRE-CREATION 
>   refactoring/refactoring.h PRE-CREATION 
>   refactoring/refactoring.cpp PRE-CREATION 
>   refactoring/refactoringcontext.h PRE-CREATION 
>   refactoring/refactoringcontext.cpp PRE-CREATION 
>   refactoring/refactoringinfo.h PRE-CREATION 
>   refactoring/refactoringinfo.cpp PRE-CREATION 
>   refactoring/renamevardeclrefactoring.h PRE-CREATION 
>   refactoring/renamevardeclrefactoring.cpp PRE-CREATION 
>   refactoring/utils.h PRE-CREATION 
>   refactoring/utils.cpp PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/123963/diff/
> 
> 
> Testing
> -------
> 
> Compiles on my Gentoo system. It makes sense to build this only on system with Clang 3.6.
> 
> 
> Thanks,
> 
> Maciej Poleski
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20150706/1c560761/attachment-0001.html>

More information about the KDevelop-devel mailing list