mercurial@39386: 10 new changesets

10 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/b4e7e1f09c09 changeset: 39377:b4e7e1f09c09 user:Anton Shestakov date:Wed Aug 22 08:20:51 2018 +0800 summary: zsh_completion: complete merge tools for -t/--tool https://www.mercurial-scm.org/repo/hg/re

D4447: resolve: test that we suggest a valid hg command

This revision was automatically updated to reflect the committed changes. Closed by commit rHG213c0493cea0: resolve: test that we suggest a valid hg command (authored by valentin.gatienbaron, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4

D4444: tests: avoid shellquoting bytes on Python 3

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf57682dca1c1: tests: avoid shellquoting bytes on Python 3 (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D?vs=10703&id=10

D4445: tracing: ignore any IOErrors when writing to pipe

This revision was automatically updated to reflect the committed changes. Closed by commit rHG452790284a15: tracing: ignore any IOErrors when writing to pipe (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4445?vs=10704

Re: [PATCH 1 of 2] bash_completion: add more global options that receive an argument

On Sun, 02 Sep 2018 08:54:47 +0800, Anton Shestakov wrote: > # HG changeset patch > # User Anton Shestakov > # Date 1535848757 -28800 > # Sun Sep 02 08:39:17 2018 +0800 > # Node ID 14eaf06a028a010ca829084acfb866823ad5714a > # Parent 57b2a02420cd3b42c757dc91df98435811603e3e > bash_completion:

D4312: New bookflow extension for bookmark-based branching

idlsoft added a comment. I added some inline comments. A test for `hg book EXISTING` is indeed missing, there is, however, one for not moving the bookmark on update, it's line 52: ` (leaving bookmark X)`. Hopefully, I'll be able to make some changes later in the week. Was not aware abou

Re: [PATCH 3 of 4] largefiles: use a context manager to control the progress bar lifetime

On Sat, 01 Sep 2018 02:05:32 -0400, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1535216964 14400 # Sat Aug 25 13:09:24 2018 -0400 # Node ID 9a5c52a1933072c6d88ba33d64ccc14f24472115 # Parent f01ec535806db02e65db9845d80914de7663a1bd largefiles: use a context man

[PATCH 1 of 2] bash_completion: add more global options that receive an argument

# HG changeset patch # User Anton Shestakov # Date 1535848757 -28800 # Sun Sep 02 08:39:17 2018 +0800 # Node ID 14eaf06a028a010ca829084acfb866823ad5714a # Parent 57b2a02420cd3b42c757dc91df98435811603e3e bash_completion: add more global options that receive an argument diff --git a/contrib/b

[PATCH 2 of 2] bash_completion: complete arguments for --color and --pager

# HG changeset patch # User Anton Shestakov # Date 1535848857 -28800 # Sun Sep 02 08:40:57 2018 +0800 # Node ID 2a342d7f75f02808bebbb811ed3998b65e7b2aad # Parent 14eaf06a028a010ca829084acfb866823ad5714a bash_completion: complete arguments for --color and --pager diff --git a/contrib/bash_co

D4446: resolve: ui.config -> ui.configbool, for better validation

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa80b8832720d: resolve: ui.config -> ui.configbool, for better validation (authored by valentin.gatienbaron, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-

D4447: resolve: test that we suggest a valid hg command

valentin.gatienbaron 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/D4447 AFFECTED FILES tests/test-resolve.t CHANGE DETAILS diff --git a/tests/test-resolve.

D4312: New bookflow extension for bookmark-based branching

pulkit added a comment. I have looked at the things more thoroughly and commented things inline. Certain things can be treated as opinions and it's perfectly fine to now fix them. I found following cases missing in tests: - Testing of creation of bookmark name which already exists

D4446: resolve: ui.config -> ui.configbool, for better validation

valentin.gatienbaron 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/D4446 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands

D4379: resolve: add config to make hg resolve not re-merge by default

This revision was automatically updated to reflect the committed changes. Closed by commit rHG56469d475341: resolve: add config to make hg resolve not re-merge by default (authored by valentin.gatienbaron, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercur

D4378: resolve: add a flag for the default behavior of re-merging

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5d00e6061ba2: resolve: add a flag for the default behavior of re-merging (authored by valentin.gatienbaron, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-

D4427: zsh_completion: handle --rev as well as -r for diff and revert

This revision was automatically updated to reflect the committed changes. Closed by commit rHG09f23b4f1be3: zsh_completion: handle --rev as well as -r for diff and revert (authored by av6, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4427

D4378: resolve: add a flag for the default behavior of re-merging

pulkit accepted this revision. pulkit added a comment. > I added a couple of simple tests. I could add one for the hint, but I figured it's probably not worth it? I *think* each case is worth a test and help us increasing code coverage. REPOSITORY rHG Mercurial REVISION DETAIL https

D4379: resolve: add config to make hg resolve not re-merge by default

pulkit added subscribers: durin42, pulkit. pulkit added a comment. I like the feature it introduces. Thanks for coding this up. This looks like a good candidate for `ui.tweakdefaults`, @durin42 what do you think? INLINE COMMENTS > commands.py:4566 > +elif (actioncount == 0 > + a

D4445: tracing: ignore any IOErrors when writing to pipe

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When the pager forks off the main process, we can end up with the pipe closed prematurely. Rather than break hg entirely when that happens and tracing is active,

D4432: py3: do .decode(), .encode() dance in runtests.py

durin42 added a comment. I have an alternative fix in https://phab.mercurial-scm.org/D. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4432 To: pulkit, #hg-reviewers Cc: durin42, yuja, mercurial-devel ___ Mercurial

D4444: tests: avoid shellquoting bytes on Python 3

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Should fix Python 3 builder. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D AFFECTED FILES tests/run-tests.py CHANGE DETAILS

Re: [PATCH 1 of 4] hg: ensure the progress bar is completed when copying the store

queued, thanks > On Sep 1, 2018, at 2:05 AM, Matt Harbison wrote: > > # HG changeset patch > # User Matt Harbison > # Date 1535214404 14400 > # Sat Aug 25 12:26:44 2018 -0400 > # Node ID bcd44b97559a0150b988f812ffc28be1f7f9d452 > # Parent a7e22dd31f540916e79fbf23ff9f1c5baf380c53 > hg: ens

Re: [PATCH] shelve: fix crash on unshelve without .shelve metadata file

queued > On Aug 31, 2018, at 8:30 AM, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1535717428 -32400 > # Fri Aug 31 21:10:28 2018 +0900 > # Node ID 1eae14fe0f9b3ed85929b6ce806c6d5a6a355117 > # Parent b64d36e5ca31cc25e159f0fc3e710dbf46b89546 > shelve: fi

Re: [PATCH 1 of 4] test-check-py3-compat: remove false output from "python3 check-py3-compat.py"

On Sat, 1 Sep 2018 17:59:31 +0530, Pulkit Goyal wrote: > On Sat, Sep 1, 2018 at 7:26 AM Yuya Nishihara wrote: > > > # HG changeset patch > > # User Yuya Nishihara > > # Date 1535764718 -32400 > > # Sat Sep 01 10:18:38 2018 +0900 > > # Node ID 875e635c201c1d1cf1c3f8d511ed32b791e8c419 > > # P

Re: [PATCH 1 of 4] test-check-py3-compat: remove false output from "python3 check-py3-compat.py"

On Sat, Sep 1, 2018 at 7:26 AM Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1535764718 -32400 > # Sat Sep 01 10:18:38 2018 +0900 > # Node ID 875e635c201c1d1cf1c3f8d511ed32b791e8c419 > # Parent a7e22dd31f540916e79fbf23ff9f1c5baf380c53 > test-check-py3-compat