D949: run-tests: set HGPLAIN=1 when bisecting

2017-10-16 Thread quark (Jun Wu)
quark updated this revision to Diff 2890. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D949?vs=2450&id=2890 REVISION DETAIL https://phab.mercurial-scm.org/D949 AFFECTED FILES tests/run-tests.py CHANGE DETAILS diff --git a/tests/run-tests.py b/tests

D1044: bisect: add --abort flag

2017-10-16 Thread quark (Jun Wu)
quark abandoned this revision. quark added a comment. In https://phab.mercurial-scm.org/D1044#18824, @durin42 wrote: > I'm confused what you think the state of this is: the proximate goal of this series (as I understood it!) was to get run-tests able to restore to an original revision af

D948: run-tests: extract Popen logic to a single method

2017-10-16 Thread quark (Jun Wu)
quark updated this revision to Diff 2889. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D948?vs=2449&id=2889 REVISION DETAIL https://phab.mercurial-scm.org/D948 AFFECTED FILES tests/run-tests.py CHANGE DETAILS diff --git a/tests/run-tests.py b/tests

D947: run-tests: move bisect logic to a separate method

2017-10-16 Thread quark (Jun Wu)
quark requested review of this revision. quark added a comment. I don't think this patch needs change. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D947 To: quark, #hg-reviewers, ryanmce Cc: mercurial-devel ___ Mercur

Re: [PATCH] subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)

2017-10-16 Thread Matt Harbison
On Tue, 17 Oct 2017 00:20:38 -0400, Matt Harbison wrote: On Mon, 16 Oct 2017 10:00:32 -0400, Pulkit Goyal <7895pul...@gmail.com> wrote: On Mon, Oct 16, 2017 at 6:51 PM, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1508122082 14400 # Sun Oct 15 22:48:02 20

[PATCH V2] subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)

2017-10-16 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1508122082 14400 # Sun Oct 15 22:48:02 2017 -0400 # Node ID 7f5dd96256997c9ada54c969919abe8c6f3f970f # Parent 22d774b9dbab4689b186afc8acbca3165cd2a660 subrepo: share instead of clone if the parent repo is shared (issue5675) (BC) Previously, o

Re: [PATCH] subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)

2017-10-16 Thread Matt Harbison
On Mon, 16 Oct 2017 10:00:32 -0400, Pulkit Goyal <7895pul...@gmail.com> wrote: On Mon, Oct 16, 2017 at 6:51 PM, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1508122082 14400 # Sun Oct 15 22:48:02 2017 -0400 # Node ID d0c2b68fedb27184337af6392ecc1f03dab39522 #

[PATCH] tests: update output for no-symlink platforms

2017-10-16 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1508101054 14400 # Sun Oct 15 16:57:34 2017 -0400 # Node ID 22d774b9dbab4689b186afc8acbca3165cd2a660 # Parent cfb054a7ecc45bcaac95f1e64b644dd0411ffe41 tests: update output for no-symlink platforms This goes with eb586ed5d8ce. diff --git a/te

D1138: webcommands: replace str(ctx) etc with pycompat.bytestr(ctx) etc

2017-10-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY hgweb can now serve the graph view in Python 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1138 AFFECTED FILES mercurial/hgweb

D1137: templater: don't blow up when trying to build an abort message

2017-10-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY __name__ is unicode, but we need bytes. For now, we'll make the (mostly-safe) assumption that template filter names will be ascii. REPOSITORY rHG Mercurial REV

D1136: templatefilters: defend against evil unicode strs in json filter

2017-10-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We only want to do I/O in terms of bytes, so lets explode early instead of recursing forever. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial

D1134: hgweb: correct an earlier error of mine - `start` should be bytes

2017-10-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Gets hgweb very close to working. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1134 AFFECTED FILES mercurial/hgweb/hgweb_mod.py

D1135: webutil: use pycompat.bytestr() instead of str()

2017-10-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Stops us from choking the templater on Python 3. With this patch applied, much of hgweb works correctly in Python 3. The notable exception is the graph page, whi

Re: [PATCH] subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)

2017-10-16 Thread Matt Harbison
On Mon, 16 Oct 2017 10:36:22 -0400, Yuya Nishihara wrote: On Mon, 16 Oct 2017 09:21:24 -0400, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1508122082 14400 # Sun Oct 15 22:48:02 2017 -0400 # Node ID d0c2b68fedb27184337af6392ecc1f03dab39522 # Parent 718adb1bf3a9a

fat-fingered push and some "duplicate" phabricator revisions

2017-10-16 Thread Augie Fackler
I accidentally pushed some of my own changes - I've cleaned up the mess, but as a result several of my clang-format changes had to get re-uploaded under new differential IDs in order to allow review. Sorry for the mess folks. ___ Mercurial-devel mailing

D1132: mpatch: switch alignment of wrapped line from tab to spaces with clang-format

2017-10-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I may be a weird person for liking this style, but our C style is historically nominally the Linux Kernel style, and when you configure clang-format to be kernel

D1131: mpatch: reformat function prototypes with clang-format

2017-10-16 Thread durin42 (Augie Fackler)
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/D1131 AFFECTED FILES mercurial/mpatch.c mercurial/mpatch.h CHANGE DETAILS diff --git a/mercurial/mpa

D1130: contrib: remove check-code rule about indentation

2017-10-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We're moving towards a clang-format world, and clang-format is able to wrap argument lists with spaces reliably, while still enforcing tabs globally. Let's let c

D1133: test-clang-format: new test to verify that files stay clang-formatted

2017-10-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY For now all .c and .h files are blacklisted. As they become clang-formatted, we'll remove them from the blacklist,and then this test will produce output if there

D1129: clang-format: configuration for the clang-format source formatter

2017-10-16 Thread durin42 (Augie Fackler)
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/D1129 AFFECTED FILES .clang-format tests/test-check-code.t CHANGE DETAILS diff --git a/tests/test-ch

D1122: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

