Mercurial > evolve
changeset 618:c39afce52e31
merge
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Wed, 21 Nov 2012 11:37:30 +0100 |
| parents | 15299bfd0813 (current diff) 469befc27b26 (diff) |
| children | 8cbada2b0c43 |
| files | debian/control hgext/evolve.py setup.py |
| diffstat | 5 files changed, 18 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Nov 21 00:18:41 2012 +0100 +++ b/.hgtags Wed Nov 21 11:37:30 2012 +0100 @@ -13,4 +13,5 @@ b1bdcb4506defef0e857e2710633f7686d8034a5 1.0.2 5559e5a4b656978c592d364f242edc62369d7e84 1.0.2 c062edbcaf13135d0312fd2039deca74573ff4f0 1.1.0 +22cacfce2a65ab965c6179ae862b148f4abc7d8a 1.1.0 d43e80504e55db9ad4826e860e50530103a27b0f 2.0.0
--- a/debian/changelog Wed Nov 21 00:18:41 2012 +0100 +++ b/debian/changelog Wed Nov 21 11:37:30 2012 +0100 @@ -1,3 +1,9 @@ +mercurial-evolve (1.1.0-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Pierre-Yves David <pierre-yves.david@logilab.fr> Tue, 20 Nov 2012 16:28:12 +0100 + mercurial-evolve (1.0.2-1) UNRELEASED; urgency=low * New upstream Release
--- a/debian/control Wed Nov 21 00:18:41 2012 +0100 +++ b/debian/control Wed Nov 21 11:37:30 2012 +0100 @@ -7,8 +7,8 @@ Pierre-Yves David <pierre-yves.david@logilab.fr>, Standards-Version: 3.9.3 Build-Depends: - mercurial (>=2.4~), - mercurial-common (>=2.4~), + mercurial (>=2.5~), + mercurial-common (>=2.5~), python, debhelper (>= 8), python-sphinx (>= 1.0.8), @@ -22,7 +22,7 @@ Depends: ${python:Depends}, ${misc:Depends}, - mercurial (>= 2.4), + mercurial (>= 2.5), Description: evolve extension for Mercurial This package provides the experimental "evolve" extension for the Mercurial DVCS.
--- a/hgext/evolve.py Wed Nov 21 00:18:41 2012 +0100 +++ b/hgext/evolve.py Wed Nov 21 11:37:30 2012 +0100 @@ -19,7 +19,7 @@ - improves some aspect of the early implementation in 2.3 ''' -testedwith = '2.4-rc' +testedwith = '' buglink = 'https://bitbucket.org/marmoute/mutable-history/issues' @@ -29,11 +29,14 @@ try: from mercurial import obsolete - getattr(obsolete, 'getrevs') # 2.4 specific if not obsolete._enabled: obsolete._enabled = True + from mercurial import bookmarks + bookmarks.bmstore except (ImportError, AttributeError): - raise util.Abort('Evolve extension requires Mercurial 2.4 (or later)') + raise util.Abort('This version of Evolve is too old for you mercurial version', + hint='requires version >> 2.4.x') + from mercurial import bookmarks @@ -1499,7 +1502,7 @@ [('A', 'addremove', None, _('mark new/missing files as added/removed before committing')), ('n', 'note', '', _('use text as commit message for this update')), - ('c', 'change', '', _('specifies the changesets to amend'), _('REV')), + ('c', 'change', '', _('specifies the changesets to amend (DEPRECATED)'), _('REV')), ('e', 'edit', False, _('invoke editor on commit messages')), ] + walkopts + commitopts + commitopts2, _('[OPTION]... [FILE]...'))