# HG changeset patch # User Jun Wu <qu...@fb.com> # Date 1490610065 25200 # Mon Mar 27 03:21:05 2017 -0700 # Node ID 293c829c83b02501a44a45bc2ed9794cec00e023 # Parent a3e835b04db41230b02233d5c7c3f4dee49407d3 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.org/quark-zju/hg-draft -r 293c829c83b0 histedit: make prune markers local
This address the issue mentioned at [1]. [1]: https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-March/095678.html diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1599,5 +1599,5 @@ def safecleanupnode(ui, repo, name, node # nodes is a set-like def getmarker(prec): - return (repo[prec], ()) + return (repo[prec], None) # sort by revision number because it sound "right" sortednodes = sorted([n for n in nodes if n in repo], diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t --- a/tests/test-histedit-obsolete.t +++ b/tests/test-histedit-obsolete.t @@ -171,6 +171,6 @@ Base setup for the rest of the testing $ hg debugobsolete - 96e494a2d553dd05902ba1cee1d94d4cb7b8faed 0 {b346ab9a313db8537ecf96fca3ca3ca984ef3bd7} (*) {'user': 'test'} (glob) - b558abc46d09c30f57ac31e85a8a3d64d2e906e4 0 {96e494a2d553dd05902ba1cee1d94d4cb7b8faed} (*) {'user': 'test'} (glob) + 96e494a2d553dd05902ba1cee1d94d4cb7b8faed 0 (*) {'user': 'test'} (glob) + b558abc46d09c30f57ac31e85a8a3d64d2e906e4 0 (*) {'user': 'test'} (glob) d2ae7f538514cd87c17547b0de4cea71fe1af9fb 0 {cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b} (*) {'user': 'test'} (glob) 177f92b773850b59254aa5e923436f921b55483b b346ab9a313db8537ecf96fca3ca3ca984ef3bd7 0 (*) {'user': 'test'} (glob) _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel