mercurial at 39138: 27 new changesets

Mercurial Commits hg at intevation.de
Sat Aug 18 01:15:42 UTC 2018


27 new changesets in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/f2e645dc6a67
changeset:   39112:f2e645dc6a67
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Thu Aug 16 00:11:35 2018 +0000
summary:     tests: conditionalize extension tests for extra extensions

https://www.mercurial-scm.org/repo/hg/rev/e8532d00b729
changeset:   39113:e8532d00b729
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Thu Aug 16 00:13:41 2018 +0000
summary:     tests: add conditional output when simplestore extensions is loaded

https://www.mercurial-scm.org/repo/hg/rev/222aba766015
changeset:   39114:222aba766015
user:        Martijn Pieters <mj at octobus.net>
date:        Mon Aug 13 20:31:01 2018 +0100
summary:     perf: time loading branchmap caches

https://www.mercurial-scm.org/repo/hg/rev/2a4bfbb52111
changeset:   39115:2a4bfbb52111
user:        Martijn Pieters <mj at octobus.net>
date:        Mon Aug 13 21:22:14 2018 +0100
summary:     branchmap: load branchmap as an iterable

https://www.mercurial-scm.org/repo/hg/rev/ffb34ee6de9e
changeset:   39116:ffb34ee6de9e
user:        Sushil khanchi <sushilkhanchi97 at gmail.com>
date:        Wed Aug 15 11:27:57 2018 +0530
summary:     rebase: cover restorestatus() by lock to prevent it from being updated

https://www.mercurial-scm.org/repo/hg/rev/4899c6d22dff
changeset:   39117:4899c6d22dff
user:        Augie Fackler <raf at durin42.com>
date:        Thu Aug 16 00:39:32 2018 -0400
summary:     patchbomb: extract function for generating message-id

https://www.mercurial-scm.org/repo/hg/rev/1415b78869eb
changeset:   39118:1415b78869eb
user:        Augie Fackler <raf at durin42.com>
date:        Thu Aug 16 00:40:20 2018 -0400
summary:     patchbomb: allow using HGHOSTNAME to force a hostname

https://www.mercurial-scm.org/repo/hg/rev/1f987f7c832b
changeset:   39119:1f987f7c832b
user:        Augie Fackler <raf at durin42.com>
date:        Thu Aug 16 00:42:04 2018 -0400
summary:     tests: force a stable hostname in patchbomb tests

https://www.mercurial-scm.org/repo/hg/rev/d7007b807fa2
changeset:   39120:d7007b807fa2
user:        Augie Fackler <raf at durin42.com>
date:        Thu Aug 16 00:50:53 2018 -0400
summary:     tests: un-glob patchbomb test lines that were only globbing a hostname

https://www.mercurial-scm.org/repo/hg/rev/7c6044634957
changeset:   39121:7c6044634957
user:        FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
date:        Tue Aug 14 20:05:36 2018 +0900
summary:     help: describe more detail about capabilities while deciding merge tool

https://www.mercurial-scm.org/repo/hg/rev/5d3b58472660
changeset:   39122:5d3b58472660
user:        FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
date:        Tue Aug 14 20:08:27 2018 +0900
summary:     filemerge: set actual capabilities of internal merge tools

https://www.mercurial-scm.org/repo/hg/rev/4d7b11877dd0
changeset:   39123:4d7b11877dd0
user:        FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
date:        Tue Aug 14 20:15:51 2018 +0900
summary:     filemerge: add the function to examine a capability of a internal tool

https://www.mercurial-scm.org/repo/hg/rev/6618634e3325
changeset:   39124:6618634e3325
user:        FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
date:        Wed Aug 15 22:24:38 2018 +0900
summary:     filemerge: show warning if chosen tool has no binary files capability

https://www.mercurial-scm.org/repo/hg/rev/cded904f7acc
changeset:   39125:cded904f7acc
user:        FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
date:        Wed Aug 15 22:24:50 2018 +0900
summary:     filemerge: add config knob to check capabilities of internal merge tools

