Index: project_git_instructions.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_git_instructions/project_git_instructions.admin.inc,v
retrieving revision 1.13
diff -u -p -r1.13 project_git_instructions.admin.inc
--- project_git_instructions.admin.inc 9 Feb 2011 07:41:48 -0000 1.13
+++ project_git_instructions.admin.inc 15 Feb 2011 05:34:40 -0000
@@ -25,10 +25,10 @@ function project_git_instructions_settin
[@email] => => user411@example.org
[!git_access_link] => Git access page
[@project_username] => merlinofchaos
- [@auth_project_url] => ssh://user411@git-dev.drupal.org:2222/project/ctools.git
- [@anon_project_url] => http://git-dev.drupalcode.org/project/ctools.git
- [@auth_sandbox_url] => ssh://user411@git-dev.drupal.org:2222/sandbox/merlinofchaos/ctools.git
- [@anon_sandbox_url] => http://git-dev.drupalcode.org/sandbox/merlinofchaos/ctools.git
+ [@auth_project_url] => ssh://user411@git-testing.drupal.org:2222/project/ctools.git
+ [@anon_project_url] => http://git-testing.drupalcode.org/project/ctools.git
+ [@auth_sandbox_url] => ssh://user411@git-testing.drupal.org:2222/sandbox/merlinofchaos/ctools.git
+ [@anon_sandbox_url] => http://git-testing.drupalcode.org/sandbox/merlinofchaos/ctools.git
'
);
$form['project_git_instructions_maintainer'] = array(
@@ -123,25 +123,25 @@ function project_git_instructions_settin
'#title' => t('Repository URL for Authenticated Users'),
'#description' => t('The preferred URL style. You can use variables here.'),
'#type' => 'textfield',
- '#default_value' => variable_get('project_git_instructions_git_repository_url_authenticated', 'ssh://@git_username@git-dev.drupal.org:2222/project/@project_name'),
+ '#default_value' => variable_get('project_git_instructions_git_repository_url_authenticated', 'ssh://@git_username@git-testing.drupal.org:2222/project/@project_name'),
);
$form['project_git_instructions_git_repository_url_anonymous'] = array(
'#title' => t('Repository URL for Anonymous Users'),
'#description' => t('The preferred URL style. You can use variables here.'),
'#type' => 'textfield',
- '#default_value' => variable_get('project_git_instructions_git_repository_url_anonymous', 'http://git-dev.drupalcode.org/project/@project_name'),
+ '#default_value' => variable_get('project_git_instructions_git_repository_url_anonymous', 'http://git-testing.drupalcode.org/project/@project_name'),
);
$form['project_git_instructions_git_sandbox_repository_url_authenticated'] = array(
'#title' => t('Repository URL for Authenticated Users'),
'#description' => t('The preferred URL style. You can use variables here.'),
'#type' => 'textfield',
- '#default_value' => variable_get('project_git_instructions_git_sandbox_repository_url_authenticated', 'ssh://@git_username@git-dev.drupal.org:2222/sandbox/@project_username/@project_name'),
+ '#default_value' => variable_get('project_git_instructions_git_sandbox_repository_url_authenticated', 'ssh://@git_username@git-testing.drupal.org:2222/sandbox/@project_username/@project_name'),
);
$form['project_git_instructions_git_sandbox_repository_url_anonymous'] = array(
'#title' => t('Repository URL for Anonymous Users'),
'#description' => t('The preferred URL style. You can use variables here.'),
'#type' => 'textfield',
- '#default_value' => variable_get('project_git_instructions_git_sandbox_repository_url_anonymous', 'http://git-dev.drupalcode.org/sandbox/@project_username/@project_name'),
+ '#default_value' => variable_get('project_git_instructions_git_sandbox_repository_url_anonymous', 'http://git-testing.drupalcode.org/sandbox/@project_username/@project_name'),
);
return system_settings_form($form);
Index: project_git_instructions.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_git_instructions/project_git_instructions.module,v
retrieving revision 1.63
diff -u -p -r1.63 project_git_instructions.module
--- project_git_instructions.module 15 Feb 2011 01:52:12 -0000 1.63
+++ project_git_instructions.module 15 Feb 2011 05:34:40 -0000
@@ -130,10 +130,10 @@ function project_git_instructions_get_de
// These are special variables and need to be run through t() in advance.
// We generate an auth url even for non-maintainers. Of course it won't work if they see it and use it.
- $defaults['@auth_project_url'] = t(variable_get('project_git_instructions_git_repository_url_authenticated', 'ssh://@git_username@git-dev.drupal.org:2222/project/@project_name'), $defaults);
- $defaults['@anon_project_url'] = t(variable_get('project_git_instructions_git_repository_url_anonymous', 'http://git-dev.drupalcode.org/project/@project_name'), $defaults);
- $defaults['@auth_sandbox_url'] = t(variable_get('project_git_instructions_git_sandbox_repository_url_authenticated', 'ssh://@git_username@git-dev.drupal.org:2222/sandbox/@project_username/@project_name'), $defaults);
- $defaults['@anon_sandbox_url'] = t(variable_get('project_git_instructions_git_sandbox_repository_url_anonymous', 'http://git-dev.drupalcode.org/sandbox/@project_username/@project_name'), $defaults);
+ $defaults['@auth_project_url'] = t(variable_get('project_git_instructions_git_repository_url_authenticated', 'ssh://@git_username@git-testing.drupal.org:2222/project/@project_name'), $defaults);
+ $defaults['@anon_project_url'] = t(variable_get('project_git_instructions_git_repository_url_anonymous', 'http://git-testing.drupalcode.org/project/@project_name'), $defaults);
+ $defaults['@auth_sandbox_url'] = t(variable_get('project_git_instructions_git_sandbox_repository_url_authenticated', 'ssh://@git_username@git-testing.drupal.org:2222/sandbox/@project_username/@project_name'), $defaults);
+ $defaults['@anon_sandbox_url'] = t(variable_get('project_git_instructions_git_sandbox_repository_url_anonymous', 'http://git-testing.drupalcode.org/sandbox/@project_username/@project_name'), $defaults);
return $defaults;
}
@@ -351,7 +351,7 @@ function project_git_instructions_mainta
cd @uri
Associate your copy of the repository with your Drupal.org account
-Although it is standard practice to use a functional address., you can also use the pre-configured address @git_username@@uid-no-reply.drupal.org. See Managing your Git identity for details.
+If you have NOT already identified yourself to Git globally, do so now. Although it is standard practice to use a functional address, you can also use the pre-configured address @git_username@@uid-no-reply.drupal.org. See Manage your Git identity for details.
git config user.email "@email"
@@ -367,9 +367,8 @@ To see what you will commit by running g
git status
Commit all changes locally
-Make your changes. For detailed directions in the Git Handbook for more
-options.
+Make your changes. Note the change in syntax for issue-related commit messages. See the Commit messages page for details.
git add -u
git commit -m "[issue category] #[issue number] by [comma-separated usernames]: [Short summary of the change]."
@@ -381,7 +380,8 @@ options.
Create a patch
git fetch origin
-git diff --no-prefix origin/@branch > [issuenumber]-"description".patch
+git rebase origin/@branch
+git format-patch origin/[version] --stdout > [description]-[issue-number]-[comment-number].patch
Create Releases
See the
naming conventions for a complete description of how to name branches and tags so you can create releases.
@@ -423,8 +423,8 @@ To see what you will commit by running g
git status
Commit all changes locally
-Make your changes. For detailed directions see the Git Handbook.
+Make your changes. Note the change in syntax for issue-related commit messages. See the Commit messages page for details.
git add -u
git commit -m "[issue category] #[issue number] by [comma-separated usernames]: [Short summary of the change]."
@@ -437,7 +437,8 @@ href="http://drupal.org/documentation/gi
Create a patch
git fetch origin
-git diff --no-prefix origin/@branch > [issuenumber]-"description".patch
+git rebase origin/@branch
+git format-patch origin/[version] --stdout > [description]-[issue-number]-[comment-number].patch
EOT;
return $default;
@@ -487,13 +488,13 @@ function project_git_instructions_sandbo
Set up this repository in your local environment for the first time:
You will be prompted to enter your Drupal.org password after the
first step (and any time you make requests from Drupal.org) if you
-have not uploaded an SSH Key or if your SSH key fails. See Authenticating with Git on Drupal.org for
+have not uploaded an SSH key or if your SSH key fails. See Authenticate with Git on Drupal.org for
details.
git clone --branch @branch @auth_sandbox_url
-cd @uri
+cd @project_fullname
Routinely
The following command both creates and checks out a new branch:
@@ -506,9 +507,8 @@ To see what you will commit by running g
git status
Commit all changes locally
-Make your changes. See detailed directions in the Git Handbook for more
-options.
+Make your changes. Note the change in syntax for issue-related commit messages. See the Commit messages page for details.
git add -u
git commit -m "Message about your changes"
@@ -530,8 +530,8 @@ change]."
Create a patch
git fetch origin
-git diff --no-prefix origin/@branch >
-[issuenumber]-"description".patch
+git rebase origin/@branch
+git format-patch origin/[version] --stdout > [description]-[issue-number]-[comment-number].patch
EOT;
return $default;
@@ -556,7 +556,8 @@ To see what you will commit by running g
git status
Commit all changes locally
-Make your changes. See detailed directions in the Git Handbook for more options.
+Make your changes. Note the change in syntax for issue-related commit messages. See the Commit messages page for details.
git add -u
git commit -m "Message about your changes"
@@ -569,7 +570,8 @@ To see what you will commit by running g
Create a patch
git fetch origin
-git diff --no-prefix origin/@branch > [issuenumber]-"description".patch
+git rebase origin/@branch
+git format-patch origin/[version] --stdout > [description]-[issue-number]-[comment-number].patch
EOT;
return $default;
@@ -579,13 +581,13 @@ function project_git_instructions_sandbo
$default = <<
Empty Sandbox Repository
Set up this repository for the first time:
-You will be prompted to enter your Drupal.org password after the last step (and any time you make requests from Drupal.org) if you have not uploaded an SSH Key or if your SSH key fails. See Authenticating with Git on Drupal.org for details.
+You will be prompted to enter your Drupal.org password after the last step (and any time you make requests from Drupal.org) if you have not uploaded an SSH key or if your SSH key fails. See Authenticate with Git on Drupal.org for details.
-mkdir @uri
-cd @uri
+mkdir @project_fullname
+cd @project_fullname
git init
-echo "name = %title" > @uri.info
-git add @uri.info
+echo "name = %title" > @project_fullname.info
+git add @project_fullname.info
git commit -m "Initial commit."
git remote add origin @auth_sandbox_url
git push origin master