[Twisted-Python] git repo maintenance
kevin.horn at gmail.com
Mon Oct 22 19:54:46 EDT 2012
On Mon, Oct 22, 2012 at 2:22 PM, Glyph <glyph at twistedmatrix.com> wrote:
> On Oct 22, 2012, at 10:53 AM, Kevin Horn <kevin.horn at gmail.com> wrote:
> On Sun, Oct 21, 2012 at 11:05 PM, Glyph <glyph at twistedmatrix.com> wrote:
>> For what it's worth, I haven't authored a branch for Twisted with SVN in
>> the last 3 years. I use Bazaar almost exclusively and I get all the fun
>> tools one generally associates with a DVCS, including offline history and a
>> nice graphical revision viewer. (One reason I am concerned about migrating
>> to Git is that this will stop working; in my opinions, Git's offline GUI
>> tools are far worse than Bazaar's - almost as much worse as Launchpad's
>> source browser is than Github.)
> I really wish I could figure out how to do this. The one page on the wiki
> helps a bit, but is insufficient for those not already familiar with bzr
> (like me). I've tried setting this up a couple of times, and I always end
> up just giving up on it.
> Let me keep it super short and sweet for you:
> C:\PROJEC~1> bzr branch http://svn.twistedmatrix.com/bzr/Twisted/trunkTwisted
> C:\PROJEC~1> cd Twisted
> as many times as desired,
> C:\PROJEC~1\TWISTED> hack hack hack
> C:\PROJEC~1\TWISTED> C:\python27\python.exe bin\trial twisted
> C:\PROJEC~1\TWISTED> bzr commit
> Review time!
> C:\PROJEC~1\TWISTED> bzr send -o - > my.patch
> Stick my.patch on a ticket and you're good to go. No need for combinator,
> or virtualenv, or subversion (not even bzr-svn, we did that part for you),
> or even a C compiler, assuming the feature you're working on doesn't need
> If any of this isn't covered in the wiki page then please update it. And
> please feel free to ask more questions - if specific version control or
> workflow issues are preventing anyone from working on Twisted then it is
> definitely on-topic for this list and I will be happy to provide answers
> and update development documentation.
See that should totally be on a wiki page someplace.
I'd be happy to put it up there, but I don't have edit permissions on that
page (or any of them?) apparently...
> (and no I don't recall exactly why, except for the one time when
> installing bzr on windows hosed my machine and made it unbootable...not
> Twisted's fault of course).
> Can we just agree that you had a virus and that this had nothing to do
> with anything in this thread? Even if that's not true I think it might be
> long-term more mentally healthy for you to believe :-)
Actually I know exactly why this happened, and it's because Windows has a
hard limit on the number of "icon overlays" you can add to Explorer. I
installed TortoiseBzr along with bzr, and went over that limit. This by
itself is not such a big deal, but it turns out that the failure behavior
of this particular issue is NOT BOOTING ANY MORE. (stupid Windows)
(FYI, I've since installed bzr again, and have had no similar problems.)
(also FYI, I haven't had a virus/spyware on a windows machine that I owned
in more than 10 years...<knock on wood>...the trick is renaming the
But aside from that, the couple of times I've tried messing around with bzr
I end up going in circles in their documentation, can't decide what I
should be doing, decide I don't have time to mess with it and just go back
to SVN (which is painful). Of course by that time I've usually gotten
distracted and I never finish whatever it was I was working on...
Mostly these days I just bang my head against translating the Lore docs
into Sphinx (yes, I'm _still_ working on that).
Unless someone applied my patch, Combinator won't work on Windows. Also,
> since the great Divmod site meltdown, there's not good instructions on how
> to use it (aside from the wayback machine, which is what I've been using).
> I'd never heard of svnmerge.py until you mentioned it. Are there any
> instructions on how to use it with Twisted? I'm not finding any, and I'm
> reluctant to experiment since Twisted has a very specific way on
> interacting with the SVN repo.
> I guess I should test this out myself at least once, but my understanding
> is that you just do svnmerge.py --bidirectional -S
> the-branch-you-want-to-merge in trunk. You can test this out for yourself
> though, since svnmerge.py is loudly advertised as "commit-free": you always
> have to do the commit yourself.
> More info here: <http://www.orcaware.com/svn/wiki/Svnmerge.py>.
> If we can ever upgrade to a version of SVN on the server that supports
> merge-tracking, the need for either of these tools will go away since a
> plain 'svn merge ../branches/branchname' will do the right thing. Any
> volunteer sysadmins want to take the opportunity to crawl out of the
> woodwork? (Please?)
I had no idea that Twisted was still using such an old version. I was
under the impression that the hackery that Combinator used was incompatible
with the new merge tracking and that's why it wasn't being used (because it
would screw up those still using Combinator...this assumes there are any).
If that's not true, perhaps I can take a look, though I likely wouldn't be
able to devote any serious time to it until at least Mid-November.
> But again: if you have trouble with this part, please just drop an email
> to the list and I will do it for you. Do not let this minor step be an
> impediment to contributing to Twisted.
My _major_ impediments are 2 and 6 years old... :) The above is at most a
_minor_ impediment. But even minor impediments can drive away new
developers, which I assume is not what we want.
Presumably you could use Mercurial with the hggit plugin against a git
>> repo, but you can't use it directly against the SVN repo, as it has a bad
>> commit in it that hgsubversion totally chokes on:
> Sadness. Hopefully this renewed attention will get the mercurial folks to
> fix this bug sooner? Thanks for filing it.
De nada...it was entirely self-interest-driven though. :)
> Trac has never really bothered me that much. Yes, occasionally it will do
> something stupid, and it's...not fast, but I guess I'm just used to the
> pain. I'm looking forward to Frack, though.
> Great, glad to hear it.
> By the way, if you've been shying away because it's slow, you should know
> that we did recently fix a major performance problem with the website.
> Bots were running amok on some very CPU and memory intensive requests, and
> robots.txt was not deployed correctly so it wasn't reducing any of the
> traffic as it should have. At the most recent sprint nobody complained
> about being unable to work because of the website falling over, which
> indicates that some of our more dire problems are now under control.
I haven't noticed any real problems with it since the grand trac revamp a
couple years ago, when Twisted's Trac instance became mostly stable.
Granted I'm not in there every day like some are...
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Twisted-Python