Commit Graph

334 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
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
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
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
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
299ea32ab0 tr()-Fixes. 2010-02-25 14:53:01 +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
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
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
Friedemann Kleint
bcba9ea604 VCS [git]: Annotate previous version/single filelog annotation.
Task-number: QTCREATORBUG-503
2010-01-07 17:29:14 +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
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
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
8097879d6d VCS: Introduce Base class for VCS plugins, use in git.
Fixes:
- Cannot diff a file that does not belong to a project
- Cannot commit when a temporary diff/log view is open
  due to the current file pointing to a temporary directory
- git's project-related actions not passing the correct
  relative path.

Implementation:
- Centralize code to listen for Qt Creator's relevant state changes
  in VCSBasePlugin, dispatching the changes to the instances affected.
  (avoiding multiple invocations of searches/QFileInfo on current).
- Do the same for the corelistener catching closing SubmitEditors.
- Introduce VCSBasePluginState representing the relevant state
  (current file/project).
- Call git with working directory set and relative arguments
- Remove setEnabled/isEnabled() logic of IVersionControl
- Pass toplevel from VCSManager to avoid duplicate searches.
2009-12-08 14:26:41 +01:00
Friedemann Kleint
8335a06ed4 Code model: Update on changes from the versioning system.
Add changed signals to IVersionControl and
VCSManager and wire them to the update methods. Add a menu action for
manually updating. Improved version of reverted
7aa2411693.

Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2009-11-11 14:32:54 +01:00
con
e4b1a25dd2 Revert "Code model: Update on changes from the versioning system."
This reverts commit 7aa2411693.
It breaks the code model updates completely. So reverting this change
until we have the right thing.

Reviewed-by: Roberto Raggi
2009-11-10 18:19:37 +01:00
Friedemann Kleint
7aa2411693 Code model: Update on changes from the versioning system.
Add state logic to CppCodeModelManagerInterface, making it aware whether
an indexer is running, protect the update methods from another
invocation while running. Add changed signals to IVersionControl and
VCSManager and wire them to the update methods. Add a menu action for
manually updating.

Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: con <qtc-committer@nokia.com>
2009-11-09 15:57:56 +01:00
Friedemann Kleint
9d4aafebac VCS/git: Make blame go to current editor line
using queued slot/variant cookie magic in command
2009-10-01 17:50:24 +02:00
Friedemann Kleint
01877b2c86 VCS: perforce, cvs, subversion: Goto current line in blame. 2009-10-01 17:32:26 +02:00
Friedemann Kleint
978cf4bda8 Rename IRunConfigurationRunner -> IRunControlFactory...
and ApplicationRunConfiguration to LocalApplicationRunConfiguration,
preparing remote debugging. Change the interface canRun() to be const,
run() to create() (since it does not run anything), use references
to the QSharedPointer<Foo>. Introduce d-Pointer and remove
unneeded headers from ProjectExplorerPlugin and add missing includes
everywhere.
2009-09-25 11:35:44 +02:00
Friedemann Kleint
40f6f72a5d Git: Make commit work on Windows 2009-08-25 09:57:58 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
188dbc3a43 API naming.
Reviewed-by: hjk
2009-08-12 10:41:30 +02:00
Friedemann Kleint
1e64d9f9b2 Version control: Replace per-VCS output panes with a single one.
...and give it some color and formatting.
2009-08-10 15:46:45 +02:00
Friedemann Kleint
9e2f12c737 VCSBase: Add common functionality, make checkout use page lists.
Move GitClient::filterUntrackedFilesOfProject into submit editor.
Make checkout wizards use page lists for greater flexibility.
2009-07-21 11:14:48 +02:00
Friedemann Kleint
9f14b79cc6 Add a clone wizard for version control (base classes + git/svn).
Task-number: 244831
2009-07-17 17:19:23 +02:00
Friedemann Kleint
41a9395d21 Optionally shorten git blame output by removing date+line number. 2009-07-15 15:18:03 +02:00
dt
4637d56284 Don't ask to reload the file, if the user uses git/undo or git/revert.
Simply do it.

Task-Nr: 254558
2009-06-18 14:30:04 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
Daniel Molkentin
5a6c636935 Run git on windows properly when git is called synchronously.
Reviewed-By: Friedemann Kleint
2009-06-15 14:04:14 +02:00
dt
8ef7ad0b62 Fix not beeing able to commit file deletions with creators git plugin
Reviewed-By: mauricek
2009-06-10 18:10:34 +02:00
Friedemann Kleint
e38250d81f Close write channels of git processes.
..in an attempt to suppress password prompts.
2009-05-28 12:27:04 +02:00
Oswald Buddenhagen
6d5eeb7afb add missing tr()s, etc., add some //: comments 2009-04-20 16:51:10 +02:00
Friedemann Kleint
3a5b6825a7 Report termination of git pull/push (which was missing feedback). 2009-04-09 10:05:53 +02:00
dt
3da6ca098c Kill the git process if we timed out waiting for it. 2009-04-07 12:04:43 +02:00
Friedemann Kleint
178fe102e8 Fixes: Suppress colors for git diff project, class names in widget template 2009-03-17 13:00:22 +01:00
Friedemann Kleint
465bf149d5 Fixes: Using a git configuration with colored output breaks much of the git plugin.
Task:     248067
Details:  Use --no-color where appropriate. Use a hack to remove color sequences from output for "status" since it does not support the option as of git 1.6.2.
2009-03-17 12:36:55 +01:00