Merge branch 'main' into merogge/ref

Author: meganrogge

build/azure-pipelines/cli/prepare.js

@@ -54,6 +54,7 @@ const setLauncherEnvironmentVars = () => {
 		['VSCODE_CLI_TUNNEL_SERVICE_MUTEX', product.win32TunnelServiceMutex],
 		['VSCODE_CLI_TUNNEL_CLI_MUTEX', product.win32TunnelMutex],
 		['VSCODE_CLI_COMMIT', commit],
+		['VSCODE_CLI_DEFAULT_PARENT_DATA_DIR', product.dataFolderName],
 		[
 			'VSCODE_CLI_WIN32_APP_IDS',
 			!isOSS && JSON.stringify(

build/azure-pipelines/cli/prepare.ts

@@ -36,7 +36,7 @@ async fn main() -> Result<(), std::convert::Infallible> {
 		});
 
 	let core = parsed.core();
-	let context_paths = LauncherPaths::new(&core.global_options.cli_data_dir).unwrap();
+	let context_paths = LauncherPaths::migrate(core.global_options.cli_data_dir.clone()).unwrap();
 	let context_args = core.clone();
 
 	// gets a command context without installing the global logger

cli/src/bin/code/main.rs

@@ -75,6 +75,12 @@ pub const TUNNEL_ACTIVITY_NAME: &str = concatcp!(PRODUCT_NAME_LONG, " Tunnel");
 
 const NONINTERACTIVE_VAR: &str = "VSCODE_CLI_NONINTERACTIVE";
 
+/// Default data CLI data directory.
+pub const DEFAULT_DATA_PARENT_DIR: &str = match option_env!("VSCODE_CLI_DEFAULT_PARENT_DATA_DIR") {
+	Some(n) => n,
+	None => ".vscode-oss",
+};
+
 pub fn get_default_user_agent() -> String {
 	format!(
 		"vscode-server-launcher/{}",

cli/src/constants.rs

@@ -6,15 +6,15 @@
 extern crate dirs;
 
 use std::{
-	fs::{create_dir, read_to_string, remove_dir_all, write},
+	fs::{create_dir_all, read_to_string, remove_dir_all, write},
 	path::{Path, PathBuf},
 	sync::{Arc, Mutex},
 };
 
 use serde::{de::DeserializeOwned, Serialize};
 
 use crate::{
-	constants::VSCODE_CLI_QUALITY,
+	constants::{DEFAULT_DATA_PARENT_DIR, VSCODE_CLI_QUALITY},
 	download_cache::DownloadCache,
 	util::errors::{wrap, AnyError, NoHomeForLauncherError, WrappedError},
 };
@@ -107,8 +107,38 @@ where
 }
 
 impl LauncherPaths {
-	pub fn new(root: &Option<String>) -> Result<LauncherPaths, AnyError> {
-		let root = root.as_deref().unwrap_or("~/.vscode-cli");
+	/// todo@conno4312: temporary migration from the old CLI data directory
+	pub fn migrate(root: Option<String>) -> Result<LauncherPaths, AnyError> {
+		if root.is_some() {
+			return Self::new(root);
+		}
+
+		let home_dir = match dirs::home_dir() {
+			None => return Self::new(root),
+			Some(d) => d,
+		};
+
+		let old_dir = home_dir.join(".vscode-cli");
+		let mut new_dir = home_dir;
+		new_dir.push(DEFAULT_DATA_PARENT_DIR);
+		new_dir.push("cli");
+		if !old_dir.exists() || new_dir.exists() {
+			return Self::new_for_path(new_dir);
+		}
+
+		if let Err(e) = std::fs::rename(&old_dir, &new_dir) {
+			// no logger exists at this point in the lifecycle, so just log to stderr
+			eprintln!(
+				"Failed to migrate old CLI data directory, will create a new one ({})",
+				e
+			);
+		}
+
+		Self::new_for_path(new_dir)
+	}
+
+	pub fn new(root: Option<String>) -> Result<LauncherPaths, AnyError> {
+		let root = root.unwrap_or_else(|| format!("~/{}/cli", DEFAULT_DATA_PARENT_DIR));
 		let mut replaced = root.to_owned();
 		for token in HOME_DIR_ALTS {
 			if root.contains(token) {
@@ -120,14 +150,16 @@ impl LauncherPaths {
 			}
 		}
 
-		if !Path::new(&replaced).exists() {
-			create_dir(&replaced)
-				.map_err(|e| wrap(e, format!("error creating directory {}", &replaced)))?;
+		Self::new_for_path(PathBuf::from(replaced))
+	}
+
+	fn new_for_path(root: PathBuf) -> Result<LauncherPaths, AnyError> {
+		if !root.exists() {
+			create_dir_all(&root)
+				.map_err(|e| wrap(e, format!("error creating directory {}", root.display())))?;
 		}
 
-		Ok(LauncherPaths::new_without_replacements(PathBuf::from(
-			replaced,
-		)))
+		Ok(LauncherPaths::new_without_replacements(root))
 	}
 
 	pub fn new_without_replacements(root: PathBuf) -> LauncherPaths {

cli/src/state.rs

@@ -2073,6 +2073,12 @@
           "markdownDescription": "%config.autofetchPeriod%",
           "default": 180
         },
+        "git.defaultBranchName": {
+          "type": "string",
+          "description": "%config.defaultBranchName%",
+          "default": "main",
+          "scope": "resource"
+        },
         "git.branchPrefix": {
           "type": "string",
           "description": "%config.branchPrefix%",

extensions/git/package.json

@@ -131,6 +131,7 @@
 	"config.checkoutType.local": "Local branches",
 	"config.checkoutType.tags": "Tags",
 	"config.checkoutType.remote": "Remote branches",
+	"config.defaultBranchName": "The name of the default branch (ex: main, trunk, development) when initializing a new git repository. When set to empty, the default branch name configured in git will be used.",
 	"config.branchPrefix": "Prefix used when creating a new branch.",
 	"config.branchProtection": "List of protected branches. By default, a prompt is shown before changes are committed to a protected branch. The prompt can be controlled using the `#git.branchProtectionPrompt#`  setting.",
 	"config.branchProtectionPrompt": "Controls whether a prompt is being shown before changes are committed to a protected branch.",

extensions/git/package.nls.json

@@ -307,6 +307,10 @@ function getCheckoutProcessor(repository: Repository, type: string): CheckoutPro
 	return undefined;
 }
 
+function sanitizeBranchName(name: string, whitespaceChar: string): string {
+	return name.trim().replace(/^-+/, '').replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, whitespaceChar);
+}
+
 function sanitizeRemoteName(name: string) {
 	name = name.trim();
 	return name && name.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, '-');
@@ -772,7 +776,11 @@ export class CommandCenter {
 			}
 		}
 
-		await this.git.init(repositoryPath);
+		const config = workspace.getConfiguration('git');
+		const defaultBranchName = config.get<string>('defaultBranchName', 'main');
+		const branchWhitespaceChar = config.get<string>('branchWhitespaceChar', '-');
+
+		await this.git.init(repositoryPath, { defaultBranch: sanitizeBranchName(defaultBranchName, branchWhitespaceChar) });
 
 		let message = l10n.t('Would you like to open the initialized repository?');
 		const open = l10n.t('Open');
@@ -2179,9 +2187,6 @@ export class CommandCenter {
 		const branchPrefix = config.get<string>('branchPrefix')!;
 		const branchWhitespaceChar = config.get<string>('branchWhitespaceChar')!;
 		const branchValidationRegex = config.get<string>('branchValidationRegex')!;
-		const sanitize = (name: string) => name ?
-			name.trim().replace(/^-+/, '').replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, branchWhitespaceChar)
-			: name;
 
 		let rawBranchName = defaultName;
 
@@ -2206,7 +2211,7 @@ export class CommandCenter {
 				ignoreFocusOut: true,
 				validateInput: (name: string) => {
 					const validateName = new RegExp(branchValidationRegex);
-					const sanitizedName = sanitize(name);
+					const sanitizedName = sanitizeBranchName(name, branchWhitespaceChar);
 					if (validateName.test(sanitizedName)) {
 						// If the sanitized name that we will use is different than what is
 						// in the input box, show an info message to the user informing them
@@ -2224,7 +2229,7 @@ export class CommandCenter {
 			});
 		}
 
-		return sanitize(rawBranchName || '');
+		return sanitizeBranchName(rawBranchName || '', branchWhitespaceChar);
 	}
 
 	private async _branch(repository: Repository, defaultName?: string, from = false): Promise<void> {

extensions/git/src/commands.ts

@@ -401,9 +401,14 @@ export class Git {
 		return new Repository(this, repository, dotGit, logger);
 	}
 
-	async init(repository: string): Promise<void> {
-		await this.exec(repository, ['init']);
-		return;
+	async init(repository: string, options: { defaultBranch?: string } = {}): Promise<void> {
+		const args = ['init'];
+
+		if (options.defaultBranch && options.defaultBranch !== '') {
+			args.push('-b', options.defaultBranch);
+		}
+
+		await this.exec(repository, args);
 	}
 
 	async clone(url: string, options: ICloneOptions, cancellationToken?: CancellationToken): Promise<string> {