Commit Graph

362 Commits

Author SHA1 Message Date
Friedemann Kleint
de28b61cca VCS[git], CodePaster: Add support for applying patches.
Modify CodePaster::fetch to do a mimetype detection on the
content, create a filename with the matching extension and
open that file.
This gives correct syntax highlighting  and makes "Save as"
more convenient. Keep the file around and delete on exit.

Modify patch mimetype with some content detection (higher priority
than C++).

Add a "current patch file" to the VCSBasePlugin::State. Add "Apply
patch" to git with whitespace fix.
2010-03-25 16:23:37 +01:00
Friedemann Kleint
5dd8dfba30 tr()-Fixes 2010-03-23 17:24:59 +01:00
Thorbjørn Lindeijer
66543381b0 Set a parent on git actions to make sure they're not leaked
Static leaks, but causes noise in valgrind output. :)

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2010-03-22 15:03:30 +01:00
Friedemann Kleint
751d7d043c VCS: Add 'Annotate' context menu entry to build issues task window. 2010-03-19 17:22:53 +01:00
Friedemann Kleint
bcd020f382 VCS[git]: Introduce optional pull --rebase.
Do 'git rebase --abort' if something fails.
2010-03-19 16:07:34 +01:00
Friedemann Kleint
75e7d30de3 VCS[git]: Reorganize menu action creation/Start SVN submenu.
Create actions with convenient factory functions, do enabling per
file/project/repository centrally.
2010-03-19 14:48:21 +01:00
Friedemann Kleint
bbcacaf59f Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4. 2010-03-18 10:59:06 +01:00
Robert Loehning
20ee66f86a Fixed parsing of git status so that one can check out a branch when not on a branch before. 2010-03-15 20:51:42 +01:00
Robert Loehning
8e21546009 Fixed parsing of Git branches when current checkout is not on a branch. 2010-03-15 17:14:24 +01:00
Friedemann Kleint
288ece116a VCS[git]: Add "Clean project"
in the same fashion as "Clean repository".
2010-03-15 09:18:24 +01:00
Lasse Holmstedt
68c49a65e9 Plugin manager for enabling/disabling plugins
Go to About Plugins and enable/disable plugins from there.

Reviewed-by: mae
2010-03-12 16:02:42 +01:00
Friedemann Kleint
93b156e585 VCS[git]: Add support for cleaning a repository.
Present user with a checkable list of files to be cleaned (add reusable
dialog to VCSBase module).
2010-03-12 15:54:09 +01:00
Friedemann Kleint
edf3437644 VCS/git: Add setting for diff --patience and make it default. 2010-03-10 11:19:59 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
con
58703ba73d Version bump. 2010-03-01 17:57:37 +01:00
Friedemann Kleint
c56b56be81 VCS: Minor fixes
- git status: Recognize text in case -u was passed
- Mercurial: Always run in C locale
2010-03-01 10:33:35 +01:00
Friedemann Kleint
a1fed931c4 VCS: Fix time-out handling for synchronous processes.
Introduce static utilities to Utils::SynchronousProcess
for synchronous processes that mimicks the handling
of Utils::SynchronousProcess (apply timeout after no
more data are available on stdout/stderr as opposed
to waitForFinished()).

Task-number: QTCREATORBUG-777
2010-03-01 10:06:32 +01:00
Friedemann Kleint
214679d65b Git: Improve Timeouts.
- Observe timeout setting when running synchronous commands.
- Increase Default on Windows
- Stop process with terminate first (signal).
Task-number: QTCREATORBUG-777
2010-02-26 17:43:37 +01:00
Friedemann Kleint
c0a68f53c3 Tr()-fixes. 2010-02-26 14:20:17 +01:00
Friedemann Kleint
299ea32ab0 tr()-Fixes. 2010-02-25 14:53:01 +01:00
Friedemann Kleint
d2d49bbc3f VCS[git]: Fix StashDialog selection mode.
Task-number: QTCREATORBUG-731
2010-02-19 18:07:21 +01:00
Friedemann Kleint
0dd30210dd VCS[git]: Stashdialog: Fix broken remove.
Used the wrong indexes, set focus option.
2010-02-19 17:53:22 +01:00
dt
75545a2bf0 Fix FileManager to correctly handle multiple IFile's for the same file
And port the Qt4ProjectManager to use that API for synchronization
between editors and the .pro file tree.

Reviewed-By: con
2010-02-17 16:51:02 +01:00
Friedemann Kleint
d185889351 VCS[git]: Make version fail warning less obtrusive.
Display correct warning if git is not installed.
Do not display it as error (popping up the log pane) from
IVersionControl.  Introduce separate caching flag to avoid
repeated execution if git is not installed.
2010-02-16 09:12:37 +01:00
Friedemann Kleint
b03ab1d704 Add command locator.
Make it possible to trigger actions from the locator bar by
registering an instance of Locator::CommandLocator by prefix.
Currently used for VCS systems.

