D3990: linelog: add a Python implementation of the linelog datastructure

martinvonz added a comment. I'm still just trying to understand how weaves work. Here are some questions for you for now. We may want to document some of the answers in a follow-up patch (not just here in Phabricator). INLINE COMMENTS > linelog.txt:110 > + > + The following cases are consi

D4049: testrunner: allow multiple #testcases

martinvonz updated this revision to Diff 9784. martinvonz edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4049?vs=9772&id=9784 REVISION DETAIL https://phab.mercurial-scm.org/D4049 AFFECTED FILES tests/run-tests.py

D4049: testrunner: allow multiple #testcases

martinvonz added a comment. In https://phab.mercurial-scm.org/D4049#62792, @martinvonz wrote: > In https://phab.mercurial-scm.org/D4049#62791, @mharbison72 wrote: > > > Not sure. If we can’t reuse ‘#’, maybe ‘_’ would be ok as a distinct visual identifier? I don’t think either are r

D4052: testrunner: use "#" for "test cases" suffix in .err filename too

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This seems like a natural follow-up to https://phab.mercurial-scm.org/rHGb865bba56db1a6ee14d6249ac071d1ad36169ec9 (run-tests: update the test case name format

D4049: testrunner: allow multiple #testcases

martinvonz added a comment. In https://phab.mercurial-scm.org/D4049#62791, @mharbison72 wrote: > Not sure. If we can’t reuse ‘#’, maybe ‘_’ would be ok as a distinct visual identifier? I don’t think either are reserved characters. I was thinking of using '#'. It would be kind of

D4049: testrunner: allow multiple #testcases

mharbison72 added a comment. Not sure. If we can’t reuse ‘#’, maybe ‘_’ would be ok as a distinct visual identifier? I don’t think either are reserved characters. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4049 To: martinvonz, #hg-reviewers, mharbison72 C

D4049: testrunner: allow multiple #testcases

martinvonz added a comment. In https://phab.mercurial-scm.org/D4049#62787, @mharbison72 wrote: > I think Windows will choke on ‘:’ in the file name. What's a better character for Windows? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4049 To: marti

D4049: testrunner: allow multiple #testcases

mharbison72 requested changes to this revision. mharbison72 added a comment. This revision now requires changes to proceed. I think Windows will choke on ‘:’ in the file name. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4049 To: martinvonz, #hg-reviewers, mha

D4023: index: don't allow index[len(index)] to mean nullid

martinvonz updated this revision to Diff 9782. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4023?vs=9723&id=9782 REVISION DETAIL https://phab.mercurial-scm.org/D4023 AFFECTED FILES mercurial/cext/revlog.c mercurial/revlog.py tests/test-parseinde

D4021: index: replace insert(-1, e) method by append(e) method

martinvonz updated this revision to Diff 9780. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4021?vs=9721&id=9780 REVISION DETAIL https://phab.mercurial-scm.org/D4021 AFFECTED FILES mercurial/bundlerepo.py mercurial/cext/revlog.c mercurial/pure/p

D4020: pure: create type for revlog v0 index

martinvonz updated this revision to Diff 9779. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4020?vs=9720&id=9779 REVISION DETAIL https://phab.mercurial-scm.org/D4020 AFFECTED FILES mercurial/revlog.py CHANGE DETAILS diff --git a/mercurial/revlog.p

D4016: revlog: remove some knowledge of sentinel nullid in index

martinvonz updated this revision to Diff 9776. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4016?vs=9716&id=9776 REVISION DETAIL https://phab.mercurial-scm.org/D4016 AFFECTED FILES mercurial/revlog.py CHANGE DETAILS diff --git a/mercurial/revlog.p

D4022: index: don't include nullid in len()

martinvonz updated this revision to Diff 9781. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4022?vs=9722&id=9781 REVISION DETAIL https://phab.mercurial-scm.org/D4022 AFFECTED FILES mercurial/cext/revlog.c mercurial/pure/parsers.py mercurial/repo

D4018: index: handle index[-1] as nullid more explicitly

