mercurial@45514: new changeset

2020-09-21 Thread Mercurial Commits
New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/93a0f3ba36bb changeset: 45514:93a0f3ba36bb bookmark:@ tag: tip parent: 45513:22140fd783d2 parent: 45509:2bc978921e8a user:Augie Fackler date:Mon Sep 21 15:05:38 2020 -0400 summary:

D9063: merge: use merge.clean_update() when applicable

2020-09-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We have had this higher-level function (higher than `merge.update()`, that is) for a while. Let's simply some callers by using it. I don't know why I

D9067: merge: delete hg.updaterepo() and use merge.update() instead (API)

2020-09-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a reviewer: durin42. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9067 AFFECTED FILES hgext/histedit.py

D9064: merge: add a back_out() function to encapsulate update()

2020-09-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I've sent several earlier patches adding `merge.clean_update()`, `merge.merge()` etc, one function for each use case. This patch continues that work. I

D9065: merge: make low-level update() private (API)

2020-09-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We have very few callers left that call the low-level `merge.update()` function. I think it's time to make it private. I'll remove the remaining callers in

D9066: merge: add a higher-level update() for the common `hg update` use case

2020-09-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is different from the `update()` function that I just made private. The new function is specifically for the normal `hg update` use case. It doesn't

mercurial@45513: 8 new changesets (2 on stable)

2020-09-21 Thread Mercurial Commits
8 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/1f50bcc96595 changeset: 45506:1f50bcc96595 user:Pierre-Yves David date:Thu Sep 17 11:21:13 2020 +0200 summary: changing-files: document the various sets

D9062: git: also convert timezone to int (issue6359)

2020-09-21 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Credit to moshez for testing this in the wild. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9062 AFFECTED