Acked-by: con
Initial-patch-by: Roberto Raggi <roberto.raggi@nokia.com>
2010-02-12 16:03:08 +01:00
Friedemann Kleint
81f14bb270 Fix some code scanning issues.
QString: Use QChar/char where appropriate, do not use QString::null
2010-02-02 17:09:41 +01:00
Friedemann Kleint
9b76c068f9 VCS[git]: Implement add using '--intent-to-add' depending on version.
Implement IVersionControl::vcsAdd() using --intent-to-add with a cached
version check. On this occasion, implement vcsDelete() as well using
'git rm -f'.
2010-02-02 12:27:05 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
2010-01-29 21:33:57 +01:00
Friedemann Kleint
18ab532e56 VCS[git]: Make Branchdialog non-modal as is StashDialog.
Give dialogs a consistent look, set
WA_DeleteOnClose on them and improve updating.
Add a Refresh/Diff buttons to branch dialog.
2010-01-27 12:47:23 +01:00
Friedemann Kleint
9ac98a402c VCS[git]: Add support for stashes.
Add non-modal stash management dialog and additional menu option
"Stash snapshot..." to stash away changes prompting for a description,
which will immediately replay the stash (take snapshot and continue
working).
Add interface to IVersionControl for creating/restoring/deleting
snapshots for backup/complex undo operations (currently supported
by git only). Add test options to VCSBasePlugin.
Clean up and extend git client accordingly.
2010-01-15 12:28:22 +01:00
Friedemann Kleint
d5271a086d VCS[hg, git]: Add support for repository creation.
Add repository creation operation to IVersionControl, implement for hg
and git, add convenience slot with prompts to VCSBasePlugin.
Add respective menu options and make menus are visible in case no VCS is
active.
Change project wizards extension page to list VCS that are capable of
repository creation in a QComboBox in case the directory is not managed
by another VCS (in which case it lists that one for operation 'add').
On that occasion, polish the Project selection to use a QComboBox as
well and add some smartness to find the most suitable project to add via
path matching.
2010-01-12 16:45:21 +01:00
Tobias Hunger
b95c86db23 Remove duplicate inclusions of headers
Reviewed-by: thorbjorn
2010-01-11 10:26:12 +01:00
Friedemann Kleint
b81c30df2b VCS[git]: Add log repository action. 2010-01-08 16:07:05 +01:00
Tobias Hunger
cacdc6c736 Add display name to VCS plugin structs
Reviewed-by: Friedemann Kleint
2010-01-08 11:51:53 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
con
2e495e7075 Version bump. 2010-01-07 18:17:10 +01:00
Friedemann Kleint
bcba9ea604 VCS [git]: Annotate previous version/single filelog annotation.
Task-number: QTCREATORBUG-503
2010-01-07 17:29:14 +01:00
Thorbjørn Lindeijer
ae535daa20 Merge branch '1.3'
Conflicts:
	src/plugins/git/gitplugin.cpp
2010-01-07 09:09:45 +01:00
Thorbjørn Lindeijer
fdbdf50ce4 Fixed warnings about absolutePath on empty filename in git plugin
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2010-01-07 08:58:01 +01:00
Friedemann Kleint
40f5d38b91 Git: Introduce diff repository and group actions. 2010-01-05 16:36:27 +01:00
Friedemann Kleint
c55b5b7b31 Git/SVN: Ignore whitespace in annotation/blame (introduce setting).
Defaulting to true.

Task-number: QTCREATORBUG-502
2010-01-05 15:45:41 +01:00
Friedemann Kleint
718f8fa898 Replace handcrafted filter widgets by Utils::FilterLineEdit 2009-12-16 15:58:10 +01:00
Friedemann Kleint
730fd82ac8 VCS: Add "Open file" context menu action to VCS log pane
to be used for status/opened output. enabling convenient opening.
Append repository as block data to log text to be able to resolve
relative paths.
2009-12-15 14:20:06 +01:00
Friedemann Kleint
304d398357 Git: Expand commit template relative to repository directory
if it is a relative file specification.
Task-number: QTCREATORBUG-451
2009-12-14 15:16:40 +01:00
Friedemann Kleint
dde46ec1eb VCS: Introduce configureable timeout to vcs,svn, p4.
as already present for git, mercurial.

Task-number: QTCREATORBUG-475
2009-12-14 12:45:45 +01:00
Friedemann Kleint
0af3c1f13a VCS Submit: Run check script in repository, do not front-trim message.
Make checkscript a bit more verbose.

Task-number: QTCREATORBUG-451
Task-number: QTCREATORBUG-422
2009-12-14 10:56:50 +01:00
dt
839bc1e941 Fixes commiting with empty author/email information
Also only filling in the author field works, git does magic then.
Also fix quoting
2009-12-11 14:08:27 +01:00
Friedemann Kleint
7ce3683143 CVS: Use new VCSBasePlugin-class.
Make the diff-base directory a property of VCSBaseEditor and use
everywhere.
2009-12-09 12:41:10 +01:00
Friedemann Kleint
ff1054fc8d Subversion: Adapt to new VCSBasePlugin.
Remove logic handling several repositories.
2009-12-08 16:50:27 +01:00