Commit Graph

2048 Commits

Author SHA1 Message Date
Petar Perisin
bf3c8601ef git - add files for commit that are inside untracked folders
However, files need to be part of the current project to be added to the
list.

Task-number: QTCREATORBUG-9153
Change-Id: Ifb7a4684e85d0ccd688956eeff77b4cc7d807911
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-05 21:48:44 +02:00
Orgad Shaneh
164955a4e0 Git: Use top level for stash working directory
The message in stashPrompt doesn't make sense with an inner directory

Change-Id: Iddbea519915cd22a6882dcafb705d1ed99106db6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-05 18:32:29 +02:00
Petar Perisin
d567c60061 Git - bugfix with empty string in findRepositoryForDirectory
Change-Id: I44f68ad59d10e9751d09ed6e0f959d2a78d53822
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-05 17:02:22 +02:00
Orgad Shaneh
465654b83a Git: Add Reset to locator
Change-Id: I81b52b8f349cfd5e9d67bd48b0be32c48e5b2f8e
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-05 13:24:20 +02:00
Orgad Shaneh
63cf15b180 Git: Start interactive rebase in topLevel
Change-Id: I99edfed36b12942e64ee1947a46eddd1ca08b9ba
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-05 13:24:16 +02:00
Orgad Shaneh
2ee83d4c9e Git: Fix stash pop on end of a continuous command
Broken in 92392454b7

Change-Id: I4e3d3b1c2fbec66c5471baedf1996529b852b868
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-05 13:23:44 +02:00
Eike Ziller
7c8db79817 Switch less often to edit mode
This change
* Removes IMode::type, ModeManager::activateModeType, and
  IEditor::preferredModeType, and adds IEditor::isDesignModePreferred
  instead
* Adapts the mode switching code in EditorManager to handle multiple
  windows, for example switching to edit mode should only happen if
  the editor/view is in the main window. Otherwise the editor window
  should be raised and focused
* Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor
* Reverts the EditorManager::ModeSwitch logic to switch mode or
  make the current editor visible by default, introducing
  DoNotMakeVisible flag instead
* Fixes a few instances where EditorManager::ModeSwitch should have been
  used

One non-trivial problem left: If you open a .ui file and switch to an
external editor window, edit mode is activated, because the current
editor no longer is a .ui file, which means that the design mode gets
deactivated.

Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-05 09:43:14 +02:00
jkobus
f99ce422b4 Remove unused code
Change-Id: Icc4bb2648fc4e18e95216012ce08365940a80937
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-05 09:16:34 +02:00
Petar Perisin
046fd0523d Git - remove unnecessary member m_createRepositoryAction
Change-Id: I3b3f72c5699e63f3f273b1564ea0a093b6c9725b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-04 23:34:16 +02:00
Petar Perisin
45e6edaf3a Git - fix bug with empty working directory in ChangeSelectionDialog
and also remove unnedded command.

Change-Id: I6c20f2061fc3628693d80ad01fe23c1a835ca127
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-04 23:12:53 +02:00
Petar Perisin
808afcfbb2 Git - made Clean List support submodules
Change-Id: I106420e8492d64451eee3648800ce57a4de2bfb9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-04 21:14:12 +02:00
hjk
8510c2ab2b Git: Try do consolidate code duplication
Change-Id: I5ac34d96152d6e4f9abc8f6dd18d1e1eab0bde7f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-06-04 13:20:33 +02:00
Petar Perisin
36bec480ae Git - execute push asynchronously
Change-Id: I0d5b0eaf562d30f34f01bcf344791a4ce766bdab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-04 10:59:38 +02:00
Petar Perisin
dd7c2e622e Git - refactor executeGit and remove unnecessary args
Change-Id: Idf770a20db66191b4d7fe3a704d31bdce70505c5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-04 10:59:06 +02:00
Petar Perisin
80a7107691 Git - execute fetch asynchronously
Change-Id: Ic2243adaa36444099f834676186331927f3f4588
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-04 10:58:56 +02:00
Orgad Shaneh
1f447715b0 Git: Remove double warning for gerrit push
Change-Id: I5581521753fa525c6bb9f53725c28f947c8bbd44
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-04 10:43:54 +02:00
Orgad Shaneh
92392454b7 Git: Do not pop stash if a command is in progress
Running interactive rebase and choosing edit for a commit causes
stash pop when the commit is expected to be edited

Change-Id: I37249e8486b609dedba143bd130059444f882303
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-04 10:43:35 +02:00
hjk
3814e262ff DiffEditor: Rename DiffEditorEditable to DiffEditor
More in line with current naming conventions.

Change-Id: I63f6677bd12d82f6749032996585d761f1a74fb7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-03 17:28:48 +02:00
Orgad Shaneh
5d39fcf7cf Git: Better wording for rebase in progress message
Change-Id: I13d002773dd81206c70b7eb91727f152d7e84507
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-03 10:41:30 +02:00
Orgad Shaneh
3f1901cb1f Git: Provide a real highlighter for interactive rebase
* Kate highlighter doesn't have enough colors
* It works out of the box only on Windows
* New editor support links

Change-Id: I09bbaef08574660e535ccb86c2c460d5976fc2e3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-03 10:40:32 +02:00
Orgad Shaneh
3e022beb12 Git: Move submit highlighter to a separate file
Change-Id: I61e07b2abe3b1da1b56935bb3ce528a5f571705f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-03 10:37:48 +02:00
Orgad Shaneh
bcd8c02aea Git: Prevent or close fixup editor if no local commits are found
Change-Id: I546241fb3531cbc542b97d6d0f53382c9225dcf4
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-03 10:36:22 +02:00
Petar Perisin
55e087ab05 Git: fix bug with Log and Blame not showing stuff correctly.
Task-number: QTCREATORBUG-9375
Change-Id: I4e18e4c2d4db71392aa305d49ffce924f8451a0b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-03 09:28:11 +02:00
Orgad Shaneh
05a6fc48ba Git: Support change links on commit editor
Useful for commit messages with "reverts <hash>" for example.

Can later be extended for interactive rebase

Change-Id: Ibf77433ecddfacbd8d443636ddbc406bda474aa7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-31 14:53:02 +02:00
Orgad Shaneh
f3eedaf300 Git: Warn when commits are not found
Change-Id: I5e03853f0b658d7f246538ca90e35f38cc2f49d4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-31 14:44:46 +02:00
Orgad Shaneh
2d68f9c808 Git: Avoid version warning when Git is not found
Task-number: QTCREATORBUG-9411
Change-Id: I0bb90e508b78d0e7c7ff86fda72399036ad665ae
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-31 10:46:03 +02:00
Eike Ziller
00f3fc2846 Make option for diff viewer in git options clearer
Change-Id: Iae0f427ed447430c82852c967022bc30ee4e88d1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-05-31 06:23:36 +02:00
Petar Perisin
77c136646b Gerrit - Removed all patch set stuff
Change-Id: I013c116fc7e0ac1571513005b8ea49992e0771a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-05-31 06:08:35 +02:00
Petar Perisin
2b903b46d3 Git - added dummy locator actions
for Merge, Rebase, Show, Cherry Pick, Revert and Checkout.

Task-number: QTCREATORBUG-9405
Change-Id: I9a10d93382248ca86fe566bf1dccf4d390601aaf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-30 10:21:36 +02:00
Petar Perisin
86d7e28db4 Git - added submoduleDataMap to handle submodule data
Change-Id: I8462ed07f3d1edce5c7f5ab8c166ce8c68b6d4b3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-28 21:53:26 +02:00
Petar Perisin
beac53ad8d Gerrit - use new diff editor for diff
Change-Id: I7ba84491a5f6796ff446c2e21487ed4c04441b82
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-28 10:25:26 +02:00
Orgad Shaneh
e9f901be15 Git: Don't pop VCS pane on stage
The command is appended anyway, and it usually produces no output
to stdout

Change-Id: Ie5f685b090ead8a0e888c9c0cfa6db2411e91f33
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-28 10:02:43 +02:00
Orgad Shaneh
5374a4f3cd Git: Use OtherContent type for commit
Change-Id: Ic0d31a1131f559d1dfa2c880d72c68720d378d1f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 17:55:10 +02:00
Orgad Shaneh
b75cf96868 Git: Refactor stash handling
* Replace RebaseManager with ConflictHandler
* Store StashGuard in GitClient, allow popping after
  a whole process is done (e.g. pull with resolved conflicts)

