anna
1e9a4087e6
parenthesis processing (IDEA-98421)
2013-01-03 13:15:42 +01:00
Konstantin Bulenkov
507bcd7333
retina icons
2013-01-03 12:58:03 +01:00
Konstantin Bulenkov
cbc61c0f13
Finder like sorting + IDEA-80435 Project file sorting
2013-01-03 12:28:05 +01:00
Roman Shevchenko
b4eebdd684
IDEA-98421 (parse super call type arguments)
2013-01-02 21:19:14 +01:00
Roman Shevchenko
d8ef7d17d8
Highlighting test framework fixed
2013-01-02 18:56:31 +01:00
Roman Shevchenko
e6753d5369
Cleanup
2013-01-02 16:28:37 +01:00
Anna Kozlova
678a62e549
Merge remote-tracking branch 'origin/master'
2013-01-02 16:16:16 +01:00
Anna Kozlova
f93b1790ef
create test: warn if there is no test root for a module (IDEA-98018)
2013-01-02 16:13:47 +01:00
Kirill Likhodedov
50df59bfbf
[git tests] fix imports
2013-01-02 19:13:20 +04:00
Kirill Likhodedov
b9326984bd
[dvcs tests] Fix NPE in MockVirtualFile.
2013-01-02 19:13:19 +04:00
Kirill Likhodedov
c1f31bb584
[git] Merge GitBranchUiUtil to GitBranchUtil
...
It was always hard to distinguish the two.
2013-01-02 18:41:19 +04:00
Kirill Likhodedov
6d4ba29bd5
Move libraries cucumber-core, cucumber-java and gherkin to community
2013-01-02 18:24:33 +04:00
Anna Kozlova
2a4b7abc9b
Merge remote-tracking branch 'origin/master'
2013-01-02 14:30:21 +01:00
Anna Kozlova
b84376a59b
customizable navbar extension (IDEA-98199)
2013-01-02 14:27:03 +01:00
Kirill Likhodedov
b2a709b07c
[git] Move GitCherryPicker to the proper package.
2013-01-02 17:23:30 +04:00
Kirill Likhodedov
35112f6c01
[git] Tests: remove unused MockGit, GitFastTest and GitLightRepository. Make GitIntegrationEnablerTest be GitLightTest.
2013-01-02 17:23:30 +04:00
Kirill Likhodedov
ee8fb57a6a
[git] write test on cherry-pick-without-auto-commit, remove old style cherry-pick tests
2013-01-02 17:23:29 +04:00
Kirill Likhodedov
aec119110c
[git] tests: simplify virtual commit details format
2013-01-02 17:23:29 +04:00
Kirill Likhodedov
b3a3d8583c
[git] cherry-pick test refactoring:
...
move creation of conflicting commits into from background into scenarios: easier to refer from these scenarios, less to execute for scenarios that don't need these commits.
2013-01-02 17:23:28 +04:00
Kirill Likhodedov
45f001f7ad
[git] More tests on cherry-pick for IDEA-73548, disabled for now.
2013-01-02 17:23:28 +04:00
Kirill Likhodedov
1202a57554
[git] More tests on cherry-pick
...
+ Better notification content html adjustment.
2013-01-02 17:23:28 +04:00
Kirill Likhodedov
d4eadc0e0b
[git] UntrackedFilesNotifier: "failed" instead of "error" for unification.
2013-01-02 17:23:27 +04:00
Kirill Likhodedov
20adfff19e
[git] cherry-pick: avoid "\n" in change list names (although they are replaced in UI).
2013-01-02 17:23:27 +04:00
Kirill Likhodedov
daec3a55cf
[vcs] Move showMergeDialog overloading method to the base class
...
showMergeDialog(files, provider) and (files) are just handy wrapper for the "main" method with (files, provider, customizer).
Move their implementation to AbstractVcsHelper not to force inheritors implement them.
2013-01-02 17:23:26 +04:00
Kirill Likhodedov
72262569e9
[git] tests: convert some framework classes from groovy to java, enhance test framework, write more tests on cherry-pick
2013-01-02 17:23:25 +04:00
Kirill Likhodedov
c2065dfd77
[git] cucumber tests: move from groovy to java, introduce virtual commits, understand commit details syntax
...
Virtual commits are to be able to specify commit hashes in feature files.
Since it's not possible to can't assign a hash to a commit, remember the actual hash after committing and link them together.
Make it able to specify commit details in the feature file similar to the way they are written in the log, parse it using CommitDetails, and perform the commit given these specifications.
2013-01-02 17:23:25 +04:00
Kirill Likhodedov
73ad4a3022
[git] cherry pick: remove quotes from commit subject in notifications
2013-01-02 17:23:24 +04:00
Kirill Likhodedov
87e2a7e40d
[git] Start writing cucumber tests.
...
* First scenario for cherry-pick tests.
* GitCucumberWorld to contain environment variables visible from everywhere.
* Move initialization stuff from GitLightTest to static methods of GitTestInitUtil to reuse in GeneralStepdefs.
* Add cucumber-jvm & cucumber-groovy to git4idea classpath.
2013-01-02 17:23:24 +04:00
Kirill Likhodedov
fb3f5870c3
[git tests] don't output empty lines
2013-01-02 17:23:24 +04:00
Kirill Likhodedov
c71b280033
[git tests] GitScenarios: static import instead of mixin, make methods static
2013-01-02 17:23:23 +04:00
Kirill Likhodedov
b66390d9f0
[git tests] GitExecutor: allow command parameters with spaces surrounded by single quotes
2013-01-02 17:23:23 +04:00
Kirill Likhodedov
95504754bb
[git] cherry-pick: print it as "cherry picked" in the commit message, since Git does so.
2013-01-02 17:23:22 +04:00
Kirill Likhodedov
1bfa01e0f0
[git] cherry-pick: use single \n between description and "cherry-picked from...", since Git itself does so.
2013-01-02 17:23:22 +04:00
Kirill Likhodedov
109f50685b
[git] Make Executor & GitExecutor static
2013-01-02 17:23:21 +04:00
Anna Kozlova
7228521cd1
extract method: insert cast when duplicate with changed type processed (IDEA-98396)
2013-01-02 12:45:05 +01:00
Kirill Likhodedov
2e432c35fd
[git] IDEA-98433 Git push changes the branch.master.rebase value to an invalid value
...
branch.<name>.rebase should be set to true or false, not to the name of the tracked branch, which is still written in branch.<name>.merge.
2013-01-02 15:22:41 +04:00
Anna Kozlova
782320dcd0
highlight enum constant name when its body should contain some implementation (IDEA-98411)
2013-01-02 11:41:23 +01:00
irengrig
1d6bdcc3bd
Merge remote branch 'origin/master'
2013-01-01 16:47:38 +04:00
irengrig
034b5ba97a
IDEA-96821 Wrong Subversion log after update/switch to a different branch
2012-12-31 22:00:56 +04:00
irengrig
f1471a67ba
IDEA-98373 Subversion: in update results, show information that root being switched was switched - also check on update finished event
2012-12-31 21:53:06 +04:00
irengrig
71c7b97697
Subversion: changed on server notification should also pay attention to branch switches
2012-12-31 21:50:40 +04:00
Roman Shevchenko
9b3adc4079
Broken link condition fixed
2012-12-31 16:10:24 +01:00
Roman Shevchenko
6adfa3221f
Do not index and navigate to broken links
2012-12-31 15:23:33 +01:00
Roman Shevchenko
6fcdc75e53
Symlink node presentation improved
2012-12-31 15:23:33 +01:00
Roman Shevchenko
53d58ffe01
Correct logging category
2012-12-31 15:23:32 +01:00
anna
132e0631a9
EA-42347 - NPE: BaseRefactoringProcessor.createPresentation
2012-12-31 14:51:54 +01:00
anna
d677e27847
EA-42376 - NPE: EditScopesAction.update
2012-12-31 14:48:17 +01:00
anna
57f7c7ae9c
EA-42257 - IAE: JComboBox.setSelectedIndex
2012-12-31 14:44:40 +01:00
anna
e47dc7accb
extract method object: do not make static when already static (IDEA-98290)
2012-12-31 13:58:17 +01:00
anna
e9070ccbc8
extract method object: no need to change signature when nothing was changed by duplicates processing (IDEA-98288)
2012-12-31 13:30:21 +01:00
anna
Konstantin Bulenkov
Roman Shevchenko
Kirill Likhodedov
irengrig