Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed bug in add() pipe validation #26

Closed
wants to merge 9 commits into from

Conversation

amihaiemil
Copy link
Contributor

PR for #22 .
Changes in methods: TkPipeAdd.add(String) and DyPipes.add(String). Other lines in some files ($Id$) were automatically changed by git when I checked them out.

Also, I fixed a mistake in .gitattribtues . Specified eol=lf for .java and .xml files specifically, since it breaks the images if I simply specify *

@yegor256
Copy link
Owner

@rultor try to merge

@rultor
Copy link
Collaborator

rultor commented Jun 27, 2016

@rultor try to merge

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

@rultor
Copy link
Collaborator

rultor commented Jun 27, 2016

@rultor try to merge

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

+ as_root=false
+ mkdir -p /home/rultor/.ssh
+ echo -e 'Host github.com\n\tStrictHostKeyChecking no\n'
+ chmod 600 /home/rultor/.ssh/config
+ git clone [email protected]:yegor256/wring.git repo
Cloning into 'repo'...
Warning: Permanently added the RSA host key for IP address '192.30.253.112' to the list of known hosts.
+ cd repo
+ git config user.email [email protected]
+ git config user.name rultor
+ '[' -z 'sudo gem install pdd' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'sudo gem install pdd' ';' 'java -version' ';' 'mvn help:system clean install -Pqulice --settings ../settings.xml' ';' 'mvn clean site -Psite --settings ../settings.xml' ';' 'mvn clean' ';' 'pdd --source=$(pwd) --verbose --file=/dev/null' ';'
+ rm -rf .gpg
+ cd repo
+ git remote add fork [email protected]:amihaiemil/wring.git
+ git remote update
Fetching origin
Fetching fork
From github.com:amihaiemil/wring
 * [new branch]      22         -> fork/22
 * [new branch]      master     -> fork/master
+ 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/22
error: Your local changes to the following files would be overwritten by checkout:
    src/main/java/io/wring/agents/Agent.java
    src/main/java/io/wring/agents/Cycle.java
    src/main/java/io/wring/agents/Exec.java
    src/main/java/io/wring/agents/FkAgent.java
    src/main/java/io/wring/agents/IgnoreEvents.java
    src/main/java/io/wring/agents/JsonAgent.java
    src/main/java/io/wring/agents/Printable.java
    src/main/java/io/wring/agents/Refill.java
    src/main/java/io/wring/agents/Routine.java
    src/main/java/io/wring/agents/ThreadAppender.java
    src/main/java/io/wring/agents/github/AgGithub.java
    src/main/java/io/wring/agents/github/BoCommit.java
    src/main/java/io/wring/agents/github/BoIssue.java
    src/main/java/io/wring/agents/github/Body.java
    src/main/java/io/wring/agents/github/Subject.java
    src/main/java/io/wring/dynamo/DyBase.java
    src/main/java/io/wring/dynamo/DyVault.java
Please, commit your changes or stash them before you can switch branches.
Aborting
'cid' file is absent, container wasn't started correctly

@amihaiemil
Copy link
Contributor Author

@yegor256 git acts funny about that $Id$ . I have the same behaviour when I checkout the repo and try to switch to branch 22. Did you ever encounter this before?

@yegor256
Copy link
Owner

@amihaiemil I think you should not touch that $Id$ placeholders in source files. they are replaced by Git automatically

@amihaiemil
Copy link
Contributor Author

@yegor256 I reverted the changes to the $Id$. Something seems off anyway - git automatically removes the id when I checkout the files and they all appear modified in my local repo.

Plus, if you look in the history apparently the files had the same id when I first checked them out
c79829f9e91907f21c716854779af4233e496fa9

@yegor256
Copy link
Owner

@rultor merge

@rultor
Copy link
Collaborator

rultor commented Jun 27, 2016

@rultor merge

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

@rultor
Copy link
Collaborator

rultor commented Jun 27, 2016

@rultor merge

@amihaiemil @yegor256 Oops, I failed. You can see the full log here (spent 19s)