martinvonz updated this revision to Diff 9777. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4018?vs=9718&id=9777 REVISION DETAIL https://phab.mercurial-scm.org/D4018 AFFECTED FILES mercurial/cext/revlog.c mercurial/pure/parsers.py CHANGE DETAILS

D4019: index: drop support for negative indexes into the index

martinvonz updated this revision to Diff 9778. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4019?vs=9719&id=9778 REVISION DETAIL https://phab.mercurial-scm.org/D4019 AFFECTED FILES mercurial/cext/revlog.c mercurial/pure/parsers.py CHANGE DETAILS

D4050: linelog: fix import statements to pass the import checker on py3

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb9974f2ef9b1: linelog: fix import statements to pass the import checker on py3 (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org

D4011: changegroup: move file matcher from narrow extension

martinvonz added a comment. Looks good, thanks for cleaning up! (I know it's already been queued.) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4011 To: indygreg, durin42, #hg-reviewers Cc: martinvonz, mercurial-devel __

D4051: linelog: port to Python 3

durin42 created this revision. Herald added a reviewer: pulkit. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4051 AFFECTED FILES contrib/python3-whitelist mercurial/linelog.py

D4050: linelog: fix import statements to pass the import checker on py3

durin42 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/D4050 AFFECTED FILES mercurial/linelog.py CHANGE DETAILS diff --git a/mercurial/linelog.py b/mercurial

Re: [PATCH 2 of 2 v3] manifest: persist the manifestfulltext cache

These are queued, thanks > On Aug 1, 2018, at 17:29, Martijn Pieters wrote: > > # HG changeset patch > # User Martijn Pieters > # Date 1533058674 -7200 > # Tue Jul 31 19:37:54 2018 +0200 > # Branch stable > # Node ID 92180b2297bd8bff6e2f3bc9d6e4ea71ed9e > # Parent 23e31b60983e3fb78aeb

D4049: testrunner: allow multiple #testcases

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This lets you have multiple #testcases declarations and they're taken to be different dimensions of the test, so their cross product becomes the total set of

D3990: linelog: add a Python implementation of the linelog datastructure

This revision was automatically updated to reflect the committed changes. Closed by commit rHG752d858aab2d: linelog: add a Python implementation of the linelog datastructure (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.or

D4011: changegroup: move file matcher from narrow extension

This revision was automatically updated to reflect the committed changes. Closed by commit rHG9c057acba656: changegroup: move file matcher from narrow extension (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4011?vs=9

D3990: linelog: add a Python implementation of the linelog datastructure

indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. I'm OK breaking out my rubber stamp for this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3990 To: durin42, #hg-reviewers, indygreg Cc: indygreg, mercu

D4048: fix: add a monkey-patchable point after all new revisions have been committed

hooper updated this revision to Diff 9769. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4048?vs=9768&id=9769 REVISION DETAIL https://phab.mercurial-scm.org/D4048 AFFECTED FILES hgext/fix.py CHANGE DETAILS diff --git a/hgext/fix.py b/hgext/fix.py -

D4048: fix: add a monkey-patchable point after all new revisions have been committed

hooper 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/D4048 AFFECTED FILES hgext/fix.py CHANGE DETAILS diff --git a/hgext/fix.py b/hgext/fix.py --- a/hgext/f

D3993: linelog: add replacelines_vec for fastannotate

durin42 updated this revision to Diff 9766. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3993?vs=9684&id=9766 REVISION DETAIL https://phab.mercurial-scm.org/D3993 AFFECTED FILES mercurial/linelog.py tests/test-linelog.py CHANGE DETAILS diff --gi

D4046: absorb: use ui.debug() instead of open-coding it

durin42 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/D4046 AFFECTED FILES hgext/absorb.py CHANGE DETAILS diff --git a/hgext/absorb.py b/hgext/absorb.py ---

D3992: absorb: drop wrapper around the amend command

durin42 updated this revision to Diff 9765. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3992?vs=9683&id=9765 REVISION DETAIL https://phab.mercurial-scm.org/D3992 AFFECTED FILES hgext/absorb.py tests/test-absorb.t CHANGE DETAILS diff --git a/tes

D4047: absorb: note some TODOs from the code review

durin42 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/D4047 AFFECTED FILES hgext/absorb.py CHANGE DETAILS diff --git a/hgext/absorb.py b/hgext/absorb.py ---

D4045: absorb: use pycompat to get xrange

durin42 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/D4045 AFFECTED FILES hgext/absorb.py CHANGE DETAILS diff --git a/hgext/absorb.py b/hgext/absorb.py ---

D4044: absorb: use set literal to avoid intermediate list

durin42 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/D4044 AFFECTED FILES hgext/absorb.py CHANGE DETAILS diff --git a/hgext/absorb.py b/hgext/absorb.py ---

D4043: absorb: avoid mutable default arg

durin42 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/D4043 AFFECTED FILES hgext/absorb.py CHANGE DETAILS diff --git a/hgext/absorb.py b/hgext/absorb.py ---

D3990: linelog: add a Python implementation of the linelog datastructure

durin42 added inline comments. INLINE COMMENTS > indygreg wrote in linelog.py:77-88 > While I like the abstraction of instructions, given the simplicity of the > language and the overhead of function calls in Python, I wonder if we'd be > better off with the execution logic inlined. The perform

D3990: linelog: add a Python implementation of the linelog datastructure

durin42 updated this revision to Diff 9759. durin42 marked 4 inline comments as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3990?vs=9681&id=9759 REVISION DETAIL https://phab.mercurial-scm.org/D3990 AFFECTED FILES contrib/wix/help.wxs mercur

D2679: [PoC] obsolete: config option to enable local only obsolescence mode

pulkit added a comment. These patches were result of a very extensive discussion about what ways we have to start supporting obsmarkers by default. I will like to push these changesets so that we can try these in this cycle. If I don't hear any concern in a week, I will push them. REPOSITOR

D4035: resolve: add option to warn/abort on -m with unresolved conflict markers

spectral added a comment. In https://phab.mercurial-scm.org/D4035#62660, @pulkit wrote: > Also, even though this is experimental, can we document it somewhere? Sure, any advice for where would be a good place to do that? I would have thought `mercurial/help/config.txt`, but there

D4035: resolve: add option to warn/abort on -m with unresolved conflict markers

pulkit added a comment. Also, even though this is experimental, can we document it somewhere? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4035 To: spectral, #hg-reviewers Cc: pulkit, khanchi97, mercurial-devel ___ M

D4036: revlog: use specialized exception for ambiguous prefix lookup

martinvonz created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It's useful to be able to catch a specific exception for this case. We'll use it soon. REPOSITORY rHG Mercurial REVISION

D4041: revisions: allow "x123" to refer to nodeid prefix "123"

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When resolving "123" to a revision, we try to interpret it as revnum before we try to interpret it as a nodeid hex prefix. This can lead to the shortest valid

D4042: shortest: use 'x' prefix to disambiguate from revnum if configured

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/D4042 AFFECTED FILES mercurial/scmutil.py tests/test-template-functions.t CHANGE DETAILS diff --g

D4040: shortest: make isrev() a top-level function

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'm going to add another caller in the next patch. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4040 AFFECTED FILES mercurial

D4035: resolve: add option to warn/abort on -m with unresolved conflict markers

This revision was automatically updated to reflect the committed changes. Closed by commit rHGbb54db4a4350: resolve: add option to warn/abort on -m with unresolved conflict markers (authored by spectral, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercuria

D4038: scmutil: make shortest() respect disambiguation revset

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The previous patch would let you use a shorter prefix if the prefix is unique within a configured revset. However, that's not very useful if there's no simple

D4039: [RFC] shortest: cache disambiguation revset

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This doesn't seem like the right way to cache it. Suggestions? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4039 AFFECTED FILES

D4037: lookup: add option to disambiguate prefix within revset

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When resolving a nodeid prefix that is not unique within the repo and the user has configured a revset that they want to disambiguate within, we now try to lo

D4035: resolve: add option to warn/abort on -m with unresolved conflict markers

pulkit added a comment. In https://phab.mercurial-scm.org/D4035#62582, @spectral wrote: > In https://phab.mercurial-scm.org/D4035#62542, @pulkit wrote: > > > I like the idea here. @khanchi97 is already working on adding --confirm to `hg resolve`, how about having something like `hg re

[PATCH 2 of 2 v3] manifest: persist the manifestfulltext cache

# HG changeset patch # User Martijn Pieters # Date 1533058674 -7200 # Tue Jul 31 19:37:54 2018 +0200 # Branch stable # Node ID 92180b2297bd8bff6e2f3bc9d6e4ea71ed9e # Parent 23e31b60983e3fb78aeb8822de8c630798f46447 # EXP-Topic persistentmanifestcache manifest: persist the manifestfulltext

[PATCH 1 of 2 v3] debug: allow specifying a manifest node rather than a revision

# HG changeset patch # User Martijn Pieters # Date 1533157442 -7200 # Wed Aug 01 23:04:02 2018 +0200 # Branch stable # Node ID 23e31b60983e3fb78aeb8822de8c630798f46447 # Parent e06a10d3b926844b5a933ec2b8f2b70cf1fb941e # EXP-Topic persistentmanifestcache debug: allow specifying a manifest nod

D4010: exchange: refactor control flow of _getbundlechangegrouppart()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG188d12d890f0: exchange: refactor control flow of _getbundlechangegrouppart() (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/

D4009: exchange: move _computeellipsis() from narrow

This revision was automatically updated to reflect the committed changes. Closed by commit rHGea9834aa017a: exchange: move _computeellipsis() from narrow (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4009?vs=9701&id=

D4008: exchange: move narrow acl functionality into core

This revision was automatically updated to reflect the committed changes. Closed by commit rHG461e7b1f6ad0: exchange: move narrow acl functionality into core (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4008?vs=9700

D4007: exchange: move disabling of rev-branch-cache bundle part out of narrow

This revision was automatically updated to reflect the committed changes. Closed by commit rHGab765bc4f232: exchange: move disabling of rev-branch-cache bundle part out of narrow (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-

D4035: resolve: add option to warn/abort on -m with unresolved conflict markers

spectral added a comment. In https://phab.mercurial-scm.org/D4035#62542, @pulkit wrote: > I like the idea here. @khanchi97 is already working on adding --confirm to `hg resolve`, how about having something like `hg resolve --mark --confirm` which asks you before marking each file as reso

D4011: changegroup: move file matcher from narrow extension

indygreg added a comment. In https://phab.mercurial-scm.org/D4011#62541, @durin42 wrote: > This one needs rebased I ran `hg rebase` against `@` and the 3-way merge "just worked." Limitations of our `hg import` based workflow, I suppose. REPOSITORY rHG Mercurial REVISION DETAIL

D4011: changegroup: move file matcher from narrow extension

indygreg updated this revision to Diff 9746. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4011?vs=9703&id=9746 REVISION DETAIL https://phab.mercurial-scm.org/D4011 AFFECTED FILES hgext/narrow/narrowbundle2.py hgext/narrow/narrowchangegroup.py me

D4024: dispatch: don't show list of commands on bogus command

This revision was automatically updated to reflect the committed changes. Closed by commit rHG81fb442187c6: dispatch: don't show list of commands on bogus command (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4024?

D4003: index: write expression for encoded revision index consistently

This revision was automatically updated to reflect the committed changes. Closed by commit rHG37161dc600c5: index: write expression for encoded revision index consistently (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.o

D4006: histedit: avoid repeating name of state file in a few places

This revision was automatically updated to reflect the committed changes. Closed by commit rHGec835fc0fd0e: histedit: avoid repeating name of state file in a few places (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/

D4025: dispatch: show a short error message when invalid global option given

This revision was automatically updated to reflect the committed changes. Closed by commit rHG13ed71fe983c: dispatch: show a short error message when invalid global option given (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial

D3991: absorb: import extension from Facebook's hg-experimental

indygreg added a comment. I only reviewed about half of this. I'm inclined to take it as-is or close to as-is. But I would like to have a handle of the follow-ups before we forget about them. INLINE COMMENTS > absorb.py:67-69 > +configitem('absorb', 'addnoise', default=True) > +configitem('

D3992: absorb: drop wrapper around the amend command

indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. I should have looked at the full series before commenting on the previous patch. Thank you for removing this feature. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercuria

D4035: resolve: add option to warn/abort on -m with unresolved conflict markers

pulkit added subscribers: khanchi97, pulkit. pulkit added a comment. I like the idea here. @khanchi97 is already working on adding --confirm to `hg resolve`, how about having something like `hg resolve --mark --confirm` which asks you before marking each file as resolved? REPOSITORY rHG Me

D4011: changegroup: move file matcher from narrow extension

durin42 added a comment. This one needs rebased REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4011 To: indygreg, durin42, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-sc

D4035: resolve: add option to warn/abort on -m with unresolved conflict markers

spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve

D4025: dispatch: show a short error message when invalid global option given

pulkit accepted this revision. pulkit added a comment. I like this one too! Thanks for UI improvements! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4025 To: martinvonz, #hg-reviewers, pulkit Cc: pulkit, mercurial-devel

D4024: dispatch: don't show list of commands on bogus command

pulkit accepted this revision. pulkit added a comment. I like this change. Thanks! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4024 To: martinvonz, #hg-reviewers, pulkit Cc: pulkit, mercurial-devel ___ Mercurial-dev

D3988: resolve: add confirm config option

pulkit requested changes to this revision. pulkit added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > commands.py:4536 > > +if all and confirm and ui.promptchoice(_(b're-merge all unresolved files' > + b' (yn)?$

D4032: global: use pycompat.xrange()

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe7aa113b14f7: global: use pycompat.xrange() (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4032?vs=9734&id=9739 REVISION D

D4031: pycompat: add xrange alias for Python 2

This revision was automatically updated to reflect the committed changes. Closed by commit rHG7eba8f83129b: pycompat: add xrange alias for Python 2 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4031?vs=9733&id=9737

D4033: check-code: ban use of bare xrange()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG882ef6949bdc: check-code: ban use of bare xrange() (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4033?vs=9735&id=9738 REV

D4034: py3: stop rewriting xrange() to pycompat.xrange()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6558f24f2202: py3: stop rewriting xrange() to pycompat.xrange() (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4034?vs=9736

D4032: global: use pycompat.xrange()

indygreg created this revision. Herald added a reviewer: durin42. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY On Python 3, our module importer automatically rewrites xrange() to pycompat.xrange(). We

D4034: py3: stop rewriting xrange() to pycompat.xrange()

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We now require the use of pycompat.xrange() in source. One less feature in the module importer gets us one step closer to Python 3 native source code. REPOS

D4031: pycompat: add xrange alias for Python 2

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We assign xrange on Python 3 but not Python 2. Adding the missing symbol on Python 2 allows us to use `pycompat.xrange` to get a generator range function. REPO

D4033: check-code: ban use of bare xrange()

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We want everyone to use pycompat.xrange(). REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4033 AFFECTED FILES contrib/check-code.

D4015: revlog: don't include trailing nullrev in revlog.revs(stop=len(revlog))

This revision was automatically updated to reflect the committed changes. Closed by commit rHG83a505b5cf85: revlog: don't include trailing nullrev in revlog.revs(stop=len(revlog)) (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercuri

D4017: perfmoonwalk: make work with filtered repo

This revision was automatically updated to reflect the committed changes. Closed by commit rHG0848ed4ee7ac: perfmoonwalk: make work with filtered repo (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4017?vs=9717&id=9

[PATCH STABLE] packaging: always execute builddeb from source root

# HG changeset patch # User Gregory Szorc # Date 1533151492 25200 # Wed Aug 01 12:24:52 2018 -0700 # Branch stable # Node ID 824636b08400c3f1265fe1eb6d8971384560ec60 # Parent cc8657f6fd3ed222cc92c6994ab3a561da5ad3d3 packaging: always execute builddeb from source root Without this, dockerdeb

D4027: revlog: remove micro-optimization for looking up only nullid

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY index_find_node() would call nt_find() before initializing the node tree. nt_find() would then return -2 unless the requested revision was the null revision.

D4028: revlog: remove side effect from failed nt_init()

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If nt_init() successfully allocates memory for the node tree but then runs out of memory while trying to insert nullid into it, it will leave the node tree po

D4026: revlog: remove unnecessary output parameter from node_check()

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The "nodelen" output parameter is always set to 20 if the function returns successfully. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-s

D3975: mergetool: warn if ui.merge points to nonexistent tool

martinvonz added a comment. Just a reminder that this is ready to be queued now that the freeze is over (I understand that it wasn't queued during the freeze). REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3975 To: martinvonz, #hg-reviewers, lothiraldan Cc: me

D4024: dispatch: don't show list of commands on bogus command

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If a command is ambiguous, you get this: $ hg ve hg: command 've' is ambiguous: verify version [255] If you typo a command, you get th

D4025: dispatch: show a short error message when invalid global option given

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Similar reasoning as the previous patch. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4025 AFFECTED FILES mercurial/dispatch.

D4023: index: don't allow index[len(index)] to mean nullid

martinvonz created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now everything else has been cleaned up and we can drop support for getting the nullid from the end of the index (from *past*

D4015: revlog: don't include trailing nullrev in revlog.revs(stop=len(revlog))

martinvonz created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This was an odd side effect of the nullid entry that's in the index. The existing callers (mostly repair.py) seem to have han

D4020: pure: create type for revlog v0 index

martinvonz created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The new type takes care of hiding the nullid entry. This type helps us transition away from including that entry at index[len

D4019: index: drop support for negative indexes into the index

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I want index[i] to work for any valid revnum including -1 (as it already does), and I also want len(index) to be the number of revisions in the index (not cou

D4018: index: handle index[-1] as nullid more explicitly

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I find it more intuitive to check if "pos == -1" than to first add the index length (which includes one extra item for the nullid) and compare that to "length

D4021: index: replace insert(-1, e) method by append(e) method

martinvonz created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I want to make index[len(index) - 1] be the tip revision, not null revision as it is today. insert(-1, e) will then make litt

D4022: index: don't include nullid in len()

martinvonz created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I suspect the reason the nullid is in the index in the last position is that it lets index[i] for regular revision number, ev

D4017: perfmoonwalk: make work with filtered repo

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This also fixes the out-of-range "len(repo)" that weirdly works (and gets the nullid). I suspect it wasn't intentional to include the timing of reading the nu

D4016: revlog: remove some knowledge of sentinel nullid in index

martinvonz created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I think the "-2" to mean "last position in index, not counting the null revision at the end" is an implementation detail of t

D3990: linelog: add a Python implementation of the linelog datastructure

indygreg added a comment. Oh, I'd also appreciate replacing //blame// with //annotate// throughout this series so we can avoid the culture of negativity. I've actually heard people commend Mercurial over because //annotate// is the primary verb in the UI! REPOSITORY rHG Mercurial REVISI

D3990: linelog: add a Python implementation of the linelog datastructure

indygreg requested changes to this revision. indygreg added a comment. This revision now requires changes to proceed. I wrote several comments. But overall this code seems very reasonable as a first implementation. Especially if we want to maintain backwards compatibility with the C implement

[Bug 5950] New: widening with narrow extension does work when narrow.serverellipses config is not set

https://bz.mercurial-scm.org/show_bug.cgi?id=5950 Bug ID: 5950 Summary: widening with narrow extension does work when narrow.serverellipses config is not set Product: Mercurial Version: default branch Hardware: PC

D3952: patchbomb: ensure all headers and values given to email mod are native strings

This revision was automatically updated to reflect the committed changes. Closed by commit rHG65ed2fcb9032: patchbomb: ensure all headers and values given to email mod are native strings (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mer

D3951: patchbomb: work around email module really wanting to write unicode data

indygreg requested changes to this revision. indygreg added a comment. This revision now requires changes to proceed. Requesting revisions per @yuja's comment to look into `BytesGenerator`. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3951 To: durin42, #hg-rev

mercurial@38767: new changeset

New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/eb2945f0a4a1 changeset: 38767:eb2945f0a4a1 bookmark:@ tag: tip user:Augie Fackler date:Thu Jul 19 15:21:28 2018 -0400 summary: ui: fix implicit unicode-to-bytes conversion introduced in 9df29b

  1   2   >