Commit Graph

1436 Commits

Author SHA1 Message Date
Orgad Shaneh
7740c31746 Git: Increase delay for mergetool
On Windows it takes more than 500ms to retrieve the first line.

Really wait until we have an entire line then read.

Change-Id: I9f7c222c314ea977179ed549281ef145ba756c73
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-30 10:01:44 +00:00
Orgad Shaneh
b2dae02762 Git: Enable "Continue Merging" dialog on deleted conflict
When a Deleted conflict is aborted, this prompt appears too.

Change-Id: I8f45363c4875b2d66bcbff93cf53b075d890ba2b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-28 16:50:44 +00:00
Orgad Shaneh
0780c1d763 Git: Fix compilation with GCC 4.8
Change-Id: I47e2ac73a7afdd5c44c054bab54bc454973a1fa7
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-09-10 18:49:37 +00:00
Orgad Shaneh
a2bd8e11f6 Git: Fix crash
An asynchronous command deletes itself when it ends.
Raw pointer is a bad idea.

Task-number: QTCREATORBUG-15051
Change-Id: Ie2b3a90e308a4bb1e414f924a836d816abf1dfd1
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-09-10 10:35:15 +00:00
Orgad Shaneh
786aa4a441 Git: Fix source repository resolution in Stashes dialog
Remove workaround done in Branches and store copies where they're needed.

Task-number: QTCREATORBUG-14850
Change-Id: I6a81fc5ac02fb11d444906af6cfbe768695c9965
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-08-12 11:32:20 +00:00
Orgad Shaneh
14419e3d1b Git: Fix typo in comment
Change-Id: I07a7905bed3a46f7fbd60fd0844e9c46d61fbc1f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-08-09 19:09:16 +00:00
Nikita Baryshnikov
7bc397b1ff GitPlugin: reorder namespaces endin
that is all:)

Change-Id: Idf32e241f6c94f5717518b4e0f66f41ea8aed034
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-07-16 09:42:01 +00:00
Orgad Shaneh
1b6cc02725 Git: Strip line numbers from blame output
The editor already has its own line numbers. Save a few chars for content.

Change-Id: I83fa55140c09224cf0f2ec24ff2dac0baa64def1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-07-07 08:50:50 +00:00
Orgad Shaneh
23b89f1e85 Git: Include committer details in Show
Task-number: QTCREATORBUG-12834
Change-Id: I3a38f9bd7e98b9ef982ea51c2ffccbdaf3595a9c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-07-06 15:20:47 +00:00
Orgad Shaneh
b643f33ee4 Git: Limit size of conflicted files list
Change-Id: I98996eee080ca25b812b53d02a89f45fdcdf3c52
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-07-06 12:40:15 +00:00
Thiago Macieira
d6da30d77a Fix the getting of the Git author name when user.name isn't set
The config variable is not required, as Git will get the user's name
from other system settings, like the gecos field in /etc/passwd. So
adapt Qt Creator to use the same mechanism that Git does.

Change-Id: I255870833a024a36adf6ffff13ecb43cc0c45bbf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-07-01 16:02:25 +00:00
Tobias Hunger
75dc728799 Git: Remove unused variable
Change-Id: Ic5c6986cf2b8b6c1249e1b6e10ee12173583e614
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-06-30 14:58:06 +00:00
Orgad Shaneh
995e3d9802 Git: Suppress output for submodule status
It is internal, no reason to expose it.

Change-Id: I7612cfa58cefa22b63635cab66498186b390da8b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-23 15:15:13 +00:00
hjk
56f9729a10 Git: Remove last user of Core::Id::fromUniqueIdentifier
Change-Id: I049a89a17341205275f68b22fe18234c756dec78
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-06-23 13:34:09 +00:00
Tobias Hunger
e0c5ff03ec Vcs: Do not crash when stopping running commands
Drop the connect once the editor gets killed. Remove the QSignalMapper
and replace it with a lambda to facilitate that change.

Task-number: QTCREATORBUG-14613
Change-Id: I1a5990bf37af88092933143ebb78dd5ceb9c1222
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-06-23 09:17:45 +00:00
Orgad Shaneh
2a11548703 Git: Fix Stash & Pop for synchronous actions
After a successful Cherry-Pick or Revert, a ConflictHandler needs be
instantiated in order to call endStashScope.

This was broken in b6608d0d3.