+ chmod 600 /home/rultor/.ssh/config
+ git clone [email protected]:yegor256/wring.git repo
Cloning into 'repo'...
+ cd repo
+ git config user.email [email protected]
+ git config user.name rultor
+ '[' -z 'sudo gem install pdd' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'sudo gem install pdd' ';' 'java -version' ';' 'mvn help:system clean install -Pqulice --settings ../settings.xml' ';' 'mvn clean site -Psite --settings ../settings.xml' ';' 'mvn clean' ';' 'pdd --source=$(pwd) --verbose --file=/dev/null' ';'
+ rm -rf .gpg
+ cd repo
+ git remote add fork [email protected]:amihaiemil/wring.git
+ git remote update
Fetching origin
Fetching fork
From github.com:amihaiemil/wring
 * [new branch]      22         -> fork/22
 * [new branch]      master     -> fork/master
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ wc -l
++ git show-branch __rultor
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/22
Switched to a new branch '__rultor'
M   src/main/java/io/wring/agents/Agent.java
M   src/main/java/io/wring/agents/Exec.java
M   src/main/java/io/wring/agents/FkAgent.java
M   src/main/java/io/wring/agents/IgnoreEvents.java
M   src/main/java/io/wring/agents/JsonAgent.java
M   src/main/java/io/wring/agents/Printable.java
M   src/main/java/io/wring/agents/Refill.java
M   src/main/java/io/wring/agents/Routine.java
M   src/main/java/io/wring/agents/ThreadAppender.java
M   src/main/java/io/wring/agents/github/AgGithub.java
M   src/main/java/io/wring/agents/github/BoCommit.java
M   src/main/java/io/wring/agents/github/BoIssue.java
M   src/main/java/io/wring/agents/github/Body.java
M   src/main/java/io/wring/agents/github/Subject.java
M   src/main/java/io/wring/dynamo/DyBase.java
M   src/main/java/io/wring/dynamo/DyVault.java
Branch __rultor set up to track remote branch 22 from fork.
+ git checkout -B master origin/master
error: Your local changes to the following files would be overwritten by checkout:
    src/main/java/io/wring/agents/BoostEvents.java
    src/main/java/io/wring/agents/Cycle.java
Please, commit your changes or stash them before you can switch branches.
Aborting
'cid' file is absent, container wasn't started correctly

@yegor256
Copy link
Owner

@amihaiemil I think you need to merge master into your branch

@amihaiemil
Copy link
Contributor Author

@yegor256 try now, maybe? I had to do the merge manually since git wouldn't let me. It changes the ID instantly, I can't even do git checkout -- . : the operation works fine, but then I do git status and changes are there again :))

@yegor256
Copy link
Owner

@rultor try to merge

@rultor
Copy link
Collaborator

rultor commented Jun 27, 2016

@rultor try to merge

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

@rultor
Copy link
Collaborator

rultor commented Jun 27, 2016

@rultor try to merge

@amihaiemil @yegor256 Oops, I failed. You can see the full log here (spent 1min)

