Go to main content

Textpattern CMS support forum

You are not logged in. Register | Login | Help

#1 2011-09-01 14:49:09

hcgtv
Archived Plugin Author
From: Key Largo, Florida
Registered: 2005-11-29
Posts: 2,722
Website

Textpattern on GitHub

Though not official, I’d like to point out the GitHub mirror of Textpattern setup by Graeme Porteous:

https://github.com/textpattern/textpattern

It’s a very easy way to download the latest code without having to use an SVN client, I dislike the Tortoise. The download will say 4.4.0 in the zip’s name but it’s the latest code after 4.4.1.

The reason I bring this up, is so more people can get involved in testing the latest release. Today there are many ways to run a local testing environment, XAMPP on Windows, MAMP on a Mac, or even running Linux on a dedicated or virtual machine.

Also, check out Phil’s new default theme:

https://github.com/philwareham/txp-h5bp-theme

Getting involved, it’s what Open Source is all about.

Offline

#2 2012-02-27 11:12:00

philwareham
Core designer
From: Haslemere, Surrey, UK
Registered: 2009-06-11
Posts: 3,565
Website GitHub Mastodon

Re: Textpattern on GitHub

I’m bumping this since I’m still wanting to see Textpattern have a better presence of GitHub.

It would be good if the unofficial GitHub repo of Textpattern mentioned above tracked commits more frequently like the (official) WordPress one that updates every 30 mins. At the moment it takes a few weeks for changes to appear – I’m guessing because someone has to manually sync the repo – not great if you’re trying to work on core changes.

Better still would be if the core devs adopted that repo as an official source of Textpattern code and accepted pull requests that way (as well as via Subversion and Mercurial if they wish). I really don’t know why the reluctance to use it persists. If anything, Stef’s call to clone the Mercurial repo of Textpattern5 on Google Code has shown that direction to have failed.

FWIW Wired had quite an interesting writeup on GitHub recently

Offline

#3 2012-02-27 13:15:16

wet
Developer Emeritus
From: Vöcklabruck, Austria
Registered: 2005-06-06
Posts: 3,421
Website GitHub Mastodon

Re: Textpattern on GitHub

philwareham wrote:

Better still would be if the core devs adopted that repo as an official source of Textpattern code

I’m not quite sure how we can adopt a resource which we do not own or control. This is, admittedly, a point of friction and might cause a bit of reluctance on our side. In related news, I’m all open to setup a regular syncing task somewhere.

Offline

#4 2012-02-27 14:19:24

net-carver
Archived Plugin Author
Registered: 2006-03-08
Posts: 1,648

Re: Textpattern on GitHub

wet wrote:

I’m not quite sure how we can adopt a resource which we do not own or control. This is, admittedly, a point of friction and might cause a bit of reluctance on our side.

Graeme & I bagged that project name a while back on GitHub, specifically to reserve it for the Dev team should they want it. If you want it, it’s yours. I have offered it before but had no take up.

In related news, I’m all open to setup a regular syncing task somewhere.

The repos should be auto-synchronised. I’ll see if I can find out if Graeme’s sync script is down for some reason.


Steve

Offline

#5 2012-02-27 14:24:47

philwareham
Core designer
From: Haslemere, Surrey, UK
Registered: 2009-06-11
Posts: 3,565
Website GitHub Mastodon

Re: Textpattern on GitHub

net-carver wrote:

The repos should be auto-synchronised. I’ll see if I can find out if Graeme’s sync script is down for some reason.

Just out of curiosity, what frequency is the auto-sync set to?

Offline

#6 2012-02-27 14:29:04

net-carver
Archived Plugin Author
Registered: 2006-03-08
Posts: 1,648

Re: Textpattern on GitHub

I don’t recall — will have to get the word on that from Graeme — but it certainly didn’t used to take this long to reflect the changes from googlecode.


Steve

Offline

#7 2012-02-27 21:44:58

graeme
Plugin Author
Registered: 2004-06-21
Posts: 337
Website

Re: Textpattern on GitHub

Auto-sync script was set to run 4 times per hour. Release tags were done manually.

Recently I’ve had sever problems and I’m in the process of setting up a new server which I was planning on moving the script and txpforge.org to. I’ll make an effort to conplete soon.

As Steve said, we’re happy to hand ove the github account to dev team and I’m happy to continue to maintain script in my spare time or to hand over to someone else with more time on their hands.

Offline

#8 2012-03-15 22:20:36

net-carver
Archived Plugin Author
Registered: 2006-03-08
Posts: 1,648

Re: Textpattern on GitHub

As a follow up to this, Graeme and I have handed the keys to the Textpattern account on github over to the devs and are in the process of detaching ourselves from that particular web-space.


Steve

Offline

#9 2012-03-20 08:56:29

[Axel]
Member
From: Switzerland/Denmark
Registered: 2007-07-26
Posts: 65
Website

Re: Textpattern on GitHub

Looks like the mirror is dead. last update is 7 month old. I though I could find 4.5 here somewhere to check it out. Is there an other source than the svn to get a hand on it?


Greetz [Axel]

Offline

#10 2012-03-20 09:48:52

philwareham
Core designer
From: Haslemere, Surrey, UK
Registered: 2009-06-11
Posts: 3,565
Website GitHub Mastodon

Re: Textpattern on GitHub

The (now official) Textpattern GitHub repo is only a few weeks behind (Jan 30th) but hopefully it will be synced up again soon now the ownership has changed.

