XEmacs-Patches February 2008

xemacs-patches@xemacs.org

16 participants
52 discussions

[AC web] Update repo access instructions 16 years, 10 months

Stephen J. Turnbull

APPROVE COMMIT web Thanks to Joachim Schrod for the suggestion. Index: Develop/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Develop/ChangeLog,v retrieving revision 1.105 diff -u -U0 -r1.105 ChangeLog --- Develop/ChangeLog 24 Mar 2007 15:30:19 -0000 1.105 +++ Develop/ChangeLog 2 Feb 2008 07:17:50 -0000 ＠＠ -0,0 +1,9 ＠＠ +2008-02-01 Stephen J. Turnbull <stephen(a)xemacs.org> + + * hgaccess.content: New file based on cvsaccess.html. + + * index.content: Add reference to hgaccess.html. + Add reference to beta.html. + + * cvsaccess.content: Add reference to hgaccess.html. + Index: Develop/index.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Develop/index.content,v retrieving revision 1.15 diff -u -r1.15 index.content --- Develop/index.content 8 Nov 2003 22:37:13 -0000 1.15 +++ Develop/index.content 2 Feb 2008 07:17:52 -0000 ＠＠ -8,20 +8,39 ＠＠ <h2 id="xemacs">XEmacs Development</h2> + As of 5 December 2007, the development mainline (aka version + 21.5) has been moved to a + <a href="http://hgbook.red-bean.com/hgbook.html">Mercurial</a> + repository on <code>hg.debian.org</code> from which you may + <a href="http://hg.debian.org/hg/xemacs/xemacs">browse</a> the + latest checked-in code. Please see the introduction to the + <a href="hgaccess.html">XEmacs Mercurial Repository</a> for + instructions on its use. + + Other XEmacs repositories, including the 21.4 branch, the + packages, and the sources for this website, continue to be + provided by the CVS repository on <code>cvs.xemacs.org</code>, + hosted by our friends at <code>dotsrc.org</code>. + - More detailed information is forthcoming, but in the short term, - if you'd like to help with the XEmacs development effort, do the + If you'd like to help with the XEmacs development effort, do the following: <ol> <li> - <a href="../Download/index.html">Download</a> the - latest beta release, or (better) go to <a href=""></a> and follow - the instructions to get an up-to-date CVS tree of the XEmacs - source. + <a href="">Download</a> + the latest releases of 21.4 (the stable branch) or 21.5 (the + development mainline, or (better) get the most up-to-date + sources from the source repositories. For 21.5, see the + introduction to the + <a href="hgaccess.html">XEmacs Mercurial Repository</a> and + follow the instructions to get an up-to-date tree of the + XEmacs 21.5 source. For other resources, such as the 21.4 + stable tree, the package tree and the source to this website, + see the introduction to the + <a href="cvsaccess.html">XEmacs CVS Repository</a> and follow + the instructions to get an up-to-date trees of those resources. </li> <li> ＠＠ -51,8 +70,12 ＠＠ The rules for creating and submitting patches are set forth in - etc/BETA (look for Creating patches for submission - in documentation accessed via M-x describe-beta) + etc/BETA (section Creating patches for submission + in documentation accessed via M-x describe-beta), + or see the + <a href=""> + web version</a>. + You may find the <a Index: Develop/cvsaccess.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Develop/cvsaccess.content,v retrieving revision 1.30 diff -u -r1.30 cvsaccess.content --- Develop/cvsaccess.content 12 Jan 2006 09:41:58 -0000 1.30 +++ Develop/cvsaccess.content 2 Feb 2008 07:17:53 -0000 ＠＠ -9,8 +9,22 ＠＠ <h1>XEmacs CVS Repository</h1> - - Please review the information below even if you are familiar with + As of 5 December 2007, the development mainline (aka version + 21.5) has been moved to a + <a href="http://hgbook.red-bean.com/hgbook.html">Mercurial</a> + repository on <code>hg.debian.org</code> from which you may + <a href="http://hg.debian.org/hg/xemacs/xemacs">browse</a> the + latest checked-in code. Please see the introduction to the + <a href="hgaccess.html">XEmacs Mercurial Repository</a> for + instructions on its use. + + Other XEmacs repositories, including the 21.4 branch, the + packages, and the sources for this website, continue to be + provided by the CVS repository on <code>cvs.xemacs.org</code>, + hosted by our friends at <code>dotsrc.org</code>. This page + describes access to those resources. + + Please review the information below even if you are familiar with the XEmacs CVS repository. <ul> Index: Develop/hgaccess.content =================================================================== RCS file: Develop/hgaccess.content diff -N Develop/hgaccess.content --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Develop/hgaccess.content 2 Feb 2008 07:17:53 -0000 ＠＠ -0,0 +1,538 ＠＠ +%title% +XEmacs CVS Archive +%author% +Jareth Hein <jareth(a)xemacs.org> +Steve Youngs <youngs(a)xemacs.org> +Adrian Aichner <adrian(a)xemacs.org> +Stephen J. Turnbull <stephen(a)xemacs.org> +%main% + + <h1>XEmacs Mercurial Repository</h1> + + As of 5 December 2007, the development mainline (aka version + 21.5) has been moved to a + <a href="http://hgbook.red-bean.com/hgbook.html">Mercurial</a> + repository on <code>hg.debian.org</code> from which you may + <a href="http://hg.debian.org/hg/xemacs/xemacs">browse</a> the + latest checked-in code. This page describes access to those + resources. + + Other XEmacs repositories, including the 21.4 branch, the + packages, and the sources for this website, continue to be + provided by the CVS repository on <code>cvs.xemacs.org</code>, + hosted by our friends at <code>dotsrc.org</code>. Please see the + introduction to the <a href="cvsaccess.html">XEmacs CVS + Repository</a> for instructions on its use. + + Please note: This page was hacked up quickly + by copying and editing the corresponding page for CVS. If you + spot any CVS-isms or other statements that are not correct for + the new repository, please report it as a bug to the + <a href="mailto:xemacs-beta＠xemacs.org">XEmacs Developers</a>. + + <ul> + + <li><a href="#quickstart">Quick start guide</a></li> + + <li><a href="#whatishg">What is Mercurial?</a></li> + + <li><a href="#tutorial">Using the XEmacs Mercurial server</a></li> + + <li><a href="#tags">Tags: what they are and their use</a></li> + + <li><a href="#packages">Packages info</a></li> + + <li><a href="#webaccess">Web access to the trees</a></li> + + <li><a href="#committers">Commit (R/W) access to the CVS trees</a></li> + + <li><a href="#recent">Recent news</a></li> + + </ul> + + + This site has a collection of + <a href="http://www.selenic.com/">Mercurial</a>trees for XEmacs, + a feature-packed text-editing environment based on Lisp. For + general information about XEmacs, check out the + <a href="http://www.xemacs.org">XEmacs main WWW server</a>. + + <h3><a name="quickstart">Quick Start Guide</a></h3> + + + To get the official (21.5) development sources, do: + <pre xml:space="preserve"> + hg clone http://hg.debian.org/hg/xemacs/xemacs-beta + </pre> + + To get the bleeding edge patches that are still under review (and + in some cases may already have been vetoed or be known to cause + crashes and other showstoppers) do: + <pre xml:space="preserve"> + hg clone http://hg.debian.org/hg/xemacs/xemacs + </pre> + + instead. The XEmacs lisp packages are now unbundled, and are + available from the <a href="cvsaccess.html">CVS repository</a>. + Older versions of XEmacs, including the currently stable version + (21.4) may also be checked out from <a href="cvsaccess.html">CVS + repository</a>. + + + Each of these components are available separately as non-CVS + tarballs via HTTP and FTP. Here are the current HTTP URLs: + <ul> + <li><a href="http://ftp.xemacs.org/pub/xemacs/xemacs-21.5">http://ftp.xe...> + <li><a href="http://ftp.xemacs.org/pub/xemacs/xemacs-21.4">http://ftp.xe...> + <li><a href="http://ftp.xemacs.org/pub/xemacs/xemacs-21.1">http://ftp.xe...> + <li><a href="http://ftp.xemacs.org/pub/xemacs/packages">http://ftp.xemac...> + </ul> + If you prefer FTP for some reason, simply change the URL scheme + from "http" to "ftp". + + <hr /> + <h3><a name="whatishg">What is Mercurial?</a></h3> + + + <a href="http://hgbook.red-bean.com/hgbook.html">Mercurial</a> + is a modern version control system (VCS) that not only keeps + track of older versions also handles branching and distributed + development well. Unlike CVS or Subversion (the defacto + industry-standard source code control system for open source + software projects), every Mercurial checkout is a full + repository, containing all of the project's history. Because + the archives are compressed, a full repository (back to 21.5.0) + requires much less than twice the space of the source tree + alone. Unlike many other VCSes (including CVS and git) + Mercurial is perfectly happy to serve remote clients over an + ordinary HTTP connection, using an unmodified httpd and a tiny + CGI. This means that you can easily share your + version-controlled patches with others, even if they are not + accepted for the mainline. + + + Regular contributors to XEmacs are strongly encouraged to get + Mercurial write access to the source repository. This + distributes most of the patch-tracking work to those most + qualified to do it, namely the patch authors. XEmacs source + code maintenance is basically organized on the bazaar model - + we'd like to have as many people as possible, including + you, making high quality contributions to the + source code, in parallel. But even if you are just a lurker + with no desire to make any modifications to the tree, Mercurial + gives you a painless way to upgrade between versions. + + + + By current standards, these trees are moderate in size. XEmacs + 21.5 sources will take up 80 MB of hard drive space, before + compilation, the Mercurial metadata and archive about as much. + A typical build will add about 60 MB of build products, for a + total of about 220 MB required for core development. Add in + the lisp packages tree (another 120 MB of source, with compiled + Lisp taking about 70MB) in your calculations if you're + interested in messing with them too. +  + + + <hr /> + <h3><a name="tutorial">Using the XEmacs Mercurial server</a></h3> + + + If you're interested in using the XEmacs Mercurial trees + directly, you'll need to install Mercurial. Mercurial is highly + portable because it is entirely written in Python. Binary + packages are available for most platforms, either through native + package distributions or from + <a href="http://www.selenic.com/mercurial/wiki/index.cgi/Download"> + Selenic</a>. + + + Unlike many centralized servers, XEmacs's Mercurial repository + does not require login for cloning the repository. (Note: for + modern distributed VCSes, whole repository is duplicated and can + stand alone, so we use the word "clone" rather than "checkout". + "Checkout" is used to describe the operation of copying files + from the repository archive to the working copy, whether to + revert undesirable changes in a single file, or to switch the + entire working copy over to another branch.) The clone + operation is simple. + + + + First cd to the place you want to put the tree, and actually + clone the repository. + + <pre xml:space="preserve"> +chibi$ hg clone http://hg.debian.org/hg/xemacs/xemacs-beta xemacs-21.5 +(churn, churn, churn) + </pre> + + + And voila! One xemacs-21.5 directory complete + with the latest versions of the base code. Packages are + separate, of course. + + + The last argument <code>xemacs-21.5</code> gives the name of the + directory to use as a workspace. The repository metadata and + archives go in the <code>.hg</code> subdirectory, and there will + usually be a <code>.hgignore</code> file containing regexps + matching names of files to ignore for version control purposes. + If the tree root name (here <code>xemacs-21.5</code>) is + omitted, it will be defaulted to the basename of the URL being + cloned. + + + You probably want to create a <code>~/.hgrc</code> file to + configure your local defaults. At least it's worth setting your + Mercurial username: + + <pre xml:space="preserve"><tt> +[ui] +username = J. Random Hacker <jrhacker(a)example.com> + </tt></pre> + + + so that any local commits to your own repository look nice. + (Feel free to commit what you like, it's your + repository. If you expect to contribute upstream, however, you + may want to keep a separate "pristine" workspace or learn about + named branches.) + + + When there is an upstream update, you can get the whole skinny + quick, fast and relatively painlessly with the following command + (executed from the directory created by <tt>hg + clone</tt>). + + <pre xml:space="preserve"> +chibi$ hg pull -u + </pre> + + + The <code>-u</code> switch automatically updates your workspace + to correspond to the tip. + + + If you have local changes that you'd like to keep under version + control, you can either use a separate repository or named + branches. Here's one suggestion: + + <pre xml:space="preserve"> +Message-ID: <87abmmc1lo.fsf(a)uwakimon.sk.tsukuba.ac.jp> +From: "Stephen J. Turnbull" <stephen(a)xemacs.org> +Cc: XEmacs Beta List <xemacs-beta(a)xemacs.org> +Subject: Converting from using CVS to hg +Date: Thu, 31 Jan 2008 08:53:07 +0900 + +robert writes: + + > I have 21.5.b28 from CVS which I have kept uptodate. I also have a few + > changes to files in src and lisp for my own use. + > + > I just got a clone of the current tree using + > mv xemacs xemacs-cvs + > hg clone http://hg.debian.org/hg/xemacs/xemacs + + > When I want to update the xemacs tree, do I + > cd xemacs + > hg pull http://hg.debian.org/hg/xemacs/xemacs + +No, you should do "hg pull -u", which updates the directory from the +default "other repository". This starts out as the repo you cloned, +and won't change unless you edit .hg/hgrc. The update, like CVS, +merges. + + > If I am only compiling and using XEmacs--not contributing code, is + > hg still the way I should go? + +Yes. Because hg is so much better at branching, what you probably +want to do is to keep a pristine checkout of XEmacs, and a separate +checkout of your changes. so the initial clone would look like + +cd $parent +hg clone http://hg.debian.org/hg/xemacs/xemacs +mv xemacs xemacs-upstream +hg clone xemacs-upstream +for f in $files_I_want_to_keep_from_my_version; do + cp f xemacs/$the_right_place +done +cd xemacs +hg commit -m "Bring in my existing local changes." + +and your update process would look like: + +cd xemacs-upstream +hg pull -u # there should never be any merge conflicts +cd ../xemacs +hg pull -u +# fix any merge conflicts here +# if there were merge conflicts, commit + +Alternatively, you could use named branches. Initial clone: + +cd $parent +hg clone http://hg.debian.org/hg/xemacs/xemacs +hg branch myxemacs +for f in $files_I_want_to_keep_from_my_version; do + cp f $the_right_place +done +hg commit -m "Bring in my existing local changes." + +and update + +cd xemacs +hg checkout default +hg pull # no -u because you're just going to overwrite + # again immediately +hg checkout myxemacs +hg merge default +# fix any merge conflicts here +hg commit -m "Merge $date." + +(WARNING: The above use of named branches is as yet untested by me!) + </pre> + + <h3><a name="tags">Just how much do you want to bleed?</a></h3> + + + XEmacs developers push their commits on an asynchronous basis. + The idea is to keep those actively coding on the same page by + making everyone's most recent code available in a central place. + There is no strong guarantee that the tip of the default + Mercurial branch even compiles for anyone. This means that if + you blindly do a hg pull -u, there is a good + chance that what you get is not functional. + + There are several ways to deal with the churn. + + <ul> + <li>Since you have the whole repository available, you can + simply revert to an earlier revision. + <pre xml:space="preserve"> +chibi$ hg checkout -r 1234 + </pre> + If this mechanism satisfies you, you may even want to clone + and update to the completely unfiltered repository that the + active developers are committing to: + <pre xml:space="preserve"> +chibi$ hg clone http://hg.debian.org/hg/xemacs/xemacs xemacs-21.5 + </pre> + </li> + <li> + You can also take advantage of the review process, and use the + <code>xemacs-beta</code> repository as described above.</li> + <li> + Finally, the most conservative approach is to checkout only + the official releases. These are identical to the tarballs + distributed by <code>xemacs.org</code>, and are identified in + the <code>xemacs-beta</code> repository by tags of the form + rX-Y-Z, corresponding to the version number X.Y.Z (or + X.Y-bZ). X is the major version, Y the minor version, and Z + the micro version or patchlevel.</li> + </ul> + + + In general, tags are admissible anywhere a revision number or + hash is allowed. To checkout a particular revision use the + <code>checkout</code> command with the -r + <TAG> option to. Therefore, to update to 21.5 + beta 16 (but no further), you'd type: + + <pre xml:space="preserve"> +chibi$ hg checkout -r r21-5-16 + </pre> + + + The most recent patchlevel or beta release is identified by the + tag rX-Y-latest-beta. + + + For more info, check the Mercurial documentation: + <ul> + <li>the <a href="http://hgbook.red-bean.com/hgbook.html"> + Mercurial book</a></li> + <li>the <a href="http://www.selenic.com/mercurial/wiki/"> + Mercurial wiki</a></li> + <li>the builtin help, using <code>hg help</code></li> + </ul> + + <hr /> + + <h3><a name="packages">New Package system</a></h3> + + + For those of you wishing to work with XEmacs 21, you should + probably know about our new packaging system. All the details are + available <a href="packages.html">here</a>, and there is also an + <a href="cvsaccess.html#packages">introduction to the packages + CVS repository</a>. + + <h3><a name="webaccess">Web Access</a></h3> + + + You can browse the repositories simply by accessing the + repositories with any web browser. + + <ul> + <li>The <a href="http://hg.debian.org/hg/xemacs/xemacs-beta"> + reviewed and approved beta versions</a></li> + <li>The <a href="http://hg.debian.org/hg/xemacs/xemacs">raw + patch stream</a></li> + </ul> + + <hr /> + <h3><a name="committers">Commit (R/W) access to the Mercurial tree</a></h3> + + + Anybody who has become reasonably well-known to the + <a href="jobs.html">XEmacs Reviewers</a> can get access to + commit to the repository. This has the following advantages: + + <ul> + + <li> + The revision history will contain the true author of a change, + which makes tracking changes easier, and gives credit where + credit is due.</li> + + <li> + Committers are more likely to take responsibility for their + changes when they are directly modifying the repository + themselves.</li> + + </ul> + + + To qualify to be a committer, you should have a history of + submitting successful patches to + <a href="http://list-archive.xemacs.org/xemacs-patches/"> + xemacs-patches</a> + + + Currently we are adding new committers using the following + method (which may change): + + <ol> + <li> + Make sure ssh (version 1 or 2) is installed on your + computer.</li> + + <li> + Get yourself a ssh public key. Here is some unsolicited + advice on maintaining your ssh key: + + + In general, you should only have ONE identity that you expose + to the outside world. Create only ONE key pair: + <tt>~/.ssh/identity</tt> and <tt>~/.ssh/identity.pub</tt> + for version 1. Or for version 2, one of either + <tt>~/.ssh/id_rsa</tt> and <tt>~/.ssh/id_rsa.pub</tt> or + <tt>~/.ssh/id_dsa</tt> and <tt>~/.ssh/id_dsa.pub</tt> + with <tt>ssh-keygen</tt>, and change the comment to something + more meaningful like your email address. Your ssh public key + is a lot like a business card. + + + For example, I modified the comment in my version 1 public key + using + + <pre xml:space="preserve"> +ssh-keygen -c -C 'Steve Youngs <youngs(a)xemacs.org>' + </pre> + + + SSH version 2 is slightly different. If you try the above + command on a version 2 key you'll get an error saying that + comments are only supported for version 1 keys. Don't believe + everything you read, you can have a comment in a version 2 + key. You just have to add the comment when you create the + key: + + <pre xml:space="preserve"> +ssh-keygen -t dsa -C 'Steve Youngs <youngs(a)xemacs.org>' + </pre> + + + After you have created your keys, copy the <tt>~/.ssh/identity</tt> + or <tt>~/.ssh/id_dsa</tt> or <tt>~/.ssh/id_rsa</tt> file to + all the machines you run ssh from. + + + Also, append your public key file <tt>~/.ssh/identity.pub</tt> + to the <tt>~/.ssh/authorized_keys</tt> file for SSH 1 or + <tt>~/.ssh/id_(dsa|rsa).pub</tt> to + <tt>~/.ssh/authorized_keys2</tt> on all the machines you run + ssh to. + + + When people ask you for your public ssh key, just send them + the contents of <tt>~/.ssh/identity.pub</tt> or + <tt>~/.ssh/id_dsa.pub</tt> or + <tt>~/.ssh/id_rsa.pub</tt>.</li> + + <li> + If you are not already a Debian developer, you'll need to go + to <a href="http://alioth.debian.org/">Alioth</a> + (<code>http://alioth.debian.org/</code>) and get an account + for guest developers. If you're not a Debian person, it will + have "-guest" appended to it, so be prepared. (Sorry, + "unwelcome-guest" is already taken, but I can think of a few + others that are moderately creative. Think!)</li> + + <li> + Send the <a href="mailto:mike＠xemacs.org">Mercurial + Administrator</a> your Alioth user name and your public + ssh key (i.e. the contents of <tt>~/.ssh/identity.pub</tt> for + SSH 1, or <tt>~/.ssh/id_dsa.pub</tt> or + <tt>~/.ssh/id_rsa.pub</tt> for SSH 2). The administrator + will take care of the administrivia to give you + access.</li> + + <li> + + Add this stanza to your <tt>~/.ssh/config</tt> file (create it + if necessary): + + <pre xml:space="preserve"> +Host hg.debian.org + User alioth-user-guest + ForwardX11 no + ForwardAgent no + </pre> + </li> + </ol> + + <hr /> + <h3><a name="recent"></a>News and changes</h3> + + <h5>2008-02-01</h5> + + <h4>Changes by Stephen:</h4> + + + Steal the contents of cvsaccess.html and modify them for + Mercurial. + +  _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit: Remove unnecessary call to SET_EVENT_MAGIC_X_EVENT. 16 years, 10 months

Jerry James

changeset: 4416:930bb9cba65a668a939d8d4369f4d1db1b33f156 tag: tip user: Jerry James <james(a)xemacs.org> date: Fri Feb 01 09:36:51 2008 -0700 files: src/ChangeLog src/event-Xt.c description: Remove unnecessary call to SET_EVENT_MAGIC_X_EVENT. 2008-02-01 Jerry James <james(a)xemacs.org> * event-Xt.c (emacs_Xt_event_handler): Remove unnecessary call to SET_EVENT_MAGIC_X_EVENT. See xemacs-beta message <870180fe080131201011b191ae5g1d70cbd2136f570c(a)mail.gmail.com>. diff -r bceb3e285ae702385e5ee8c2a7ea11f20a06318d -r 930bb9cba65a668a939d8d4369f4d1db1b33f156 src/ChangeLog --- a/src/ChangeLog Wed Jan 30 22:33:29 2008 +0100 +++ b/src/ChangeLog Fri Feb 01 09:36:51 2008 -0700 ＠＠ -1,3 +1,9 ＠＠ 2008-01-30 Aidan Kehoe <kehoea＠parhasa +2008-02-01 Jerry James <james(a)xemacs.org> + + * event-Xt.c (emacs_Xt_event_handler): Remove unnecessary call to + SET_EVENT_MAGIC_X_EVENT. See xemacs-beta message + <870180fe080131201011b191ae5g1d70cbd2136f570c(a)mail.gmail.com>. + 2008-01-30 Aidan Kehoe <kehoea(a)parhasard.net> * search.c (debug-xemacs-searches): diff -r bceb3e285ae702385e5ee8c2a7ea11f20a06318d -r 930bb9cba65a668a939d8d4369f4d1db1b33f156 src/event-Xt.c --- a/src/event-Xt.c Wed Jan 30 22:33:29 2008 +0100 +++ b/src/event-Xt.c Fri Feb 01 09:36:51 2008 -0700 ＠＠ -1493,7 +1493,6 ＠＠ x_event_to_emacs_event (XEvent *x_event, return 0; SET_EVENT_CHANNEL (emacs_event, wrap_frame (frame)); - SET_EVENT_MAGIC_X_EVENT (emacs_event, *x_event_copy); break; } } _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches February 2008