+ chmod 600 /home/rultor/.ssh/config
+ git clone [email protected]:yegor256/wring.git repo
Cloning into 'repo'...
+ cd repo
+ git config user.email [email protected]
+ git config user.name rultor
+ '[' -z 'sudo gem install pdd' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'sudo gem install pdd' ';' 'java -version' ';' 'mvn help:system clean install -Pqulice --settings ../settings.xml' ';' 'mvn clean site -Psite --settings ../settings.xml' ';' 'mvn clean' ';' 'pdd --source=$(pwd) --verbose --file=/dev/null' ';'
+ rm -rf .gpg
+ cd repo
+ git remote add fork [email protected]:amihaiemil/wring.git
+ git remote update
Fetching origin
Fetching fork
From github.com:amihaiemil/wring
 * [new branch]      22         -> fork/22
 * [new branch]      master     -> fork/master
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ wc -l
++ git show-branch __rultor
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/22
Switched to a new branch '__rultor'
M   src/main/java/io/wring/agents/Agent.java
M   src/main/java/io/wring/agents/Exec.java
M   src/main/java/io/wring/agents/FkAgent.java
M   src/main/java/io/wring/agents/IgnoreEvents.java
M   src/main/java/io/wring/agents/JsonAgent.java
M   src/main/java/io/wring/agents/Printable.java
M   src/main/java/io/wring/agents/Refill.java
M   src/main/java/io/wring/agents/Routine.java
M   src/main/java/io/wring/agents/ThreadAppender.java
M   src/main/java/io/wring/agents/github/AgGithub.java
M   src/main/java/io/wring/agents/github/BoCommit.java
M   src/main/java/io/wring/agents/github/BoIssue.java
M   src/main/java/io/wring/agents/github/Body.java
M   src/main/java/io/wring/agents/github/Subject.java
M   src/main/java/io/wring/dynamo/DyBase.java
M   src/main/java/io/wring/dynamo/DyVault.java
Branch __rultor set up to track remote branch 22 from fork.
+ git checkout -B master origin/master
error: Your local changes to the following files would be overwritten by checkout:
    src/main/java/io/wring/agents/BoostEvents.java
    src/main/java/io/wring/agents/Cycle.java
Please, commit your changes or stash them before you can switch branches.
Aborting
'cid' file is absent, container wasn't started correctly

@yegor256
Copy link
Owner

yegor256 commented Oct 6, 2017

@amihaiemil what's up with this PR?

@amihaiemil
Copy link
Contributor Author

@yegor256 it's so old I don't even remember. It's probably not even applicable anymore. Closing it :)

@amihaiemil amihaiemil closed this Oct 6, 2017
@yegor256
Copy link
Owner

yegor256 commented Oct 6, 2017

@amihaiemil it's still applicable, the bug is still there. It's a pity you closed it, the code was correct, there were just merge problems.

@amihaiemil amihaiemil reopened this Oct 6, 2017
@0crat
Copy link
Collaborator

0crat commented Oct 6, 2017

@yegor256 please, pay attention to this pull request

@0crat
Copy link
Collaborator

0crat commented Oct 6, 2017

Job gh:yegor256/wring#26 is in scope.

@yegor256
Copy link
Owner

@amihaiemil I'm sorry it took two years to review your PR :) Please, fix the code above and let's merge it, it's a good PR.

@amihaiemil
Copy link
Contributor Author

amihaiemil commented Mar 16, 2018

@yegor256 I have no idea what's happening, some settings may be not ok in this repo. I cloned my fork locally and it had about 10 files changed automatically, that git $Id$ deleted... I remember I had this issue here also 2 years ago

@yegor256
Copy link
Owner

@amihaiemil the bug is still there, I believe. If you post an empty pipe, the system crashes with an exception.

@amihaiemil
Copy link
Contributor Author

@yegor256 I'll try to make another clean PR. Reclone the repo and everything. But I still don't undertand why the weird behaviour with the $Id -- when I clone it locall git automatically deletes the generated IDs and shows all files as modified. Sure there isn't some misplaced setting somewhere? Never had it in any other repo.

@0crat
Copy link
Collaborator

0crat commented Apr 12, 2018

@yegor256/z everybody who has role DEV are banned at this job; I won't be able to assign anyone automatically; consider assigning someone manually or invite more people to the project, as explained in §51

@0crat
Copy link
Collaborator

0crat commented Apr 17, 2018

@yegor256/z everybody who has role DEV are banned at this job; I won't be able to assign anyone automatically; consider assigning someone manually or invite more people to the project, as explained in §51

@0crat
Copy link
Collaborator

0crat commented Apr 22, 2018

@yegor256/z everybody who has role DEV are banned at this job; I won't be able to assign anyone automatically; consider assigning someone manually or invite more people to the project, as explained in §51

@0crat
Copy link
Collaborator

0crat commented Apr 27, 2018

@yegor256/z everybody who has role DEV are banned at this job; I won't be able to assign anyone automatically; consider assigning someone manually (as in §19), or invite more people (as in §51), or remove the job from the scope (as in §14)

@0crat
Copy link
Collaborator

0crat commented May 3, 2018

@yegor256/z everybody who has role DEV are banned at this job; I won't be able to assign anyone automatically; consider assigning someone manually (as in §19), or invite more people (as in §51), or remove the job from the scope (as in §14)

@yegor256
Copy link
Owner

yegor256 commented May 6, 2018

@0crat assign me

@0crat
Copy link
Collaborator

0crat commented May 6, 2018

@0crat assign me (here)

@yegor256 The job #26 assigned to @yegor256/z, here is why; the budget is 30 minutes, see §4; please, read §8 and §9; if the task is not clear, read this and this

@0crat
Copy link
Collaborator

0crat commented May 6, 2018

Manual assignment of issues is discouraged, see §19: -5 point(s) just awarded to @yegor256/z

@0crat
Copy link
Collaborator

0crat commented May 8, 2018

@yegor256/z everybody who has role DEV are banned at this job; I won't be able to assign anyone automatically; consider assigning someone manually (as in §19), or invite more people (as in §51), or remove the job from the scope (as in §14)

@0crat
Copy link
Collaborator

0crat commented May 13, 2018

@yegor256/z everybody who has role DEV are banned at this job; I won't be able to assign anyone automatically; consider assigning someone manually (as in §19), or invite more people (as in §51), or remove the job from the scope (as in §14)

@yegor256
Copy link
Owner

@0crat out

@0crat
Copy link
Collaborator

0crat commented May 14, 2018

@0crat out (here)

@yegor256 GitHub issue is still open, won't close

@yegor256
Copy link
Owner

@0crat status

@0crat
Copy link
Collaborator

0crat commented May 14, 2018

@0crat status (here)

@yegor256 This is what I know about this job, as in §32:

@0crat
Copy link
Collaborator

0crat commented May 18, 2018

@yegor256/z everybody who has role DEV are banned at #26; I won't be able to assign anyone automatically; consider assigning someone manually (as in §19), or invite more people (as in §51), or remove the job from the scope (as in §14)

@0crat
Copy link
Collaborator

0crat commented May 23, 2018

@yegor256/z everybody who has role DEV is banned at #26; I won't be able to assign anyone automatically; consider assigning someone manually (as in §19), or invite more people (as in §51), or remove the job from the scope (as in §14)

@0crat
Copy link
Collaborator

0crat commented May 28, 2018

@yegor256/z everybody who has role DEV is banned at #26; I won't be able to assign anyone automatically; consider assigning someone manually (as in §19), or invite more people (as in §51), or remove the job from the scope (as in §14)

@0crat
Copy link
Collaborator

0crat commented Jun 2, 2018

@yegor256/z everybody who has role DEV is banned at #26; I won't be able to assign anyone automatically; consider assigning someone manually (as in §19), or invite more people (as in §51), or remove the job from the scope (as in §14)

@0crat
Copy link
Collaborator

0crat commented Jun 7, 2018

@yegor256/z everybody who has role DEV is banned at #26; I won't be able to assign anyone automatically; consider assigning someone manually (as in §19), or invite more people (as in §51), or remove the job from the scope (as in §14)

@0crat
Copy link
Collaborator

0crat commented Jun 12, 2018

@yegor256/z everybody who has role DEV is banned at #26; I won't be able to assign anyone automatically; consider assigning someone manually (as in §19), or invite more people (as in §51), or remove the job from the scope (as in §14)

@yegor256 yegor256 closed this Jun 14, 2018
@0crat
Copy link
Collaborator

0crat commented Jun 14, 2018

Order was finished: +30 point(s) just awarded to @yegor256/z

@0crat
Copy link
Collaborator

0crat commented Jun 14, 2018

The job #26 is now out of scope

@0crat
Copy link
Collaborator

0crat commented Jun 18, 2018

@yegor256/z everybody who has role DEV is banned at #26; I won't be able to assign anyone automatically; consider assigning someone manually (as in §19), or invite more people (as in §51), or remove the job from the scope (as in §14)

@0crat
Copy link
Collaborator

0crat commented Jun 20, 2018

The job #26 is now out of scope

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants