mirror of
https://github.com/desktop/desktop
synced 2024-06-30 22:54:41 +00:00
Compare commits
8 Commits
41acc46732
...
b1dfa400ea
Author | SHA1 | Date | |
---|---|---|---|
|
b1dfa400ea | ||
|
d2c6ddb164 | ||
|
95f263a23d | ||
|
10c3d47706 | ||
|
8d86091ae3 | ||
|
d8873cb08d | ||
|
a404a3f251 | ||
|
56f515f998 |
|
@ -103,6 +103,10 @@ const editors: IDarwinExternalEditor[] = [
|
|||
'com.sublimetext.2',
|
||||
],
|
||||
},
|
||||
{
|
||||
name: 'NetBeans',
|
||||
bundleIdentifiers: ['org.apache.netbeans'],
|
||||
},
|
||||
{
|
||||
name: 'BBEdit',
|
||||
bundleIdentifiers: ['com.barebones.bbedit'],
|
||||
|
@ -127,6 +131,10 @@ const editors: IDarwinExternalEditor[] = [
|
|||
name: 'RubyMine',
|
||||
bundleIdentifiers: ['com.jetbrains.RubyMine'],
|
||||
},
|
||||
{
|
||||
name: 'RustRover',
|
||||
bundleIdentifiers: ['com.jetbrains.RustRover'],
|
||||
},
|
||||
{
|
||||
name: 'RStudio',
|
||||
bundleIdentifiers: ['org.rstudio.RStudio', 'com.rstudio.desktop'],
|
||||
|
|
|
@ -77,6 +77,15 @@ const editors: ILinuxExternalEditor[] = [
|
|||
name: 'Typora',
|
||||
paths: ['/usr/bin/typora'],
|
||||
},
|
||||
{
|
||||
name: 'Netbeans',
|
||||
paths: [
|
||||
'/opt/netbeans-22/bin/netbeans',
|
||||
'/opt/netbeans-21/bin/netbeans',
|
||||
'/opt/netbeans-20/bin/netbeans',
|
||||
'/snap/bin/netbeans',
|
||||
],
|
||||
},
|
||||
{
|
||||
name: 'SlickEdit',
|
||||
paths: [
|
||||
|
@ -100,7 +109,7 @@ const editors: ILinuxExternalEditor[] = [
|
|||
name: 'JetBrains PhpStorm',
|
||||
paths: [
|
||||
'/snap/bin/phpstorm',
|
||||
'.local/share/JetBrains/Toolbox/scripts/phpstorm',
|
||||
'.local/share/JetBrains/Toolbox/scripts/PhpStorm',
|
||||
],
|
||||
},
|
||||
{
|
||||
|
@ -128,6 +137,27 @@ const editors: ILinuxExternalEditor[] = [
|
|||
'.local/share/JetBrains/Toolbox/scripts/goland',
|
||||
],
|
||||
},
|
||||
{
|
||||
name: 'JetBrains CLion',
|
||||
paths: [
|
||||
'/snap/bin/clion',
|
||||
'.local/share/JetBrains/Toolbox/scripts/clion1',
|
||||
],
|
||||
},
|
||||
{
|
||||
name: 'JetBrains Rider',
|
||||
paths: [
|
||||
'/snap/bin/rider',
|
||||
'.local/share/JetBrains/Toolbox/scripts/rider',
|
||||
],
|
||||
},
|
||||
{
|
||||
name: 'JetBrains RubyMine',
|
||||
paths: [
|
||||
'/snap/bin/rubymine',
|
||||
'.local/share/JetBrains/Toolbox/scripts/rubymine',
|
||||
],
|
||||
},
|
||||
{
|
||||
name: 'JetBrains PyCharm',
|
||||
paths: [
|
||||
|
@ -136,6 +166,13 @@ const editors: ILinuxExternalEditor[] = [
|
|||
'.local/share/JetBrains/Toolbox/scripts/pycharm',
|
||||
],
|
||||
},
|
||||
{
|
||||
name: 'JetBrains JetBrains RustRover',
|
||||
paths: [
|
||||
'/snap/bin/rustrover',
|
||||
'.local/share/JetBrains/Toolbox/scripts/rustrover',
|
||||
],
|
||||
},
|
||||
{
|
||||
name: 'Android Studio',
|
||||
paths: [
|
||||
|
|
|
@ -296,6 +296,19 @@ const editors: WindowsExternalEditor[] = [
|
|||
displayNamePrefixes: ['Brackets'],
|
||||
publishers: ['brackets.io'],
|
||||
},
|
||||
{
|
||||
name: 'Apache NetBeans',
|
||||
registryKeys: [
|
||||
// Netbeans-22/21/20 Main-releases
|
||||
LocalMachineUninstallKey('nbi-nb-all-22.0.0.240522.0'),
|
||||
LocalMachineUninstallKey('nbi-nb-all-21.0.0.240215.0'),
|
||||
LocalMachineUninstallKey('nbi-nb-all-20.0.0.231123.0'),
|
||||
],
|
||||
installLocationRegistryKey: 'InstallLocation',
|
||||
executableShimPaths: [['netbeans', 'bin', 'netbeans.exe']],
|
||||
displayNamePrefixes: ['Apache NetBeans IDE 22', 'Apache NetBeans IDE 21', 'Apache NetBeans IDE 20'],
|
||||
publishers: ['Apache NetBeans'],
|
||||
},
|
||||
{
|
||||
name: 'ColdFusion Builder',
|
||||
registryKeys: [
|
||||
|
@ -488,6 +501,14 @@ const editors: WindowsExternalEditor[] = [
|
|||
displayNamePrefixes: ['DataSpell '],
|
||||
publishers: ['JetBrains s.r.o.'],
|
||||
},
|
||||
{
|
||||
name: 'JetBrains RustRover',
|
||||
registryKeys: registryKeysForJetBrainsIDE('RustRover'),
|
||||
executableShimPaths: executableShimPathsForJetBrainsIDE('rustrover'),
|
||||
jetBrainsToolboxScriptName: 'rustrover',
|
||||
displayNamePrefixes: ['RustRover '],
|
||||
publishers: ['JetBrains s.r.o.'],
|
||||
},
|
||||
{
|
||||
name: 'Pulsar',
|
||||
registryKeys: [
|
||||
|
|
|
@ -20,28 +20,22 @@ import { IRemote } from '../../models/remote'
|
|||
export type ProgressCallback = (progress: ICheckoutProgress) => void
|
||||
|
||||
function getCheckoutArgs(progressCallback?: ProgressCallback) {
|
||||
return progressCallback != null
|
||||
? [...gitNetworkArguments(), 'checkout', '--progress']
|
||||
: [...gitNetworkArguments(), 'checkout']
|
||||
return [
|
||||
...gitNetworkArguments(),
|
||||
'checkout',
|
||||
...(progressCallback ? ['--progress'] : []),
|
||||
]
|
||||
}
|
||||
|
||||
async function getBranchCheckoutArgs(branch: Branch) {
|
||||
const baseArgs: ReadonlyArray<string> = []
|
||||
if (enableRecurseSubmodulesFlag()) {
|
||||
return branch.type === BranchType.Remote
|
||||
? baseArgs.concat(
|
||||
branch.name,
|
||||
'-b',
|
||||
branch.nameWithoutRemote,
|
||||
'--recurse-submodules',
|
||||
'--'
|
||||
)
|
||||
: baseArgs.concat(branch.name, '--recurse-submodules', '--')
|
||||
}
|
||||
|
||||
return branch.type === BranchType.Remote
|
||||
? baseArgs.concat(branch.name, '-b', branch.nameWithoutRemote, '--')
|
||||
: baseArgs.concat(branch.name, '--')
|
||||
return [
|
||||
branch.name,
|
||||
...(branch.type === BranchType.Remote
|
||||
? ['-b', branch.nameWithoutRemote]
|
||||
: []),
|
||||
...(enableRecurseSubmodulesFlag() ? ['--recurse-submodules'] : []),
|
||||
'--',
|
||||
]
|
||||
}
|
||||
|
||||
async function getCheckoutOpts(
|
||||
|
|
|
@ -485,8 +485,7 @@ export function gitRebaseArguments() {
|
|||
// uses the merge backend even if the user has the apply backend
|
||||
// configured, since this is the only one supported.
|
||||
// This can go away once git deprecates the apply backend.
|
||||
'-c',
|
||||
'rebase.backend=merge',
|
||||
...['-c', 'rebase.backend=merge'],
|
||||
]
|
||||
}
|
||||
|
||||
|
|
|
@ -11,28 +11,16 @@ async function getFetchArgs(
|
|||
remote: string,
|
||||
progressCallback?: (progress: IFetchProgress) => void
|
||||
) {
|
||||
if (enableRecurseSubmodulesFlag()) {
|
||||
return progressCallback != null
|
||||
? [
|
||||
...gitNetworkArguments(),
|
||||
'fetch',
|
||||
'--progress',
|
||||
'--prune',
|
||||
'--recurse-submodules=on-demand',
|
||||
remote,
|
||||
]
|
||||
: [
|
||||
...gitNetworkArguments(),
|
||||
'fetch',
|
||||
'--prune',
|
||||
'--recurse-submodules=on-demand',
|
||||
remote,
|
||||
]
|
||||
} else {
|
||||
return progressCallback != null
|
||||
? [...gitNetworkArguments(), 'fetch', '--progress', '--prune', remote]
|
||||
: [...gitNetworkArguments(), 'fetch', '--prune', remote]
|
||||
}
|
||||
return [
|
||||
...gitNetworkArguments(),
|
||||
'fetch',
|
||||
...(progressCallback ? ['--progress'] : []),
|
||||
'--prune',
|
||||
...(enableRecurseSubmodulesFlag()
|
||||
? ['--recurse-submodules=on-demand']
|
||||
: []),
|
||||
remote,
|
||||
]
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -19,28 +19,15 @@ async function getPullArgs(
|
|||
remote: string,
|
||||
progressCallback?: (progress: IPullProgress) => void
|
||||
) {
|
||||
const divergentPathArgs = await getDefaultPullDivergentBranchArguments(
|
||||
repository
|
||||
)
|
||||
|
||||
const args = [
|
||||
return [
|
||||
...gitNetworkArguments(),
|
||||
...gitRebaseArguments(),
|
||||
'pull',
|
||||
...divergentPathArgs,
|
||||
...(await getDefaultPullDivergentBranchArguments(repository)),
|
||||
...(enableRecurseSubmodulesFlag() ? ['--recurse-submodules'] : []),
|
||||
...(progressCallback ? ['--progress'] : []),
|
||||
remote,
|
||||
]
|
||||
|
||||
if (enableRecurseSubmodulesFlag()) {
|
||||
args.push('--recurse-submodules')
|
||||
}
|
||||
|
||||
if (progressCallback != null) {
|
||||
args.push('--progress')
|
||||
}
|
||||
|
||||
args.push(remote)
|
||||
|
||||
return args
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue
Block a user