From b0ffe1b65ae332cd7fe19a8c5fdd12d4d947a41e Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 2 Jun 2020 21:49:27 +0300 Subject: [PATCH] git: move registry options into plugin.xml GitOrigin-RevId: 499be7d79f7d2138f1bba3d7e7403b655d8d824a --- .../util/resources/misc/registry.properties | 85 ------------------ .../git4idea/resources/META-INF/plugin.xml | 87 ++++++++++++++++++- 2 files changed, 85 insertions(+), 87 deletions(-) diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 6de6c62a4448..7a1b4ca1adc6 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -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 " 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 " 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 diff --git a/plugins/git4idea/resources/META-INF/plugin.xml b/plugins/git4idea/resources/META-INF/plugin.xml index f3d886b8ea54..2391b5b51f64 100644 --- a/plugins/git4idea/resources/META-INF/plugin.xml +++ b/plugins/git4idea/resources/META-INF/plugin.xml @@ -1,8 +1,8 @@ - + Git Git4Idea - Git.
  • Check out your source code from a Git repository
    • @@ -204,6 +204,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +