On Windows it is "Ignore, Merge Tool, Skip, Abort", while on Linux it is
"Merge Tool, Ignore, Skip, Abort"
That makes Ignore default on Windows, which is confusing
Change-Id: Id7e9e8dd6fd5748d518de4d94db47ae075268627
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
It is used for both input and output, the pointer is assumed
to be valid
Change-Id: Iad9a82dfb5ea4850584d4da848076699cddd23c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Introduce a const submitEditorWidget() and use it
* Directly use layout from ui
Change-Id: Ib566bab464d4f1c08a3f2af0edb5e1fa989c3160
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
To be used for "amend previous commit" feature
Change-Id: Id1190d67bdd1a3dd3866a6a0f9d41be5f9baaa4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Fixes the following pattern:
Subject
# comment
Another line - considered as subject
Change-Id: I708521efde886c6f5be748795251ce0aafc8f590
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Italic is harder to read, especially when there are many of them
Change-Id: I15bf054356a996308820e5c7969041933aeb538a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Refactor combobox values to use %1 as a placeholder for values
Change-Id: I9a9bb6b9ba5c21bcaad4a3047d322856225892bc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
If the LogChangeDialog is closed without selecting any
commit, interactive rebase started with '^' as the commit.
Change-Id: I6292c700f61e5d075953ecc371d0916342096801
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This makes command stand out. Before it looked like regular branch.
Change-Id: I9f47e42392bb70cbd9ceec94fd4d55dc15c95b02
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
So ChangeSelectionDialog does not show full path of current file, but
just path to top level dir
Change-Id: I4960009216afc0564b009bbf4f89b676cb92c4df
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
it looks like submodule list in git config does not return paths. that
is why I have direct reading of .gitmodules file now.
Change-Id: I7f441d0b2e31ad7b73fbc8c05e5c9a9e0c84036c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
It was not possible to simultaneously open two commit editors for
different version control systems, also there was no reason to scan all
open editors for the submit editor, since the plugins can just remember
the editor that they opened.
Change-Id: I1bea6ece3cd6faa1ecc0566bdd6f5fb10c816963
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Remove enum, provide the associated flag in the combobox.
Change-Id: I1c4751c75f59312904fe7c175678f965ac16741d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Branch log and diff were sometimes having problems.
I have project in main git module, and I was not able to get branch diff and log in a submodule,
because they open new editor and as soon as it is opened m_repository changes to the master module.
Since repository working dir is set after editor opens, it is already changed in branchModel
Branch diff and log should now work as expected.
Change-Id: I72f730d77b8fe23ef6eac757415fe96321ef147b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Since we select final commit for interactive rebase in a listed dialog,
it is IMO expected and more user-frendly to also have selected commit in
the interactive rebase list.
Change-Id: I56febd024cc174bcd046b1f02bccfe990043aae4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Preemptively fix exit warning "QEventLoop cannot be used
without QApplication" (Qt 5/dev) emitted by destruction of
the of the generic highlighter manager singleton which had a
member of type Utils::NetworkAccessManager.
Use a single instance of Utils::NetworkAccessManager for the
main thread and clean up properly using a qAddPostRoutine().
Change-Id: Ida57b9028a79eb4927818ce49088ea567f3bdfd6
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.
Change-Id: Ib2afbc530760684db96888b927c5153b29fe24aa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
sometimes tags are annotated, and have different hash than head - now
all will be good with them too.
Change-Id: Ibd66b78e6dbc7f181ba05f45339f2d97bb611602
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
