Mercurial > hg-stable
changeset 5665:495a9dc86fc2
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 18 Dec 2007 15:17:11 -0600 |
| parents | da72b4d24797 (current diff) eae4553b2763 (diff) |
| children | 9d6ad26fab10 |
| files | hgext/patchbomb.py |
| diffstat | 2 files changed, 4 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/macosx/Readme.html Tue Dec 18 14:11:13 2007 -0600 +++ b/contrib/macosx/Readme.html Tue Dec 18 15:17:11 2007 -0600 @@ -17,20 +17,11 @@ <body> <p class="p1"><b>Before you install</b></p> <p class="p2"><br></p> -<p class="p3">This is <i>not</i> a stand-alone version of Mercurial.</p> -<p class="p2"><br></p> -<p class="p3">To use it, you must have the appropriate version of Universal MacPython from <a href="http://www.python.org">www.python.org</a> installed.</p> -<p class="p2"><br></p> -<p class="p3">You can find more information and download MacPython from here:</p> -<p class="p4"><span class="s1"><a href="http://www.python.org/download">http://www.python.org/download</a></span></p> -<p class="p2"><br></p> -<p class="p3">Or direct links to the latest version are:</p> -<p class="p4"><span class="s1"><a href="http://www.python.org/ftp/python/2.5.1/python-2.5.1-macosx.dmg">Python 2.5.1 for Macintosh OS X</a></span></p> -<p class="p4"><span class="s1"><a href="http://www.python.org/ftp/python/2.4.4/python-2.4.4-macosx2006-10-18.dmg">Python 2.4.4 for Macintosh OS X</a></span></p> +<p class="p3">This is an OS X 10.5 version of Mercurial that depends on the default Python 2.5 installation.</p> <p class="p2"><br></p> <p class="p1"><b>After you install</b></p> <p class="p2"><br></p> -<p class="p3">This package installs the <span class="s2">hg</span> executable in <span class="s2">/Library/Frameworks/Python.framework/Versions/Current/bin</span>. This directory may not be in your shell's search path. The MacPython installer will have created an entry in <span class="s2">.profile</span> for it but if your shell doesn't use <span class="s2">.profile</span> you'll need configure it yourself or create a symlink from a directory already in your path.</p> +<p class="p3">This package installs the <span class="s2">hg</span> executable in <span class="s2">/usr/local/bin</span> and the Mercurial files in </span class="s2">/Library/Python/2.5/site-packages/mercurial.</span></p> <p class="p2"><br></p> <p class="p1"><b>Documentation</b></p> <p class="p2"><br></p>
--- a/hgext/patchbomb.py Tue Dec 18 14:11:13 2007 -0600 +++ b/hgext/patchbomb.py Tue Dec 18 15:17:11 2007 -0600 @@ -228,7 +228,8 @@ # really sending mail.validateconfig(ui) - if not (revs or opts.get('rev') or opts.get('outgoing')): + if not (revs or opts.get('rev') + or opts.get('outgoing') or opts.get('bundle')): raise util.Abort(_('specify at least one changeset with -r or -o')) cmdutil.setremoteconfig(ui, opts)