Community
Participate
Working Groups
It should be possible to delete a remote branch in the Orion Git client. This is equivalent to the command line: git push origin :branch-name
https://github.com/pjanik/orion.client/commits/bug349375 https://github.com/pjanik/orion.server/commits/bug349375 I wrote all this code and have the rights to contribute it to Eclipse under the eclipse.org web site terms of use.
Both commits look good. I would just extend the test case with few lines where from a secondary clone you verify that the removed branch is gone. Moreover, if the branch is already tracked locally, an assertion for pulling the removed branch, which should fail, would be nice to have as well.
(In reply to comment #2) > Both commits look good. I would just extend the test case with few lines where > from a secondary clone you verify that the removed branch is gone. Moreover, if > the branch is already tracked locally, an assertion for pulling the removed > branch, which should fail, would be nice to have as well. I don't understand - what secondary clone? There is no secondary clone. Do you want to have something like double check? I can do it using JGit API but... is really necessary or even useful for this test case? In my opinion - not. I list all remote branches, check their quantity and even names. I think that sufficient for such simple test case.
A secondary clone - a second clone of the same repo. Double checking if the branch is gone in the secondary clone would assure us that the change is actually pushed to the origin and we're not mislead by a false image of the remote in the first clone.
(In reply to comment #4) > A secondary clone - a second clone of the same repo. Double checking if the > branch is gone in the secondary clone would assure us that the change is > actually pushed to the origin and we're not mislead by a false image of the > remote in the first clone. I'm not sure if I understand it.. Do you want to create secondary clone and just do the same thing - list it's remote branches?
(In reply to comment #5) > Do you want to create secondary clone and just > do the same thing - list it's remote branches? That would fail, because you need to fetch first. And this is what I miss in the single clone case. 1. Clone a repo -> clone#1 2. Clone#1: create a branch, push it 3. Clone a repo -> clone#2 4. Clone#2: check if the branch is available 5. Clone#1: remove the branch/push 6. Clone#1: check if the branch is gone 7. Clone#2: fetch, check if the branch is gone In comment 2, I mentioned an alternate scenario: 1. Clone a repo -> clone#1 2. Clone#1: create a branch, push it 3. Clone a repo -> clone#2 4. Clone#2: check if the branch is available 5. Clone#2: checkout the branch 6. Clone#1: remove the branch/push 7. Clone#1: check if the branch is gone 8. Clone#2: pull, should fail, check result
1. Are you able to implement scenario 1 in the Orion? 2. Are you able to reproduce scenario 1 even in the console? 3. Are you able to implement scenario 2 in the Orion? In my opinion: 1. Unfortunately not. To do these you need "git remote prune origin". 2. Unfortunately not. Git REST API doesn't contain "git remote prune origin" equivalent. 3. Unfortunately not. Git REST API doesn't contain "git pull". Apart from that, general question - what are we testing in fact? Orion, JGit or both of them? I've made small change to support empty srcref. If answer is Orion - I think that we should test if Orion accepts such request (as it used to refuse such requests), if JGit command is actually called and if proper response is returned. This is area of Orion responsibility. JGit takes care of the rest of actions. Your tests cases - ofc they are useful, nice, tests a lot, but I think that is rather JGit testing than Orion. Don't get me wrong. I wanted and tried to implement it - but I couldn't manage because of mentioned problems. I think that next X minutes/hours spent on trying to resolve these problems isn't just worth of it, as it's not Orion testing imho.
Scenario 2 with JGit call for Pull is possible (if you such solution is satisfactory for you).
New version: https://github.com/pjanik/orion.server/tree/bug349375 It's almost scenario 2 (fetch instead of pull). I hope that it will be sufficient.
Fixed with http://git.eclipse.org/c/orion/org.eclipse.orion.server.git/commit/?id=7dd37630b94528456e845cad12233d35eedc18fa and http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/?id=959b51f632dfae1ed6be82990d7411556a9ad952, but filed bug 353135 for an issue with server response when trying to fetch a removed remote branch.