My own Textpattern GitHub fork is from more recent SVN but it does have a few changes in it that are not yet part, or may never be part, of the official core.

Offline

#11 2012-03-20 10:01:23

Bloke
Developer
From: Leeds, UK
Registered: 2006-01-29
Posts: 12,463
Website GitHub

Re: Textpattern on GitHub

philwareham wrote:

hopefully it will be synced up again soon now the ownership has changed.

I’ve got my grubby mitts on a script written by Graeme which syncs the repos, but I’m currently (still, because I’m lazy) not blessed with a Linux environment. It’s a shell script so I can’t run it. And I hate cygwin.

Wrapping my head around a way to get it set up in a really slick fashion. Didn’t know who to call so I tried Ghostbusters: waiting for them to check back and give me some guidance.


The smd plugin menagerie — for when you need one more gribble of power from Textpattern. Bleeding-edge code available on GitHub.

Hire Txp Builders – finely-crafted code, design and Txp

Offline

#12 2012-03-20 10:15:45

philwareham
Core designer
From: Haslemere, Surrey, UK
Registered: 2009-06-11
Posts: 3,565
Website GitHub Mastodon

Re: Textpattern on GitHub

My webserver is linux (CentOS 5), maybe we could put the shell script on there for the moment?

Will we one day be able to send pull requests to the GitHub repo?

Offline

#13 2012-03-20 10:29:30

Bloke
Developer
From: Leeds, UK
Registered: 2006-01-29
Posts: 12,463
Website GitHub

Re: Textpattern on GitHub

philwareham wrote:

My webserver is linux (CentOS 5), maybe we could put the shell script on there for the moment?

Sounds like an option. When I get an answer back from Graeme/Steve about the options open to us we’ll figure out the best way to host the script and keep things in sync.

Will we one day be able to send pull requests to the GitHub repo?

No good asking me: I’ve never even used git.

I just work here :-)


The smd plugin menagerie — for when you need one more gribble of power from Textpattern. Bleeding-edge code available on GitHub.

Hire Txp Builders – finely-crafted code, design and Txp

Offline

#14 2012-03-20 16:08:59

maniqui
Member
From: Buenos Aires, Argentina
Registered: 2004-10-10
Posts: 3,070
Website

Re: Textpattern on GitHub

Phil, it seems you have done your commits on top of master branch.
I’d suggest you to undo and redo them (not really, as it just a matter of running a few git commands) on a new branch (let’s call it phil-experiments branch).

This will have the advantage that you will be able to keep the master branch of your fork up to date with the latest commits on upstream (official) master branch.
And then, you also get the advantage of being able to rebase the phil-experiments branch on top of master, each time master changes. If no conflicts, you can be sure that your experiments apply nicely on top of master branch, while keeping the phil-experimental commit history in a nice, linear shape (not filled with lot of merge commits).

I can also see, in the commit history of your master branch, that you have manually applied all the changes in SVN repo since Jan 30.
Now, I can understand that you did it because the (now official) Textpattern repo at GitHub got stucked at that day, and you wanted your master branch to reflect changes in SVN, so you resorted to applying them manually.

Being that you are asking here about being able to send, someday, a Pull Request (btw, Pull Requests are a GitHub feature, not a Git feature), all this “commit jugglery” you did on your master branch may not apply nicely to the official master branch.
In any case, I think that Pull Request can be done in a “per commit” basis (and not the whole series of commits), similar or equal to git cherry-pick.

TL;DR: Phil, I’d suggest you to keep your master branch clean, in sync with master branch from upstream (aka the now official TXP repo at GitHub), and have a phil-experiments branch, with your changes rebased on top of master.

In a serie of git commands:

git branch phil-experiments # Create new "phil-experiments" branch, based on your current (dirty) "master" branch. 
git reset --hard e5f9040ba3 # While still in "master", and you reset it to latest official commit.
git push -f origin master # Push & rewrite the "master" branch on your GH fork (I'm assuming it's named "origin").
git push origin phil-experiments # If you want to publish that branch on GH

Eventually, the master branch on upstream will get unstuck, and you will be able to rebase your phil-experiments branch on top of it. By that time, you may also want to get rid of all those unnecessary “Merge SVN as r1234” (or similar) commits. You will be able to do that by branching again from master (a new branch, let’s call it phil-master), and then, on that branch git cherry-pick each one of your substantial commits from phil-experiments branch (thus, discarding all the manual merging you did).

Have fun!


La música ideas portará y siempre continuará

TXP Builders – finely-crafted code, design and txp

Offline

#15 2012-03-20 16:21:42

maniqui
Member
From: Buenos Aires, Argentina
Registered: 2004-10-10
Posts: 3,070
Website

Re: Textpattern on GitHub

Just to add up to the confussion, I’ve my own Textpattern repo in GitHub:
github.com/maniqui/textpattern
which is not a fork of the (now official) github.com/textpattern/textpattern repo.

It includes an 4.4.1-mlp branch (with MLP already bundled), and most of the tags (I’ve discarded a few RC) corresponding to official releases. It also includes two extra tags related to the integration of the MLP.

For those interested in why I didn’t fork from the (now official, but not at that time) Textpattern repo, I tried to explain it here. Basically, I was just trying to learn and to scratch my own itch.

Edited to fix broken textile link.

Last edited by net-carver (2012-04-17 16:32:37)


La música ideas portará y siempre continuará

TXP Builders – finely-crafted code, design and txp

Offline

Board footer

Powered by FluxBB