Mercurial > hg
changeset 10609:5ee3faa7c563
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 07 Mar 2010 22:04:35 -0600 |
| parents | 87fce8c5e29d (current diff) 1037bd445768 (diff) |
| children | eea2db5f56ba |
| files | |
| diffstat | 6 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/macosx/Readme.html Mon Mar 08 00:01:12 2010 +0100 +++ b/contrib/macosx/Readme.html Sun Mar 07 22:04:35 2010 -0600 @@ -17,11 +17,11 @@ <body> <p class="p1"><b>Before you install</b></p> <p class="p2"><br></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="p3">This is an OS X 10.6 version of Mercurial that depends on the default Python 2.6 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">/usr/local/bin</span> and the Mercurial files in <span class="s2">/Library/Python/2.5/site-packages/mercurial.</span></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.6/site-packages/mercurial.</span></p> <p class="p2"><br></p> <p class="p1"><b>Documentation</b></p> <p class="p2"><br></p>
--- a/hgext/bookmarks.py Mon Mar 08 00:01:12 2010 +0100 +++ b/hgext/bookmarks.py Sun Mar 07 22:04:35 2010 -0600 @@ -296,6 +296,13 @@ tags.update(self._bookmarks) return (tags, tagtypes) + if hasattr(repo, 'invalidate'): + def invalidate(self): + super(bookmark_repo, self).invalidate() + for attr in ('_bookmarks', '_bookmarkcurrent'): + if attr in self.__dict__: + delattr(repo, attr) + repo.__class__ = bookmark_repo def uisetup(ui):
--- a/hgext/progress.py Mon Mar 08 00:01:12 2010 +0100 +++ b/hgext/progress.py Sun Mar 07 22:04:35 2010 -0600 @@ -182,6 +182,7 @@ sharedprog = progbar(ui) extensions.wrapfunction(ui, 'progress', sharedprog.progress) extensions.wrapfunction(ui, 'write', sharedprog.write) + extensions.wrapfunction(ui, 'write_err', sharedprog.write) def reposetup(ui, repo): uisetup(repo.ui)
--- a/mercurial/commands.py Mon Mar 08 00:01:12 2010 +0100 +++ b/mercurial/commands.py Sun Mar 07 22:04:35 2010 -0600 @@ -451,7 +451,7 @@ if not opts.get('force') and utflabel in repo.branchtags(): if label not in [p.branch() for p in repo.parents()]: raise util.Abort(_('a branch of the same name already exists' - ' (use --force to override)')) + " (use 'hg update' to switch to it)")) repo.dirstate.setbranch(utflabel) ui.status(_('marked working directory as branch %s\n') % label) else:
--- a/mercurial/demandimport.py Mon Mar 08 00:01:12 2010 +0100 +++ b/mercurial/demandimport.py Sun Mar 07 22:04:35 2010 -0600 @@ -130,6 +130,9 @@ 'resource', # this trips up many extension authors 'gtk', + # setuptools' pkg_resources.py expects "from __main__ import x" to + # raise ImportError if x not defined + '__main__', ] def enable():
--- a/tests/test-newbranch.out Mon Mar 08 00:01:12 2010 +0100 +++ b/tests/test-newbranch.out Sun Mar 07 22:04:35 2010 -0600 @@ -2,7 +2,7 @@ foo marked working directory as branch bar % branch shadowing -abort: a branch of the same name already exists (use --force to override) +abort: a branch of the same name already exists (use 'hg update' to switch to it) marked working directory as branch default % there should be only one default branch head changeset: 3:bf1bc2f45e83