feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
29,818 Commits 108 Branches 368 Tags
3e022beb1235cf74cc2bbe30711858bf5c47d433
Commit Graph

828 Commits

Author SHA1 Message Date
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
Orgad Shaneh
c60ab1ca3c Git: Fix object leaks 
Change-Id: I0efb368782ffb66cf6b8d39650fe7840c5ef2501
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-17 17:59:10 +02:00
Orgad Shaneh
3723bc12d4 Git: Set HOME variable by default on Windows 
Change-Id: Ib780f794acfc58753b139174ea3ea90bee542a38
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-17 11:43:45 +02:00
Orgad Shaneh
74a512892a Git: Use Git process environment for Gerrit plugin processes 
Change-Id: Iab0124d3aeed189c5ffd900c02ce6b87293b9c79
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-17 11:42:14 +02:00
Leena Miettinen
bc9bb4b93c UI text: fix VCS related strings 
Fix capitalization and punctuation and a typo.

Change-Id: Ie974594878aad6dec558516b2d31b202e8c732d4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-05-16 14:33:32 +02:00
Petar Perisin
84520b37e7 Git - fetch from all remotes in repository 
Change-Id: I024e6905ad9ef246bf30b898c654ba99e73b42e9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-05-15 19:53:05 +02:00
jkobus
97a86c50dc Basic integration of diff editor inside git plugin 
Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-15 16:24:38 +02:00
Petar Perisin
f5ccdb6b23 Git - modify way to get remotes 
Need to use push remote, and not fetch one because of gerrit plugin
checks if remote url contains url set in gerritSettings. This needs push
and not fetch url.

Change-Id: If738e5c46f90ad00dc4616a2d109cab7a193620d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-13 20:59:46 +02:00
Orgad Shaneh
20c3d45409 Git: Output standard error on commit success 
post-commit or commit-msg hook might print useful information even
without failing the commit

Change-Id: I91b6ccfc43f1d148fb773ae074b2668927815235
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-13 11:41:29 +02:00
Orgad Shaneh
d158226c10 Git: Add copyright header 
Change-Id: Ie84922a3f8f521812627f77ac729c8626f87d469
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-05-10 13:03:08 +02:00
Orgad Shaneh
566d3d9d9b Git: Enable commit selection in Push to Gerrit dialog 
Change-Id: Ie0ca8322858ac75d4bacf8b3efe66fa40577e3a2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-05-07 11:50:51 +02:00
Orgad Shaneh
cd2722b1a0 Git: Fix changing remote in GerritPushDialog 
Change-Id: I881a0402b4ba2fd887e62e02cf64406324bd9dbe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-07 11:49:50 +02:00
Orgad Shaneh
e836cd082c Git: Prefer remote tracking branch in GerritPushDialog 
In case it contains the latest remote commit

Change-Id: Id9e4cc40b7d1aa9daac3a9a2cf9ba41f589da7eb
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-07 11:01:08 +02:00
Orgad Shaneh
1f38110dad Git: Preserve reviewers list in GerritPushDialog 
Not stored in settings (it is not important enough), but usually
the same reviewers are required for consequent changes

Change-Id: I28564791419ac441478db65e51b09189b9f2f196
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-07 11:01:00 +02:00
Orgad Shaneh
df767f1c48 Git: Fix leak when GerritPushDialog is canceled or fails 
Change-Id: Id7479f44ee01f68e1423cc8346bc80f78ddfedb4
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-07 11:00:54 +02:00
Orgad Shaneh
838ce020a8 Git: Some cleanup in GerritPushDialog 
Change-Id: I452f7d929d9abc1224fa9f694c106345dcc96caa
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-07 11:00:47 +02:00
Orgad Shaneh
002fa92a34 Git: Fix validation in GerritPushDialog 
Change-Id: I1764ccd4950d5d5fee3cbd00515716ef5f524bf0
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-07 11:00:40 +02:00
Petar Perisin
6e677a97fb Git - use appropriate working directory in ChangeSelectionDialog 
In case Working Directory is changed in dialog, use new one for command.

Change-Id: Iea2e71d3695fff49a6375d19d723f4d62a092c2f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-05-07 08:59:20 +02:00
Nikolai Kosjar
b3033381cb Git: Rename "Cancel" to "Close" in ChangeSelectionDialog 
Change-Id: Ib3dbfa8c3dc3b187d53ad004ffab29fb87c9aa2c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-05-06 16:15:41 +02:00
Nikolai Kosjar
fd0cf19cfb Git: Specify shortcuts in ChangeSelectionDialog 
Change-Id: If4f734e7a93246732f2e618feb107af598a79faa
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-05-06 16:15:32 +02:00
Orgad Shaneh
c45e4e614a Git: Do not return empty string for top commit in LogChangeDialog 
Change-Id: I26cff005974102c037bbbff04b7606e7f8a07b84
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-06 10:54:45 +02:00