Change-Id: I2e828fa87695b9ac9972fca569e473b5f63abfec
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-22 09:20:19 +00:00
Orgad Shaneh
c621768b29 Git: Show original branch name while rebasing
Change-Id: I104afed7d2d5f37d391b7690f81fbad07363907c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-15 08:41:22 +00:00
Orgad Shaneh
a4890d838d Git: Always warn on hard reset when there are modified files
A warning is currently only displayed for reset via context-menu.

Change-Id: If01c6c58dfe8ad0d066f4c6fe02ea3d7bb2c8a55
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-11 09:02:52 +00:00
Orgad Shaneh
e0671c0d78 Git: Fix detection of line with whitespace in commit highlighter
Git strips trailing whitespace.

Change-Id: Ie0d3fa85007d4cd3646424faa772a904edc55966
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-11 08:59:54 +00:00
Tobias Hunger
5a2459d1e1 VcsBase: Make some slots protected and update users accordingly
Change-Id: If38be72e9037126b6b697c5064a07de29a2ef8e5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-06-11 08:41:01 +00:00
Marco Bubke
b29f69b944 Gerrit: Fix build
Change-Id: I0e0da912562ffafc92f45b96b0bdd61813ccb24e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-10 16:25:32 +00:00
Tobias Hunger
be0aa40520 Gerrit: Remove method that is used only once
Change-Id: I6a65cf7dcb2e5e0f0cff46fd11092799254023be
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-06-10 14:43:26 +00:00
Tobias Hunger
3abdad568d Gerrit: WS fix
Change-Id: Ic0b6a36033830f7f67fb3ba5eb8554cdbc295ba0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-06-10 14:12:06 +00:00
Tobias Hunger
467cb4a186 Gerrit: Use Qt5 style connects
Change-Id: I54f2f02f93fc99b896dc479f390f63611ab22e98
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-06-10 14:11:43 +00:00
Tobias Hunger
ea476ffc39 ShellCommand: Store workingdirectory in the jobs
Not all jobs of one command can run in the same directory, so
prepare for having individual working directories per job.

Change-Id: Ice43361fe54f2b7153ccd38435f6108d83570082
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-06-10 12:05:31 +00:00
Eike Ziller
4f927e4c87 Move "open" from IEditor to IDocument
For non-editor documents it currently is not used, but for editors it
makes more sense to have that on the document instead of the editor.
Most actual implementations of "open" were done in the documents already
anyhow, because it is needed for reloading.

Change-Id: I29d4df2078995cbe80172b51a9bebeecb3afad3c
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-06-10 11:21:17 +00:00
Eike Ziller
e00aa54f4e Add override keyword to IEditor & TextEditorWidget implementations
Change-Id: I403101d788d9edfea5c5c9440ab4f39ad00e81f7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-09 04:17:42 +00:00
Orgad Shaneh
4aa5116694 Git: Re-disable timeout for interactive rebase
Broken by be3e0438c6.

Change-Id: I2d22a47b764940e9c36847f2c6ea6c8e29cb29de
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-27 09:55:05 +00:00
Tobias Hunger
3d0b690d31 Git: Replace CloneWizard with a Json wizard
Change-Id: I2188c083665acc239bc98bf857ff57b071805fbc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-18 13:43:39 +00:00
Tobias Hunger
ef56bc6be0 Git: Make initial checkout more verbose
I tried this before and it did not work...

Change-Id: Ia503e1d9c72c6bec7e8fdb68c683a6666f32f851
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-18 12:11:04 +00:00
Tobias Hunger
94dc35694a CheckoutWizards: Use IVersionControl::createInitialCheckoutCommand
Change-Id: I09dd38f66b9cad46d561493c2e27a833595d8728
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-11 13:22:49 +00:00
Tobias Hunger
caca9dfa6f CheckoutWizards: Simplify code to look up specific pages
Change-Id: I0098e17585d73e05632027676e7712ef9c843da2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-11 11:52:00 +00:00
Tobias Hunger
75f067550f IVersionControl: Add method to get a ShellCommand for initial checkouts
Change-Id: Iabc056dad186d788003b221afb34303c37fef728
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-11 11:51:53 +00:00
Orgad Shaneh
79d3d23488 Git: Use side-by-side layout for Fixup Previous Commit
Similar to simple commit layout.

Change-Id: If9470d47159cba21f11aefc8e2cc4895d10ff409
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2015-05-10 20:10:44 +00:00
Tobias Hunger
a44c403b5f ShellCommand: Rename some signals
Rename the signals used to report stdout/stderr to make it clearer
what they actually do. Remove some unimplemented private member
functions while at it.

Change-Id: I7e856f906ccb45964f3b1b64336d4d8ebca7b9ee
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-07 13:07:14 +00:00
Tobias Hunger
eec0a03212 Vcs: Split up VcsCommand
Move the biggest chunk into Utils::ShellCommand, add some Qt Creator
specific magic in Core::ShellCommand and leave the rest in
VcsBase::VcsCommand.

Change-Id: I5fe6f7076e96023ad2164bcfaacfb3b65a7ff8a8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-04 15:27:25 +00:00
Tobias Hunger
c7c785ace3 Vcs: Push the binary into the Jobs of VcsCommand
This is the first step to generalizing the class for wider use.

Change-Id: I40ccb5bec4fdcb9d0a67388160c867799331007b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-29 08:40:46 +00:00
Tobias Hunger
94af581dd8 Git: Make git show a bit more robust
Change-Id: I5d0dc3bb43753f7b2ac9c308944f327537547d76
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-23 15:52:00 +00:00
Tobias Hunger
bd1ee39991 Git: Remove duplicate arguments
BaseController already adds -M and -C for us.

Change-Id: Ifb64e78a4eba5f43b6fbe2a701f087ebf38db45a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-23 15:51:46 +00:00
Orgad Shaneh
edf1d0d513 Git: Fix diff for renamed/copied file from commit editor
Change-Id: I8100c3f029687d5d0b7af6a8f4c29cf939ee93e6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-21 10:43:27 +00:00
Orgad Shaneh
9e1e11db60 Git: Detect renames and copies on diff
Change-Id: I96e822df7eb5a0fc85108163a7ecf7b5e2a98d58
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-04-20 14:36:47 +00:00
Tobias Hunger
49aa04bf1e Git: Use colors from theme
Change-Id: I1627f7d55d50f302f76c591345c021a3b400e43e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-04-17 11:56:23 +00:00
Eike Ziller
50fe3585a8 Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/libs/timeline/qml/MainView.qml
	src/plugins/git/gitclient.cpp

Change-Id: I0b6ec7b9a592014deb0dd2e1145b19dd6753b1c3
2015-04-15 17:45:47 +02:00
Tobias Hunger
3d6d33f60d Fix printing of seconds and milliseconds
We use a space between the number and the unit and use 'ms' or 's'.

Change-Id: I689a8639c2d33c2f97789455b1e05693be0b2ccb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-04-15 13:06:56 +00:00
Orgad Shaneh
ec2d13641b Git: Suppress stderr output for fully synchronous executions
Broken by dcdcf54048.

Change-Id: I32f56bb432dfd3ce26397fd41908c6823cd4d7f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-15 12:48:54 +00:00
Tobias Hunger
5a2b5036ab Git: Get rid of findExistingVCSEditor
VcsBaseClientImpl::createVcsEditor does do the same check.

Change-Id: I89c8d954e8d104261d8ee51a098b97110b4538f4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-15 12:24:35 +00:00
Tobias Hunger
ee7a47681b Git: Use vcsExec in favor of plain VcsCommand
Change-Id: I9e422d3ef7749f37323edf1f85d1c65b8c60344a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-15 12:24:29 +00:00
Tobias Hunger
be3e0438c6 Git: Rename asyncCommand to vcsExecAbortable
This name makes it more clear what the method does.

Refactor to use VcsBaseClientImpl::vcsExec.

Change-Id: I4cf742c2b172d2589bd7d6740461e4a4c8d470ed
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-15 12:24:24 +00:00
Tobias Hunger
d45dea6cf8 Git: Move executeGit into VcsBaseClientImpl
and rename it to vcsExec. Accept a QVariant to set as cookie on the
command instead of a int for the linenumber.

Change-Id: I8240b53e775ac3883f92bdbf7b111abeeeb39426
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-15 12:24:20 +00:00
Orgad Shaneh
5bf6cfb381 Git: Suppress double logging of commands
appendCommand() is already called by runVcs.

Change-Id: I215ac00d0efc36e5f62865d7d2cf9941533a160d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-15 10:31:54 +00:00