Home Specs Ideas Testing About
You are here: CSS Working Group Wiki » CSSWG Tools » Quick Guide To Using Mercurial

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
tools:hg [2014/04/10 18:51] – [Setting Up Mercurial Preferences] update hg.csswg.org fingerprint plinsstools:hg [2017/01/30 16:55] (current) – plinss
Line 15: Line 15:
 ==== Installing Mercurial ==== ==== Installing Mercurial ====
  
-You need to first [[tools:hg:install|install Mercurial on your system]], if you haven't already. Our server is running version 2.9. Earlier versions should work, but we recommend using the latest client.+You need to first [[tools:hg:install|install Mercurial on your system]], if you haven't already. Our server is running version 3.2.1. Earlier versions should work, but we recommend using the latest client.
  
 You can see if you already have Mercurial installed by opening up a command shell and typing: You can see if you already have Mercurial installed by opening up a command shell and typing:
Line 25: Line 25:
  
 <code> <code>
-Mercurial Distributed SCM (version 2.9)+Mercurial Distributed SCM (version 3.2)
 (see http://mercurial.selenic.com for more information) (see http://mercurial.selenic.com for more information)
 </code> </code>
Line 56: Line 56:
   mq =    mq = 
   graphlog =    graphlog = 
 +  progress =
 +  bookmarks =
 +  color =
      
   [auth]   [auth]
-  # CSSWG Test Repository+  # CSSWG Test & Draft Repositories
   csswg.prefix = https://hg.csswg.org/   csswg.prefix = https://hg.csswg.org/
   csswg.username = your_csswg.org_username   csswg.username = your_csswg.org_username
   csswg.password = your_csswg.org_password #optional   csswg.password = your_csswg.org_password #optional
      
-  # CSSWG Spec Repository +  # FXTF Draft Repository 
-  w3c.prefix = https://dvcs.w3.org/hg/csswg/+  fxtf.prefix = https://hg.fxtf.org/ 
 +  fxtf.username = your_csswg.org_username 
 +  fxtf.password = your_csswg.org_password #optional 
 +   
 +  # CSS-Houdini TF Draft Repository 
 +  houdini.prefix = https://hg.css-houdini.org/ 
 +  houdini.username = your_csswg.org_username 
 +  houdini.password = your_csswg.org_password #optional 
 +   
 +  # Other W3C Spec Repositories 
 +  w3c.prefix = https://dvcs.w3.org/hg/
   w3c.username = your_w3.org_username   w3c.username = your_w3.org_username
   w3c.password = your_w3.org_password #optional   w3c.password = your_w3.org_password #optional
Line 87: Line 100:
 ** Avoiding Fingerprint Warnings (and improving security)** ** Avoiding Fingerprint Warnings (and improving security)**
  
-Depending on your OS and Mercurial root certificate configuration you may get a warning message about the host certificate when communicating with the central repository. If that happens, you can remove those warnings by adding the following to your configuration file: +Depending on your OS and Mercurial root certificate configuration you may get a warning message about the host certificate when communicating with the central repository. If that happens, please see [[https://www.mercurial-scm.org/wiki/CACertificates#Configuration_of_HTTPS_certificate_authorities|the instructions on the Mercurial wiki]].
-  [hostfingerprints] +
-  dvcs.w3.org = B7:88:F5:6C:F3:82:71:AC:3F:30:F7:2F:DD:37:C3:46:2C:F7:B6:EF +
-  hg.csswg.org = 71:06:B1:F3:E4:74:AB:53:C2:CE:8E:BF:99:7D:F8:B4:4C:22:E8:B9 +
-     +
-Note that these fingerprints will only be valid until the certificates expire (dvcs.w3.org expires 03-may-2016, hg.csswg.org expires expires 10-apr-2016). You will need to update the fingerprints when new certificates are issued. +
- +
-Alternatively (and better if you're on an OS where this is easy), you can avoid ever having to add fingerprints by following [[http://mercurial.selenic.com/wiki/CACertificates#Configuration_of_HTTPS_certificate_authorities|the instructions on the Mercurial wiki]].+
 </note> </note>
    
Line 128: Line 134:
 </code> </code>
  
-** Resources directory (needed when authoring script tests using testharness) **+** Resources directory (for script tests) ** 
 + 
 +This directory contains testharness.js which is needed if you'll be running script tests locally. This is maintained in a separate repository in GitHub. See the [[https://help.github.com/articles/set-up-git/|instructions on GitHub]] for setting up git, then:
 <code> <code>
 cd /     #not required, but resources directory is located at root level in repository cd /     #not required, but resources directory is located at root level in repository
-hg clone https://dvcs.w3.org/hg/resources/     +git clone https://github.com/w3c/testharness.js.git resources
 </code> </code>
  
-** CSSWG Spec Repository **+** CSSWG Draft Repository **
 <code> <code>
-cd /mirror/hg/dvcs.w3.org/   #just an example, pick your own local directory +cd /mirror/hg.csswg.org/   #just an example, pick your own local directory 
-hg clone https://dvcs.w3.org/hg/csswg/+hg clone https://hg.csswg.org/drafts/
 </code> </code>
  
-** FXTF Spec Repository **+** FXTF Draft Repository **
 <code> <code>
-hg clone https://dvcs.w3.org/hg/FXTF/ +hg clone https://hg.fxtf.org/drafts/ 
 </code> </code>
  
Line 154: Line 162:
 Note: By default, the working directory name will match the name of the central repository on the server (the last path component of the URL). If you want to use a different name for your working directory, enter it at the end of the clone command, e.g.: Note: By default, the working directory name will match the name of the central repository on the server (the last path component of the URL). If you want to use a different name for your working directory, enter it at the end of the clone command, e.g.:
 <code> <code>
-hg clone https://dvcs.w3.org/hg/csswg/ specs+hg clone https://hg.csswg.org/drafts/ csswg
 </code> </code>
  
Line 161: Line 169:
 All of our repositories are readable by anyone. Permission to write (i.e. push) into the repositories is restricted to certain users. All of our repositories are readable by anyone. Permission to write (i.e. push) into the repositories is restricted to certain users.
  
-Access to the CSSWG Test Suite Repository is based on your account for [[http://test.csswg.org/shepherd/|Shepherd]] and this wiki (user accounts are shared between systems). By default, all CSSWG members should have write access. Other contributors to the Test Suite Repository need to ask for access. If you already have an account on this wiki, log in to Shepherd and submit a request to modify assets on the [[https://test.csswg.org/shepherd/login/account/access/|Repository Access]] page. You will receive an email once repository access has been granted. If you don't already have an account, you can [[https://test.csswg.org/shepherd/register/|register for an account on Shepherd]].+Access to the repositories on hg.csswg.org, hg.fxtf.org, and hg.css-houdini.org is based on your account for [[http://test.csswg.org/shepherd/|Shepherd]] and this wiki (user accounts are shared between systems). By default, all CSSWG members should have write access to the Test Suite Repository. Other contributors to the Test Suite Repository need to ask for access. If you already have an account on this wiki, log in to Shepherd and submit a request to modify assets on the [[https://test.csswg.org/shepherd/login/account/access/|Repository Access]] page. You will receive an email once repository access has been granted. If you don't already have an account, you can [[https://test.csswg.org/shepherd/register/|register for an account on Shepherd]]. 
 + 
 +In addition to the Test Suite Repository, all CSSWG members should have write access to the CSSWG Draft Repository, all CSSWG and SVGWG members should have write access to the FXTF and CSS-Houdini TF Draft Repositories. If you need write access and don't already have it, you can submit a request on the [[https://drafts.csswg.org/login/account/access/|CSSWG Repository Access]], [[https://drafts.fxtf.org/login/account/access/|FXTF Repository Access]], or [[https://drafts.css-houdini.org/login/account/access/|CSS-Houdini TF Repository Access]] pages.
  
-Access to the CSSWG or FXTF Spec Repositories is controlled by your W3C user account. All CSSWG members should have write access to the CSSWG Spec Repository, all CSSWG and SVGWG members should have write access to the FXTF Spec Repository. If you're not a member of the appropriate group and need write access, please email [[mailto:peter.linss@hp.com|Peter]].+Access to the repositories on dvcs.w3.org is controlled by your W3C user account. If you're not a member of the appropriate group and need write access, please email [[mailto:peter.linss@hp.com|Peter]] or [[mailto::sysreq@w3.org|sysreq]].
  
 ===== Working With Mercurial ===== ===== Working With Mercurial =====
Line 313: Line 323:
  
 At this point your changes will be available on the server to other users. At this point your changes will be available on the server to other users.
 +
 +
 +:?: If you see a message similar to: "abort: authorization failed", then email Peter. See Footer at bottom.
 +
  
 === Merging Branches of Work: hg merge === === Merging Branches of Work: hg merge ===
Line 506: Line 520:
  
 Use ''hg help'' to learn more about each command. Use ''hg help'' to learn more about each command.
 +
 +If you need to edit history, e.g. undo/drop your latest change set, see:
 +  * http://mercurial.selenic.com/wiki/EditingHistory
 +In particular, ''hg strip'' is useful for dropping the most recent changeset.
  
 ===== CVS / Subversion Cheat Sheet ===== ===== CVS / Subversion Cheat Sheet =====
Line 511: Line 529:
 If you are used to using Subversion or CVS, the following commands are roughly equivalent: If you are used to using Subversion or CVS, the following commands are roughly equivalent:
  
-  cvs update  == svn update  ==  hg pull --u+  cvs update  == svn update  ==  hg pull --rebase
   cvs commit  == svn commit  ==  hg commit . ; hg push   cvs commit  == svn commit  ==  hg commit . ; hg push
   cvs stat    == svn status  ==  hg status .   cvs stat    == svn status  ==  hg status .
 
tools/hg.1397181098.txt.gz · Last modified: 2014/12/09 15:48 (external edit)
Recent changes RSS feed Valid XHTML 1.0 Valid CSS Driven by DokuWiki