Commit Graph

2048 Commits

Author SHA1 Message Date
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
Orgad Shaneh
9228587b8e Git: Hide remote in Push to Gerrit dialog if there is only 1
Change-Id: Id4b701e16f6edc74b2ad19b5255d84ceca5ec216
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-06 10:35:44 +02:00
Orgad Shaneh
325c0beda5 Git: Show commit on double-click in fixup editor
Change-Id: I8cb08b0fcba3ddac7223b39b3762ff71e8d61f8c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-06 10:25:10 +02:00
Orgad Shaneh
ec84dd058a Fix indentation
Mostly 3 leading spaces converted to 4

A few other indentation issues

Change-Id: Ib0db5925cac4d2999faf5699cd570884cbcd4863
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-06 08:38:50 +02:00
Orgad Shaneh
aa5b049561 Git: Improve LogChangeWidget
* Enable display of local-only commits
* Enable specifying a top commit

Change-Id: I0688ba9ac670f709d2044ae2b7bff081fd86c860
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-04 20:01:23 +02:00
Orgad Shaneh
8695fe6d7c Git: Implement "Fixup previous commit"
Change-Id: Ia2584ff975ed0db614dc878a70ce4adbd5c3ba67
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-04 20:01:04 +02:00
Orgad Shaneh
5d325f6b1a Git: Use StashGuard inside RebaseManager
If the rebase succeeds without conflicts, pop

Change-Id: I4f0c6ad3061f4f69f7e5c9450f972cce5c15227d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-04 20:00:39 +02:00
Orgad Shaneh
fb40fd8297 Git: Allow reviewers specification in Push to Gerrit dialog
Change-Id: I6126411209d73797cc7e4f7c15a6a49b50366c63
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-04 19:59:44 +02:00
Eike Ziller
a2171c2d82 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
2013-05-03 09:49:28 +02:00
Orgad Shaneh
be7f73308c Git: Use consistent ordering for Merge Tool dialog
On Windows it is "Ignore, Merge Tool, Skip, Abort", while on Linux it is
"Merge Tool, Ignore, Skip, Abort"

That makes Ignore default on Windows, which is confusing

Change-Id: Id7e9e8dd6fd5748d518de4d94db47ae075268627
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 17:30:57 +02:00
Orgad Shaneh
20f1208e0f Git: Pass CommitData by reference
It is used for both input and output, the pointer is assumed
to be valid

Change-Id: Iad9a82dfb5ea4850584d4da848076699cddd23c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 16:52:55 +02:00
Orgad Shaneh
06da25f610 Git: Add commit type to CommitData
Change-Id: I900f3dd89eeeac61e29604ac459d36ecc6c0aa8f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 16:52:10 +02:00
Orgad Shaneh
cb055c1d0f Git: Simplify editor code a bit
* Introduce a const submitEditorWidget() and use it
* Directly use layout from ui

Change-Id: Ib566bab464d4f1c08a3f2af0edb5e1fa989c3160
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 16:47:19 +02:00
Orgad Shaneh
c702639a8e Git: Factor out the central widget from LogChangeDialog
To be used for "amend previous commit" feature

Change-Id: Id1190d67bdd1a3dd3866a6a0f9d41be5f9baaa4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 14:38:05 +02:00
Orgad Shaneh
7b851602cc Git: Use an enum for simple/amend commit
Change-Id: Ibea0a1f2826c67796a56414326fe6afdee654576
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 14:38:00 +02:00
Orgad Shaneh
2b41210b3f Gerrit: Add accelerators for Push to Gerrit dialog
Change-Id: If806dd9b8aefcc1ecaccf326bd08ad1fc23d71c8
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 14:37:49 +02:00
Petar Perisin
f4eabcfa0e Git - ChangeSelectionDialog select from recent history
Change-Id: Ib87f9bd997a5c7c07abfd56a05d9e454c1a9ea93
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 13:37:05 +02:00
Orgad Shaneh
711315f383 Gerrit: Add topic in Push to Gerrit dialog
Change-Id: I4f2df0d40d7518b1a88595ad2ff52fd50b8ac92d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 13:26:29 +02:00
Eike Ziller
bedc477943 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
2013-04-30 11:43:33 +02:00
Orgad Shaneh
cb02e45b4a Git: Fix commit message highlighting
Fixes the following pattern:

    Subject

    # comment

    Another line - considered as subject

Change-Id: I708521efde886c6f5be748795251ce0aafc8f590
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-29 14:45:29 +02:00
Orgad Shaneh
5383c4581c Git: Use bold instead of italic for decorated commits
Italic is harder to read, especially when there are many of them

Change-Id: I15bf054356a996308820e5c7969041933aeb538a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-29 12:38:04 +02:00
Orgad Shaneh
f1a622a779 LogChangeDialog: Show 40 entries
Change-Id: I96c41cac8426c7de65671c787691ad302fe77ded
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-29 12:34:04 +02:00
Orgad Shaneh
fafe964c71 Git: Fix commit message highlighting
Task-number: QTCREATORBUG-5874
Change-Id: I287a7fbd2d1a3c39983d7a9ac820b190250a6484
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-29 12:33:40 +02:00
Orgad Shaneh
40d001694b Git: Use synchronousParentRevisions to retrieve parents
Replace explicit 'git log' call

Change-Id: I7fd3821d9a321d84fa25bad4bd0a4525fee11993
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-29 11:34:12 +02:00
Orgad Shaneh
86c2342ed2 Git: Fix Precedes/Follows display for show opened from log
Change-Id: Ib999f8f00b065e4e51b70f1c5f81bdd17baabd8c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-29 11:13:42 +02:00
Andre Hartmann
d61a4f1ba5 Git: Fix closing namespace comment.
Change-Id: I886bbbf886439d3d2b484afb2af2131e7c696e65
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-29 11:12:01 +02:00
Orgad Shaneh
a5962841cf Git: Support graph log for all log types (file, project, repo)
* Added a Graph toggle button for log editor
* Hide diff parameters when Diff is off
* Remove GitClient::graphLog

Change-Id: Ib87560bc4d6d7dbe866f0e58db8743a95df0622b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-29 11:01:05 +02:00
Orgad Shaneh
48b9747550 Vcs: Allow multiple flags in parameter widgets
Refactor combobox values to use %1 as a placeholder for values

Change-Id: I9a9bb6b9ba5c21bcaad4a3047d322856225892bc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-29 11:00:19 +02:00
Petar Perisin
81f62d3673 Git - use proper label text in LogChangeDialog
Change-Id: Ie0b9f06f411308e93dc29aa7025a960fc640a359
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-29 00:33:29 +02:00
Petar Perisin
3ce2b605d9 Git: Fix canceling interactive rebase
If the LogChangeDialog is closed without selecting any
commit, interactive rebase started with '^' as the commit.

Change-Id: I6292c700f61e5d075953ecc371d0916342096801
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-29 00:33:17 +02:00
Petar Perisin
571672c414 Git - capitalize command in progress in topic
This makes command stand out. Before it looked like regular branch.

Change-Id: I9f47e42392bb70cbd9ceec94fd4d55dc15c95b02
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-28 08:29:19 +02:00