2017-10-16 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG85cee4c0c329: arbitraryfilecontext: skip the cmp fast path if any side is a symlink (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-sc

D1094: cmdutil: pass metadata from amend() to cleanupnodes

2017-10-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG63712407c620: cmdutil: pass metadata from amend() to cleanupnodes (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1094?vs=2784

D932: filemerge: introduce functions to halt merge flow

2017-10-16 Thread ryanmce (Ryan McElroy)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa1625035db16: filemerge: introduce functions to halt merge flow (authored by ryanmce, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D932?vs=2501&id=2876#toc REPOSITORY rHG M

D1124: test-hgweb-annotate-whitespace: make test compatible with chg

2017-10-16 Thread singhsrb (Saurabh Singh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG96fea7580ac4: test-hgweb-annotate-whitespace: make test compatible with chg (authored by singhsrb, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D

D951: merge: allow user to halt merge on merge-tool failures

2017-10-16 Thread ryanmce (Ryan McElroy)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGf583cef55995: merge: allow user to halt merge on merge-tool failures (authored by ryanmce, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D951?vs=2

D1095: amend: add a flag `-n/--note` to store note with amend

2017-10-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGfdec31766a51: amend: add a flag `-n/--note` to store note with amend (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1095?vs=2

D1093: scmutil: add capability to cleanupnodes to take obsmarker metadata

2017-10-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG162e8807abad: scmutil: add capability to cleanupnodes to take obsmarker metadata (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.or

D1106: context: add workingfilectx.markcopied

2017-10-16 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGcc1bf4612bb4: context: add workingfilectx.markcopied (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1106?vs=2798&id=2867 RE

D736: registrar: add support for storing the type of command in func object

2017-10-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG18507697d917: registrar: add support for storing the type of command in func object (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm

D1057: filemerge: use arbitraryfilectx for backups

2017-10-16 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. phillco marked an inline comment as done. Closed by commit rHG8e247db0d0f6: filemerge: use arbitraryfilectx for backups (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://p

D1127: test-obsolete-bounds-checking: make the test compatible with chg

2017-10-16 Thread singhsrb (Saurabh Singh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGf20b987625f7: test-obsolete-bounds-checking: make the test compatible with chg (authored by singhsrb, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.or

D1058: context: add overlayfilectx.cmp()

2017-10-16 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGe8ec39263850: context: add overlayfilectx.cmp() (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1058?vs=2697&id=2863 REVISIO

D1060: filemerge: add a missing flushall()

2017-10-16 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa25f886e1b8b: filemerge: add a missing flushall() (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1060?vs=2699&id=2865 REVIS

D1126: test-dispatch: make the test compatible with chg

2017-10-16 Thread singhsrb (Saurabh Singh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG65a2c4114158: test-dispatch: make the test compatible with chg (authored by singhsrb, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1126?vs=2852&

D1059: filemerge: store backups in the overlayworkingctx if using imm

2017-10-16 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb5e7aa688689: filemerge: store backups in the overlayworkingctx if using imm (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D

D1123: histedit: remove the nonexistant config 'histeditng'

2017-10-16 Thread singhsrb (Saurabh Singh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG85596338f122: histedit: remove the nonexistant config 'histeditng' (authored by singhsrb, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1123?vs=2

D1105: merge: don't use workers in in-memory mode

2017-10-16 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8ff80d1c75b5: merge: don't use workers in in-memory mode (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1105?vs=2797&id=2866

D1128: test-pager: make the test compatible with chg

2017-10-16 Thread singhsrb (Saurabh Singh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4effa078d157: test-pager: make the test compatible with chg (authored by singhsrb, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1128?vs=2853&id=

D1113: clang-format: configuration for the clang-format source formatter

2017-10-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGebfbf4e48d65: clang-format: configuration for the clang-format source formatter (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.or

D1119: releasenotes: fix documentation of similaritycheck()

2017-10-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG735153be8151: releasenotes: fix documentation of similaritycheck() (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1119?vs=282

D1030: mpatch: switch alignment of wrapped line from tab to spaces with clang-format

2017-10-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3b9e510335ee: mpatch: switch alignment of wrapped line from tab to spaces with clang-format (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.merc

D1116: Makefile: add target to apply clang-format in-place

2017-10-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGaf487f227278: Makefile: add target to apply clang-format in-place (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1116?vs=282

D1115: test-clang-format: new test to verify that files stay clang-formatted

2017-10-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8d2cada7277d: test-clang-format: new test to verify that files stay clang-formatted (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-sc

D1028: mpatch: reformat function prototypes with clang-format

2017-10-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGbd177139e635: mpatch: reformat function prototypes with clang-format (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1028?vs=

D1114: contrib: remove check-code rule about indentation

2017-10-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG6aeb3d69e16b: contrib: remove check-code rule about indentation (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1114?vs=2822&

D1124: test-hgweb-annotate-whitespace: make test compatible with chg

2017-10-16 Thread singhsrb (Saurabh Singh)
singhsrb added a comment. @durin42: That's a valid concern and I am planning to look at the pattern handling code at some point. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1124 To: singhsrb, #hg-reviewers, quark, durin42 Cc: durin42, mercurial-devel ___

D952: merge: additional test cases to show changing behavior

2017-10-16 Thread durin42 (Augie Fackler)
durin42 added a comment. https://phab.mercurial-scm.org/D953 is abandoned- should this be as well? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D952 To: ryanmce, #hg-reviewers, mbthomas Cc: durin42, mercurial-devel _

D1095: amend: add a flag `-n/--note` to store note with amend

2017-10-16 Thread durin42 (Augie Fackler)
durin42 added a comment. (Thanks to @yuja for reviewing this new feature so I could have more confidence landing the patch this late in the cycle.) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1095 To: pulkit, #hg-reviewers, dlax, yuja, durin42 Cc: yuja, merc

D1124: test-hgweb-annotate-whitespace: make test compatible with chg

2017-10-16 Thread durin42 (Augie Fackler)
durin42 added a comment. I'm a bit worried that chg can't handle the typical argument pattern here... REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1124 To: singhsrb, #hg-reviewers, quark Cc: durin42, mercurial-devel

D1128: test-pager: make the test compatible with chg

2017-10-16 Thread durin42 (Augie Fackler)
durin42 added a comment. It's probably worth pointing out that the "killed!" message is racy on solaris, which probably means it's just straight-up racy and Linux/FreeBSD/OS X aren't annoying enough to trigger the race on a regular basis REPOSITORY rHG Mercurial REVISION DETAIL http

D1128: test-pager: make the test compatible with chg

2017-10-16 Thread quark (Jun Wu)
quark accepted this revision. quark added a comment. This was suggested by me. Basically there are too many "racy" cases that errors can happen everywhere, ex. chg cannot send fds, etc. And the "killed!" output is also racy that it may appear before or after a chg error message. Instead

D1013: dispatch: filter the repository depending on func.cmdtype

2017-10-16 Thread durin42 (Augie Fackler)
durin42 requested changes to this revision. durin42 added a comment. This revision now requires changes to proceed. Needs tests. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1013 To: pulkit, #hg-reviewers, durin42 Cc: durin42, mercurial-devel _

D1117: config: simplify aliasing commands.update.check

2017-10-16 Thread durin42 (Augie Fackler)
durin42 requested changes to this revision. durin42 added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > configitems.py:184 > default=None, > +alias=[('experimental', 'updatecheck')] > ) Please add the comment that this alias should be discarded post-

D1044: bisect: add --abort flag

2017-10-16 Thread durin42 (Augie Fackler)
durin42 added a comment. In https://phab.mercurial-scm.org/D1044#18780, @quark wrote: > I think with `--command`, an option to restore to the original commit is a useful feature in `bisect` itself. If we cannot reach an agreement before freeze, could we push the first 3 commits (https:/

D1128: test-pager: make the test compatible with chg

2017-10-16 Thread singhsrb (Saurabh Singh)
singhsrb created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY https://phab.mercurial-scm.org/D911 tried to make this test compatible with chg but instead resulted in the test being flaky for chg. For now, disabling this tes

D1126: test-dispatch: make the test compatible with chg

2017-10-16 Thread singhsrb (Saurabh Singh)
singhsrb updated this revision to Diff 2852. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1126?vs=2850&id=2852 REVISION DETAIL https://phab.mercurial-scm.org/D1126 AFFECTED FILES tests/test-dispatch.t CHANGE DETAILS diff --git a/tests/test-dispatc

D1126: test-dispatch: make the test compatible with chg

2017-10-16 Thread singhsrb (Saurabh Singh)
singhsrb added inline comments. INLINE COMMENTS > quark wrote in test-dispatch.t:77 > Alternatively, you can use individual line matching without duplicating the > `hg version` line: > > abort: error getting current working directory: * (glob) (no-chg !) > chg: abort: failed to getcwd (errn

D1127: test-obsolete-bounds-checking: make the test compatible with chg

2017-10-16 Thread singhsrb (Saurabh Singh)
singhsrb created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This test fails when run with chg because the error message starts with "ProgrammingError" instead of "mercurial.error.ProgrammingError". Therefore, globing the

D1126: test-dispatch: make the test compatible with chg

2017-10-16 Thread quark (Jun Wu)
quark requested changes to this revision. quark added a comment. This revision now requires changes to proceed. Just a small nit. INLINE COMMENTS > test-dispatch.t:77 >$ HGDEMANDIMPORT=disable hg version -q >abort: error getting current working directory: * (glob) >[255] Alternat

D1126: test-dispatch: make the test compatible with chg

2017-10-16 Thread singhsrb (Saurabh Singh)
singhsrb created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The test is broken when run with chg because it prints a different error message when chg is running. This commit fixes the test by special casing for chg. TE

D1044: bisect: add --abort flag

2017-10-16 Thread quark (Jun Wu)
quark added a comment. I think with `--command`, an option to restore to the original commit is a useful feature in `bisect` itself. If we cannot reach agreement, could we push the first 3 commits (https://phab.mercurial-scm.org/D947+https://phab.mercurial-scm.org/D948+https://phab.mercurial

[Bug 5711] New: Cannot clone in Python 3 due to string handling

2017-10-16 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5711 Bug ID: 5711 Summary: Cannot clone in Python 3 due to string handling Product: Mercurial Version: 4.3.3 Hardware: Macintosh OS: Mac OS Status: UNCONFIRMED

D1063: rebase: enable multidest by default

2017-10-16 Thread quark (Jun Wu)
quark added a comment. Interface-wise, I'm thinking about defining `BASE` as `max(roots(ALLSRC) & ::SRC)^` to make it easier to use. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1063 To: quark, #hg-reviewers, durin42 Cc: dlax, martinvonz, durin42, mercurial-d

Re: [PATCH] subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)

2017-10-16 Thread Augie Fackler
On Mon, Oct 16, 2017 at 11:36:22PM +0900, Yuya Nishihara wrote: > On Mon, 16 Oct 2017 09:21:24 -0400, Matt Harbison wrote: > > # HG changeset patch > > # User Matt Harbison > > # Date 1508122082 14400 > > # Sun Oct 15 22:48:02 2017 -0400 > > # Node ID d0c2b68fedb27184337af6392ecc1f03dab39522

Re: [PATCH] subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)

2017-10-16 Thread Augie Fackler
On Mon, Oct 16, 2017 at 07:30:32PM +0530, Pulkit Goyal wrote: > On Mon, Oct 16, 2017 at 6:51 PM, Matt Harbison wrote: > > # HG changeset patch > > # User Matt Harbison > > # Date 1508122082 14400 > > # Sun Oct 15 22:48:02 2017 -0400 > > # Node ID d0c2b68fedb27184337af6392ecc1f03dab39522 > >

Phabricator and [stable] patches

2017-10-16 Thread Augie Fackler
As we approach the freeze, I'm realizing we don't have a good way of flagging things for stable in Phabricator. Anyone have ideas for how we should do this? Thanks, Augie ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.me

D1057: filemerge: use arbitraryfilectx for backups

2017-10-16 Thread phillco (Phil Cohen)
phillco marked 4 inline comments as done. phillco added inline comments. INLINE COMMENTS > phillco wrote in filemerge.py:604 > Sure, will do. I think most likely by breaking the context -> fileset > dependency. @durin42 done REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-

D1057: filemerge: use arbitraryfilectx for backups

2017-10-16 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 2843. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1057?vs=2696&id=2843 REVISION DETAIL https://phab.mercurial-scm.org/D1057 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerg

D1124: test-hgweb-annotate-whitespace: make test compatible with chg

2017-10-16 Thread singhsrb (Saurabh Singh)
singhsrb created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY https://phab.mercurial-scm.org/D946 fixed a bunch of tests which had the same root cause. Please see that for details. This seems to be one of the newer tests wh

D1057: filemerge: use arbitraryfilectx for backups

2017-10-16 Thread phillco (Phil Cohen)
phillco added inline comments. INLINE COMMENTS > durin42 wrote in filemerge.py:604 > Ick. Please add a TODO here to figure out a way to break the cycle (it can be > done! I'm sure of it, even if I don't yet know how) and then we can move > forward with this. Sure, will do. I think most likely

D1063: rebase: enable multidest by default

2017-10-16 Thread durin42 (Augie Fackler)
durin42 added a comment. (Note that I'd still welcome feedback from non-BigCo contributors here - is this something we should make permanent? Have people been testing this? Etc.) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1063 To: quark, #hg-reviewers, duri

D1063: rebase: enable multidest by default

2017-10-16 Thread durin42 (Augie Fackler)
durin42 added a comment. In https://phab.mercurial-scm.org/D1063#17791, @martinvonz wrote: > In https://phab.mercurial-scm.org/D1063#17789, @durin42 wrote: > > > I'm a fan. Will give it to Monday for any objections. > > > I'm against. I'd like to see that the feature is indeed po

D1122: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

2017-10-16 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 2841. phillco edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1122?vs=2840&id=2841 REVISION DETAIL https://phab.mercurial-scm.org/D1122 AFFECTED FILES mercurial/context.py tes

D1122: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

2017-10-16 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 2840. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1122?vs=2839&id=2840 REVISION DETAIL https://phab.mercurial-scm.org/D1122 AFFECTED FILES mercurial/context.py tests/test-arbitraryfilectx.t CHANGE DETAILS d

D1122: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

2017-10-16 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 2839. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1122?vs=2838&id=2839 REVISION DETAIL https://phab.mercurial-scm.org/D1122 AFFECTED FILES mercurial/context.py tests/test-arbitraryfilectx.t CHANGE DETAILS d

D1056: context: add a fast-comparision path between arbitraryfilectx and workingfilectx

2017-10-16 Thread phillco (Phil Cohen)
phillco added a comment. Done: https://phab.mercurial-scm.org/D1122. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1056 To: phillco, #hg-reviewers, durin42 Cc: ryanmce, mercurial-devel ___ Mercurial-devel mailing list

D1122: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

2017-10-16 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 2838. phillco edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1122?vs=2836&id=2838 REVISION DETAIL https://phab.mercurial-scm.org/D1122 AFFECTED FILES mercurial/context.py tes

D1123: histedit: remove the nonexistant config 'histeditng'

2017-10-16 Thread singhsrb (Saurabh Singh)
singhsrb created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY https://phab.mercurial-scm.org/D942 removed the experimental config 'histeditng'. This is a leftover which should have been rem

D785: context: also consider path conflicts when clearing unknown files

2017-10-16 Thread swhitaker (Simon Whitaker)
swhitaker added inline comments. INLINE COMMENTS > context.py:1941 > +if wvfs.isfileorlink(p): > +wvfs.unlink(p) > +break This breaks test-audit-path.t on macOS. In the test "attack /tmp/test", we call this codepath with f == '/tmp/test'. util.finddir

mercurial@34681: 32 new changesets

2017-10-16 Thread Mercurial Commits
32 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/6c85f4e3d914 changeset: 34650:6c85f4e3d914 user:Boris Feld date:Fri Sep 29 19:59:15 2017 +0100 summary: test: add a test file dedicated to an important distributed case https://www.mercurial-scm.org/r

D1057: filemerge: use arbitraryfilectx for backups

2017-10-16 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > phillco wrote in filemerge.py:604 > I don't think so, because the filectx classes reference the ctx classes in > various places. Ick. Please add a TODO here to figure out a way to break the cycle (it can be done! I'm sure of it, even if I don't

D1122: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

2017-10-16 Thread phillco (Phil Cohen)
phillco 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/D1122 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py b/mercurial

D1056: context: add a fast-comparision path between arbitraryfilectx and workingfilectx

2017-10-16 Thread durin42 (Augie Fackler)
durin42 added a comment. For now, send a follow-up to not do that fast-path if it's a symlink, and we can reason more carefully about this API during the freeze with an eye towards landing something better in 4.5... REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org

D1082: split: new extension to split changesets

2017-10-16 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > martinvonz wrote in test-split.t:487-493 > Leaving these two behind seems reasonable. It would also be reasonable to > evolve/stabilize them. Either way, it's different from what "hg rebase" does. > Do we eventually want them to behave the same? If

Re: [PATCH 4 of 4 v3] log: add -L/--line-range option to follow file history by line range

2017-10-16 Thread Denis Laxalde
Augie Fackler a écrit : (+jordigh, themystic, indygreg in case one of them has an opinion or inspiration) On Oct 13, 2017, at 10:24 AM, Yuya Nishihara wrote: On Fri, 13 Oct 2017 10:02:07 +0200, Denis Laxalde wrote: Yuya Nishihara a écrit : On Tue, 10 Oct 2017 17:37:27 +0200, Denis Laxalde

D1082: split: new extension to split changesets

2017-10-16 Thread quark (Jun Wu)
quark added a comment. In https://phab.mercurial-scm.org/D1082#18648, @lothiraldan wrote: > It will be great to have split in core, even if it's only as an experimental experiment for now. > > I like the UX improvements, but could we add a config knob to disable the auto-rebase for p

D1097: releasenotes: don't abort is there is a bad formatted entry for releasenotes

2017-10-16 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 2833. pulkit edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1097?vs=2787&id=2833 REVISION DETAIL https://phab.mercurial-scm.org/D1097 AFFECTED FILES hgext/releasenotes.py CHANG

D1121: releasenotes: show a warning if fuzzywuzzy is not present

2017-10-16 Thread pulkit (Pulkit Goyal)
pulkit 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/D1121 AFFECTED FILES hgext/releasenotes.py CHANGE DETAILS diff --git a/hgext/releasenotes.py b/hgext/re

D1120: releasenotes: move import of fuzzywuzzy to import level

2017-10-16 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This will help us in determining easily that whether fuzzywuzzy is loaded or not loaded in any of the function. REPOSITORY rHG Mercurial REVISION DETAIL http

D1119: releasenotes: fix documentation of similaritycheck()

2017-10-16 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The function document says that it returns true when the fragment can be merged, but if you see the function just above it which is similar(), it writes already

D1096: releasenotes: make the import of fuzzywuzzy optional

2017-10-16 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 2830. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1096?vs=2786&id=2830 REVISION DETAIL https://phab.mercurial-scm.org/D1096 AFFECTED FILES hgext/releasenotes.py CHANGE DETAILS diff --git a/hgext/releasenotes.p

[PATCH 5 of 8 V2] phase: introduce a new 'check:phases' part

2017-10-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1507698782 -7200 # Wed Oct 11 07:13:02 2017 +0200 # Node ID 3e12cfeb7b0177e2efdd39de00dc7f03d944 # Parent c581583a2c085662c9a59f55f2483a2c748eb573 # EXP-Topic b2.phases.push # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 8 of 8 V2] phase: use a binary phase part to push through bundle2 (BC)

2017-10-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1505929086 -7200 # Wed Sep 20 19:38:06 2017 +0200 # Node ID 76e192debcd8036c6695b56681ca096690322880 # Parent 9c084f14df72a2d511d414e0ecf50a086c0a2341 # EXP-Topic b2.phases.push # Available At https://bitbucket.org/octobus/mercurial-devel/ #

Re: [PATCH 8 of 8] phase: use a binary phase part to push through bundle2 (BC)

2017-10-16 Thread Boris Feld
On Mon, 2017-10-16 at 19:33 +0530, Pulkit Goyal wrote: > On Mon, Oct 16, 2017 at 7:11 PM, Boris Feld > wrote: > > # HG changeset patch > > # User Boris Feld > > # Date 1505929086 -7200 > > #  Wed Sep 20 19:38:06 2017 +0200 > > # Node ID cd40bc7040c08dad560f14300c1f665914dded19 > > # Parent  9

[PATCH 6 of 8 V2] phase: generate a push-race detection part on push

2017-10-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1507700400 -7200 # Wed Oct 11 07:40:00 2017 +0200 # Node ID e688d8b13100c464897c7f872c498202f8e82272 # Parent 3e12cfeb7b0177e2efdd39de00dc7f03d944 # EXP-Topic b2.phases.push # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 7 of 8 V2] phase: isolate logic to update remote phrase through bundle2 pushkey

2017-10-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1505927857 -7200 # Wed Sep 20 19:17:37 2017 +0200 # Node ID 9c084f14df72a2d511d414e0ecf50a086c0a2341 # Parent e688d8b13100c464897c7f872c498202f8e82272 # EXP-Topic b2.phases.push # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 1 of 8 V2] phase: filter out non-draft item in "draft root"

2017-10-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1507745282 -7200 # Wed Oct 11 20:08:02 2017 +0200 # Node ID 629de091478a249c97ce410733c8520aaec779f2 # Parent a652b7763f669683eb5540c6d4b77ee18e55bc80 # EXP-Topic b2.phases.push # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 4 of 8 V2] phase: gather remote phase information in a summary object

2017-10-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1507739944 -7200 # Wed Oct 11 18:39:04 2017 +0200 # Node ID c581583a2c085662c9a59f55f2483a2c748eb573 # Parent 9fb76d6c80d20b5af8ee1d0e7d6c221924b1d7bb # EXP-Topic b2.phases.push # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 3 of 8 V2] phase: simplify the check for issue3781 shortcut in discovery

2017-10-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1507739974 -7200 # Wed Oct 11 18:39:34 2017 +0200 # Node ID 9fb76d6c80d20b5af8ee1d0e7d6c221924b1d7bb # Parent 29a71a5125a7beb8334a7f7386a3023bfa1f66f8 # EXP-Topic b2.phases.push # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 2 of 8 V2] exchange: fix issue3781 reference in the comment

2017-10-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1508150202 -7200 # Mon Oct 16 12:36:42 2017 +0200 # Node ID 29a71a5125a7beb8334a7f7386a3023bfa1f66f8 # Parent 629de091478a249c97ce410733c8520aaec779f2 # EXP-Topic b2.phases.push # Available At https://bitbucket.org/octobus/mercurial-devel/ #

  1   2   >