pharo-vcs / iceberg

Iceberg is the main toolset for handling VCS in Pharo.
MIT License
134 stars 85 forks source link

Option to commit to local repository #1832

Closed dolezvo1 closed 4 months ago

dolezvo1 commented 4 months ago

As the title says, I'd really appreciate an option to commit to the source local repository. I'm really not sure of the reason why this doesn't seem to be easily possible. This fact is especially inconvenient when your project contains non-Smalltalk files that you have workflows built around.

dolezvo1 commented 4 months ago

These are the options that I see on the local repository:

image

Meanwhile on the other repositories I see all these other options:

image

dolezvo1 commented 4 months ago

I should also mention that Iceberg doesn't seem to be able to find my SSH keys, which points to it probably not being able to parse the host+key definitions in the home directory which git uses, so that's another use case for you.

Ducasse commented 4 months ago

Thanks for your report. Please open a separate issue for your ssh keys. Now you should consider

dolezvo1 commented 4 months ago

Sorry, but I'm not interested in Pharo/Iceberg touching my SSH keys, so I will not be creating the issue.

Ducasse commented 4 months ago

This is not touching this is using your ssh keys. How do you want git to work if it cannot pass to libgit your ssh keys :)? Apparently you misunderstand something important but you have the right to do so.

Ducasse commented 4 months ago

OK so I will close this issue. To be able to help we need more collaboration.

dolezvo1 commented 4 months ago

Apparently you misunderstand something important but you have the right to do so.

No, I really don't believe so. Pharo/Iceberg doesn't need to touch my keys to commit to a local repository, as far as my understanding goes.

tinchodias commented 4 months ago

@dolezvo1 after you select the "Repair repository" option in the menu, these options appear (Pharo 13 colors):

Screenshot 2024-07-22 at 16 00 52

then a window like this popups:

Screenshot 2024-07-22 at 16 06 14

What did I do? in this case, what is shown are changes that I did on my local repo (my clone): 1 - in a terminal, I removed the "sdfg..." file 2 - code was modified externally 3 - commit from the terminal (I didn't push) 4 - I came back to Pharo IDE and Iceberg showed the "Detached Working Copy" because the head of the local repo is different than the head that Iceberg knew. That's why Iceberg considers a "repair" is needed... because for Iceberg, the head of that repo was X, but suddenly it finds that head is Y.

I was not very structured on this answer, but I hope it helps.