mercurial at 27011: 58 new changesets (2 on stable)

Mercurial Commits hg at intevation.org
Thu Nov 19 03:15:48 UTC 2015


58 new changesets (2 on stable) in mercurial:

http://selenic.com/repo/hg//rev/f804bf27439b
changeset:   26954:f804bf27439b
user:        Yuya Nishihara <yuya at tcha.org>
date:        Sun Nov 01 13:53:05 2015 +0900
summary:     import-checker: make it executable for convenience

http://selenic.com/repo/hg//rev/c4114e335b49
changeset:   26955:c4114e335b49
user:        Yuya Nishihara <yuya at tcha.org>
date:        Sun Nov 01 15:39:25 2015 +0900
summary:     import-checker: extract function to generate a formatted warning

http://selenic.com/repo/hg//rev/4b56214ebb7a
changeset:   26956:4b56214ebb7a
user:        Yuya Nishihara <yuya at tcha.org>
date:        Sun Nov 01 15:46:06 2015 +0900
summary:     import-checker: include lineno in warning message

http://selenic.com/repo/hg//rev/d16d73173fdd
changeset:   26957:d16d73173fdd
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Thu Nov 12 13:14:03 2015 -0800
summary:     merge: move messages about possible conflicts a litte earlier

http://selenic.com/repo/hg//rev/32bd195ab787
changeset:   26958:32bd195ab787
user:        Anton Shestakov <av6 at dwimlabs.net>
date:        Fri Nov 06 22:32:00 2015 +0800
summary:     monoblue: add a space to separate navigation links in file log footer

http://selenic.com/repo/hg//rev/ed5f20f9c22e
changeset:   26959:ed5f20f9c22e
branch:      stable
parent:      26945:8a256cee72c8
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Fri Nov 13 15:56:02 2015 -0800
summary:     resolve: restore .orig only after merge is fully complete (issue4952)

http://selenic.com/repo/hg//rev/6979fe2a6d75
changeset:   26960:6979fe2a6d75
branch:      stable
user:        liscju <piotr.listkiewicz at gmail.com>
date:        Sun Nov 15 22:18:48 2015 +0100
summary:     rebase: add returning value from pullrebase function

http://selenic.com/repo/hg//rev/042422f3a773
changeset:   26961:042422f3a773
parent:      26958:32bd195ab787
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Fri Nov 13 14:24:22 2015 -0800
summary:     merge: stop emptying out 'cd' and 'dc' actions

http://selenic.com/repo/hg//rev/fa2daf0e61ab
changeset:   26962:fa2daf0e61ab
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Fri Nov 13 22:43:09 2015 -0800
summary:     merge: make 'cd' and 'dc' actions store the same arguments as 'm'

http://selenic.com/repo/hg//rev/de5ae97ce9f4
changeset:   26963:de5ae97ce9f4
user:        Matt Mackall <mpm at selenic.com>
date:        Mon Nov 02 17:17:33 2015 -0600
summary:     encoding: extend test cases for utf8b

http://selenic.com/repo/hg//rev/5abba2c92da3
changeset:   26964:5abba2c92da3
user:        Yuya Nishihara <yuya at tcha.org>
date:        Sun Nov 01 00:37:22 2015 +0900
summary:     import-checker: allow import of child modules from package root

http://selenic.com/repo/hg//rev/1fa66d3ad28d
changeset:   26965:1fa66d3ad28d
user:        Yuya Nishihara <yuya at tcha.org>
date:        Sun Nov 01 17:42:03 2015 +0900
summary:     import-checker: reset context to verify convention in function scope

http://selenic.com/repo/hg//rev/51fa43a3cd58
changeset:   26966:51fa43a3cd58
user:        Yuya Nishihara <yuya at tcha.org>
date:        Mon Nov 09 22:31:01 2015 +0900
summary:     test-encoding: enable fuzz testing of utf8b roundtrip

http://selenic.com/repo/hg//rev/7a8e9a985c3b
changeset:   26967:7a8e9a985c3b
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Wed Nov 11 10:19:11 2015 -0800
summary:     filemerge: remove leading space from " no tool found..."

http://selenic.com/repo/hg//rev/216cc65cf227
changeset:   26968:216cc65cf227
user:        liscju <piotr.listkiewicz at gmail.com>
date:        Sun Nov 15 22:58:28 2015 +0100
summary:     pull: return 255 value on update failure (issue4948) (BC)

http://selenic.com/repo/hg//rev/b54b520a24c2
changeset:   26969:b54b520a24c2
user:        Matt Harbison <matt_harbison at yahoo.com>
date:        Sun Nov 15 21:12:13 2015 -0500
summary:     tests: fix globs for Windows

http://selenic.com/repo/hg//rev/6d99cc89ee0e
changeset:   26970:6d99cc89ee0e
user:        Matt Harbison <matt_harbison at yahoo.com>
date:        Sun Nov 15 22:11:23 2015 -0500
summary:     test-convert-git: drop a git warning that doesn't occur on Windows

