[Python-apps-commits] r13281 - in packages/mercurial/trunk/debian (3 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Fri Jun 3 07:20:42 UTC 2016
Date: Friday, June 3, 2016 @ 07:20:41
Author: vicho
Revision: 13281
Delete from_upstream__strip_invalidate_phase_cache_after_stripping_changeset_issue5235.patch as it's now included upstream
Modified:
packages/mercurial/trunk/debian/changelog
packages/mercurial/trunk/debian/patches/series
Deleted:
packages/mercurial/trunk/debian/patches/from_upstream__strip_invalidate_phase_cache_after_stripping_changeset_issue5235.patch
Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog 2016-06-03 07:20:18 UTC (rev 13280)
+++ packages/mercurial/trunk/debian/changelog 2016-06-03 07:20:41 UTC (rev 13281)
@@ -1,6 +1,9 @@
mercurial (3.8.3-1) UNRELEASED; urgency=medium
* New upstream release
+ * Delete
+ from_upstream__strip_invalidate_phase_cache_after_stripping_changese
+ t_issue5235.patch as it's now included upstream
-- Javi Merino <vicho at debian.org> Fri, 03 Jun 2016 08:13:49 +0100
Deleted: packages/mercurial/trunk/debian/patches/from_upstream__strip_invalidate_phase_cache_after_stripping_changeset_issue5235.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/from_upstream__strip_invalidate_phase_cache_after_stripping_changeset_issue5235.patch 2016-06-03 07:20:18 UTC (rev 13280)
+++ packages/mercurial/trunk/debian/patches/from_upstream__strip_invalidate_phase_cache_after_stripping_changeset_issue5235.patch 2016-06-03 07:20:41 UTC (rev 13281)
@@ -1,94 +0,0 @@
-Author: Laurent Charignon <lcharignon at fb.com>
-Origin: https://selenic.com/repo/hg/rev/bf7b8157c483
-Description: strip: invalidate phase cache after stripping changeset (issue5235)
- When we remove a changeset from the changelog, the phase cache must be
- invalidated, otherwise it could refer to changesets that are no longer in the
- repo.
- .
- To reproduce the failure, I created an extension querying the phase cache after
- the strip transaction is over.
- .
- To do that, I stripped two commits with a bookmark on one of them to force
- another transaction (we open a transaction for moving bookmarks)
- after the strip transaction.
- .
- Without the fix in this patch, the test leads to a stacktrace showing the issue:
- repair.strip(ui, repo, revs, backup)
- File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/repair.py", line 205, in strip
- tr.close()
- File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/transaction.py", line 44, in _active
- return func(self, *args, **kwds)
- File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/transaction.py", line 490, in close
- self._postclosecallback[cat](self)
- File "$TESTTMP/crashstrip2.py", line 4, in test
- [repo.changelog.node(r) for r in repo.revs("not public()")]
- File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/changelog.py", line 337, in node
- return super(changelog, self).node(rev)
- File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/revlog.py", line 377, in node
- return self.index[rev][7]
- IndexError: revlog index out of range
- .
- The situation was encountered in inhibit (evolve's repo) where we would crash
- following the volatile set invalidation submitted by Augie in
- e6f490e328635312ee214a12bc7fd3c7d46bf9ce. Before his patch the issue was masked
- as we were not accessing the phasecache after stripping a revision.
- .
- This bug uncovered another but in histedit (see explanation in issue5235).
- I changed the histedit test accordingly to avoid fixing two things at once.
-
-diff --git a/mercurial/repair.py b/mercurial/repair.py
---- a/mercurial/repair.py
-+++ b/mercurial/repair.py
-@@ -194,6 +194,7 @@ def strip(ui, repo, nodelist, backup=Tru
- if not repo.ui.verbose:
- repo.ui.popbuffer()
- f.close()
-+ repo._phasecache.invalidate()
-
- for m in updatebm:
- bm[m] = repo[newbmtarget].node()
-diff --git a/tests/test-strip.t b/tests/test-strip.t
---- a/tests/test-strip.t
-+++ b/tests/test-strip.t
-@@ -838,6 +838,41 @@ strip backup content
- date: Thu Jan 01 00:00:00 1970 +0000
- summary: mergeCD
-
-+Check that the phase cache is properly invalidated after a strip with bookmark.
-+
-+ $ cat > ../stripstalephasecache.py << EOF
-+ > from mercurial import extensions, localrepo
-+ > def transactioncallback(orig, repo, desc, *args, **kwargs):
-+ > def test(transaction):
-+ > # observe cache inconsistency
-+ > try:
-+ > [repo.changelog.node(r) for r in repo.revs("not public()")]
-+ > except IndexError:
-+ > repo.ui.status("Index error!\n")
-+ > transaction = orig(repo, desc, *args, **kwargs)
-+ > # warm up the phase cache
-+ > list(repo.revs("not public()"))
-+ > if desc != 'strip':
-+ > transaction.addpostclose("phase invalidation test", test)
-+ > return transaction
-+ > def extsetup(ui):
-+ > extensions.wrapfunction(localrepo.localrepository, "transaction",
-+ > transactioncallback)
-+ > EOF
-+ $ hg up -C 2
-+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-+ $ echo k > k
-+ $ hg add k
-+ $ hg commit -m commitK
-+ $ echo l > l
-+ $ hg add l
-+ $ hg commit -m commitL
-+ $ hg book -r tip blah
-+ $ hg strip ".^" --config extensions.crash=$TESTTMP/stripstalephasecache.py
-+ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-+ saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg (glob)
-+ $ hg up -C 1
-+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-
- Error during post-close callback of the strip transaction
- (They should be gracefully handled and reported)
Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series 2016-06-03 07:20:18 UTC (rev 13280)
+++ packages/mercurial/trunk/debian/patches/series 2016-06-03 07:20:41 UTC (rev 13281)
@@ -5,4 +5,3 @@
deb_specific__disable_libdir_replacement.patch
for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
deb_specific__fix_fhs_paths.patch
-from_upstream__strip_invalidate_phase_cache_after_stripping_changeset_issue5235.patch
More information about the Python-apps-commits
mailing list