MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

git: move registry options into plugin.xml

Browse Source 
GitOrigin-RevId: 499be7d79f7d2138f1bba3d7e7403b655d8d824a
This commit is contained in:
Aleksey Pivovarov
2020-06-02 22:00:02 +03:00
committed by intellij-monorepo-bot
parent 4de05268c4
commit b0ffe1b65a
2 changed files with 85 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/resources/misc/registry.properties
-85
View File
@@ -1165,86 +1165,6 @@ ide.instant.theme.switch.description=Switch theme in the quick switcher instantl
ide.instant.theme.switch.delay=500
ide.instant.theme.switch.delay.description=Instant theme switch delay in milliseconds
git.execute.with.mediator=true
git.execute.with.mediator.description=Use wrapper executable on Windows to support soft Git process cancellation.
git.blocking.read=true
git.allow.stderr.to.stdout.mixing=false
git.allow.stderr.to.stdout.mixing.description=Enables legacy hack for git integration, when some messages from stderr are handled as if they came from stdout.
git.execution.trace=0
git.execution.trace.description=Bitmask to control git logging of the commands executed by the IDE. Specified as int.\n\
(0) 00000 - logging disabled\n\
(31) 11111 - all categories enabled\n\
(1) 00001 - GIT_TRACE\n\
(2) 00010 - GIT_TRACE_PACK_ACCESS\n\
(4) 00100 - GIT_TRACE_PACKET\n\
(8) 01000 - GIT_TRACE_PERFOMANCE\n\
(16) 10000 - GIT_TRACE_SETUP
git.file.history.full=true
git.file.history.full.description=Adds "--full-history --simplify-merges" to git log arguments when retrieving history for a file. \
This may sometimes result in empty merges being shown in the file history. \
However, skipping this arguments hides some side branches if the end result is the same.
git.diff.renameLimit=1
git.diff.renameLimit.description=Sets diff.renameLimit configuration variable value. \n\
Essentially this variable tells Git the maximal size of commit for which to perform rename detection.\
Zero value means detecting renames in all commits.\
Setting this value too high (or zero) may lead to increased memory consumption by a Git process and longer execution time.\n\
This variable only used when reading git commits for indexing.\
Value from git configuration (1000 by default) is used for other purposes (eg for displaying changes in changes view).
git.refresh.vfs.total=false
git.refresh.vfs.total.description=If set to true, the whole Git repository root will be refreshed after performing a Git operation.\
Otherwise only the affected files will be refreshed.\
Affects only a subset of Git operations.\
The option is needed to debug possible "incomplete VFS refresh" reports, if they appear.
git.force.commit.using.staging.area=true
git.force.commit.using.staging.area.description=When enabled, perform all git commits by updating staging area. If disabled, use `git commit --only` when possible.
git.clone.recurse.submodules=true
git.clone.recurse.submodules.description=When enabled, Checkout from Git calls `git clone --recurse-submodules`, i.e. clones the main repository with all submodules if there are any.
git.read.content.with.textconv=false
git.read.content.with.textconv.description=Apply `textconv` transformations when reading file content from git. (overrides "git.read.content.with.filters" option)
git.read.content.with.filters=true
git.read.content.with.filters.description=Apply `filters` transformations when reading file content from git.
git.log.fix.merge.commits.parents.order=false
git.log.fix.merge.commits.parents.order.description=Find merge commits where a remote branch was merged into local before pushing \
and fix parents order for such commits in order to display them more naturally in the commits graph.
git.log.fix.merge.commits.parents.order.restartRequired=true
git.log.use.index.for.picked.commits.highlighting=true
git.log.use.index.for.picked.commits.highlighting.description=Find cherry-picked commits not only looking at patches using `git cherry` \
but also by matching commit author, author time and "cherry picked from commit <hash>" suffix.
git.log.fast.picked.commits.highlighting=false
git.log.fast.picked.commits.highlighting.description=Find cherry-picked commits not looking at patches using `git cherry` \
but by matching commit author, author time and commit message. This allows to find commits that were cherry-picked with conflicts \
and without adding "cherry picked from commit <hash>" suffix. Requires "git.log.use.index.for.picked.commits.highlighting" set to true.
git.parallel.fetch.threads=-3
git.parallel.fetch.threads.description=Number of threads to call git fetch in parallel.\n\
Set to 1 to execute sequentially.\n\
Set to -1 to use the number of CPU cores.\n\
Set to -2 to start as many threads, as there are repositories in the project.\n\
Set to -3 to start as many threads, as there are repositories, but not more than 2 * number of cores.\n\
By default, SSH supports up to 10 multiplexed connections, thus number of threads will be limited by 10 despite this value.
git.use.schannel.on.windows=true
git.use.schannel.on.windows.description=Force git to use Windows certificate store to very SSL connections. Git 2.14 and above is requried
git.use.shell.script.on.windows=true
git.use.shell.script.on.windows.description=Use workaround for Native SSH support in Git. Batch file cannot properly handle arguments with newlines when used as SSH_ASKPASS.
git.use.setsid.for.native.ssh=true
git.use.setsid.for.native.ssh.description=Wrap 'git' process with 'setsid' for remote operations. \
This fixes issue with SSH_ASKPASS if IDE is executed from terminal or under DM/WM that pass system TTY from Xorg to GUI applications.
git.use.setsid.wait.for.wsl.ssh=true
git.use.setsid.wait.for.wsl.ssh.description=Wrap 'git' process with 'setsid -w' for remote operations with WSL executable.
git.use.push.force.with.lease=true
git.use.push.force.with.lease.description=Use '--force-with-lease' to push from IDE instead of '--force'
git.use.no.optional.locks=true
git.use.no.optional.locks.description=Use 'GIT_OPTIONAL_LOCKS' env variable to avoid taking unnecessary locks in git. Ex: to avoid "git status" to interfere with 'git rebase' process in terminal.
git.process.ignored=true
git.process.ignored.description=Process and highlight Git ignored files.
git.update.incoming.outgoing.info=true
git.update.incoming.outgoing.info.description=Update branches info that have incoming/outgoing commits in the Branches popup.
git.merge.conflicts.toolwindow=false
git.merge.conflicts.toolwindow.description=Show dedicated toolwindow for git merge conflicts
git.update.project.info.as.log=true
git.update.project.info.as.log.description=If enabled, Update Project for Git is followed by the list of commits, instead of the list of updated files.
git.enable.stage=false
git.enable.stage.description=Show tool window with staging area.
hg4idea.process.ignored=true
hg4idea.process.ignored.description=Process and highlight mercurial ignored files. \
Switching this option on may lead to some performance problems.
@@ -1522,11 +1442,6 @@ ide.inplace.errors.outline.description=Enables outlining controls containing err
ide.inplace.validation.tooltip=true
ide.inplace.validation.tooltip.description=Show tooltips with errors or warnings over components where possible
git.shelve.load.base.in.batches=1000
git.shelve.load.base.in.batches.description=If set to a value > 0, load base contents for shelving in batches: \
by reading the given number of files at once. \
If set to -1, contents are loaded as usual, one by one.
performance.watcher.unresponsive.interval.ms=5000
performance.watcher.unresponsive.interval.ms.description=Maximum time in ms for UI freezes. If UI thread freezes longer the thread dump will be logged
plugins/git4idea/resources/META-INF/plugin.xml
+85 -2
View File
@@ -1,8 +1,8 @@
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
<idea-plugin>
<name>Git</name>
<id>Git4Idea</id>
<description>
<![CDATA[
<![CDATA[
Provides integration with <a href="http://git-scm.com/">Git</a>.
<ul>
<li>Check out your source code from a Git repository</li>
@@ -204,6 +204,89 @@
</actions>
<extensions defaultExtensionNs="com.intellij">
<registryKey key="git.execute.with.mediator" defaultValue="true"
description="Use wrapper executable on Windows to support soft Git process cancellation."/>
<registryKey key="git.blocking.read" defaultValue="true"
description="Use blocking mode for git process output reader."/>
<registryKey key="git.allow.stderr.to.stdout.mixing" defaultValue="false"
description="Enables legacy hack for git integration, when some messages from stderr are handled as if they came from stdout."/>
<registryKey key="git.execution.trace" defaultValue="0"
description="Bitmask to control git logging of the commands executed by the IDE. Specified as int.\n
(0) 00000 - logging disabled\n
(31) 11111 - all categories enabled\n
(29) 11101 - the one you might want\n
(1) 00001 - GIT_TRACE\n
(2) 00010 - GIT_TRACE_PACK_ACCESS\n
(4) 00100 - GIT_TRACE_PACKET\n
(8) 01000 - GIT_TRACE_PERFOMANCE\n
(16) 10000 - GIT_TRACE_SETUP"/>
<registryKey key="git.file.history.full" defaultValue="true"
description="Adds &quot;--full-history --simplify-merges&quot; to git log arguments when retrieving history for a file.
This may sometimes result in empty merges being shown in the file history.
However, skipping this arguments hides some side branches if the end result is the same."/>
<registryKey key="git.diff.renameLimit" defaultValue="1"
description="Sets diff.renameLimit configuration variable value.\n
Essentially this variable tells Git the maximal size of commit for which to perform rename detection.
Zero value means detecting renames in all commits.
Setting this value too high (or zero) may lead to increased memory consumption by a Git process and longer execution time.\n
This variable only used when reading git commits for indexing.
Value from git configuration (1000 by default) is used for other purposes (eg for displaying changes in changes view)."/>
<registryKey key="git.refresh.vfs.total" defaultValue="false"
description="If set to true, the whole Git repository root will be refreshed after performing a Git operation.
Otherwise only the affected files will be refreshed.
Affects only a subset of Git operations.
The option is needed to debug possible &quot;incomplete VFS refresh&quot; reports, if they appear."/>
<registryKey key="git.force.commit.using.staging.area" defaultValue="true"
description="When enabled, perform all git commits by updating staging area. If disabled, use 'git commit --only' when possible."/>
<registryKey key="git.clone.recurse.submodules" defaultValue="true"
description="When enabled, Checkout from Git calls 'git clone --recurse-submodules', i.e. clones the main repository with all submodules if there are any."/>
<registryKey key="git.read.content.with.textconv" defaultValue="false"
description="Apply 'textconv' transformations when reading file content from git. (overrides &quot;git.read.content.with.filters&quot; option)"/>
<registryKey key="git.read.content.with.filters" defaultValue="true"
description="Apply 'filters' transformations when reading file content from git."/>
<registryKey key="git.log.fix.merge.commits.parents.order" defaultValue="false" restartRequired="true"
description="Find merge commits where a remote branch was merged into local before pushing
and fix parents order for such commits in order to display them more naturally in the commits graph."/>
<registryKey key="git.log.use.index.for.picked.commits.highlighting" defaultValue="true"
description="Find cherry-picked commits not only looking at patches using 'git cherry'
but also by matching commit author, author time and &quot;cherry picked from commit &lt;hash&gt;&quot; suffix."/>
<registryKey key="git.log.fast.picked.commits.highlighting" defaultValue="false"
description="Find cherry-picked commits not looking at patches using 'git cherry'
but by matching commit author, author time and commit message. This allows to find commits that were cherry-picked with conflicts
and without adding &quot;cherry picked from commit &lt;hash&gt;&quot; suffix. Requires &quot;git.log.use.index.for.picked.commits.highlighting&quot; set to true."/>
<registryKey key="git.parallel.fetch.threads" defaultValue="-3"
description="Number of threads to call git fetch in parallel.\n
Set to 1 to execute sequentially.\n
Set to -1 to use the number of CPU cores.\n
Set to -2 to start as many threads, as there are repositories in the project.\n
Set to -3 to start as many threads, as there are repositories, but not more than 2 * number of cores.\n
By default, SSH supports up to 10 multiplexed connections, thus number of threads will be limited by 10 despite this value."/>
<registryKey key="git.use.schannel.on.windows" defaultValue="true"
description="Force git to use Windows certificate store to very SSL connections. Git 2.14 and above is required"/>
<registryKey key="git.use.shell.script.on.windows" defaultValue="true"
description="Use workaround for Native SSH support in Git. Batch file cannot properly handle arguments with newlines when used as SSH_ASKPASS."/>
<registryKey key="git.use.setsid.for.native.ssh" defaultValue="true"
description="Wrap 'git' process with 'setsid' for remote operations.
This fixes issue with SSH_ASKPASS if IDE is executed from terminal or under DM/WM that pass system TTY from Xorg to GUI applications."/>
<registryKey key="git.use.setsid.wait.for.wsl.ssh" defaultValue="true"
description="Wrap 'git' process with 'setsid -w' for remote operations with WSL executable."/>
<registryKey key="git.use.push.force.with.lease" defaultValue="true"
description="Use '--force-with-lease' to push from IDE instead of '--force'"/>
<registryKey key="git.use.no.optional.locks" defaultValue="true"
description="Use 'GIT_OPTIONAL_LOCKS' env variable to avoid taking unnecessary locks in git. Ex: to avoid 'git status' to interfere with 'git rebase' process in terminal."/>
<registryKey key="git.process.ignored" defaultValue="true"
description="Process and highlight Git ignored files."/>
<registryKey key="git.update.incoming.outgoing.info" defaultValue="true"
description="Update branches info that have incoming/outgoing commits in the Branches popup."/>
<registryKey key="git.merge.conflicts.toolwindow" defaultValue="false"
description="Show dedicated toolwindow for git merge conflicts"/>
<registryKey key="git.update.project.info.as.log" defaultValue="true"
description="If enabled, Update Project for Git is followed by the list of commits, instead of the list of updated files."/>
<registryKey key="git.enable.stage" defaultValue="false"
description="Show tool window with staging area."/>
<registryKey key="git.shelve.load.base.in.batches" defaultValue="1000"
description="If set to a value > 0, load base contents for shelving in batches: by reading the given number of files at once. If set to -1, contents are loaded as usual, one by one."/>
<search.projectOptionsTopHitProvider implementation="git4idea.config.GitOptionsTopHitProvider"/>
<vcs name="Git" vcsClass="git4idea.GitVcs" displayName="Git" administrativeAreaName=".git"/>
<checkoutProvider implementation="git4idea.checkout.GitCheckoutProvider" order="first"/>