D1577: localrepo: fix cache repo._filteredrepotypes by adding filtername in key

quark added a comment. This was my idea to support the "directaccess" exception rules. Ideally, the exception state should be per `(unfiltered repo, filter name)`. So the `cls` here is a good candidate to attach that exception revs. (ex. `cls._visibleexceptionrevs = set()`). More

[PATCH 4 of 5] fancyopts: use getopt.gnu_getopt()

# HG changeset patch # User Yuya Nishihara # Date 1511453340 -32400 # Fri Nov 24 01:09:00 2017 +0900 # Node ID 8dd510eb51942ddae4dc69423627a349656d25f0 # Parent eaa3dd26e7da4b6ab73c9b124697a607324bef36 fancyopts: use getopt.gnu_getopt() The issue described in the docstring

[PATCH 2 of 5] dispatch: replace _earlyreq*() with new fancyopts-based parser

# HG changeset patch # User Yuya Nishihara # Date 1511443439 -32400 # Thu Nov 23 22:23:59 2017 +0900 # Node ID fd8f98308ad7cfe10465c21190c8611ad9b3572f # Parent 44930515ee3b612477d8b0b5cfe8d24057351a2f dispatch: replace _earlyreq*() with new fancyopts-based parser diff --git

[PATCH 5 of 5] fancyopts: fix handling of "--" value in earlygetopt()

# HG changeset patch # User Yuya Nishihara # Date 1511598650 -32400 # Sat Nov 25 17:30:50 2017 +0900 # Node ID a0242100667f22448b33009299c468ce3431297b # Parent 8dd510eb51942ddae4dc69423627a349656d25f0 fancyopts: fix handling of "--" value in earlygetopt() diff --git

[PATCH 1 of 5] dispatch: alias --repo to --repository while parsing early options

# HG changeset patch # User Yuya Nishihara # Date 1511597032 -32400 # Sat Nov 25 17:03:52 2017 +0900 # Node ID 44930515ee3b612477d8b0b5cfe8d24057351a2f # Parent 2523ab8ba69dfbfd9832f115d9bbc1f9b9ce4745 dispatch: alias --repo to --repository while parsing early options This

[PATCH STABLE] convert: restore the ability to use bzr < 2.6.0 (issue5733)

# HG changeset patch # User Matt Harbison # Date 1512188828 18000 # Fri Dec 01 23:27:08 2017 -0500 # Branch stable # Node ID dedc5dbc155dcd1c142059c4896a9a5cf3e1e350 # Parent fff9ffa2ea05c3b661aa769644454b27266ab940 convert: restore the ability to use bzr < 2.6.0

[PATCH 3 of 5] dispatch: replace _earlygetopt(strip=True) with new parser

# HG changeset patch # User Yuya Nishihara # Date 1511446736 -32400 # Thu Nov 23 23:18:56 2017 +0900 # Node ID eaa3dd26e7da4b6ab73c9b124697a607324bef36 # Parent fd8f98308ad7cfe10465c21190c8611ad9b3572f dispatch: replace _earlygetopt(strip=True) with new parser The execution

mercurial@35181: 2 new changesets

2 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/3180ff7f6025 changeset: 35180:3180ff7f6025 user:Yuya Nishihara date:Sun Nov 26 11:22:27 2017 +0900 summary: test-ssh: do not actually look up "brokenrepository" by DNS

D1576: amend: extract function for calculating changeset extras

martinvonz added a comment. In https://phab.mercurial-scm.org/D1576#26799, @yuja wrote: > Queued, but I doubt if `pureextra == old.extra()` would work with your extension. I did think about that and then I forgot it before I sent the patch :( We don't need this that urgently, so

[PATCH] test-lfs: drop a hack for ignoring convert devel-warnings

# HG changeset patch # User Matt Harbison # Date 1512186055 18000 # Fri Dec 01 22:40:55 2017 -0500 # Node ID dd5c3d73534038ae74c53e3baf46cabd36818af1 # Parent 2523ab8ba69dfbfd9832f115d9bbc1f9b9ce4745 test-lfs: drop a hack for ignoring convert devel-warnings This

D1577: localrepo: fix cache repo._filteredrepotypes by adding filtername in key

yuja added subscribers: indygreg, quark, yuja. yuja requested changes to this revision. yuja added a comment. This revision now requires changes to proceed. @quark, @indygreg Is there any practical problem other than the wrong class name? IIUC, the composed type object shouldn't

D1575: amend: make a copy of "extra" to avoid mutating an input

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5cc14407a739: amend: make a copy of extra to avoid mutating an input (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1576: amend: extract function for calculating changeset extras

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd3bba59a70e1: amend: extract function for calculating changeset extras (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1578: tests: removes bashism from test-unamend.t

This revision was automatically updated to reflect the committed changes. Closed by commit rHG900ed9853017: tests: removes bashism from test-unamend.t (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1578?vs=4069=4078

D1477: run-tests: mechanism to report exceptions during test execution

This revision was automatically updated to reflect the committed changes. Closed by commit rHGbd8875b6473c: run-tests: mechanism to report exceptions during test execution (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1574: run-tests: avoid calculating _testdir again

This revision was automatically updated to reflect the committed changes. Closed by commit rHG779c6cf2967b: run-tests: avoid calculating _testdir again (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1474: run-tests: convert to argparse

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb4b0aed7bfaf: run-tests: convert to argparse (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1474?vs=3714=4070 REVISION

D1480: py3: define __next__ in patch.py

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa1d2fc32bb99: py3: define __next__ in patch.py (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1480?vs=3720=4074 REVISION

D1476: run-tests: make --extra-config-opt work with Python 3

This revision was automatically updated to reflect the committed changes. Closed by commit rHG073843b5e353: run-tests: make --extra-config-opt work with Python 3 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1573: run-tests: simplify by using dict.pop() with default

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf12747de13ea: run-tests: simplify by using dict.pop() with default (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1482: py3: use byteskwargs in sparse.py

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd8d06a930d60: py3: use byteskwargs in sparse.py (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1482?vs=3722=4075 REVISION

D1475: run-tests: organize options into argument groups

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd997b82152e8: run-tests: organize options into argument groups (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1557: py3: use encoding.strtolocal() to convert string to bytes

yuja requested changes to this revision. yuja added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > debugcommands.py:729 > +ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], > + encoding.strtolocal(timestr), file_)) > for f in

D1556: py3: use pycompat.bytestr() or '%d' in place of str()

yuja requested changes to this revision. yuja added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > cmdutil.py:828 > 'h': lambda: short(node), > -'m': lambda: re.sub('[^\w]', '_', str(desc)) > +'m': lambda: re.sub('[^\w]', '_',

D1576: amend: extract function for calculating changeset extras

yuja added a comment. Queued, but I doubt if `pureextra == old.extra()` would work with your extension. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1576 To: martinvonz, #hg-reviewers, yuja Cc: mercurial-devel ___

D1477: run-tests: mechanism to report exceptions during test execution

yuja added a comment. Queued, thanks. INLINE COMMENTS > run-tests.py:2533 > +self.options.extra_config_opt.append( > +'extensions.logexceptions=%s' % > logexceptions.decode('utf-8')) > + Nit: better to use `_strpath()` here because extra_config_opt is a list of

D1568: lfs: using workers in lfs prefetch

quark accepted this revision. quark added a comment. I have changed the test plan to not include the "skipped" part. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1568 To: wlis, #hg-reviewers, quark Cc: mharbison72, quark, mercurial-devel

mercurial@35179: 5 new changesets

5 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/e0a1b9ee93cd changeset: 35175:e0a1b9ee93cd parent: 35164:6864c405f023 user:Matt Harbison date:Wed Nov 15 23:43:15 2017 -0500 summary: lfs: add a repo requirement for this

D1578: tests: removes bashism from test-unamend.t

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY FreeBSD builders fail because of bashism. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1578 AFFECTED FILES tests/test-unamend.t

D1577: localrepo: fix cache repo._filteredrepotypes by adding filtername in key

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this patch, In [13]: repo.filtered('visible').__class__ Out[13]: mercurial.localrepo.visiblefilteredrepo In [14]:

D1575: amend: make a copy of "extra" to avoid mutating an input

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I don't know of any problems this has caused, it just seems less surprising. REPOSITORY rHG Mercurial REVISION DETAIL

D1576: amend: extract function for calculating changeset extras

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We (Google) have extensions that would like to put their own entries in the extras. Some of these don't make sense to keep on amend (e.g. an entry saying

D1568: lfs: using workers in lfs prefetch

wlis requested review of this revision. wlis added a comment. Tested with the server: [wlis@dev9680.prn1 ~/hg-committed/tests] ./run-tests.py -l test-lfs* # Ran 4 tests, 0 skipped, 0 failed. REPOSITORY rHG Mercurial REVISION DETAIL

D1573: run-tests: simplify by using dict.pop() with default

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1573 AFFECTED FILES tests/run-tests.py CHANGE DETAILS diff --git a/tests/run-tests.py

D1574: run-tests: avoid calculating _testdir again

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1574 AFFECTED FILES tests/run-tests.py CHANGE DETAILS diff --git a/tests/run-tests.py

mercurial@35174: 6 new changesets (6 on stable)

6 new changesets (6 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/898c6f812a51 changeset: 35169:898c6f812a51 branch: stable user:Yuya Nishihara date:Thu Nov 23 22:04:53 2017 +0900 summary: fancyopts: add early-options parser

D1527: context: add an abstract base class for filectx

martinvonz added a comment. In https://phab.mercurial-scm.org/D1527#25742, @phillco wrote: > Note that we can't actually make `absentfilectx` based off this class today because of the `context -> merge` imprt cycle. What exactly is that cycle? Can we break one of the links with a

D1211: context: switch ctx() use to changectx()

phillco added a subscriber: sid0. phillco added a comment. cc @sid0 on the absentfilectx thing, maybe he knows more REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1211 To: phillco, #hg-reviewers, dlax Cc: sid0, martinvonz, mercurial-devel

mercurial@35168: 4 new changesets (4 on stable)

4 new changesets (4 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/27196b7fc1ac changeset: 35165:27196b7fc1ac branch: stable parent: 35111:62539b425347 user:Yuya Nishihara date:Sat Nov 25 15:29:34 2017 +0900 summary: cat: record

D1224: merge: cache unknown dir checks (issue5716)

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb85962350bb3: merge: cache unknown dir checks (issue5716) (authored by mbthomas, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1224?vs=3473=4056

D1226: merge: check created file dirs for path conflicts only once (issue5716)

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa92b9f8e11ba: merge: check created file dirs for path conflicts only once (issue5716) (authored by mbthomas, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D971: uncommit: unify functions _uncommitdirstate and _unamenddirstate to one

This revision was automatically updated to reflect the committed changes. Closed by commit rHG9dadcb99cc17: uncommit: unify functions _uncommitdirstate and _unamenddirstate to one (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D821: unamend: move fb extension unamend to core

This revision was automatically updated to reflect the committed changes. Closed by commit rHG867990238dc6: unamend: move fb extension unamend to core (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D821?vs=3671=4054

Re: [PATCH 2 of 2 STABLE V2] dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options

> On Nov 24, 2017, at 09:58, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1511443023 -32400 > # Thu Nov 23 22:17:03 2017 +0900 > # Branch stable > # Node ID 54e6e3b35ea5a96d2d822ac23d44b4d105178c05 > # Parent

Re: [PATCH] mergetools: add nbdime merge tools to default rc

Thanks for your reply! I've tried to address your comments point by point below: > Nit: I'm not sure what this "merge driver" and "merge tool" mean, and the > term "merge driver" seems to have a different meaning in Mercurial. Can you > elaborate? I wasn't certain of the mercurial terminology,

[PATCH] archive: pass thru mtime for directory archives, like the other archive types do

# HG changeset patch # User James May # Date 1512110361 -39600 # Fri Dec 01 17:39:21 2017 +1100 # Node ID b7a1f6fbfe150ab776c2cb48c120aab97f6d7e7f # Parent 6864c405f0235d5c42937658049f0405d5d1abdc archive: pass thru mtime for directory archives, like the other archive

D1285: repoview: add a new attribute _visibilityexceptions and related API

pulkit updated this revision to Diff 4051. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1285?vs=3956=4051 REVISION DETAIL https://phab.mercurial-scm.org/D1285 AFFECTED FILES mercurial/localrepo.py mercurial/repoview.py CHANGE DETAILS diff --git

D1286: repoview: consider visibility exceptions in filterrevs()

pulkit updated this revision to Diff 4052. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1286?vs=3957=4052 REVISION DETAIL https://phab.mercurial-scm.org/D1286 AFFECTED FILES mercurial/repoview.py CHANGE DETAILS diff --git a/mercurial/repoview.py

D1287: repoview: add two new filternames to be used for accessing hidden commits

pulkit updated this revision to Diff 4053. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1287?vs=3958=4053 REVISION DETAIL https://phab.mercurial-scm.org/D1287 AFFECTED FILES mercurial/branchmap.py mercurial/repoview.py CHANGE DETAILS diff --git

D1557: py3: use encoding.strtolocal() to convert string to bytes

pulkit updated this revision to Diff 4050. pulkit retitled this revision from "py3: use pycompat.bytestr() to convert string to bytes" to "py3: use encoding.strtolocal() to convert string to bytes". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1555: py3: use bytes in place of basestring

pulkit updated this revision to Diff 4048. pulkit edited the summary of this revision. pulkit retitled this revision from "py3: add pycompat.basestring and use it" to "py3: use bytes in place of basestring". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1556: py3: use pycompat.bytestr() or '%d' in place of str()

pulkit updated this revision to Diff 4049. pulkit retitled this revision from "py3: use pycompat.bytestr() in place of str()" to "py3: use pycompat.bytestr() or '%d' in place of str()". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1556?vs=3980=4049

D1532: color: respect HGPLAINEXCEPT=color to allow colors while scripting (issue5749)

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd4805a5e7e70: color: respect HGPLAINEXCEPT=color to allow colors while scripting (issue5749) (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

[PATCH] hgweb: remove negative top from .info line in graph

# HG changeset patch # User Anton Shestakov # Date 1512131582 -28800 # Fri Dec 01 20:33:02 2017 +0800 # Node ID 6c030d3e81ba8ee1af78b727f34bf5b25dafe94b # Parent 3180ff7f60253ee1d6ae1f4608acb96c60adeef3 # EXP-Topic hgweb-cleanup hgweb: remove negative top from .info line

Re: [PATCH] tests: try and scrub away IP addresses with $LOCALIP

On Fri, 1 Dec 2017 22:28:29 +0900, Yuya Nishihara wrote: > On Thu, 30 Nov 2017 16:29:40 -0500, Augie Fackler wrote: > > # HG changeset patch > > # User Augie Fackler > > # Date 1511993262 18000 > > # Wed Nov 29 17:07:42 2017 -0500 > > # Node ID

Re: [PATCH] tests: try and scrub away IP addresses with $LOCALIP

On Thu, 30 Nov 2017 16:29:40 -0500, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1511993262 18000 > # Wed Nov 29 17:07:42 2017 -0500 > # Node ID c302e8e1948355a38128905db7c880ec2454e81b > # Parent 02e348000fb6eb411306d2c67c9c053351d189cc >

Re: [PATCH] mergetools: add nbdime merge tools to default rc

On Fri, 1 Dec 2017 11:25:01 +0100, Vidar Tonaas Fauske wrote: > > Nit: I'm not sure what this "merge driver" and "merge tool" mean, and the > > term "merge driver" seems to have a different meaning in Mercurial. Can you > > elaborate? > > I wasn't certain of the mercurial terminology, so I just

Re: [PATCH STABLE] filelog: don't crash on invalid copy metadata (issue5748)

On Thu, 30 Nov 2017 21:22:10 -0500, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1512094786 18000 > # Thu Nov 30 21:19:46 2017 -0500 > # Branch stable > # Node ID 5f86d95b1bd8aae2c555d2480aa4ac0d2893d35f > # Parent

Re: [PATCH 1 of 3 STABLE] tests: add globs for Windows

On Fri, 01 Dec 2017 01:13:58 -0500, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1510421825 18000 > # Sat Nov 11 12:37:05 2017 -0500 > # Branch stable > # Node ID e2eb7fb78f36ecf33f6d398fdc38d08940961ac7 > # Parent

D1562: test: fix common-pattern for *BSD systems

lothiraldan added a comment. I got confused, I will send an updated version with a fixed changeset message. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1562 To: lothiraldan, durin42, #hg-reviewers Cc: mercurial-devel

D1232: rebase: add the --inmemory option flag; assign a wctx object for the rebase

dlax requested changes to this revision. dlax added a comment. This revision now requires changes to proceed. > In the future, the --inmemory flag might be deprecated in favor of something more intelligent Perhaps the option should be flagged experimental then? Also, would be nice

D1212: filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM

phillco updated this revision to Diff 4045. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1212?vs=4038=4045 REVISION DETAIL https://phab.mercurial-scm.org/D1212 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git

D1216: overlayworkingctx: remove flushall()

phillco updated this revision to Diff 4039. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1216?vs=3560=4039 REVISION DETAIL https://phab.mercurial-scm.org/D1216 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1230: overlayworkingctx: make clean() public

phillco updated this revision to Diff 4040. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1230?vs=3562=4040 REVISION DETAIL https://phab.mercurial-scm.org/D1230 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1232: rebase: add the --inmemory option flag; assign a wctx object for the rebase

phillco updated this revision to Diff 4042. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1232?vs=3105=4042 REVISION DETAIL https://phab.mercurial-scm.org/D1232

D1234: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts

phillco updated this revision to Diff 4044. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1234?vs=3107=4044 REVISION DETAIL https://phab.mercurial-scm.org/D1234

D1231: overlayworkingctx: move _wrappedctx out of the constructor

phillco updated this revision to Diff 4041. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1231?vs=3563=4041 REVISION DETAIL https://phab.mercurial-scm.org/D1231 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1233: rebase: do not bail on uncomitted changes if rebasing in-memory

phillco updated this revision to Diff 4043. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1233?vs=3106=4043 REVISION DETAIL https://phab.mercurial-scm.org/D1233

D1211: context: switch ctx() use to changectx()

phillco added a subscriber: martinvonz. phillco added a comment. I made https://phab.mercurial-scm.org/D1527 the new bottom of the stack, per @martinvonz's request. It actually caught a mistake that made me significantly change this commit :) REPOSITORY rHG Mercurial REVISION DETAIL

D1212: filemerge: raise InMemoryMergeConflictsError whenever we hit merge conflicts

phillco updated this revision to Diff 4038. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1212?vs=3551=4038 REVISION DETAIL https://phab.mercurial-scm.org/D1212 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git

D1211: context: switch ctx() use to changectx()

phillco updated this revision to Diff 4037. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1211?vs=4036=4037 REVISION DETAIL https://phab.mercurial-scm.org/D1211 AFFECTED FILES mercurial/context.py mercurial/filemerge.py CHANGE DETAILS diff --git

D1211: context: switch ctx() use to changectx()

phillco updated this revision to Diff 4036. phillco edited the summary of this revision. phillco retitled this revision from "context: add ctx() to workingfilectx and absentfilectx" to "context: switch ctx() use to changectx()". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE