feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
56,834 Commits 108 Branches 368 Tags
4c27b0e6e754bc88622ad90c34f7ade48a9cd890
Commit Graph

742 Commits

Author SHA1 Message Date
Francois Ferrand
367cfc8419 Git: Support staging a single chunk. 
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>
 2013-09-26 23:10:59 +02:00
jkobus
aa32c2be87 Close the other diff view when switching between diff views 
Task-number: QTCREATORBUG-10203

Change-Id: If15fac2743768572d02ce9962b54dfaab4ca1af3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-09-24 09:12:23 +02:00
Orgad Shaneh
f29ce3d9b9 DiffEditor: Preserve source for state recovery 
Task-number: QTCREATORBUG-10126
Change-Id: I707e7cdac84c91d52c5661718ac48e3d79fc7c91
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-13 15:45:36 +02:00
Friedemann Kleint
4f9594ad03 Git Show: Use %n for message and add Linguist comment. 
Change-Id: I09af9ea6531af2f768e393f37e28962860b47e5c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-13 10:12:26 +02:00
Orgad Shaneh
9df379e0dc Git: Fix crash on diff 
Task-number: QTCREATORBUG-10138
Change-Id: I7c7f054e6253c677b52a3ea24d7ace562f1ad4af
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-09-12 13:02:55 +02:00
Tobias Hunger
9e93082344 VCS: Remove dead code 
Change-Id: I9505cdd4c59f8f66e686945a3340990b195fcb55
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-09-12 10:30:41 +02:00
hjk
267e441af4 Apply 'static' pattern to VcsManager 
Adapt user and surrounding code.

Change-Id: Id2648f82a9cbbd0ad0bfb91f6958b8cee7ea29cc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-03 12:01:24 +02:00
Orgad Shaneh
fc6ff05472 VCS: Update progress bar for commands that output progress 
Change-Id: I643df94c72068259817092d7d48f71984288fdb5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 12:19:25 +02:00
jkobus
24ccd50015 Add a toolbutton for switching diff view mode 
Task-number: QTCREATORBUG-10035

Change-Id: I83cb7cec3f4ba484ab068f398a12096501017668
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 11:21:31 +02:00
Orgad Shaneh
47b01acd32 Git: Some cleanup for branches on show 
* Suppress command logging
* If no branches are found, do not add "Branches:" line

Change-Id: Id32b5f429a5c0324ec9e6d9d016f47160e9e5012
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 10:42:38 +02:00
Orgad Shaneh
f2e4b2b9c8 VCS: Invert Command -> runVcs dependency 
* Unclutter runVcs
* Enable more dynamic signal/slot usage in Command

Change-Id: Ie97b17078778b0c86b74d5725a78e766828ac6d8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 10:11:56 +02:00
Orgad Shaneh
a60cf5d0fa Git: Use default show format for diff viewer 
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>
 2013-08-29 10:57:18 +02:00
Orgad Shaneh
9f2110f8a1 Git: Extend show output on diff editor 
Change-Id: I51d3d0af96b28ec56bedaac163f9ce72158d8dc2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-28 10:12:01 +02:00
Orgad Shaneh
0865e9eb27 Git: List branches on show 
Change-Id: Ie69a58efc7068c699abf0e3d396216d9809346f4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-08-28 09:56:47 +02:00
Orgad Shaneh
afcb9b2c41 Git: Show active branch next to command in progress 
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>
 2013-08-27 12:22:43 +02:00
Oswald Buddenhagen
c2e90c360b Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
 2013-08-21 14:39:18 +02:00
Orgad Shaneh
68b5542cdb Git: Show success message when command ends 
Change-Id: I501c69df2a436d90270a6c2543c3e286bafef427
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-20 12:54:30 +02:00
Orgad Shaneh
a9095ee104 VCS: Introduce message style 
Similar to compile and app output panes

Change-Id: Ib9ac6d8be880739ae78d0a39f7051cbe616e46c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-20 12:54:17 +02:00
Orgad Shaneh
f9c4889a7f VCS: Use runVcs for Command 
* Removes duplication
* Supports all flags accepted by runVcs
* Supports output while running

Change-Id: Id067791760753184cd2516c23634564880ca5db0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-20 12:54:02 +02:00
Orgad Shaneh
cc2610aa71 VCS: Enable calling runVcs from non-GUI threads 
* 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>
 2013-08-20 12:53:33 +02:00
Orgad Shaneh
d45b6d7871 Git: Fix side-by-side show opened from interactive rebase editor 
Change-Id: Iceb9a536f6dc53bd9a61cbf5b6bab14154196628
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-19 11:45:40 +02:00
Orgad Shaneh
e1e1936073 Git: Add reflog 
Change-Id: Id328492826bdcf4b7f7e6933a9dc3931174de0fb
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-19 11:45:02 +02:00
Orgad Shaneh
3be6065b04 Git: Fix crash on quit while rebase-todo editor is open 
Change-Id: I458cbb2168642f226583b406e34596d223c7d5ea
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-13 09:22:20 +02:00
Orgad Shaneh
b0d14c79fe VCS: Use correct output style 
Change-Id: I95ea8078ae53e7339213765fbb8a79bff33f899c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-12 12:42:11 +02:00
Tobias Hunger
2e0434dd25 Git: Fix possible core dump 
Change-Id: Ieb822c8810e8943d5397e6c64188690e481dd0f9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-08 15:31:04 +02:00
Orgad Shaneh
5da86a0757 Git: Follow renames on log 
Reverted because a dependent commit broke compilation

Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
(cherry picked from commit a53cc559be)

