mike-perdide / gitbuster Goto Github PK

When using Adding the file with a custom content, if you put some non-ascii character in the 'Unmerged state' text dialog, the following error raises into the prompt :

Traceback (most recent call last):
File "/usr/local/lib/python2.7/dist-packages/gitbuster-0.9b4-py2.7.egg/gitbuster/conflicts_dialog.py", line 121, in item_clicked
self.set_choice()
File "/usr/local/lib/python2.7/dist-packages/gitbuster-0.9b4-py2.7.egg/gitbuster/conflicts_dialog.py", line 105, in set_choice
custom_content = str(self._ui.conflictTextEdit.toPlainText())
UnicodeEncodeError: 'ascii' codec can't encode character u'\xe9' in position 9: ordinal not in range(128)

It looks like we can edit the commit message, but we can't.

As an alternative, a Refresh button would allow the user to create a branch using git.

Currently, we need to do reset the repository to get the original content of the files. This could be replaced by using GitPython.

When closing gitbuster, the following is displayed : "QTimer can only be used with threads started with QThread".

Instead of populating, which implies reading all the repository, we should try to have a lazy data() method, that only reads the repository when requested. Iter_commits should be used instead. This creates a few problems: how to obtain row_count ? how to insert a commit ?

this would make the UI sexy : when starting gitbuster, I would like to be presented with a dialog that remembers the repositories I usely work on, just like chromium does with my most visited sites.

Deleting a deleted commit creates a new event and asks the EditableGitModel to delete the commit again. This isn't really critical, as the only effect is that the commit is only added one more time to self._deleted_commits. The real problem is that this creates a new event in the history, and undoing it won't have any effect.

The conflict dialog should prevent the user from writing "======" and "<<<<< HEAD" in a file. This could be done at the same time we colorize these tags (we don't want to prevent the user from writing what he want in the file, so matching HTML color tags could be an idea).

A fake QGitEditableModel doesn't contain original QGitModel, so we should reset it when it is written.

and provide an ability to copy commits from hg to git and back.

Don't hit me.

On some branch A, do some changes, then undo all changes. On some branch B, do some changes, click Apply. The dialog shows modifications on the branch A.

I wish I could copy commits or delete them on a right clic.
Or add a commit to the selection. Or add commits in the copy paste buffer before/after the commit I'm right clicking on.

This takes a long time for nothing.

The matching could use the authored date or the message.

with the licence and love

I'd like some gitbuster help when it come to resolving git conflicts. I suggest a special executable in a special mode.

gitbuster v3?

The dialog shoud show "branch name changed, X commits modified, X commits to rewrite"

I wish gitbuster would

1. as proof of concept : allow for refreshing repository, detect when changes on the disk make gitbuster state inconsistent (and refuse to handle)
2. reload automatically, whenever possible, if anything changes in the repository (eg. I made a git pull --rebase manually).

The user should be able to filter the commits list using regular expression.

There must be a way for the user to figure out where he did something, like deleting commits.
I suggest keeping them in the branch view, but in italics and strikethrough.

When we drag and drop commits from one branch to the other, the animation contains all the commits. It hides the tableView.

It shouldn't be created, or it should be cancelled. This could be done by validating before setting the new name (as gfbi_core is supposed to handle the validation) or by adding a new cancel_history_event especially for this case (in QEditableGitModel and gfbi_core.editable_git_model).

I wish I could rename a branch

This could easily be done now that we have access to self._applying. If the user goes through with the quit, it may be a good thing to interrupt the apply thread and clean the repository.

In the first tab, edit a field, then undo the change with Ctrl+Z. The field is still marked as modified (yellow).

Users can't tell why the application failed. Maybe a status label near the apply button could help them understand what's the next step.

While the toggle button in the bottom left works, the two buttons in the top of the UI don't work

I think it will probably be the most used of the two tabs.

After a merge conflict, when I try to apply the solutions, gitbuster assumes I want to log.

Instead of a lineEdit (too small).

As of now, all the commits are marked as modified. It would be nice if the git rebase process started rebasing only from the oldest modified commit.

No tmp_rebase should be left when getting out