It is very common to have output from a previous (longer) command appear
instead of the newly created one.
For example: Open a log. Check "Show Diff" and immediately uncheck it.
If this is done fast enough (or with a high Log Count limit) the output
with the diff will appear instead of the normal log.
Change-Id: Ie64cc4a383a261f5328a4d0486eec93f73766679
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Add context menu in diff editor to stage/unstage a single chunk from the diff.
Task-number: QTCREATORBUG-5875
Change-Id: Ic244a0d84b5ed5f66b90d7fe8784fc1b8041d183
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
In several places, it says '#include "..."' for headers
from different libraries/plugins.
Change-Id: I96cd74fef9b30163adefe3e1720e0847bed9553a
Reviewed-by: hjk <hjk121@nokiamail.com>
Also adjust and streamline using and surrounding code.
Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
A lot of our build system files specify unneeded include
paths. These roughly fall into the following categories:
a) Paths that are already set in more general files
such as qtcreator.pri.
b) Paths that serve no purpose at all, possibly
left over from earlier versions of the project.
c) Paths that act as workarounds for wrong include
statements of the form '#include "xyz.h"', where
xyz.h is not in the same directory as the including
file.
This patch removes such path specifications and fixes the offending
include statements from case c).
Tested on Linux, Windows and OSX with qmake and qbs.
Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
When stderr is not a terminal, --progress should be passed
to display progress
Task-number: QTCREATORBUG-6565
Change-Id: I59ba731cab55d0dd7de5e11cefe7dd254505ee11
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Command now provides the same functionality. Deduplicate code.
Change-Id: I789f021050471281870b6ef6a81a94e66fbdf0c7
Reviewed-by: Tobias Hunger <tobias.hunger@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>
* Suppress command logging
* If no branches are found, do not add "Branches:" line
Change-Id: Id32b5f429a5c0324ec9e6d9d016f47160e9e5012
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
The widget is quite small, no reason to load it with
(normally useless) data
Change-Id: I092233124505f64d05a49d9da6463b64bbb398bb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Revised topic is "master (MERGING)" instead of MERGING
This should also fix topic getting stuck as REBASING
Change-Id: I934643f5b4e632318495f141536c666f775bd15d
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>
e.g. If a branch with the chosen name already exists
Change-Id: I22be3001ed68d6bf6f45d9180ad60403267d4ad9
Reviewed-by: Petar Perisin <petar.perisin@gmail.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>
And use it where appropriate
Change-Id: I0f37b8aada6eaa9be6743724b91a59173a01cb0c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Depends on a commit that broke compilation
This reverts commit a53cc559be
Change-Id: I7b697be1c97bd25f15e2a97927dbc7d03dc456e7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
