WesnothRepository - Revision history

Demario: Update version numbers

2024-07-19T08:52:25Z

Update version numbers

Octalot: /* Push access */ Adding the main repo in an uncomment-to-push way

2022-12-12T03:39:17Z

‎Push access: Adding the main repo in an uncomment-to-push way

Clavi: /* Push access */ replaced ssh key type with modern ed25519, replaced mentions of "OSX" with "macOS"

2021-11-10T00:49:26Z

‎Push access: replaced ssh key type with modern ed25519, replaced mentions of "OSX" with "macOS"

Pentarctagon: /* See Also */

2020-05-15T20:15:17Z

‎See Also

Pentarctagon at 20:05, 15 May 2020

2020-05-15T20:05:38Z

Shiki: Update mentions of 1.12 to 1.14 (similar for 1.10)

2018-05-20T19:53:24Z

Update mentions of 1.12 to 1.14 (similar for 1.10)

Shiki: seems to be not the case anymore nowadays

2017-05-21T15:06:29Z

seems to be not the case anymore nowadays

SigurdFireDragon: /* FAQ */

2016-06-08T22:07:13Z

‎FAQ

8680: /* Browse the code */

2015-08-02T19:14:31Z

‎Browse the code

8680: /* Browse the code */

2015-08-02T19:12:37Z

‎Browse the code

