git conversion trial repository #5

git conversion trial repository #5

[Eric S. Raymond]

Next review version of the repository conversion is here:

	git@gitorious.org:emacs-transition/review5.git

This one is current to complete to 2014-05-14 17:55:37 +0400.
It has been repacked.

Cloning this may appear at first site to fetch only the master branch,
but do "git branch -a" to list the other remote branches.  You can
easily create local tracking branches for those you are interested in.

The conversion machinery, including the lift script, can be cloned from

	git@gitorious.org:emacs-transition/emacs-transition.git

How you can help:

1. Report Bazaar and CVS references that aren't already in the
emacs.lift file (see BAZAAR REFERENCES and CVS REFERENCES). 

2. Check the CVS references already in emacs.lift (see CVS REFERENCES). 

3. Check bzr references translated with nochecklog, nocheckcomment,
everylog, and everycomment. (The changelog and changecomment commands
do not need to be checked by hand as they are automatically verified
by a script in the conversion machinery.)

4. Use gitk or git log to spot CVS cliques consisting of uncoalesced
single-file changes and their ChangeLog entry commits; report them so
I can squash them into proper changesets. 

5. Investigate the old-branches and other-branches groups and determine
which branches, if any, should be discarded.

6. (Advanced) Identify the actual deletion points of as many of the
=-prefixed attic files as possible.  Look for the string "ATTIC
FILES" in emacs.lift and try to turn 'attic' calls into 'deattic'
calls. (I've already done this, but it's a difficult and finicky process;
I might have missed some.)

7. (Advanced) Learn the reposurgeon DSL.  Use this knowledge to audit
emacs.lift for correctness.

Barring any glitches found by people (other than me) doing these
auditing steps, the conversion procedure is pretty much ready to go.
I rerun it occasionally to catch new bzr references in the logs and
comments.  Note that a full conversion takes about eight hours of
commpute time; this constraint needs to be planned around in the 
conversion-day schedule.

A couple of work items remain on my list for after 24.4 release and
before the conversion, most notably merging and testing Rüdiger
Sonderfeld's improvement for vc.el.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

Americans have the will to resist because you have weapons. 
If you don't have a gun, freedom of speech has no power.
         -- Yoshimi Ishikawa, Japanese author, in the LA Times 15 Oct 1992

Re: git conversion trial repository #5

[Paul Eggert]

On 05/15/2014 01:38 AM, Eric S. Raymond wrote:
> Next review version of the repository conversion is here:
>
> 	git@gitorious.org:emacs-transition/review5.git

The repository doesn't seem to be public:

$ git clone git@gitorious.org:emacs-transition/review5.git
Cloning into 'review5'...
The authenticity of host 'gitorious.org (87.238.52.168)' can't be 
established.
RSA key fingerprint is 7e:af:8d:ec:f0:39:5e:ba:52:16:ce:19:fa:d4:b8:7d.
Are you sure you want to continue connecting (yes/no)? yes
Warning: Permanently added 'gitorious.org,87.238.52.168' (RSA) to the 
list of known hosts.
Permission denied (publickey).
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

Re: git conversion trial repository #5

[David Kastrup]

Paul Eggert <eggert@cs.ucla.edu> writes:

> On 05/15/2014 01:38 AM, Eric S. Raymond wrote:
>> Next review version of the repository conversion is here:
>>
>> 	git@gitorious.org:emacs-transition/review5.git
>
> The repository doesn't seem to be public:
>
> $ git clone git@gitorious.org:emacs-transition/review5.git

Totally garbled link I'd say.  Try

git clone git://gitorious.org/emacs-transition/review5.git

instead.

-- 
David Kastrup

Re: git conversion trial repository #5

[Eric S. Raymond]

David Kastrup <dak@gnu.org>:
> Totally garbled link I'd say.  Try
> 
> git clone git://gitorious.org/emacs-transition/review5.git
> 
> instead.

I believe you, but I'm pasting the link gitorious presents, dangit.  

I think we've had this problem before.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

Re: git conversion trial repository #5

[Geoff Shannon]

[-- Attachment #1: Type: text/plain, Size: 693 bytes --]

That looks like the git via ssh link, in which case the git@...: syntax is
correct.

Eric, your link may require write access to the repo. There's also the
https link
https://git.gitorious.org/emacs-transition/review5.git

On Thursday, May 15, 2014, Eric S. Raymond <esr@thyrsus.com> wrote:

> David Kastrup <dak@gnu.org <javascript:;>>:
> > Totally garbled link I'd say.  Try
> >
> > git clone git://gitorious.org/emacs-transition/review5.git
> >
> > instead.
>
> I believe you, but I'm pasting the link gitorious presents, dangit.
>
> I think we've had this problem before.
> --
>                 <a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
>
>

-- 
Geoff

Nothing is ever easy.

[-- Attachment #2: Type: text/html, Size: 1427 bytes --]

Re: git conversion trial repository #5

[Eli Zaretskii]

> From: esr@thyrsus.com (Eric S. Raymond)
> Date: Thu, 15 May 2014 04:38:17 -0400 (EDT)
> 
> 1. Report Bazaar and CVS references that aren't already in the
> emacs.lift file (see BAZAAR REFERENCES and CVS REFERENCES). 

  commit 2864dd38d41f7a0299f41c46271ed85bc9292ee7
  Author: Daiki Ueno <ueno@unixuser.org>
  Date:   Fri Jul 1 11:07:32 2011 +0900

      Fix commit 104823.

Re: git conversion trial repository #5

[Eric S. Raymond]

Eli Zaretskii <eliz@gnu.org>:
>       Fix commit 104823.

Thanks.  The bare numbers are the easieest ones to miss in the clutter.
This one will be fixed in review6.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

Re: git conversion trial repository #5

[Glenn Morris]

Eric S. Raymond wrote:

> A couple of work items remain on my list for after 24.4 release and
> before the conversion, most notably merging and testing Rüdiger
> Sonderfeld's improvement for vc.el.

There's no reason this needs to wait for the 24.4 release.
The Emacs trunk is open for these kind of improvements.
(Also Rüdiger has write access, so can commit things himself.)

Re: git conversion trial repository #5

[Eric S. Raymond]

Glenn Morris <rgm@gnu.org>:
> Eric S. Raymond wrote:
> 
> > A couple of work items remain on my list for after 24.4 release and
> > before the conversion, most notably merging and testing Rüdiger
> > Sonderfeld's improvement for vc.el.
> 
> There's no reason this needs to wait for the 24.4 release.
> The Emacs trunk is open for these kind of improvements.
> (Also Rüdiger has write access, so can commit things himself.)

OK, I don't object to having less work to do.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

Re: git conversion trial repository #5

[Rüdiger Sonderfeld]

Hello,

On Thursday 15 May 2014 16:20:55 Glenn Morris wrote:
> Eric S. Raymond wrote:
> > A couple of work items remain on my list for after 24.4 release and
> > before the conversion, most notably merging and testing Rüdiger
> > Sonderfeld's improvement for vc.el.
> 
> There's no reason this needs to wait for the 24.4 release.
> The Emacs trunk is open for these kind of improvements.
> (Also Rüdiger has write access, so can commit things himself.)

the problem is that my patch results in git being called twice for every 
file[1].  I proposed a solution changing vc-git to add a `conflicted' 
marker[2] but since I'm not very familiar with the vc.el and vc-git internals 
I don't feel competent enough to introduce such a change without some 
feedback.

Regards,
Rüdiger

[1] https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01126.html
[2] https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01271.html