Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mercurial-extension-hg-evolve for
openSUSE:Factory checked in at 2023-03-27 18:17:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mercurial-extension-hg-evolve (Old)
and /work/SRC/openSUSE:Factory/.mercurial-extension-hg-evolve.new.31432
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial-extension-hg-evolve"
Mon Mar 27 18:17:54 2023 rev:6 rq:1074699 version:11.0.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/mercurial-extension-hg-evolve/mercurial-extension-hg-evolve.changes
2023-03-15 18:54:43.128450776 +0100
+++
/work/SRC/openSUSE:Factory/.mercurial-extension-hg-evolve.new.31432/mercurial-extension-hg-evolve.changes
2023-03-27 18:17:55.371626664 +0200
@@ -1,0 +2,7 @@
+Mon Mar 27 10:39:04 UTC 2023 - Andrei Dziahel <[email protected]>
+
+- Update to version 11.0.1
+
+ * compatibility with Mercurial 6.4
+
+-------------------------------------------------------------------
Old:
----
hg-evolve-11.0.0.tar.gz
New:
----
hg-evolve-11.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mercurial-extension-hg-evolve.spec ++++++
--- /var/tmp/diff_new_pack.CxUSSI/_old 2023-03-27 18:17:56.447632341 +0200
+++ /var/tmp/diff_new_pack.CxUSSI/_new 2023-03-27 18:17:56.455632383 +0200
@@ -17,7 +17,7 @@
Name: mercurial-extension-hg-evolve
-Version: 11.0.0
+Version: 11.0.1
Release: 0
Summary: Flexible evolution of Mercurial history
License: GPL-2.0-or-later
++++++ hg-evolve-11.0.0.tar.gz -> hg-evolve-11.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hg-evolve-11.0.0/CHANGELOG
new/hg-evolve-11.0.1/CHANGELOG
--- old/hg-evolve-11.0.0/CHANGELOG 2023-02-26 20:02:05.000000000 +0100
+++ new/hg-evolve-11.0.1/CHANGELOG 2023-03-23 14:47:41.000000000 +0100
@@ -1,6 +1,15 @@
Changelog
=========
+11.0.1 -- 2023-03-23
+--------------------
+
+ * compatibility with Mercurial 6.4
+
+topic (1.0.1)
+
+ * compatibility with Mercurial 6.4
+
11.0.0 -- 2023-02-26
--------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hg-evolve-11.0.0/PKG-INFO
new/hg-evolve-11.0.1/PKG-INFO
--- old/hg-evolve-11.0.0/PKG-INFO 2023-02-26 20:02:14.000000000 +0100
+++ new/hg-evolve-11.0.1/PKG-INFO 2023-03-23 15:10:32.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: hg-evolve
-Version: 11.0.0
+Version: 11.0.1
Summary: Flexible evolution of Mercurial history.
Home-page: https://www.mercurial-scm.org/doc/evolution/
Author: Pierre-Yves David
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hg-evolve-11.0.0/hgext3rd/evolve/cmdrewrite.py
new/hg-evolve-11.0.1/hgext3rd/evolve/cmdrewrite.py
--- old/hg-evolve-11.0.0/hgext3rd/evolve/cmdrewrite.py 2023-02-06
15:04:55.000000000 +0100
+++ new/hg-evolve-11.0.1/hgext3rd/evolve/cmdrewrite.py 2023-03-22
02:26:13.000000000 +0100
@@ -1007,13 +1007,23 @@
# changed
changedfiles.extend(repo[rev].files())
+ need_write = True
+ if util.safehasattr(repo.dirstate, 'changing_parents'):
+ changing_parents = repo.dirstate.changing_parents(repo)
+ else:
+ # hg <= 6.3 (7a8bfc05b691)
+ need_write = False
+ changing_parents = util.nullcontextmanager()
+
# reset files that only changed in the dirstate too
dirstate = repo.dirstate
dirchanges = compat.dirchanges(dirstate)
changedfiles.extend(dirchanges)
- repo.dirstate.rebuild(newnode.node(), newnode.manifest(),
- changedfiles)
- dirstate.write(tr)
+ with changing_parents:
+ repo.dirstate.rebuild(newnode.node(), newnode.manifest(),
+ changedfiles)
+ if need_write:
+ dirstate.write(tr)
else:
bookactive = repo._activebookmark
# Active bookmark that we don't want to delete (with -B option)
@@ -1143,7 +1153,7 @@
# Set the right branch
# XXX-TODO: Find a way to set the branch without altering the dirstate
- repo.dirstate.setbranch(ctx.branch())
+ compat.setbranch(repo, ctx.branch())
if pats:
# refresh the wctx used for the matcher
@@ -1242,7 +1252,7 @@
tr.close()
finally:
# Restore the old branch
- repo.dirstate.setbranch(savedbranch)
+ compat.setbranch(repo, savedbranch)
lockmod.release(tr, lock, wlock)
@@ -1411,7 +1421,7 @@
newnode = repo.commit(text=origctx.description(),
user=origctx.user(),
date=origctx.date(), extra=origctx.extra())
- repo.dirstate.setbranch(origctx.branch())
+ compat.setbranch(repo, origctx.branch())
if pickstate:
pickstate.delete()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hg-evolve-11.0.0/hgext3rd/evolve/compat.py
new/hg-evolve-11.0.1/hgext3rd/evolve/compat.py
--- old/hg-evolve-11.0.0/hgext3rd/evolve/compat.py 2023-02-06
15:04:55.000000000 +0100
+++ new/hg-evolve-11.0.1/hgext3rd/evolve/compat.py 2023-03-22
02:26:13.000000000 +0100
@@ -529,6 +529,15 @@
context.overlayworkingctx._markdirty = fixedmarkdirty
+def setbranch(repo, branch):
+ # this attribute was introduced at about the same time dirstate.setbranch()
+ # was modified
+ # hg <= 6.3 (e9379b55ed80)
+ if util.safehasattr(dirstate, 'requires_changing_files_or_status'):
+ repo.dirstate.setbranch(branch, repo.currenttransaction())
+ else:
+ repo.dirstate.setbranch(branch)
+
if util.safehasattr(dirstate.dirstate, 'get_entry'):
def dirchanges(dirstate):
return [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hg-evolve-11.0.0/hgext3rd/evolve/evolvecmd.py
new/hg-evolve-11.0.1/hgext3rd/evolve/evolvecmd.py
--- old/hg-evolve-11.0.0/hgext3rd/evolve/evolvecmd.py 2023-02-06
15:04:55.000000000 +0100
+++ new/hg-evolve-11.0.1/hgext3rd/evolve/evolvecmd.py 2023-03-22
02:26:13.000000000 +0100
@@ -791,7 +791,7 @@
# preserved
pass
elif basebranch == divbranch and basebranch != othbranch:
- repo.dirstate.setbranch(othbranch)
+ compat.setbranch(repo, othbranch)
else:
# all the three branches are different
index = repo.ui.promptchoice(_(b"content divergent changesets on "
@@ -802,11 +802,11 @@
(basebranch, divbranch, othbranch), 0)
if index == 0:
- repo.dirstate.setbranch(basebranch)
+ compat.setbranch(repo, basebranch)
elif index == 1:
pass
elif index == 2:
- repo.dirstate.setbranch(othbranch)
+ compat.setbranch(repo, othbranch)
def mergecommitmessages(ui, basedesc, divdesc, othdesc):
"""merges the commit messages and return the new merged message and whether
@@ -999,7 +999,7 @@
if repo[b'.'].rev() != dest.rev():
compat._update(repo, dest, branchmerge=False, force=True)
if keepbranch:
- repo.dirstate.setbranch(orig.branch())
+ compat.setbranch(repo, orig.branch())
if util.safehasattr(repo, 'currenttopic'):
# uurrgs
# there no other topic setter yet
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hg-evolve-11.0.0/hgext3rd/evolve/metadata.py
new/hg-evolve-11.0.1/hgext3rd/evolve/metadata.py
--- old/hg-evolve-11.0.0/hgext3rd/evolve/metadata.py 2023-02-26
20:02:05.000000000 +0100
+++ new/hg-evolve-11.0.1/hgext3rd/evolve/metadata.py 2023-03-23
14:47:41.000000000 +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__ = b'11.0.0'
-testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3'
+__version__ = b'11.0.1'
+testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3
6.4'
minimumhgversion = b'4.8'
buglink = b'https://bz.mercurial-scm.org/'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hg-evolve-11.0.0/hgext3rd/evolve/rewind.py
new/hg-evolve-11.0.1/hgext3rd/evolve/rewind.py
--- old/hg-evolve-11.0.0/hgext3rd/evolve/rewind.py 2023-02-06
15:04:55.000000000 +0100
+++ new/hg-evolve-11.0.1/hgext3rd/evolve/rewind.py 2023-03-22
02:26:13.000000000 +0100
@@ -159,12 +159,19 @@
# changed
changedfiles.extend(ctx.files())
+ if util.safehasattr(repo.dirstate, 'changing_parents'):
+ changing_parents = repo.dirstate.changing_parents(repo)
+ else:
+ # hg <= 6.3 (7a8bfc05b691)
+ changing_parents = util.nullcontextmanager()
+
# reset files that only changed in the dirstate too
dirstate = repo.dirstate
dirchanges = compat.dirchanges(dirstate)
changedfiles.extend(dirchanges)
- repo.dirstate.rebuild(newctx.node(), newctx.manifest(),
- changedfiles)
+ with changing_parents:
+ repo.dirstate.rebuild(newctx.node(), newctx.manifest(),
+ changedfiles)
# TODO: implement restoration of copies/renames
# Ideally this step should be handled by dirstate.rebuild
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hg-evolve-11.0.0/hgext3rd/evolve/rewriteutil.py
new/hg-evolve-11.0.1/hgext3rd/evolve/rewriteutil.py
--- old/hg-evolve-11.0.0/hgext3rd/evolve/rewriteutil.py 2023-02-06
15:04:55.000000000 +0100
+++ new/hg-evolve-11.0.1/hgext3rd/evolve/rewriteutil.py 2023-03-22
02:26:13.000000000 +0100
@@ -23,6 +23,7 @@
node,
obsolete,
obsutil,
+ pycompat,
revset,
rewriteutil as corerewriteutil,
scmutil,
@@ -60,12 +61,11 @@
<action> can be used to control the commit message.
"""
# hg <= 6.1 (d4752aeb20f1)
- code = corerewriteutil.precheck.__code__
- if r'check_divergence' in code.co_varnames[:code.co_argcount]:
+ args = pycompat.getargspec(corerewriteutil.precheck).args
+ if r'check_divergence' in args:
return corerewriteutil.precheck(repo, revs, action,
check_divergence=check_divergence)
- # hg <= 5.8 (d90f6237)
if node.nullrev in revs:
msg = _(b"cannot %s the null revision") % (action)
hint = _(b"no changeset checked out")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hg-evolve-11.0.0/hgext3rd/topic/__init__.py
new/hg-evolve-11.0.1/hgext3rd/topic/__init__.py
--- old/hg-evolve-11.0.0/hgext3rd/topic/__init__.py 2023-02-26
20:02:05.000000000 +0100
+++ new/hg-evolve-11.0.1/hgext3rd/topic/__init__.py 2023-03-23
14:47:41.000000000 +0100
@@ -233,9 +233,9 @@
b'log.topic': b'green_background',
}
-__version__ = b'1.0.0'
+__version__ = b'1.0.1'
-testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3'
+testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3
6.4'
minimumhgversion = b'4.8'
buglink = b'https://bz.mercurial-scm.org/'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hg-evolve-11.0.0/tests/test-evolve-abort-orphan.t
new/hg-evolve-11.0.1/tests/test-evolve-abort-orphan.t
--- old/hg-evolve-11.0.0/tests/test-evolve-abort-orphan.t 2023-02-26
20:02:05.000000000 +0100
+++ new/hg-evolve-11.0.1/tests/test-evolve-abort-orphan.t 2023-03-23
14:47:41.000000000 +0100
@@ -593,10 +593,11 @@
last-message.txt
requires
store
- undo.backup.bookmarks
+ undo.backup.bookmarks (no-hg64 !)
+ undo.backup.branch (hg64 !)
undo.backup.dirstate
- undo.bookmarks
- undo.branch
+ undo.bookmarks (no-hg64 !)
+ undo.branch (no-hg64 !)
undo.desc
- undo.dirstate
+ undo.dirstate (no-hg64 !)
wcache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hg-evolve-11.0.0/tests/test-evolve-interrupted.t
new/hg-evolve-11.0.1/tests/test-evolve-interrupted.t
--- old/hg-evolve-11.0.0/tests/test-evolve-interrupted.t 2023-02-26
20:02:05.000000000 +0100
+++ new/hg-evolve-11.0.1/tests/test-evolve-interrupted.t 2023-03-23
14:47:41.000000000 +0100
@@ -45,8 +45,8 @@
$ hg evolve --update --config hooks.precommit=false --config ui.merge=:other
move:[1] banana
atop:[2] apricot and blueberry
- transaction abort!
- rollback completed
+ transaction abort! (no-hg64 !)
+ rollback completed (no-hg64 !)
abort: precommit hook exited with status 1
[40]
$ hg l
@@ -104,8 +104,8 @@
$ hg evolve --update --config hooks.precommit=false --config ui.merge=:other
move:[1] banana
atop:[2] apricot and blueberry
- transaction abort!
- rollback completed
+ transaction abort! (no-hg64 !)
+ rollback completed (no-hg64 !)
abort: precommit hook exited with status 1
[40]
$ cat b
@@ -129,8 +129,8 @@
$ hg evolve --update --config hooks.precommit=false --config ui.merge=:other
move:[1] banana
atop:[2] apricot and blueberry
- transaction abort!
- rollback completed
+ transaction abort! (no-hg64 !)
+ rollback completed (no-hg64 !)
abort: precommit hook exited with status 1
[40]
$ hg evolve --continue
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hg-evolve-11.0.0/tests/test-evolve-stop-orphan.t
new/hg-evolve-11.0.1/tests/test-evolve-stop-orphan.t
--- old/hg-evolve-11.0.0/tests/test-evolve-stop-orphan.t 2023-02-26
20:02:05.000000000 +0100
+++ new/hg-evolve-11.0.1/tests/test-evolve-stop-orphan.t 2023-03-23
14:47:41.000000000 +0100
@@ -189,11 +189,12 @@
last-message.txt
requires
store
+ undo.backup.branch (hg64 !)
undo.backup.dirstate
- undo.bookmarks
- undo.branch
+ undo.bookmarks (no-hg64 !)
+ undo.branch (no-hg64 !)
undo.desc
- undo.dirstate
+ undo.dirstate (no-hg64 !)
wcache
Checking when multiple revs need to be evolved, some revs evolve without
