News for hackers. Stuff that matters.
Re:Requests moved to Python Software Foundation by Avamander on Thursday September 19, 2019 @07:48AM (#21015306)
Nah, rebase is too slow on large histories and it might not be your own commit which complicates things.
Re:Requests moved to Python Software Foundation by echelon on Thursday September 19, 2019 @09:03AM (#21015744)
I work in a large monorepo with so many commits you couldn't fathom.

Rebase isn't at all slow. I know this because I do it often to squash my own commits or move things around between branches.

Re:Requests moved to Python Software Foundation by Avamander on Thursday September 19, 2019 @09:48AM (#21016103)
I disagree about it not being slow, it depends on hardware. In addition to that I did not ask about how to fix a commit history manually, I asked for a tool that would go over an entire commit history and automatically fix the issues for me.
Re:Requests moved to Python Software Foundation by falsedan on Thursday September 19, 2019 @09:52AM (#21016142)
The entire comment is:

> Nah, rebase is too slow on large histories and it might not be your own commit which complicates things.

I don't see any questions being asked. Rebase on the commits we're discussing (readme tweaks) are trivial: fixup fixup fixup

Re:Requests moved to Python Software Foundation by Avamander on Thursday September 19, 2019 @09:52AM (#21016143)
> I don't see any questions being asked.

Read the thread next time. I started by asking if there's a fixer and then someone suggests a single command that absolutely doesn't solve the problem and would take enormous time to use on some projects, even more so if your PC isn't the best of the best.

Re:Requests moved to Python Software Foundation by falsedan on Thursday September 19, 2019 @09:58AM (#21016201)
OK, I see your original comment, no need to be rude. If you're working on a computer that struggles with 'making a commit' and 'editing a text file', I feel like you're working in an environment that's going to be very frustrating when writing code.

Are you thinking about rebasing through an IDE? IDEs are uniformly terrible at git.

Re:Requests moved to Python Software Foundation by Avamander on Thursday September 19, 2019 @10:06AM (#21016278)
I just don't like downvotes because people take comments out of context.

I am not thinking about rebasing trough an IDE. Try rebasing in Chromium's repository, it's simply not fast. The thing I asked for is something that would auto-fix the entire commit histories in cases such as the Requests repository, the suggested use of rebase is too tedious and slow. Has something still remained unclear?

Re:Requests moved to Python Software Foundation by _-___________-_ on Tuesday October 01, 2019 @06:39AM (#21123906)
Late to the party, but it would be trivial to use `git rebase -i` and a decent editor to fix the Requests commit history. I just gave it a go locally and got good results with less than a minute's editing.
Re:Requests moved to Python Software Foundation by falsedan on Thursday September 19, 2019 @10:35AM (#21016564)
> Try rebasing in Chromium's repository, it's simply not fast

The intent for a tool which could do this quickly is unclear. Rebasing millions of commits will be slow, also rebasing published history will also generate a lot of extra paperwork.

Writing a utility to sort a rebase todo by message and change the later commits with the same message to be fixups is trivial.

Re:Requests moved to Python Software Foundation by marble-drink on Thursday September 19, 2019 @08:20AM (#21015463)
No it isn't. Are you thinking about filter-branch?
Re:Requests moved to Python Software Foundation by Avamander on Thursday September 19, 2019 @08:52AM (#21015653)
I am not. Manually issuing rebranch is too slow for any git histories over a few hundred. You'd then also have to find which commits you want to merge, merge them and so on and on. Rebranch basically works if you just want to fix one mistake in history you know you have.
Re:Requests moved to Python Software Foundation by packetlost on Thursday September 19, 2019 @09:42AM (#21016055)
... what? `rebranch` isn't a command in git? I think you mean rebase, and sure, if you were rebasing the entire history it would be slow and awful. But don't do that. Rebase at like `HEAD~10` (or whatever) to only clean up the last 10 commits. There's no performance issues or even management issues. Maybe go read the rebasing section (https://git-scm.com/book/en/v2/Git-Branching-Rebasing) of the git manual...
Re:Requests moved to Python Software Foundation by Avamander on Thursday September 19, 2019 @09:45AM (#21016085)
Yes, autocorrect changed it. So last ten commits isn't slow but I literally asked about entire git history.
Re:Requests moved to Python Software Foundation by falsedan on Thursday September 19, 2019 @09:53AM (#21016151)
Why would you rebase an entire git history? No one is arguing for that.
Re:Requests moved to Python Software Foundation by Avamander on Thursday September 19, 2019 @09:55AM (#21016175)
I... like, the first comment in the thread I asked if there's a tool that could go over the entire git history of a repo and fix such issues up, rebase isn't a solution in that case because it does get slow and it requires manual work which is slow, I don't understand how people are losing the context so quickly here.
Re:Requests moved to Python Software Foundation by icebraining on Friday September 20, 2019 @07:20PM (#21032291)
Your comment didn't say "the entire git history of a repo", and in the context of this thread, people made the reasonable assumption your were talking about a few sequential commits, as discussed regarding the edits to README on the Requests repo.