@@ Line 26: / Line 26: @@
 {{FeaturedURL|https://github.com/wesnoth/wesnoth}}
-There are currently two main streams of development ("<dfn>branches</dfn>"): the '''master''' branch (1.15.x), and the '''stable''' branch (1.14.x). (1.12.x is now '''oldstable'''.) Most other branches are only used for a short time to do some testing without disturbing the main development.
+There are currently two main streams of development ("<dfn>branches</dfn>"): the '''master''' branch (1.19.x), and the '''stable''' branch (1.18.x). (1.16.x is now '''oldstable'''.) Most other branches are only used for a short time to do some testing without disturbing the main development.
 == Download ==
@@ Line 80: / Line 80: @@
 '''Q: I don't want any alternate branches or repository history. How could I avoid downloading that?'''
-'''A:''' This simply requires a more elaborate command. For example, to only download the last revision of the 1.14 branch, and store it in a directory named "''wesnoth-1.14-single-branch-test''":
+'''A:''' This simply requires a more elaborate command. For example, to only download the last revision of the 1.18 branch, and store it in a directory named "''wesnoth-1.18-single-branch-test''":
-  '''>''' git clone --branch 1.14 --single-branch --depth 1 "<nowiki>https://github.com/wesnoth/wesnoth.git</nowiki>" wesnoth-1.14-single-branch-test
+  '''>''' git clone --branch 1.18 --single-branch --depth 1 "<nowiki>https://github.com/wesnoth/wesnoth.git</nowiki>" wesnoth-1.18-single-branch-test
 Example results:
-  '''>''' git clone --branch 1.14 --single-branch --depth 1 "<nowiki>https://github.com/wesnoth/wesnoth.git</nowiki>" wesnoth-1.14-single-branch-test
+  '''>''' git clone --branch 1.18 --single-branch --depth 1 "<nowiki>https://github.com/wesnoth/wesnoth.git</nowiki>" wesnoth-1.18-single-branch-test
-  Cloning into 'wesnoth-1.14-single-branch-test'...
+  Cloning into 'wesnoth-1.18-single-branch-test'...
   remote: Counting objects: 20751, done.
   remote: Compressing objects: 100% (20087/20087), done.
@@ Line 94: / Line 94: @@
   Resolving deltas: 100% (968/968), done.
   Checking out files: 100% (20369/20369), done.
-  '''>''' du -sh wesnoth-1.14-single-branch-test ''# "du" means "disk usage".''
+  '''>''' du -sh wesnoth-1.18-single-branch-test ''# "du" means "disk usage".''
-.3G	wesnoth-1.14-single-branch-test
+.3G	wesnoth-1.18-single-branch-test
 However, for development and testing, it is often better to have some of the repository history, so that you can quickly check out older versions of the repository to pin down a bug.

← Older revision		Revision as of 03:39, 12 December 2022
Line 123:		Line 123:

	'''>''' git remote set-url origin "<nowiki>ssh://git@github.com/wesnoth/wesnoth.git</nowiki>"		'''>''' git remote set-url origin "<nowiki>ssh://git@github.com/wesnoth/wesnoth.git</nowiki>"
		+
		+	You can also leave your local repo using the read-only URL, and add a '''pushurl'''. Manually editing the .git/config also allows it to be commented-out to avoid accidentally pushing to it instead of a fork:
		+
		+	<nowiki>
		+	[remote "origin"]
		+	url = https://github.com/wesnoth/wesnoth
		+	# pushurl = git@github.com:wesnoth/wesnoth.git
		+	fetch = +refs/heads/:refs/remotes/origin/</nowiki>

	=== Force-pushing policy ===		=== Force-pushing policy ===

@@ Line 103: / Line 103: @@
 For '''<dfn>push access</dfn>''' (the capability to ''push'' changes from your local repository) to our ''upstream'' repository on GitHub, you must have an account on GitHub, which must be registered as part of the [https://github.com/wesnoth ''Battle for Wesnoth''] organization.
-It may be convenient to use Git's '''Secure Shell (SSH) transport protocol''', so that you needn't either enter your username and password each time you push commits, or insecurely store those credentials in an unencrypted configuration file. To use the SSH transport, you will need to generate an SSH '''''key pair''''' with a command like (on Unix descendent operating systems, including Linux distributions and Apple OS X, at least) this:
+It may be convenient to use Git's '''Secure Shell (SSH) transport protocol''', so that you needn't either enter your username and password each time you push commits, or insecurely store those credentials in an unencrypted configuration file. To use the SSH transport, you will need to generate an SSH '''''key pair''''' with a command like (on Unix descendent operating systems, including Linux distributions and Apple macOS, at least) this:
-  '''>''' ssh-keygen -t rsa -b 15360 -f "<var><file></var>" -C "<var><your name></var>'s SSH key for GitHub"
+  '''>''' ssh-keygen -t ed25519 -f "<var><file></var>" -C "<var><your name></var>'s SSH key for GitHub"
-On a typical Linux distribution or on Apple OS X, <var><file></var> would be, e.g., "''~/.ssh/id-key-for-github''".
+On a typical Linux distribution or on Apple macOS, <var><file></var> would be, e.g., "''~/.ssh/id-key-for-github''".
 Once you have generated an SSH key pair, put the following into your SSH configuration file (on Unix descendent systems, this is generally "''~/.ssh/config''"):

@@ Line 172: / Line 172: @@
 == See Also ==
 * [[Git for Wesnoth Crash Course]]
 [[Category:Development]]

@@ Line 172: / Line 172: @@
 == See Also ==
-* [[CompilingWesnoth]]
+* [https://github.com/wesnoth/wesnoth/blob/master/INSTALL.md Compiling Wesnoth]
 * [[Git for Wesnoth Crash Course]]
 [[Category:Development]]

← Older revision		Revision as of 15:06, 21 May 2017
Line 109:		Line 109:

	On a typical Linux distribution or on Apple OS X, <var><file></var> would be, e.g., "''~/.ssh/id-key-for-github''".		On a typical Linux distribution or on Apple OS X, <var><file></var> would be, e.g., "''~/.ssh/id-key-for-github''".
−
−	~~<strong>Note</strong> that generating an SSH key pair can potentially take a while and be fairly CPU-intensive.~~

	Once you have generated an SSH key pair, put the following into your SSH configuration file (on Unix descendent systems, this is generally "''~/.ssh/config''"):		Once you have generated an SSH key pair, put the following into your SSH configuration file (on Unix descendent systems, this is generally "''~/.ssh/config''"):

← Older revision		Revision as of 22:07, 8 June 2016
Line 59:		Line 59:
	The first command links your local repository to the upstream repository; the second <dfn>checks out</dfn> a <dfn>working tree</dfn> (i.e., copies the files out of the "''.git''" directory into a form that you can use).		The first command links your local repository to the upstream repository; the second <dfn>checks out</dfn> a <dfn>working tree</dfn> (i.e., copies the files out of the "''.git''" directory into a form that you can use).

		+	'''Alternative:''' This will make a shallow clone and allow you to fetch additional history as desired.
		+	# Start by using a clone command
		+	# Run a git fetch command with an increased depth, such as "git fetch --depth=2000"
		+	# Continue to run additional fetch commands, each time increasing the depth, based on what your connection can handle. As of this writing, the max depth is around 60-70K.
		+	# When an increase in depth no longer brings additional data, verify you have a complete repository by using "git fetch --unshallow"
		+	# To fix the single branch checkout aspect, use git config and fetch commands.
		+	A sample sequence is shown below. You may want to use smaller depth increases (i.e.,2-5K) based on your connection speed and reliability.
		+	'''>''' git clone --depth 1 "<nowiki>https://github.com/wesnoth/wesnoth.git</nowiki>" wesnoth
		+	'''>''' git fetch --depth=10000
		+	'''>''' git fetch --depth=20000
		+	'''>''' git fetch --depth=30000
		+	'''>''' git fetch --depth=40000
		+	'''>''' git fetch --depth=50000
		+	'''>''' git fetch --depth=60000
		+	'''>''' git fetch --depth=70000
		+	'''>''' git fetch --unshallow
		+	'''>''' git config remote.origin.fetch "<nowiki>+refs/heads/:refs/remotes/origin/</nowiki>"
		+	'''>''' git fetch origin

	'''Q: I don't want any alternate branches or repository history. How could I avoid downloading that?'''		'''Q: I don't want any alternate branches or repository history. How could I avoid downloading that?'''

@@ Line 21: / Line 21: @@
 == Browse the code ==
-{{SideBox|heading=Want a {{abbr|GUI|Graphical User Interface}} for Git?|[https://www.syntevo.com/smartgit/ <cite>SmartGit</cite>] is cross-platform and supposedly powerful, and the {{abbr|IDEs|Integrated Development Environments}} [https://www.qt.io/download-open-source/ <cite>Qt Creator</cite>] and <cite>Microsoft Visual Studio</cite> provide Git GUIs. <em><strong>However</strong></em>, the official Git command-line program is <em>by far</em> the easiest Git program to get help with -- you may have trouble finding people who can help you with a Git GUI.}}
+{{SideBox|heading=Want a {{abbr|GUI|Graphical User Interface}} for Git?|[https://www.syntevo.com/smartgit/ <cite>SmartGit</cite>] is cross-platform and supposedly powerful, and the {{abbr|IDEs|Integrated Development Environments}} [https://www.qt.io/download-open-source/ <cite>Qt Creator</cite>] and <cite>Microsoft Visual Studio</cite> provide Git GUIs. <em><strong>However</strong></em>, the official Git command-line program is <em>by far</em> the easiest Git program to get help with -- you may well have trouble finding people who can help you with a Git GUI.}}
 You can use a Web browser to view the source code at the following Web address: