diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-vcs/git-cola/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-vcs/git-cola/files')
6 files changed, 90 insertions, 0 deletions
diff --git a/dev-vcs/git-cola/files/README.gentoo b/dev-vcs/git-cola/files/README.gentoo new file mode 100644 index 000000000000..0f4af85d5ccc --- /dev/null +++ b/dev-vcs/git-cola/files/README.gentoo @@ -0,0 +1,3 @@ +Please make sure you have either a SSH key management installed and activated or +installed a SSH askpass app like net-misc/x11-ssh-askpass. +Otherwise git-cola may hang when pushing/pulling from remote git repositories via SSH. diff --git a/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch b/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch new file mode 100644 index 000000000000..0aa476fe83ea --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch @@ -0,0 +1,16 @@ +diff --git a/cola/app.py b/cola/app.py +index f9236de..4636c81 100644 +--- a/cola/app.py ++++ b/cola/app.py +@@ -66,9 +66,9 @@ def setup_environment(): + elif ssh_askpass: + askpass = ssh_askpass + elif sys.platform == 'darwin': +- askpass = resources.share('bin', 'ssh-askpass-darwin') ++ askpass = resources.prefix('bin', 'ssh-askpass-darwin') + else: +- askpass = resources.share('bin', 'ssh-askpass') ++ askpass = resources.prefix('bin', 'ssh-askpass') + + compat.setenv('GIT_ASKPASS', askpass) + compat.setenv('SSH_ASKPASS', askpass) diff --git a/dev-vcs/git-cola/files/git-cola-1.9.3-disable-tests.patch b/dev-vcs/git-cola/files/git-cola-1.9.3-disable-tests.patch new file mode 100644 index 000000000000..79f1ec2ff8bc --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-1.9.3-disable-tests.patch @@ -0,0 +1,21 @@ +diff -Naur cola-1.3.7.21.orig/test/git_test.py cola-1.3.7.21/test/git_test.py +--- cola-1.3.7.21.orig/test/git_test.py 2009-04-30 13:56:22.352319047 +0200 ++++ cola-1.3.7.21/test/git_test.py 2009-04-30 13:56:53.123149963 +0200 +@@ -24,17 +24,6 @@ + version = self.git.version()[STDOUT] + self.failUnless(version.startswith('git version')) + +- def test_tag(self): +- """Test running 'git tag'""" +- tags = self.git.tag()[STDOUT].splitlines() +- self.failUnless( 'v1.0.0' in tags ) +- +- def test_show(self): +- """Test running 'git show'""" +- sha = '1b9742bda5d26a4f250fa64657f66ed20624a084' +- contents = self.git.show(sha)[STDOUT].splitlines() +- self.failUnless(contents[0] == '/build') +- + def test_stdout(self): + """Test overflowing the stdout buffer""" + # Write to stdout only diff --git a/dev-vcs/git-cola/files/git-cola-2.2.1-disable-live-tests.patch b/dev-vcs/git-cola/files/git-cola-2.2.1-disable-live-tests.patch new file mode 100644 index 000000000000..2ebdc9880d1e --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-2.2.1-disable-live-tests.patch @@ -0,0 +1,22 @@ +diff --git a/test/git_test.py b/test/git_test.py +index 9f812b2..ff7da24 100644 +--- a/test/git_test.py ++++ b/test/git_test.py +@@ -53,17 +53,6 @@ class GitCommandTest(unittest.TestCase): + version = self.git.version()[STDOUT] + self.failUnless(version.startswith('git version')) + +- def test_tag(self): +- """Test running 'git tag'""" +- tags = self.git.tag()[STDOUT].splitlines() +- self.failUnless( 'v1.0.0' in tags ) +- +- def test_show(self): +- """Test running 'git show'""" +- sha = '1b9742bda5d26a4f250fa64657f66ed20624a084' +- contents = self.git.show(sha)[STDOUT].splitlines() +- self.failUnless(contents[0] == '/build') +- + def test_stdout(self): + """Test overflowing the stdout buffer""" + # Write to stdout only diff --git a/dev-vcs/git-cola/files/git-cola-2.2.1-update-git-config-in-tests.patch b/dev-vcs/git-cola/files/git-cola-2.2.1-update-git-config-in-tests.patch new file mode 100644 index 000000000000..96271d05548c --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-2.2.1-update-git-config-in-tests.patch @@ -0,0 +1,13 @@ +diff --git a/test/helper.py b/test/helper.py +index 006a5b1..64d0dfc 100644 +--- a/test/helper.py ++++ b/test/helper.py +@@ -87,6 +87,8 @@ class GitRepositoryTestCase(TmpPathTestCase): + + def initialize_repo(self): + self.git('init') ++ self.git('config', '--local', 'user.name', 'Your Name') ++ self.git('config', '--local', 'user.email', 'you@example.com') + self.touch('A', 'B') + self.git('add', 'A', 'B') + diff --git a/dev-vcs/git-cola/files/index.html b/dev-vcs/git-cola/files/index.html new file mode 100644 index 000000000000..7f1e814a0b51 --- /dev/null +++ b/dev-vcs/git-cola/files/index.html @@ -0,0 +1,15 @@ +<html> +<head> + <title>Missing documentation</title> +</head> +<body> +<div style="border: 4px double red; padding: 2em; margin: 4em; top: 4em; width: 20em;"> + This documentation is missing. Please reinstall dev-util/cola with the 'doc' useflag enabled. + + <p style="text-align: right;"> + Sincerely,<br/> + your package maintainer. + </p> +</div> +</body> +</html> |