http://selenic.com/repo/hg//rev/9f3410a52f44
changeset:   26971:9f3410a52f44
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Wed Feb 11 22:22:29 2015 -0800
summary:     test-rename-merge2: make selected output less arbitrary

http://selenic.com/repo/hg//rev/4b0c3df5d635
changeset:   26972:4b0c3df5d635
user:        Shubhanshu Agrawal <agrawal.shubhanshu at gmail.com>
date:        Sun Nov 15 20:27:27 2015 +0530
summary:     strip: renaming local variables

http://selenic.com/repo/hg//rev/fdd63acf3215
changeset:   26973:fdd63acf3215
user:        Laurent Charignon <lcharignon at fb.com>
date:        Mon Nov 16 17:14:15 2015 -0800
summary:     convert: indentation change to make the next patch more legible

http://selenic.com/repo/hg//rev/4b5dc0d9e899
changeset:   26974:4b5dc0d9e899
user:        Laurent Charignon <lcharignon at fb.com>
date:        Mon Nov 16 17:15:36 2015 -0800
summary:     convert: use repo._bookmarks.recordchange instead of repo._bookmarks.write

http://selenic.com/repo/hg//rev/6618dfd3ea1c
changeset:   26975:6618dfd3ea1c
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Nov 15 22:45:20 2015 -0800
summary:     merge.applyupdates: don't return early if merge driver's conclude failed

http://selenic.com/repo/hg//rev/c48fee950ce4
changeset:   26976:c48fee950ce4
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Fri Nov 13 23:01:36 2015 -0800
summary:     debugmergestate: print out record type for files

http://selenic.com/repo/hg//rev/bd19561b98d9
changeset:   26977:bd19561b98d9
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Fri Nov 13 22:37:51 2015 -0800
summary:     filectx: allow custom comparators

http://selenic.com/repo/hg//rev/9b9d4bcc915e
changeset:   26978:9b9d4bcc915e
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Mon Nov 16 11:27:27 2015 -0800
summary:     filectx: add isabsent method

http://selenic.com/repo/hg//rev/7b038ec6c5fd
changeset:   26979:7b038ec6c5fd
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Mon Nov 16 11:45:35 2015 -0800
summary:     filemerge: introduce class whose objects represent files not in a context

http://selenic.com/repo/hg//rev/18f50b8cbf1e
changeset:   26980:18f50b8cbf1e
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Mon Nov 16 11:23:32 2015 -0800
summary:     node: add 'nullhex', hex-encoded nullid

http://selenic.com/repo/hg//rev/cda2e980281e
changeset:   26981:cda2e980281e
user:        liscju <piotr.listkiewicz at gmail.com>
date:        Thu Nov 12 12:44:15 2015 +0100
summary:     histedit: extracts _isdirtywc function

http://selenic.com/repo/hg//rev/fa6685ea7ad8
changeset:   26982:fa6685ea7ad8
user:        Bryan O'Sullivan <bos at serpentine.com>
date:        Tue Nov 17 13:43:09 2015 -0800
summary:     osutil: don't leak on statfiles error

http://selenic.com/repo/hg//rev/f9f2f29ce023
changeset:   26983:f9f2f29ce023
user:        Bryan O'Sullivan <bos at serpentine.com>
date:        Tue Nov 17 13:47:14 2015 -0800
summary:     osutil: make statfiles check for interrupts periodically

http://selenic.com/repo/hg//rev/af2663680e95
changeset:   26984:af2663680e95
user:        Bryan O'Sullivan <bos at serpentine.com>
date:        Tue Nov 17 13:47:16 2015 -0800
summary:     dirstate: back out 502b56a9e897

http://selenic.com/repo/hg//rev/039a53c87370
changeset:   26985:039a53c87370
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 14:10:12 2015 -0800
summary:     error: add a structured exception for unsupported merge records

http://selenic.com/repo/hg//rev/1ee5e48f09d4
changeset:   26986:1ee5e48f09d4
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 14:11:52 2015 -0800
summary:     mergestate: raise structured exception for unsupported merge records

http://selenic.com/repo/hg//rev/416b2b7d3068
changeset:   26987:416b2b7d3068
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 17:00:54 2015 -0800
summary:     mergestate: add a constructor that sets up a clean merge state

http://selenic.com/repo/hg//rev/7e38d49bc713
changeset:   26988:7e38d49bc713
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 17:02:35 2015 -0800
summary:     strip: switch to mergestate.clean()

http://selenic.com/repo/hg//rev/a65ea44f163e
changeset:   26989:a65ea44f163e
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 17:04:32 2015 -0800
summary:     localrepo: switch to mergestate.clean()

http://selenic.com/repo/hg//rev/11b1832db8ae
changeset:   26990:11b1832db8ae
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 17:04:53 2015 -0800
summary:     merge.applyupdates: switch to mergestate.clean()

http://selenic.com/repo/hg//rev/2ddc92bae4a7
changeset:   26991:2ddc92bae4a7
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 13:55:30 2015 -0800
summary:     mergestate: add a constructor that reads state from disk

http://selenic.com/repo/hg//rev/b3b5ed560283
changeset:   26992:b3b5ed560283
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 13:56:10 2015 -0800
summary:     shelve: switch to mergestate.read()

http://selenic.com/repo/hg//rev/d240ae897ba6
changeset:   26993:d240ae897ba6
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 13:56:46 2015 -0800
summary:     commands.resolve: switch to mergestate.read()

http://selenic.com/repo/hg//rev/676c3838d217
changeset:   26994:676c3838d217
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 14:20:55 2015 -0800
summary:     commands.summary: switch to mergestate.read()

http://selenic.com/repo/hg//rev/d5a6be56970b
changeset:   26995:d5a6be56970b
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 13:57:38 2015 -0800
summary:     fileset: switch to mergestate.read()

http://selenic.com/repo/hg//rev/bf3eec62212f
changeset:   26996:bf3eec62212f
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 13:58:50 2015 -0800
summary:     localrepo.commit: switch to mergestate.read()

http://selenic.com/repo/hg//rev/1791f9aa782f
changeset:   26997:1791f9aa782f
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 15:43:21 2015 -0800
summary:     test-resolve.t: switch to mergestate.read()

http://selenic.com/repo/hg//rev/4414d500604f
changeset:   26998:4414d500604f
user:        Laurent Charignon <lcharignon at fb.com>
date:        Wed Nov 18 01:36:58 2015 -0800
summary:     localrepo: put bookmark move following commit in one transaction

http://selenic.com/repo/hg//rev/2d79a354d843
changeset:   26999:2d79a354d843
user:        Laurent Charignon <lcharignon at fb.com>
date:        Tue Nov 17 12:49:57 2015 -0800
summary:     bookmarks: use repo._bookmarks.recordchange instead of repo._bookmarks.write

http://selenic.com/repo/hg//rev/05d8db5d2116
changeset:   27000:05d8db5d2116
user:        Laurent Charignon <lcharignon at fb.com>
date:        Tue Nov 17 13:12:46 2015 -0800
summary:     mq: indentation change to make the next patch more legible

http://selenic.com/repo/hg//rev/c07a2fd31970
changeset:   27001:c07a2fd31970
user:        Laurent Charignon <lcharignon at fb.com>
date:        Tue Nov 17 13:12:33 2015 -0800
summary:     mq: use repo._bookmarks.recordchange instead of repo._bookmarks.write

http://selenic.com/repo/hg//rev/a8a5206585ec
changeset:   27002:a8a5206585ec
user:        Christian Delahousse <cdelahousse at fb.com>
date:        Tue Nov 17 18:01:21 2015 -0800
summary:     convert: changed test's progress output format to ignore estimate

http://selenic.com/repo/hg//rev/487cca1bf61f
changeset:   27003:487cca1bf61f
user:        Christian Delahousse <cdelahousse at fb.com>
date:        Wed Nov 11 13:28:00 2015 -0800
summary:     debugdirstate: convert keyword parameters to **opts

http://selenic.com/repo/hg//rev/a4c26918fb23
changeset:   27004:a4c26918fb23
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 14:22:30 2015 -0800
summary:     debugmergestate: explain why we create mergestate objects directly

http://selenic.com/repo/hg//rev/3185c01c551c
changeset:   27005:3185c01c551c
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 14:04:56 2015 -0800
summary:     mergestate: move _read() call to read constructor

http://selenic.com/repo/hg//rev/9d58dc193c46
changeset:   27006:9d58dc193c46
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 17 14:23:26 2015 -0800
summary:     mergestate.commit: factor out making the list of records

http://selenic.com/repo/hg//rev/c8cbef073645
changeset:   27007:c8cbef073645
user:        Yuya Nishihara <yuya at tcha.org>
date:        Sun Nov 01 13:58:32 2015 +0900
summary:     hgweb: alias ui module as uimod

http://selenic.com/repo/hg//rev/7f19f331ef59
changeset:   27008:7f19f331ef59
user:        Yuya Nishihara <yuya at tcha.org>
date:        Sun Nov 01 14:00:14 2015 +0900
summary:     hgweb: do not import templatefilters.revescape and websub as symbol

http://selenic.com/repo/hg//rev/f5faef7e9119
changeset:   27009:f5faef7e9119
user:        Yuya Nishihara <yuya at tcha.org>
date:        Sun Nov 01 14:43:25 2015 +0900
summary:     hgweb: unify import style of error classes

http://selenic.com/repo/hg//rev/f4fec0940278
changeset:   27010:f4fec0940278
parent:      27009:f5faef7e9119
parent:      26960:6979fe2a6d75
user:        Matt Mackall <mpm at selenic.com>
date:        Wed Nov 18 20:59:17 2015 -0600
summary:     merge with stable

http://selenic.com/repo/hg//rev/53c668dc6b16
changeset:   27011:53c668dc6b16
bookmark:    @
tag:         tip
user:        Laurent Charignon <lcharignon at fb.com>
date:        Wed Nov 18 13:46:42 2015 -0800
summary:     rebase: fix a typo in test-rebase-obsolete

-- 
Repository URL: http://selenic.com/repo/hg/


More information about the Mercurial-devel mailing list