Re: [PATCH 3 of 3] fileset: combine union of basic patterns into single matcher

On Sat, Aug 4, 2018 at 5:15 AM Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1532161152 -32400 > # Sat Jul 21 17:19:12 2018 +0900 > # Node ID 33247ffb2c71b954e229da8424798d52c1e0d8e1 > # Parent db488b9c65596088550b2b96ed25aff60a938219 > fileset: combine

D4102: resolve: support confirm config option with --unmark flag

khanchi97 updated this revision to Diff 9905. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4102?vs=9899=9905 REVISION DETAIL https://phab.mercurial-scm.org/D4102 AFFECTED FILES mercurial/commands.py tests/test-resolve.t CHANGE DETAILS diff

D4103: resolve: update commands.resolve.confirm help text

khanchi97 updated this revision to Diff 9906. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4103?vs=9900=9906 REVISION DETAIL https://phab.mercurial-scm.org/D4103 AFFECTED FILES mercurial/help/config.txt CHANGE DETAILS diff --git

D4102: resolve: support confirm config option with --unmark flag

khanchi97 added inline comments. INLINE COMMENTS > pulkit wrote in commands.py:4555 > This should be 'mark all resolved files as unresolved'. Oops, sorry. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4102 To: khanchi97, #hg-reviewers Cc: pulkit,

D4101: resolve: support commands.resolve.confirm option with --mark flag

This revision was automatically updated to reflect the committed changes. Closed by commit rHGdb03e5cefc82: resolve: support commands.resolve.confirm option with --mark flag (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D4101?vs=9898=9903#toc

D4100: fix: compute changed lines lazily to make whole-file fixer tools faster

This revision was automatically updated to reflect the committed changes. Closed by commit rHG257c9846b532: fix: compute changed lines lazily to make whole-file fixer tools faster (authored by hooper, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: [PATCH 1 of 2] sparse: do not include operator in i18n strings

On Sat, Aug 4, 2018 at 5:44 PM Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1533370263 -32400 > # Sat Aug 04 17:11:03 2018 +0900 > # Node ID b2afb0058fd7143c12cb6ef3466ec85ee71ba8ce > # Parent a01200b25da69bf3e0d78200abe1bdfc8d18a5db > sparse: do not

D4071: resolve: graduate resolve.mark-check from experimental, add docs

This revision was automatically updated to reflect the committed changes. spectral marked an inline comment as done. Closed by commit rHG96d0795bd0bd: resolve: graduate resolve.mark-check from experimental, add docs (authored by spectral, committed by ). CHANGED PRIOR TO COMMIT

D4072: resolve: add commands.resolve.mark-check=abort to tweakdefaults

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe9740c07158d: resolve: add commands.resolve.mark-check=abort to tweakdefaults (authored by spectral, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4103: resolve: update commands.resolve.confirm help text

pulkit added inline comments. INLINE COMMENTS > config.txt:442 > ``resolve.confirm`` > -Confirm before re-merging all unresolved files when running > -:hg:`resolve --all`. > +Confirm before performing actions. > +:hg: `resolve -m` - confirm before marking all unresolved files as

D4071: resolve: graduate resolve.mark-check from experimental, add docs

pulkit accepted this revision. pulkit added inline comments. INLINE COMMENTS > configitems.py:937 > ) > -coreconfigitem('experimental', 'resolve.mark-check', > +coreconfigitem('commands', 'resolve.mark-check', > default=None, Moved this up in order to maintain alphabetical order. >

[PATCH 3 of 3] fileset: combine union of basic patterns into single matcher

# HG changeset patch # User Yuya Nishihara # Date 1532161152 -32400 # Sat Jul 21 17:19:12 2018 +0900 # Node ID 33247ffb2c71b954e229da8424798d52c1e0d8e1 # Parent db488b9c65596088550b2b96ed25aff60a938219 fileset: combine union of basic patterns into single matcher This appears to improve

[PATCH 2 of 3] fileset: reorder 'or' expression by weight

# HG changeset patch # User Yuya Nishihara # Date 1532160814 -32400 # Sat Jul 21 17:13:34 2018 +0900 # Node ID db488b9c65596088550b2b96ed25aff60a938219 # Parent edc1dd4b31467ccff6d50435cca4f29840032331 fileset: reorder 'or' expression by weight diff --git a/mercurial/filesetlang.py

[PATCH 1 of 3] fileset: introduce weight constants for readability

# HG changeset patch # User Yuya Nishihara # Date 1533370113 -32400 # Sat Aug 04 17:08:33 2018 +0900 # Node ID edc1dd4b31467ccff6d50435cca4f29840032331 # Parent 6be3eb0c37638c886c8113a7cf51d9c69b40fcb9 fileset: introduce weight constants for readability These constants are defined in the

[PATCH 1 of 2] sparse: do not include operator in i18n strings

# HG changeset patch # User Yuya Nishihara # Date 1533370263 -32400 # Sat Aug 04 17:11:03 2018 +0900 # Node ID b2afb0058fd7143c12cb6ef3466ec85ee71ba8ce # Parent a01200b25da69bf3e0d78200abe1bdfc8d18a5db sparse: do not include operator in i18n strings diff --git a/mercurial/sparse.py

[PATCH 2 of 2] sparse: use named parameters in i18n strings

# HG changeset patch # User Yuya Nishihara # Date 1533370651 -32400 # Sat Aug 04 17:17:31 2018 +0900 # Node ID 6be3eb0c37638c886c8113a7cf51d9c69b40fcb9 # Parent b2afb0058fd7143c12cb6ef3466ec85ee71ba8ce sparse: use named parameters in i18n strings This should give more hints about what the

D4103: resolve: update commands.resolve.confirm help text

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Included --mark and --unmark in the help text of resolve.confirm.config. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4103

D4102: resolve: support confirm config option with --unmark flag

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now, commands.resolve.confirm also respect --unmark option; and confirm to unresolve all resolved files. It will confirm only when no files pats are passed

D4101: resolve: support commands.resolve.confirm option with --mark flag

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now, commands.resolve.confirm config option also respect --mark; and confirm to mark all 'unresolved' files as 'resolved'. It will confirm only when you

Re: D3976: grep: add MULTIREV support to --all-files flag

> > I also expect hg grep --all-files -r0+1 foo will show matches from both > rev 0 and 1. > > Suppose there are ten hits in 0 and the same 10 hits in 1, do you mean we > print out all the 20 results, What purpose that would serve? Yes. I think that's the least surprising behavior for

D3976: grep: add MULTIREV support to --all-files flag

yuja added a comment. > > I also expect hg grep --all-files -r0+1 foo will show matches from both rev 0 and 1. > > Suppose there are ten hits in 0 and the same 10 hits in 1, do you mean we print out all the 20 results, What purpose that would serve? Yes. I think that's the

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

martinvonz added a comment. In https://phab.mercurial-scm.org/D4022#63500, @yuja wrote: > > if (PyInt_Check(value)) { > > long rev = PyInt_AS_LONG(value); > > > > - return rev >= -1 && rev < index_length(self); + return rev >= -1 && rev <

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

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa01200b25da6: shortest: use x prefix to disambiguate from revnum if configured (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

This revision was automatically updated to reflect the committed changes. Closed by commit rHG531b86cc8fb3: shortest: make isrev() a top-level function (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

This revision was automatically updated to reflect the committed changes. Closed by commit rHG7848f284b211: revisions: allow x123 to refer to nodeid prefix 123 (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa3dacabd476b: index: dont allow index[len(index)] to mean nullid (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6104b203bec8: index: replace insert(-1, e) method by append(e) method (authored by martinvonz, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D4021?vs=9884=9891#toc REPOSITORY

D4039: shortest: cache disambiguation revset

This revision was automatically updated to reflect the committed changes. Closed by commit rHG3588e41f796d: shortest: cache disambiguation revset (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4039?vs=9887=9894

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

This revision was automatically updated to reflect the committed changes. Closed by commit rHG781b2720d2ac: index: dont include nullid in len() (authored by martinvonz, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D4022?vs=9885=9892#toc REPOSITORY rHG Mercurial

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

yuja added a comment. > if (PyInt_Check(value)) { > long rev = PyInt_AS_LONG(value); > > - return rev >= -1 && rev < index_length(self); + return rev >= -1 && rev < index_length(self) - 1; Fixed this to `index_length(self) + 1`. Maybe you'll want to drop

Re: D4039: [RFC] shortest: cache disambiguation revset

> (I don't know what a resolver is yet, but I'll figure that out later). Perhaps I mistook a function name. I just meant `shortesthexnodeidprefix()` could be turned into a closure having node cache. ___ Mercurial-devel mailing list

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

yuja added a comment. > Note that we attempt to resolve symbols as nodeid prefixes after we've > exhausted all other posibilities, so this is a backwards compatible > change (only queries that would previously fail may now succeed). > > I've still hidden this feature behind

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

> if (PyInt_Check(value)) { > long rev = PyInt_AS_LONG(value); > - return rev >= -1 && rev < index_length(self); > + return rev >= -1 && rev < index_length(self) - 1; Fixed this to `index_length(self) + 1`. Maybe you'll want to drop `+ 1` by a later

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

Bumped cext version and queued, thanks. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

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

yuja added a comment. Bumped cext version and queued, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4021 To: martinvonz, indygreg, #hg-reviewers Cc: yuja, mercurial-devel ___ Mercurial-devel mailing list