Commit Graph

2048 Commits

Author SHA1 Message Date
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
60fa56db8e Git: Initialize remote model directory even when no remotes found
Task-number: QTCREATORBUG-9789
Change-Id: If3626e244b9d85ad670d586438710e17bba8e927
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-29 10:33:18 +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
Orgad Shaneh
5d1d2d2b62 Git: Fix autostash for branches
Broken by 771fe03cfe

Change-Id: Ifb629535d2197bbee771050c94952068834614f3
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-07-28 18:04:43 +02:00
Petar Perisin
2ac65aaa7c Git - Add Cherry Pick in branches dialog
Change-Id: Ic01846e3f8622cfa7b6c6ada8b626af6fa8cb3e9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-24 17:28:58 +02:00
Orgad Shaneh
39755c09b9 Git: Only show Tags root node when tags are enabled and exist
Create it on demand. Remove on clear

Change-Id: Ic29e82a859f99b5d739c25be83aa6c40a1ee2cc8
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-22 12:38:54 +02:00
Orgad Shaneh
ea424a076c Git: Use enums instead of numbers for branch root nodes
Change-Id: I52e9fce33c2a157389a88377e2f24695e8c3722d
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-07-22 08:08:45 +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
Nikita Baryshnikov
61367fc6ab Git: fix crash in branches dialog
When tags are not shown in branches dialog, selecting of any item in
branches list causes crash

Change-Id: I8bfb66202f486c175a14c59f17b43df21ff596ff
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-07-19 14:21:13 +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
8c2e3fd2cb Fix usage of EditorManager::editorsForFileName
And move to using the corresponding method in document model.

Change-Id: I80b12ceab8a91c5393b9c0422d660a8896ae09d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-18 14:51:39 +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
Eike Ziller
5563604876 Merge remote-tracking branch 'origin/2.8' into HEAD 2013-07-18 11:54:02 +02:00
Erik Verbruggen
0e62487fb3 Git: fix compilation failure in Qt4 specific code.
Caused by 762099487c where a memory pool
was introduced to fix memory leakage.

Change-Id: Ib2f7c53e9560ff473fcdfedd6dcfce50455095da
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-17 14:31:46 +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
Petar Perisin
771fe03cfe Git - couple fixes in branch based auto stash
- do not start stash scope when creating auto stash
- return if reset fails

Change-Id: I471abc1d430351192c46ac78041949ba81f11b09
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-07-15 16:51:46 +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
Eike Ziller
21f63c24c7 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1310d473584f1e2cd44008d45747c868103bbde1
2013-07-12 10:39:18 +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
Orgad Shaneh
457b5e2969 Git: Prevent double stash pop on branch checkout
when Move Local Changes is selected

Change-Id: I2c52e7fde56020370251c6eb93ed3f342fb8d9d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-07-11 12:52:06 +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
Eike Ziller
113c5600c9 Move displayName from IEditor to IDocument
The display name is not editor instance specific, but belongs to the
document.

Change-Id: I3c936f04a86e10e6ca30063d85036d85b4b5880e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-10 17:26:15 +02:00
Orgad Shaneh
3eacb444e9 Git: Prevent another crash on checkout
Crash happens if the repository has a submodule with local
changes that requires updating (commit changed between current
branch and new branch)

Since we already refresh for every repo change, just add "expect"
for checkout and remove the code accessing the deleted index.

Change-Id: Ic464129a2f001e017244fdf719b282dcbd9dffa4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-10 12:51:06 +02:00
Orgad Shaneh
062b8f5d31 Git: Set remote-tracking branch
Task-number: QTCREATORBUG-8863
Change-Id: I06df735d85e2f9ed17c71385fed5057f8fc67d55
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-10 12:50:50 +02:00
Eike Ziller
cc7c3c9623 Add QTCREATOR_COMPAT_VERSION
Necessary for keeping compatibility within a minor series.
When bumping versions, the compatVersion now needs to be taken into
account too.

Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 15:14:10 +02:00
Eike Ziller
dd43d9908f Rename IDocument::fileName --> filePath
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 13:51:42 +02:00
Orgad Shaneh
41b51ff67f Git: Preserve reset type
Task-number: QTCREATORBUG-9666
Change-Id: I364bc0eefef376a9a14953b259e9d7b2eb29c228
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-09 12:00:07 +02:00
Orgad Shaneh
02512e234e Git: Use direct settings member instead of accessors
Change-Id: Iba2954934218bec92716a8df1c04fe9347defd17
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-07-09 08:50:54 +02:00
Eike Ziller
a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
2013-07-08 15:01:17 +02:00
Orgad Shaneh
2c21100725 Git: Disambiguate branch/tag names
Task-number: QTCREATORBUG-9700
Change-Id: I48e779fba65afc71ba13b426e526c3cb82070142
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 13:28:23 +02:00
Orgad Shaneh
b2a09f7b45 Git: Rename branchName -> fullName
The model can contain tags

Change-Id: I70a75534848232476447125801a5ca7e963bbdcc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 13:22:31 +02:00
Orgad Shaneh
2af4c05b8c Git: Use -x for cherry-pick
Change-Id: Iaa6bfdaa1307a3c7a73fd80fb0ffe3b80a01312d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 13:21:47 +02:00
Orgad Shaneh
aad68917b9 Git: Always allow stash before cherry-pick/revert
Currently done only from "Actions on Commits"

Change-Id: Ide34e198e72f554ba6fd75ef21aaaf35917b4f6a
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 13:21:41 +02:00
Orgad Shaneh
8aa1c9bc37 VCS: Remove removeColorCodes
status output can be uncolorized using the git config value
color.status=false (works for short status since git 1.7.0)

Change-Id: I0887ab9a02f4c98fe54a94a53ffcd4f91fef8699
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 12:47:56 +02:00
Orgad Shaneh
54b7146986 Gerrit: Notify on invalid configuration
Task-number: QTCREATORBUG-9548
Change-Id: I4c5f9a4c6b7a818d296a923df1d665c22afd8292
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 12:47:03 +02:00
Orgad Shaneh
ffdd317773 Git: Support remove/rename for tags
Change-Id: I737d2405ef1a10ec451c4baceaea9a0bc194ac1e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 12:43:13 +02:00
Orgad Shaneh
0ae3d29a66 Git: Simplify button enabling conditions in branches
Change-Id: I6484dd62eac80e1e4aba00890926e7dfb542f0be
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 12:30:34 +02:00
Orgad Shaneh
45ccd7d919 Git: Fix crash on checkout branch
Task-number: QTCREATORBUG-9756
Change-Id: I3bdba870737bbffde6c0e6a9046a58ba78f097be
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-08 11:24:03 +02:00
Orgad Shaneh
a6626b49c4 Git: Reorder reset types
Hard is now the default (as it is in 2.7), and the types are
properly ordered

Task-number: QTCREATORBUG-9733
Change-Id: I54fb22543bf31f43381e57fb0acf4aeb15e8a293
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-07-06 20:18:52 +02:00