https://www.mercurial-scm.org/repo/hg/rev/e09fad982ef5
changeset:   39126:e09fad982ef5
user:        FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
date:        Tue Aug 14 22:20:28 2018 +0900
summary:     filemerge: show actual capabilities of internal merge tools

https://www.mercurial-scm.org/repo/hg/rev/95bd19f60957
changeset:   39127:95bd19f60957
user:        Kyle Lippincott <spectral at google.com>
date:        Wed Aug 15 17:40:21 2018 -0700
summary:     overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)

https://www.mercurial-scm.org/repo/hg/rev/3201ea44fe09
changeset:   39128:3201ea44fe09
user:        Augie Fackler <augie at google.com>
date:        Wed Jul 25 13:41:21 2018 -0400
summary:     tests: update test-check-py3-compat.t output in the py3exe branch

https://www.mercurial-scm.org/repo/hg/rev/7c9fedcf7a36
changeset:   39129:7c9fedcf7a36
user:        Augie Fackler <augie at google.com>
date:        Wed Jul 25 13:40:42 2018 -0400
summary:     tests: remove test-py3-commands.t

https://www.mercurial-scm.org/repo/hg/rev/0600d09764df
changeset:   39130:0600d09764df
user:        Pulkit Goyal <pulkit at yandex-team.ru>
date:        Thu Aug 16 16:36:32 2018 +0300
summary:     tests: don't create new repo inside existing repo in test-rebase-inmemory.t

https://www.mercurial-scm.org/repo/hg/rev/02e80e37fbbc
changeset:   39131:02e80e37fbbc
user:        Pulkit Goyal <pulkit at yandex-team.ru>
date:        Thu Aug 16 16:53:48 2018 +0300
summary:     tests: demonstrate that IMM needs to be smarter with path conflicts

https://www.mercurial-scm.org/repo/hg/rev/873f3a56993f
changeset:   39132:873f3a56993f
user:        Pulkit Goyal <pulkit at yandex-team.ru>
date:        Thu Aug 16 16:59:40 2018 +0300
summary:     context: make sure file is not deleted while checking path conflicts

https://www.mercurial-scm.org/repo/hg/rev/06baaf43c959
changeset:   39133:06baaf43c959
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Thu Aug 16 18:53:51 2018 +0000
summary:     rebase: call _dorebase() properly

https://www.mercurial-scm.org/repo/hg/rev/e338a921a0cd
changeset:   39134:e338a921a0cd
user:        Yuya Nishihara <yuya at tcha.org>
date:        Fri Aug 17 10:19:17 2018 +0900
summary:     rebase: add test for in-memory merge conflicts

https://www.mercurial-scm.org/repo/hg/rev/485a3349d5ee
changeset:   39135:485a3349d5ee
user:        Yuya Nishihara <yuya at tcha.org>
date:        Fri Aug 17 10:21:25 2018 +0900
summary:     rebase: do not pass in user option to rollback in-memory merge conflict

https://www.mercurial-scm.org/repo/hg/rev/b892df0766e1
changeset:   39136:b892df0766e1
user:        Yuya Nishihara <yuya at tcha.org>
date:        Fri Aug 17 10:24:29 2018 +0900
summary:     branchmap: strip '\n' read from cache file as before

https://www.mercurial-scm.org/repo/hg/rev/dd1614906a20
changeset:   39137:dd1614906a20
user:        Yuya Nishihara <yuya at tcha.org>
date:        Fri Aug 17 10:25:39 2018 +0900
summary:     branchmap: close cache file properly

https://www.mercurial-scm.org/repo/hg/rev/8547c8590ac1
changeset:   39138:8547c8590ac1
bookmark:    @
tag:         tip
user:        Yuya Nishihara <yuya at tcha.org>
date:        Fri Aug 17 10:51:05 2018 +0900
summary:     branchmap: explicitly convert file into iterator

-- 
Repository URL: https://www.mercurial-scm.org/repo/hg


More information about the Mercurial-devel mailing list