Change-Id: I85784f32f515ff896c73f35303c7de26f8006f59
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 10:43:44 +02:00
Orgad Shaneh
829357b397 Git: Only execute stash if there are changes
...even when NoPrompt is specified

Change-Id: I735133e390403a0f8f6aa573d6f9c63cf0784187
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 10:00:48 +02:00
Orgad Shaneh
5d558c141c Git: Add m_ prefix to StashGuard members
Change-Id: Ice9f33e986688e8d2c5250435a30cd7cb1ac3b28
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 10:00:36 +02:00
hjk
cfc8ce8c1b Remove changeEvent(QEvent::LanguageChange) implementation
This was implemented only for a small set of widgets. It's unlikely that
we will ever have or even want a dynamic language selection, until then
this code is only dead freight.

Change-Id: I1bff4e1e89057786c0e5cb57225a508c5d390d9c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-27 08:58:51 +02:00
Petar Perisin
e835b57fc2 Gerrit - Added Shortcuts to Gerrit Dialog
Change-Id: I048ea80b48d693b7d44769e1f538d0c0050dbe2d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-26 15:08:45 +02:00
Petar Perisin
b28ae07274 Gerrit Dialog - renamed "Apply" to "Cherry Pick"
Cherry pick is git command that everyone who works with git knows. First
time I saw "Apply" I thought it was some git or gerrit command unknown
to me. Renaming it to "Cherry Pick" makes dialog more clear, since user
knows what command will execute when button is pressed.

Change-Id: Ifbcad697ef5f5909a36dc008f716025d48a26ad0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-26 15:08:36 +02:00
jkobus
b43027ac38 Git - Use new diff editor also for show and diff branch
Change-Id: I94d28dbc1cc5f753beda2284244bcd5c2c9df236
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-24 14:49:50 +02:00
jkobus
2ddb726dd5 Add file list combobox to diff editor
Change-Id: I2a40207ed3c4a5c07ba544d681aed6649a0b1a11
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-24 14:14:06 +02:00
Orgad Shaneh
5832945835 Git: Move GitSubmitHighlighter to header
And change it to derive TextEditor::SyntaxHighlighter

Required for reusing for a BaseTextDocument

Change-Id: I034b76e03e447bcc47f11833367f7bba9cc031c1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-24 12:30:13 +02:00
Orgad Shaneh
7bfaf7a946 Git: Provide a commit editor for files opened externally
Change-Id: I52fccf36cca032dda36102d4be2654eb7461de64
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-24 12:29:49 +02:00
Orgad Shaneh
a9d9d44494 VCS: Rename RegularCommandOutput to OtherContent
Change-Id: I37d47c79f0efaf51eb5afd1fe529aacfadff8ee1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-24 12:29:34 +02:00
Orgad Shaneh
05ef32f242 Remove Nokia leftovers
Mostly internal mimetypes

Change-Id: Ia84206f1334c1f83474cbc307e848719bb98adbc
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-24 12:29:23 +02:00
Orgad Shaneh
fd48f081c6 VCS: Remove unused extension parameter from editors
Change-Id: I17e73e269698af0d515f668d3c272a748cdca3bb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-24 12:21:26 +02:00
jkobus
a033beecc8 Simplify code
Change-Id: I1576c3b8d370fdae660a399654b77af11a5f5d36
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-23 10:19:23 +02:00
Tobias Hunger
24ee641543 Fix dependency information according to output of dependency checker
Change-Id: Ic1259f04f4120b6e495ebb3672f7f360c71cba7f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-22 16:41:39 +02:00
Friedemann Kleint
292cfce0df Fix change selection dialog.
Remove context help button and prevent it from showing up at 0,0
by setting a minimum size only.

Change-Id: I41d019b0074a47a20ecacd557f1ea05235dda995
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-22 12:38:20 +02:00
Christian Kandeler
a78fa5fd9c Git: Fix include from ui file.
In the case of a shadow build, a relative local include will only
work by accident, if at all. Use a global one instead.

Change-Id: Idc2636d519ea19a3325c861cdcb1dcfb6e0a5920
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-21 13:18:25 +02:00