Change-Id: I8de3dbeca7eed3815eb5f0843eba6a86d371675e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-08 11:14:42 +02:00
Orgad Shaneh
35798d4ad6 VCS: Use a single filename for log 
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>
 2013-08-07 17:43:58 +02:00
Orgad Shaneh
7c5b19ebf4 Revert "Git: Use a single filename for log" 
Breaks compilation

This reverts commit a05ea71133

Change-Id: I713f06a1fe1ff24f4721cda082fb732dc3f5c270
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-08-06 18:27:09 +02:00
Orgad Shaneh
fe25ae9935 Revert "Git: Follow renames on log" 
Depends on a commit that broke compilation

This reverts commit a53cc559be

Change-Id: I7b697be1c97bd25f15e2a97927dbc7d03dc456e7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-08-06 18:27:06 +02:00
Orgad Shaneh
a53cc559be Git: Follow renames on log 
Change-Id: Ic2666e62f5226780f68da0cdda0229b343d38116
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-06 17:24:15 +02:00
Orgad Shaneh
a05ea71133 Git: Use a single filename for log 
The list always contains a single entry (or none) anyway

Change-Id: I567b622efd42dd6f676bebb92fbf1c8774bd80ff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-06 17:23:25 +02:00
Orgad Shaneh
ec247074d4 Git: Prompt to commit when merge tool finishes after merge 
Change-Id: I41a7e7febb77706e84595d560a8abb56a018a823
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-06 17:22:39 +02:00
Orgad Shaneh
208aeb79ed Introduce Utils::SynchronousProcess::normalizeNewlines 
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>
 2013-08-06 04:52:58 +02:00
Orgad Shaneh
6b8c93637b VCS: Un-data functions that accept QString 
Change-Id: Iffa82f4ab06162ab57e77301e77fb37ed7230bd5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-31 11:23:00 +02:00
Orgad Shaneh
044a78f750 Git: Support remotes with whitespace on url 
Task-number: QTCREATORBUG-9789

Change-Id: Id501ade0ac2ce7093fa38368f13b2bfab31bd35f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-29 10:32:36 +02:00
Petar Perisin
e6de18eaab Git - show command name in tooltip 
Change-Id: Ib652813c713e24cf9cbe8cb4b77207d54be7e132
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-07-21 23:03:00 +02:00
Eike Ziller
745f82bfc6 Merge remote-tracking branch 'origin/2.8' into HEAD 
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: I59ce346c85803f5496a22bdadf7dca09e59d3174
 2013-07-19 14:17:43 +02:00
Orgad Shaneh
360366ae08 VCS: Remove unused termination mode 
Defaults to NoReport and nobody sets other values

Change-Id: I3def23bd350fcef45df9eb8d3a0e86baac192bd9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-19 13:56:41 +02:00
Orgad Shaneh
0c50c5a1d3 VCS: Consolidate codec handling 
Change-Id: I2c9a5031b63f0bc3e884739be680d051d7cf1ab4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-19 13:56:34 +02:00
Petar Perisin
a766fc42bb Git - allow stash-only in stashPrompt 
Change-Id: I5e81bd3dfc8986c7492701ac5ce5537e0d591834
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-07-19 10:33:58 +02:00
Orgad Shaneh
173da5f45b Git: Set diff base directory for log 
Log can also contain diff, base directory is required for correct
apply/revert actions

Change-Id: I9540fc75b1e008a1c8433f121b184f164172a1cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-18 16:59:42 +02:00
Eike Ziller
bc88c0b89e VCS: Use documents instead of editors a bit more. 
This patch mostly gets rid of EditorManager::openedEditors usage. The
VCS editors should have a better widget<>document separation, also to
make it possible to split/duplicate them, but that's for another time.

Change-Id: Idd92a6a4884ff69fba4f4793d182aa7ff68d79e4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-18 14:51:03 +02:00
Orgad Shaneh
ad9e7ccab6 Fix coding style for else statements 
Change-Id: I1309db70e98d678e150388c76ce665e988fdf081
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-17 11:11:25 +02:00
Eike Ziller
fade19a9bf Move IEditor::createNew to IDocument::setContents 
The method is for setting the contents, so it belongs to the document,
and should be named correspondingly.

Change-Id: I40363dc08f11268f530885b512e4a88e8b10d096
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-17 09:00:17 +02:00
Friedemann Kleint
aec9124723 tr()-fixes in git. 
- Do concatenate message pieces that may not fit grammatically.
- Common message for "Cannot launch".
- Add period marker.

Change-Id: Ic67b27e30143febebc9153a3cefe523ebfd4bc49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-07-15 17:10:26 +02:00
Orgad Shaneh
aa981f4066 PushToGerrit: Filter out stale branches 
Change-Id: Ib4f1d7ead2c40f27be28fa45e042c3694c0444fd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-07-12 17:52:38 +02:00
Eike Ziller
354cd410b0 Make document model static and add some document related methods 
Change-Id: Ibcb863e67a2433529c9d2b6dec237f9d8b1d8d50
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-12 11:55:59 +02:00
Orgad Shaneh
e63d1f64b5 Git: Refresh configuration widget if editor is found 
Task-number: QTCREATORBUG-9783
Change-Id: Id1092fb9a79dfbf0425be4913241a507afb56a85
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-11 18:05:46 +02:00
Orgad Shaneh
bcf9c7621f Git: Remove args from diff 
They are unused

Change-Id: I6cff3c6028208f1c7c0937c53b3f5090dae719a6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-11 18:05:03 +02:00
Eike Ziller
ab0c3da08f Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I37e550646f877b50693043894976a693ac22ad5e
 2013-07-11 08:02:41 +02:00