Re: [PATCH] aggressivemergedeltas: enabled the option by default

On Mon, Jul 9, 2018 at 9:55 AM, Gregory Szorc wrote: > On Mon, Jul 9, 2018 at 6:35 AM, Boris Feld wrote: > >> # HG changeset patch >> # User Paul Morelle >> # Date 1529624558 -7200 >> # Fri Jun 22 01:42:38 2018 +0200 >> # Node ID 799439bbfcc194238ff4af2979eb286c5defdc3f >> # Parent

D3870: rebase: add --confirm option

khanchi97 updated this revision to Diff 9486. khanchi97 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3870?vs=9386=9486 REVISION DETAIL https://phab.mercurial-scm.org/D3870 AFFECTED FILES hgext/rebase.py

D3871: rebase: improve output of --confirm option

khanchi97 updated this revision to Diff 9487. khanchi97 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3871?vs=9387=9487 REVISION DETAIL https://phab.mercurial-scm.org/D3871 AFFECTED FILES hgext/rebase.py

[PATCH] tweakdefaults: enable word-diff by default

# HG changeset patch # User Augie Fackler # Date 1531145240 14400 # Mon Jul 09 10:07:20 2018 -0400 # Node ID 02c04e1b5c85836efbe4079dc7ca089007987202 # Parent 44f5acfb9ad292a0426b24671feed17ffae42bf0 tweakdefaults: enable word-diff by default It's another creature comfort in diff output,

Re: [PATCH] aggressivemergedeltas: enabled the option by default

> On Jul 9, 2018, at 09:35, Boris Feld wrote: > > # HG changeset patch > # User Paul Morelle > # Date 1529624558 -7200 > # Fri Jun 22 01:42:38 2018 +0200 > # Node ID 799439bbfcc194238ff4af2979eb286c5defdc3f > # Parent a0e185f104541858a0b049e1fb67c4d113930a9a > # EXP-Topic

Looks like D3700 and/or D3701 caused some breakage?

https://buildbot.mercurial-scm.org/builders/hg%20tests/builds/1804/steps/run-tests.py%20%28python%202.7.10%29/logs/stdio and https://buildbot.mercurial-scm.org/builders/FreeBSD%20hg%20tests/builds/1724/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio for example. Could you send a

[PATCH 2 of 3 gca-revset V3] revset: add optimization for heads(commonancestors())

# HG changeset patch # User Sean Farley # Date 1530051981 25200 # Tue Jun 26 15:26:21 2018 -0700 # Branch gca-revset # Node ID 31ada9bee6360235a9fb027b867b50fba721ebb7 # Parent 20b61392326c251c5898ab34a610829113e3da0b revset: add optimization for heads(commonancestors()) Previously, the

[PATCH 3 of 3 gca-revset V3] contrib: add heads(commonancestors(_)) to all-revsets

# HG changeset patch # User Sean Farley # Date 1529539666 25200 # Wed Jun 20 17:07:46 2018 -0700 # Branch gca-revset # Node ID e22217eac5ebb878a7a85d11047f8a367f8f64fe # Parent 31ada9bee6360235a9fb027b867b50fba721ebb7 contrib: add heads(commonancestors(_)) to all-revsets This is mainly to

[PATCH 1 of 3 gca-revset V3] revsets: add commonancestors revset

# HG changeset patch # User Sean Farley # Date 1529376114 25200 # Mon Jun 18 19:41:54 2018 -0700 # Branch gca-revset # Node ID 20b61392326c251c5898ab34a610829113e3da0b # Parent c153f440682f6b0d512065a915c9f4909ed05180 revsets: add commonancestors revset This is a method to reproduce "::x

D3897: tests: prevent conflict markers in test case from triggering warnings

hooper created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Broadly, having lines that begin with several '<' tends to trigger tools that try to warn you about unresolved conflicts. It will save some headaches to tweak

D3826: grep: change default behaviour of grep

durin42 requested changes to this revision. durin42 added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > commands.py:2518 > > By default, grep prints the most recent revision number for each > file in which it finds a match. To get it to print every

D3693: shelve: directly handle the initial parent alignment

This revision was automatically updated to reflect the committed changes. Closed by commit rHGc829749e7639: shelve: directly handle the initial parent alignment (authored by lothiraldan, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3694: shelve: use more accurate description in conflict marker

This revision was automatically updated to reflect the committed changes. Closed by commit rHG9b077e5fa8ba: shelve: use more accurate description in conflict marker (authored by lothiraldan, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3866: histedit: use cbor to write histedit-state file

pulkit planned changes to this revision. pulkit added a comment. I am not confident to land some state format changes at this point in the cycle. Let's do it early in next cycle. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3866 To: pulkit, durin42,

D3714: scmutil: from revsymbol(), extract helper for resolving multiple nodes

martinvonz abandoned this revision. martinvonz added a comment. Abandoning since I abandoned its descendant, https://phab.mercurial-scm.org/D3715. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3714 To: martinvonz, #hg-reviewers Cc: mercurial-devel

D3870: rebase: add --confirm option

khanchi97 added a comment. In https://phab.mercurial-scm.org/D3870#60813, @yuja wrote: > > def _dryrunrebase(ui, repo, opts): > > rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts) > > > > - ui.status(_('starting dry-run rebase; repository will not be changed\n')) +

Re: [PATCH] aggressivemergedeltas: enabled the option by default

On Mon, Jul 9, 2018 at 6:35 AM, Boris Feld wrote: > # HG changeset patch > # User Paul Morelle > # Date 1529624558 -7200 > # Fri Jun 22 01:42:38 2018 +0200 > # Node ID 799439bbfcc194238ff4af2979eb286c5defdc3f > # Parent a0e185f104541858a0b049e1fb67c4d113930a9a > # EXP-Topic

D3826: grep: change default behaviour of grep

sangeet259 updated this revision to Diff 9482. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3826?vs=9481=9482 REVISION DETAIL https://phab.mercurial-scm.org/D3826 AFFECTED FILES mercurial/commands.py tests/test-grep.t CHANGE DETAILS diff --git

D3826: grep: change default behaviour of grep

sangeet259 updated this revision to Diff 9481. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3826?vs=9480=9481 REVISION DETAIL https://phab.mercurial-scm.org/D3826 AFFECTED FILES mercurial/commands.py tests/test-grep.t CHANGE DETAILS diff --git

D3826: grep: change default behaviour of grep

sangeet259 updated this revision to Diff 9480. sangeet259 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3826?vs=9474=9480 REVISION DETAIL https://phab.mercurial-scm.org/D3826 AFFECTED FILES mercurial/commands.py

[PATCH 4 of 4] windows: replace single quote with double quote when translating to cmd.exe

# HG changeset patch # User Matt Harbison # Date 1531026341 14400 # Sun Jul 08 01:05:41 2018 -0400 # Node ID 53901aad0dbbf6d194a502ec437e4ef7d285e3fe # Parent 6c1736648339979cd4950d435cd696f0d4a4a186 windows: replace single quote with double quote when translating to cmd.exe Since cmd.exe

[PATCH 1 of 4] windows: don't consider '$$' to be an escaped '$' when translating to cmd.exe

# HG changeset patch # User Matt Harbison # Date 1531016036 14400 # Sat Jul 07 22:13:56 2018 -0400 # Node ID b028d7427a3d87bed191b1b56c51f87c56b51d0e # Parent f068495a1c28358c22695545ed15a00b54da0d45 windows: don't consider '$$' to be an escaped '$' when translating to cmd.exe This

[PATCH 2 of 4] hook: narrow the 'priority' prefix check to align with the documentation

# HG changeset patch # User Matt Harbison # Date 1531021669 14400 # Sat Jul 07 23:47:49 2018 -0400 # Node ID f32405ce6d8e71c277c15e3a7598e1b406e6f452 # Parent b028d7427a3d87bed191b1b56c51f87c56b51d0e hook: narrow the 'priority' prefix check to align with the documentation A prefix like

[PATCH 3 of 4] hook: add support for disabling the shell to native command translation

# HG changeset patch # User Matt Harbison # Date 1531021086 14400 # Sat Jul 07 23:38:06 2018 -0400 # Node ID 6c1736648339979cd4950d435cd696f0d4a4a186 # Parent f32405ce6d8e71c277c15e3a7598e1b406e6f452 hook: add support for disabling the shell to native command translation I think having it

D3701: run-tests: extract onStart and onEnd into the test result

This revision was automatically updated to reflect the committed changes. Closed by commit rHG948691ea92a9: run-tests: extract onStart and onEnd into the test result (authored by lothiraldan, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3700: run-tests: add support for external test result

This revision was automatically updated to reflect the committed changes. Closed by commit rHGc44ae5997869: run-tests: add support for external test result (authored by lothiraldan, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2874: remotenames: synchronise remotenames after push also

This revision was automatically updated to reflect the committed changes. Closed by commit rHG4d5fb4062f0b: remotenames: synchronise remotenames after push also (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3700: run-tests: add support for external test result

lothiraldan updated this revision to Diff 9476. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3700?vs=9031=9476 REVISION DETAIL https://phab.mercurial-scm.org/D3700 AFFECTED FILES tests/basic_test_result.py tests/run-tests.py

4.7 freeze coming up - prepare accordingly

Howdy folks, We're coming up on the freeze for hg 4.7. I'll entertain suggestions on how we can accept patches for default during the freeze, but in general expect us to not want new features etc between about July 17th and August 1st. If you need help getting something landed between now and

mercurial@38600: 3 new changesets

3 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/d046bf37f1ba changeset: 38598:d046bf37f1ba user:Yuya Nishihara date:Sat Jun 09 18:00:26 2018 +0900 summary: fileset: move helper functions to top https://www.mercurial-scm.org/repo/hg/rev/f9805627af1f

Re: [PATCH 7 of 7] bundle2: use ProgrammingError to report bad use of addparam()

> On Jul 9, 2018, at 09:24, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1531045458 -32400 > # Sun Jul 08 19:24:18 2018 +0900 > # Node ID f64791ccde76f9e1cf8f44a80a000d8084ea0a8c > # Parent 9a7d1a087b1807a06b2e051725c69e0e0275c001 > bundle2: use

[PATCH] aggressivemergedeltas: enabled the option by default

# HG changeset patch # User Paul Morelle # Date 1529624558 -7200 # Fri Jun 22 01:42:38 2018 +0200 # Node ID 799439bbfcc194238ff4af2979eb286c5defdc3f # Parent a0e185f104541858a0b049e1fb67c4d113930a9a # EXP-Topic enable-aggressivemergedeltas # Available At

[PATCH 2 of 7] py3: fix revnums in bookmark discovery to be consumable more than once

# HG changeset patch # User Yuya Nishihara # Date 1531043548 -32400 # Sun Jul 08 18:52:28 2018 +0900 # Node ID 87079f4958b2a73c84d1a6339801854b5245ee0e # Parent 505e0568b89501ef64d0522ba9b12afbd8642bca py3: fix revnums in bookmark discovery to be consumable more than once diff --git

[PATCH 5 of 7] py3: drop b'' while formatting BundleUnknownFeatureError message

# HG changeset patch # User Yuya Nishihara # Date 1531045959 -32400 # Sun Jul 08 19:32:39 2018 +0900 # Node ID a695979732a9b26b78e465096bc3434aef6e40f6 # Parent ad368dee20a7762100e5c46e152e67d838e15d9b py3: drop b'' while formatting BundleUnknownFeatureError message diff --git

[PATCH 7 of 7] bundle2: use ProgrammingError to report bad use of addparam()

# HG changeset patch # User Yuya Nishihara # Date 1531045458 -32400 # Sun Jul 08 19:24:18 2018 +0900 # Node ID f64791ccde76f9e1cf8f44a80a000d8084ea0a8c # Parent 9a7d1a087b1807a06b2e051725c69e0e0275c001 bundle2: use ProgrammingError to report bad use of addparam() This allows us to embed

[PATCH 6 of 7] py3: byte-stringify literals in extension in test-bundle2-format.t

# HG changeset patch # User Yuya Nishihara # Date 1531046051 -32400 # Sun Jul 08 19:34:11 2018 +0900 # Node ID 9a7d1a087b1807a06b2e051725c69e0e0275c001 # Parent a695979732a9b26b78e465096bc3434aef6e40f6 py3: byte-stringify literals in extension in test-bundle2-format.t # skip-blame just

[PATCH 3 of 7] py3: drop b'' while formatting ResponseError

# HG changeset patch # User Yuya Nishihara # Date 1531043891 -32400 # Sun Jul 08 18:58:11 2018 +0900 # Node ID 6737fa60496004cfb6a9bc1bbc1e212321c97591 # Parent 87079f4958b2a73c84d1a6339801854b5245ee0e py3: drop b'' while formatting ResponseError diff --git a/contrib/python3-whitelist

[PATCH 4 of 7] py3: suppress write() result and close file in test-bookmarks-pushpull.t

# HG changeset patch # User Yuya Nishihara # Date 1531044714 -32400 # Sun Jul 08 19:11:54 2018 +0900 # Node ID ad368dee20a7762100e5c46e152e67d838e15d9b # Parent 6737fa60496004cfb6a9bc1bbc1e212321c97591 py3: suppress write() result and close file in test-bookmarks-pushpull.t diff --git

[PATCH 1 of 7] py3: byte-stringify literals in extension in test-bundle2-exchange.t

# HG changeset patch # User Yuya Nishihara # Date 1531044300 -32400 # Sun Jul 08 19:05:00 2018 +0900 # Node ID 505e0568b89501ef64d0522ba9b12afbd8642bca # Parent a936d1368fc5c54dadb9ebae3621657b2bcf5e4c py3: byte-stringify literals in extension in test-bundle2-exchange.t # skip-blame just

Re: D3870: rebase: add --confirm option

> def _dryrunrebase(ui, repo, opts): > rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts) > -ui.status(_('starting dry-run rebase; repository will not be changed\n')) > +confirm = opts.get('confirm') > +if confirm: > +ui.status(_('starting rebase...\n')) > +

D3870: rebase: add --confirm option

yuja added a comment. > def _dryrunrebase(ui, repo, opts): > rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts) > > - ui.status(_('starting dry-run rebase; repository will not be changed\n')) +confirm = opts.get('confirm') +if confirm: +

Re: [PATCH] diff: graduate word-diff option from experimental

On Sun, 8 Jul 2018 18:29:37 +0530, Pulkit Goyal wrote: > > --- a/mercurial/help/config.txt > > +++ b/mercurial/help/config.txt > > @@ -702,6 +702,9 @@ for related options for the annotate com > > ``unified`` > > Number of lines of context to show. > > > > +``word-diff`` > > +Highlight

Re: [PATCH 1 of 2] config: introduce load order tracking

On Mon, 09 Jul 2018 12:12:21 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1530887625 -7200 > # Fri Jul 06 16:33:45 2018 +0200 > # Node ID 1019d8a4f6b810aaa63651ed56b29668650f590e > # Parent 8c38d29482177cd40243a008057d6762c7d23c6f > # EXP-Topic config-order >

D3826: grep: change default behaviour of grep

yuja added a comment. Looks mostly good. Can you rebase this onto the current tip and update the help? > $ hg grep '.*' > > - port:4:export > - port:4:vaportight > - port:4:import/export + port:2147483647:export + port:2147483647:vaportight + port:2147483647:import/export

Re: D3826: grep: change default behaviour of grep

Looks mostly good. Can you rebase this onto the current tip and update the help? >$ hg grep '.*' > - port:4:export > - port:4:vaportight > - port:4:import/export > + port:2147483647:export > + port:2147483647:vaportight > + port:2147483647:import/export [snip] It's probably better to

Re: D3896: copies: handle case when both merge cset are not descendant of merge base

Can you add some tests that make both `dirtyc1` and `dirtyc2` set, and trigger copy tracing? > Since we can have both dirtyc1, and dirtyc2 true, I am not sure whether > this else should be turned into it's own if statement? No idea. I doubt if the current copy tracing can handle such cases. From

D3896: copies: handle case when both merge cset are not descendant of merge base

yuja added a comment. Can you add some tests that make both `dirtyc1` and `dirtyc2` set, and trigger copy tracing? > Since we can have both dirtyc1, and dirtyc2 true, I am not sure whether > this else should be turned into it's own if statement? No idea. I doubt if the current

D3893: ui: make the large file warning limit fully configurable

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa936d1368fc5: ui: make the large file warning limit fully configurable (authored by joerg.sonnenberger, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

[PATCH 2 of 2] config: use the alternative with highest level

# HG changeset patch # User Boris Feld # Date 1530895697 -7200 # Fri Jul 06 18:48:17 2018 +0200 # Node ID 2eac4bcf6e050eeb55f6872b816ed3a328818614 # Parent 1019d8a4f6b810aaa63651ed56b29668650f590e # EXP-Topic config-order # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 1 of 2] config: introduce load order tracking

# HG changeset patch # User Boris Feld # Date 1530887625 -7200 # Fri Jul 06 16:33:45 2018 +0200 # Node ID 1019d8a4f6b810aaa63651ed56b29668650f590e # Parent 8c38d29482177cd40243a008057d6762c7d23c6f # EXP-Topic config-order # Available At https://bitbucket.org/octobus/mercurial-devel/ #

D3826: grep: change default behaviour of grep

sangeet259 updated this revision to Diff 9474. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3826?vs=9473=9474 REVISION DETAIL https://phab.mercurial-scm.org/D3826 AFFECTED FILES mercurial/commands.py tests/test-grep.t CHANGE DETAILS diff --git

D3826: grep: change default behaviour of grep

sangeet259 updated this revision to Diff 9473. sangeet259 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3826?vs=9472=9473 REVISION DETAIL https://phab.mercurial-scm.org/D3826 AFFECTED FILES mercurial/commands.py

D3826: grep: change default behaviour of grep

sangeet259 updated this revision to Diff 9472. sangeet259 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3826?vs=9470=9472 REVISION DETAIL https://phab.mercurial-scm.org/D3826 AFFECTED FILES mercurial/commands.py