Mercurial > public > mercurial-scm > hg-stable
diff mercurial/revset.py @ 26716:c027641f8a83
revset: rename and test '_destmerge'
We make the name consistent with the one used by '_destupdate' and we ensure the
code is run by testing it (abort is expected and merge would).
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 15 Oct 2015 01:47:28 +0100 |
| parents | 9903261dcc81 |
| children | a95c975f42e3 |
line wrap: on
line diff
--- a/mercurial/revset.py Thu Oct 15 01:19:32 2015 +0100 +++ b/mercurial/revset.py Thu Oct 15 01:47:28 2015 +0100 @@ -469,13 +469,8 @@ args = getargsdict(x, 'limit', 'clean check') return subset & baseset([destutil.destupdate(repo, **args)[0]]) -def _mergedefaultdest(repo, subset, x): - # ``_mergedefaultdest()`` - - # default destination for merge. - # # XXX: Currently private because I expect the signature to change. - # # XXX: - taking rev as arguments, - # # XXX: - bailing out in case of ambiguity vs returning all data. +def _destmerge(repo, subset, x): + # experimental revset for merge destination getargs(x, 0, 0, _("_mergedefaultdest takes no arguments")) return subset & baseset([destutil.destmerge(repo)]) @@ -2098,7 +2093,7 @@ symbols = { "_destupdate": _destupdate, - "_mergedefaultdest": _mergedefaultdest, + "_destmerge": _destmerge, "adds": adds, "all": getall, "ancestor": ancestor,