Refactored partially synchronized methods pattern.

aravij commented 4 years ago

Test data is simplifyed
Old test data moved into integration test samples
After refactoring all old tests have passed

Most of the changes are due to files renaming and moving.

acheshkov commented 4 years ago

@rultor merge

rultor commented 4 years ago

@rultor merge

@acheshkov OK, I'll try to merge now. You can check the progress of the merge here

rultor commented 4 years ago

@rultor merge

@acheshkov @aravij Oops, I failed. You can see the full log here (spent 2min)

+ cat
+ echo 'export '\''head=git@github.com:cqfn/aibolit.git'\''' ';' 'export '\''pull_id=573'\''' ';' 'export '\''fork=git@github.com:cqfn/aibolit.git'\''' ';' 'export '\''fork_branch=issue-528_9'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_title=Refactored partially synchronized methods pattern.'\''' ';' 'export '\''author=acheshkov'\''' ';' 'python3 -m pip install twine' ';' make ';'
+ sensitive=()
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:cqfn/aibolit.git
+ git remote update
Fetching origin
Fetching fork
From github.com:cqfn/aibolit
 * [new branch]      acheshkov-patch-1 -> fork/acheshkov-patch-1
 * [new branch]      acheshkov-patch-2 -> fork/acheshkov-patch-2
 * [new branch]      acheshkov-scope-update -> fork/acheshkov-scope-update
 * [new branch]      issue-295  -> fork/issue-295
 * [new branch]      issue-310  -> fork/issue-310
 * [new branch]      issue-404  -> fork/issue-404
 * [new branch]      issue-418  -> fork/issue-418
 * [new branch]      issue-419  -> fork/issue-419
 * [new branch]      issue-528_5 -> fork/issue-528_5
 * [new branch]      issue-528_9 -> fork/issue-528_9
 * [new branch]      issue-532  -> fork/issue-532
 * [new branch]      issue-533  -> fork/issue-533
 * [new branch]      issue-535  -> fork/issue-535
 * [new branch]      issue-537  -> fork/issue-537
 * [new branch]      issue-538  -> fork/issue-538
 * [new branch]      issue-550  -> fork/issue-550
 * [new branch]      issue_528_1 -> fork/issue_528_1
 * [new branch]      issue_528_10 -> fork/issue_528_10
 * [new branch]      issue_528_11 -> fork/issue_528_11
 * [new branch]      issue_528_13 -> fork/issue_528_13
 * [new branch]      issue_528_15 -> fork/issue_528_15
 * [new branch]      issue_528_18 -> fork/issue_528_18
 * [new branch]      issue_528_2 -> fork/issue_528_2
 * [new branch]      issue_528_3 -> fork/issue_528_3
 * [new branch]      issue_528_4 -> fork/issue_528_4
 * [new branch]      issue_528_7 -> fork/issue_528_7
 * [new branch]      issue_528_8 -> fork/issue_528_8
 * [new branch]      java_files_custom_dir -> fork/java_files_custom_dir
 * [new branch]      master     -> fork/master
 * [new branch]      style      -> fork/style
 * [new branch]      taks-258   -> fork/taks-258
 * [new branch]      task-258   -> fork/task-258
 * [new branch]      upstream/java_files_custom_dir -> fork/upstream/java_files_custom_dir
 * [new branch]      wp_update  -> fork/wp_update
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/issue-528_9
error: Your local changes to the following files would be overwritten by checkout:
    wp/how_it_works_diagram_5.jpg
Please, commit your changes or stash them before you can switch branches.
Aborting
'cid' file is absent, container wasn't started correctly

acheshkov commented 4 years ago

@rultor merge

rultor commented 4 years ago

@rultor merge

@acheshkov OK, I'll try to merge now. You can check the progress of the merge here

rultor commented 4 years ago

@rultor merge

@acheshkov Done! FYI, the full log is here (took me 32min)

cqfn / aibolit

Refactored partially synchronized methods pattern. #573