Mercurial > evolve
changeset 3726:116ef60d4be6
branching: merge with latest release
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 25 Apr 2018 14:18:19 +0100 |
| parents | bd236590d127 (current diff) 3b220226bbec (diff) |
| children | 3f26434bdf5c |
| files | |
| diffstat | 8 files changed, 38 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Apr 23 11:44:05 2018 +0100 +++ b/.hgtags Wed Apr 25 14:18:19 2018 +0100 @@ -65,3 +65,4 @@ bf6b859807bac23752a26e58876fe3a4a9a2fef8 7.2.0 6c772398eb4e209914e1074cdac4f3ebf714e437 7.2.1 e4ac2e2c2086f977afa35e23a62f849e9305a225 7.3.0 +116cdd8c102ab0ae6295fb4886b0882e75e4d8f7 8.0.0
--- a/CHANGELOG Mon Apr 23 11:44:05 2018 +0100 +++ b/CHANGELOG Wed Apr 25 14:18:19 2018 +0100 @@ -1,24 +1,26 @@ Changelog ========= -8.0.0 - in progress +8.0.0 -- 2018-04-25 ------------------- + * evolve: a new `--abort` flag which aborts an interrupted evolve + resolving orphans, + * `hg evolve` now return 0 if there is nothing to evolve, + * amend: a new `--patch` flag to make changes to wdir parent by editing patch, + * evolve: fixed some memory leak issue, + * evolve: prevent some crash with merge and split (issue5833 and issue5832), + * evolve: improvemed support for solving phase-divergence situation, + * evolve: improvemed support for solving orphan situation, + * obsdiscovery: added unit to various progress bar, + * evolve: record "operation" for command where it was missing, + + * compatibility with Mercurial 4.6 * drop support for Mercurial 4.1 and 4.2 * `--obsolete` and `--old-obsolete` flags for `hg graft` are dropped - * evolve: a new `--abort` flag which aborts an interrupted evolve - resolving orphans - * `hg evolve` now return 0 if there is nothing to evolve - * amend: a new `--patch` flag to make changes to wdir parent by editing patch - - * fixed some memory leak issue - * templatekw: remove `obsfatedata` templatekw. Individuals fields are available in core as single template functions. - - * fixed issue 5833 and 5832 - - * topic: restring name to letter, '-', '_' and '.' + * topic: restraining name to letter, '-', '_' and '.' 7.3.0 -- 2018-03-21 ---------------------
--- a/debian/changelog Mon Apr 23 11:44:05 2018 +0100 +++ b/debian/changelog Wed Apr 25 14:18:19 2018 +0100 @@ -1,3 +1,9 @@ +mercurial-evolve (8.0.0-1) UNRELEASED; urgency=medium + + * New upstream release + + -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Wed, 25 Apr 2018 14:01:18 +0100 + mercurial-evolve (7.3.0-1) unstable; urgency=medium * New upstream release
--- a/hgext3rd/evolve/cmdrewrite.py Mon Apr 23 11:44:05 2018 +0100 +++ b/hgext3rd/evolve/cmdrewrite.py Wed Apr 25 14:18:19 2018 +0100 @@ -195,7 +195,10 @@ while newnode is None: fp.seek(0) previous_patch = fp.getvalue() - newpatch = ui.edit(fp.getvalue(), old.user(), action="diff") + if 5 <= len(ui.edit.im_func.func_defaults): + newpatch = ui.edit(fp.getvalue(), old.user(), action="diff") + else: + newpatch = ui.edit(fp.getvalue(), old.user()) afp = stringio() afp.write(newpatch)
--- a/hgext3rd/evolve/evolvecmd.py Mon Apr 23 11:44:05 2018 +0100 +++ b/hgext3rd/evolve/evolvecmd.py Wed Apr 25 14:18:19 2018 +0100 @@ -1020,7 +1020,10 @@ """Compute sets of commits divergent with a given one""" cache = {} base = {} - for n in obsutil.allpredecessors(repo.obsstore, [ctx.node()]): + allpredecessors = getattr(obsutil, 'allpredecessors', None) + if allpredecessors is None: # <= Mercurial 4.3 + allpredecessors = obsutil.allprecursors + for n in allpredecessors(repo.obsstore, [ctx.node()]): if n == ctx.node(): # a node can't be a base for divergence with itself continue
--- a/hgext3rd/evolve/metadata.py Mon Apr 23 11:44:05 2018 +0100 +++ b/hgext3rd/evolve/metadata.py Wed Apr 25 14:18:19 2018 +0100 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -__version__ = '8.0.0.dev' -testedwith = '4.3.2 4.4.2 4.5.2' +__version__ = '8.0.1.dev' +testedwith = '4.3.2 4.4.2 4.5.2 4.6' minimumhgversion = '4.3' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/evolve/obsdiscovery.py Mon Apr 23 11:44:05 2018 +0100 +++ b/hgext3rd/evolve/obsdiscovery.py Wed Apr 25 14:18:19 2018 +0100 @@ -51,14 +51,14 @@ stablerangecache, ) -try: # < hg-4.6 +try: + from mercurial import wireprototypes, wireprotov1server + from mercurial.wireprotov1peer import wirepeer + from mercurial.wireprototypes import encodelist, decodelist +except (ImportError, AttributeError): # <= hg-4.5 from mercurial import wireproto as wireprototypes wireprotov1server = wireprototypes from mercurial.wireproto import wirepeer, encodelist, decodelist -except (ImportError, AttributeError): - from mercurial import wireprototypes, wireprotov1server - from mercurial.wireprotov1peer import wirepeer - from mercurial.wireprototypes import encodelist, decodelist _pack = struct.pack _unpack = struct.unpack
--- a/hgext3rd/topic/__init__.py Mon Apr 23 11:44:05 2018 +0100 +++ b/hgext3rd/topic/__init__.py Wed Apr 25 14:18:19 2018 +0100 @@ -176,9 +176,9 @@ 'topic.active': 'green', } -__version__ = '0.9.0.dev' +__version__ = '0.9.1.dev' -testedwith = '4.3.3 4.4.2 4.5.2' +testedwith = '4.3.3 4.4.2 4.5.2 4.6' minimumhgversion = '4.3' buglink = 'https://bz.mercurial-scm.org/'