Opening a commit editor inside a submodule then executing
Local Repository Log opens the log for the supermodule.
Change-Id: I264925e0f23e2372a09a28e788174a747f5870a8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
We used to need the repository root in order to resolve the file.
This is no longer needed, since the raw patch is parsed instead.
Change-Id: Ifdbbcd686a5ef7bbbd472f37b20190b9e9abebe7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
It will be needed soon inside DiffEditor plugin.
Move "Patch command" setting out of Version Control | General
into Environment | General | System.
Introduce PatchTool class, which hold the patch command
setting and a method for applying patches (runPatch() - moved
from VcsBasePlugin).
Change-Id: I9de94358ccd5c6e31ac2beefc27305c5111d67bb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Move item model implementation to private, adjust user code.
Change-Id: Ifbe94e7c7b9b1e8be1b4c531958dbd7a9413af13
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
All VCS plugins depend on the ProjectExplorer, so it is there.
No need to test.
Change-Id: Ie6ec210af0f63f1bdad0e4973743ae68f9279a5c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
GitDiffSwitcher operates now on IDocument.
GitDiffHandler operates now on DiffEditorController.
"source" property now attached to editor's document (VcsBasePlugin).
Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Get rid of source property out of DiffEditorWidget,
attach dynamic property when it's needed instead.
Change-Id: I6641a7b55c42b4eceba78c2e28f5140b40fe0fa5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Instead of actual file.
In case currentFile is a directory, it is cleared, and project top level
is used instead. This leads to unexpected results.
This patch corrects repository resolution in stash dialog when opened
inside a submodule.
Task-number: QTCREATORBUG-10397
Change-Id: I070cc7f9cbebe3be800dbbb9569cf73f540a6d14
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Directory is used as current file in case a VCS editor is open
Change-Id: Ibf4e8a1f69cb1b618af84461ecebcc65f933e2ed
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
In the majority of cases we were doing that anyways, having two
ways is just needlessly confusing.
Change-Id: Ied362a702c23beee528368d74df1f2aabe5807f8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Introduce a proxy class for thread synchronization
* Use signals for appending text to output window
Change-Id: Iecbb010e6b6e9dab27d9862a43dafa450f2bb1f8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* If command fails - it might fail due to a conflict.
That doesn't mean the repository hasn't changed.
* On runVcs
Change-Id: I0acd33a330c90d7c4f0df1f113ef2852eaf0ad03
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
The list always contains a single entry (or none) anyway
Take 2. This time it actually compiles ;-)
Change-Id: I71a9822360a9b569ba79afa0f575e27918bb2e03
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
The list always contains a single entry (or none) anyway
Change-Id: I567b622efd42dd6f676bebb92fbf1c8774bd80ff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Replaces \r\n? with \n.
Some console applications (e.g. git-push, git-rebase) use \r alone to
move the cursor to the line's beginning. This should be replaced by \n
rather than just be erased.
Change-Id: I8d614d2b471e59decdbfa7f173ffa7fbdb11759b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
And move to using the corresponding method in document model.
Change-Id: I80b12ceab8a91c5393b9c0422d660a8896ae09d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Project tree root is not visible most of the time. Window title is more
useful.
Also shows topic for *current* open file rather than the project
(supporting submodules and externally opened files)
Change-Id: Id21be09c27beca1b0d37674513121a0e0e995feb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
The display name is not editor instance specific, but belongs to the
document.
Change-Id: I3c936f04a86e10e6ca30063d85036d85b4b5880e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
That is what it actually is, wrt how Qt API calls it.
Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
QDoc does some magic with the \class and \namespaces
and \brief commands, so the following wording must be used:
"The xxx class yyy ..."
Change-Id: Id231f30e8464898b776888d5423523de404aae34
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
The (un)expectDirectoryChange API addition has been reverted
Change-Id: I4736f51a77eb2f63b3e4a7b44426ad15a06624c7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
