D2694: merge: deprecate accessing update results by index

2018-03-04 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now that we have named attributes, let's convert the code base to use them. We also add deprecation warnings so legacy

D2691: commands: don't check for merge.update() truthiness

2018-03-04 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY AFAICT ``stats`` is always a tuple in these cases. We don't need to check if the variable has a truthy value. REPOSITORY rHG Mercurial REVISION DETAIL

D2693: histedit: always define update results

2018-03-04 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before, we had a branch that could return None for the update stats. Let's just return an updateresult instance instead.

D2692: merge: return an attrs class from update() and applyupdates()

2018-03-04 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, we returned a tuple containing counts. The result of an update is kind of complex and the use of tuples with nameless fields made the code a bit

D2686: xdiff: add a preprocessing step that trims files

2018-03-04 Thread quark (Jun Wu)
quark updated this revision to Diff 6650. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2686?vs=6645=6650 REVISION DETAIL https://phab.mercurial-scm.org/D2686 AFFECTED FILES mercurial/thirdparty/xdiff/xdiffi.c mercurial/thirdparty/xdiff/xemit.c

D2624: perf: teach perfbdiff to call blocks() and to use xdiff

2018-03-04 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > perf.py:1024-1029 > +if xdiff: > +mdiff.bdiff.xdiffblocks(*pair) > +elif blocks: > +mdiff.bdiff.blocks(*pair) > +else: > +

D2668: rebase: introduce support for automatically rebasing orphan changes

2018-03-04 Thread quark (Jun Wu)
quark added a comment. My initial idea was to allow `-r 'orphan()-obsolete()' -d auto`. That can be actually done without any code change by defining `auto` as a complex revset. That idea derived an idea of allowing omitting arguments. rebase.autodest = ... # when -r or -s is

D2681: [PoC] scmutil: support local only obsolescence

2018-03-04 Thread mharbison72 (Matt Harbison)
mharbison72 added a comment. re: the "(testcase !)" syntax- I agree that it would be better if "(false !)" means the line is *not* present, instead of optional. I made an attempt to do that, but somehow I came up with a test in test-run-tests.t that failed there, but the exact same test

D2690: sslutil: some more forcebytes() on some exception messages

2018-03-04 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY At this point, test-https.t no longer dumps tracebacks everywhere. Instead, we get some results that look like we're not adequately finding things in hg's

D2687: sslutil: lots of unicode/bytes cleanup

2018-03-04 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In general, we handle hostnames as bytes, except where Python forces them to be unicodes. This fixes all the tracebacks I was seeing in test-https.t, but

D2689: sslutil: sslcontext needs the cipher name as a sysstr

2018-03-04 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/D2689 AFFECTED FILES mercurial/sslutil.py CHANGE DETAILS diff --git a/mercurial/sslutil.py

D2688: hgweb: adapt to socket._fileobject changes in Python 3

2018-03-04 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY These are the only uses of socket._fileobject in the codebase, so let's just do something inline here rather than adding something to pycompat. REPOSITORY

D2678: help: supporting both help and doc for aliases

2018-03-04 Thread mharbison72 (Matt Harbison)
mharbison72 added a comment. I really like this feature too. Any plans to extend it to {fileset,revset,template}alias? I don't think this should prevent it from being accepted, but is there a way to get the help text rendered as-is, without reflowing? For example, to simulate the

D2685: xdiff: add comments for fields in xdfile_t

2018-03-04 Thread quark (Jun Wu)
quark abandoned this revision. quark added a comment. No longer needed REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2685 To: quark, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D2686: xdiff: add a preprocessing step that trims files

2018-03-04 Thread quark (Jun Wu)
quark updated this revision to Diff 6645. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2686?vs=6644=6645 REVISION DETAIL https://phab.mercurial-scm.org/D2686 AFFECTED FILES mercurial/thirdparty/xdiff/xdiffi.c mercurial/thirdparty/xdiff/xemit.c

D2684: xdiff: remove unused structure and functions

2018-03-04 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `bdiffparam_t` seems unused even in git's repo. `xdl_fall_back_diff` is no longer used after https://phab.mercurial-scm.org/D2573. REPOSITORY rHG Mercurial

D2683: xdiff: remove whitespace related feature

2018-03-04 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In Mercurial, whitespace related handling are done at a higher level than the low-level diff algorithm so "ignore spaces". So it's not used by mdiff. Some of the

D2686: xdiff: add a preprocessing step that trims files

2018-03-04 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY xdiff has a `xdl_trim_ends` step that removes common lines, unmatchable lines. That is in theory good, but happens too late - after splitting, hashing, and

D2685: xdiff: add comments for fields in xdfile_t

2018-03-04 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This makes the related code easier to understand. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2685 AFFECTED FILES

D2634: [DRAFT] xdiff: avoid hashing trimmed lines

2018-03-04 Thread quark (Jun Wu)
quark abandoned this revision. quark added a comment. https://phab.mercurial-scm.org/D2686 is a better fix REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2634 To: quark, #hg-reviewers Cc: mercurial-devel ___

D2681: [PoC] scmutil: support local only obsolescence

2018-03-04 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now that we have a config option for enabling local-only obsolescence, it is time to do something with it. This commit teaches cleanupnodes() - which is

D2680: [PoC] obsolete: make markers database writable if local-only mode enabled

2018-03-04 Thread indygreg (Gregory Szorc)
indygreg 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/D2680 AFFECTED FILES mercurial/obsolete.py CHANGE DETAILS diff --git a/mercurial/obsolete.py

D2666: repair: rename _backup to backupbundle

2018-03-04 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 6636. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2666?vs=6607=6636 REVISION DETAIL https://phab.mercurial-scm.org/D2666 AFFECTED FILES hgext/histedit.py mercurial/repair.py CHANGE DETAILS diff --git

D2682: [PoC] changegroup: delete obs markers when applying changegroup

2018-03-04 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In local-only obsolescence mode, our short-term hack to unhide a changeset is to delete obsolescence markers causing it to be hidden. We need to do this every

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

2018-03-04 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Our path to enable obsolescence/evolve in core is to enable creation of markers locally (no exchange) with user-facing behavior that mimics existing behavior

D2678: help: supporting both help and doc for aliases

2018-03-04 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio added a comment. Ok, should be good to go now :) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2678 To: rdamazio, #hg-reviewers Cc: pulkit, mercurial-devel ___ Mercurial-devel mailing list

D2678: help: supporting both help and doc for aliases

2018-03-04 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio updated this revision to Diff 6635. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2678?vs=6634=6635 REVISION DETAIL https://phab.mercurial-scm.org/D2678 AFFECTED FILES mercurial/configitems.py mercurial/dispatch.py mercurial/help.py

D2678: help: supporting both help and doc for aliases

2018-03-04 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio added a comment. (I'll have more test updates in a min, sorry, please hold :) ) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2678 To: rdamazio, #hg-reviewers Cc: pulkit, mercurial-devel ___ Mercurial-devel

D2678: help: supporting both help and doc for aliases

2018-03-04 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio added a comment. In https://phab.mercurial-scm.org/D2678#43196, @pulkit wrote: > I am very very much excited about this. But, this patch lacks test. :( Sorry, added now (and re-running tests in parallel) REPOSITORY rHG Mercurial REVISION DETAIL

D2678: help: supporting both help and doc for aliases

2018-03-04 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio updated this revision to Diff 6634. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2678?vs=6632=6634 REVISION DETAIL https://phab.mercurial-scm.org/D2678 AFFECTED FILES mercurial/configitems.py mercurial/dispatch.py mercurial/help.py

Re: [PATCH 1 of 4] py3: fix int formatting of "incoming changes" log

2018-03-04 Thread Pulkit Goyal
Queued the series. Many thanks. On Mon, Mar 5, 2018 at 3:49 AM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1520200097 18000 > # Sun Mar 04 16:48:17 2018 -0500 > # Node ID bbfaa4a0a9fde9170af65ef333e63f7e4626e81e > # Parent

[PATCH 2 of 4] py3: make blackbox-readonly-dispatch.py use ui instead of print()

2018-03-04 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520200235 18000 # Sun Mar 04 16:50:35 2018 -0500 # Node ID 57d883c2f3d5bd975985356e7d9a8942d72cac9e # Parent bbfaa4a0a9fde9170af65ef333e63f7e4626e81e py3: make blackbox-readonly-dispatch.py use ui instead of print() diff

[PATCH 3 of 4] py3: byte-stringify blackbox-readonly-dispatch.py

2018-03-04 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520200454 18000 # Sun Mar 04 16:54:14 2018 -0500 # Node ID 1bae4c65f65cce76e5337fd392db53ca442bdfec # Parent 57d883c2f3d5bd975985356e7d9a8942d72cac9e py3: byte-stringify blackbox-readonly-dispatch.py # skip-blame because

[PATCH 4 of 4] py3: byte-stringify test-blackbox.t

2018-03-04 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520200551 18000 # Sun Mar 04 16:55:51 2018 -0500 # Node ID 8c6317e695dc2e9721b83f67079c5d129685395e # Parent 1bae4c65f65cce76e5337fd392db53ca442bdfec py3: byte-stringify test-blackbox.t diff --git a/contrib/python3-whitelist

[PATCH 1 of 4] py3: fix int formatting of "incoming changes" log

2018-03-04 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520200097 18000 # Sun Mar 04 16:48:17 2018 -0500 # Node ID bbfaa4a0a9fde9170af65ef333e63f7e4626e81e # Parent b77ff4fbe9ad2a27454f0edc9a9772bbc3128b28 py3: fix int formatting of "incoming changes" log diff --git

D2676: tests: stop over-specifying tempfile name

2018-03-04 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 6633. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2676?vs=6628=6633 REVISION DETAIL https://phab.mercurial-scm.org/D2676 AFFECTED FILES contrib/python3-whitelist tests/test-merge-tools.t CHANGE DETAILS

D2678: help: supporting both help and doc for aliases

2018-03-04 Thread pulkit (Pulkit Goyal)
pulkit added a comment. I am very very much excited about this. But, this patch lacks test. :( REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2678 To: rdamazio, #hg-reviewers Cc: pulkit, mercurial-devel ___

Re: [PATCH 1 of 4 STABLE] test-subrepo: demonstrate problems with subrepo sharing and absolute paths

2018-03-04 Thread Matt Harbison
On Sun, 04 Mar 2018 08:20:07 -0500, Yuya Nishihara wrote: On Sat, 03 Mar 2018 23:03:25 -0500, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1519795767 18000 # Wed Feb 28 00:29:27 2018 -0500 # Branch stable # Node ID

D2678: help: supporting both help and doc for aliases

2018-03-04 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This allows an alias to be definted like: [alias] lj = log -Tjson lj:help = [-r REV] lj:doc = Shows the revision log in JSON format. REPOSITORY rHG

D2677: largefiles: use %d instead of %s to process ints

2018-03-04 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5c72b52d3dd0: largefiles: use %d instead of %s to process ints (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2674: transaction: fix an error string with bytestr() on a repr()d value

2018-03-04 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGef345f9e4295: transaction: fix an error string with bytestr() on a repr()d value (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2668: rebase: introduce support for automatically rebasing orphan changes

2018-03-04 Thread indygreg (Gregory Szorc)
indygreg requested changes to this revision. indygreg added a comment. This revision now requires changes to proceed. I'm +1 on the feature. We should bikeshed the naming. INLINE COMMENTS > rebase.py:123 > > +def _possibledestination(repo, rev): > +"""Return all changesets that may be

Re: [PATCH] xdiff: fix trivial build warnings on Windows

2018-03-04 Thread Matt Harbison
On Sun, 04 Mar 2018 16:45:28 -0500, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1520197662 18000 # Sun Mar 04 16:07:42 2018 -0500 # Node ID c4a6b599a46f93070f5492c9e68566e6be570d2f # Parent

D2676: tests: stop over-specifying tempfile name

2018-03-04 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a reviewer: pulkit. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Python 3 has more random characters in the default template, which is fine. REPOSITORY rHG Mercurial REVISION DETAIL

D2675: debugcommands: fix some %r output with bytestr() wrappers

2018-03-04 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Almost fixes test-merge-tools.t. I think the remaining failure there is due to some overspecified tempfile names. REPOSITORY rHG Mercurial REVISION DETAIL

D2677: largefiles: use %d instead of %s to process ints

2018-03-04 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/D2677 AFFECTED FILES hgext/largefiles/overrides.py CHANGE DETAILS diff --git

D2674: transaction: fix an error string with bytestr() on a repr()d value

2018-03-04 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a reviewer: pulkit. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Fixes test-rollback.t on Python 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2674 AFFECTED

Re: [PATCH 1 of 6] py3: use startswith() instead of slicing to detect leading whitespace

2018-03-04 Thread Pulkit Goyal
Queued the series. Many thanks! On Mon, Mar 5, 2018 at 3:11 AM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1520195085 18000 > # Sun Mar 04 15:24:45 2018 -0500 > # Node ID f7cd53c5127f248f5d075ad28b6be82558b7c35d > # Parent

[PATCH] xdiff: fix trivial build warnings on Windows

2018-03-04 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1520197662 18000 # Sun Mar 04 16:07:42 2018 -0500 # Node ID c4a6b599a46f93070f5492c9e68566e6be570d2f # Parent 1f9bbd1d6b8ae4f7ea5d9f4310269a3b0242e7b0 xdiff: fix trivial build warnings on Windows These are mostly

D2673: archival: use py3 friendly replacements for chr() and long()

2018-03-04 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGf14ba6eb2b5a: archival: use py3 friendly replacements for chr() and long() (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2669: util: fix unsafe url abort with bytestr() on url

2018-03-04 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGca201470abb4: util: fix unsafe url abort with bytestr() on url (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2672: archival: ensure file mode for gzipfile is sysstr

2018-03-04 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd3c231f8d27d: archival: ensure file mode for gzipfile is sysstr (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2670: py3: more passing tests (ten this time)

2018-03-04 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG93b8c83ef136: py3: more passing tests (ten this time) (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2670?vs=6613=6622

D2671: archival: fix a missing r'' on a kwargs check

2018-03-04 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG009da8c28e4d: archival: fix a missing r on a kwargs check (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2671?vs=6614=6623

[PATCH 1 of 6] py3: use startswith() instead of slicing to detect leading whitespace

2018-03-04 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520195085 18000 # Sun Mar 04 15:24:45 2018 -0500 # Node ID f7cd53c5127f248f5d075ad28b6be82558b7c35d # Parent 6bacb2f663cb07f58bb493db5f21ae321d5a2e06 py3: use startswith() instead of slicing to detect leading whitespace diff

[PATCH 4 of 6] py3: fix type of ui.configitems(ignoresub=True) result

2018-03-04 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520197278 18000 # Sun Mar 04 16:01:18 2018 -0500 # Node ID 8fe5cf00bb5e51dadafa1811c9fc1aeb2fdb47d4 # Parent 9e19942b51da8d09f6a6eea8dc12b1d7a2c4adab py3: fix type of ui.configitems(ignoresub=True) result diff --git

[PATCH 3 of 6] py3: don't use str() to stringify pushloc

2018-03-04 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520196790 18000 # Sun Mar 04 15:53:10 2018 -0500 # Node ID 9e19942b51da8d09f6a6eea8dc12b1d7a2c4adab # Parent 794b80520f0f47171ccb1e2db142e9bff1351cde py3: don't use str() to stringify pushloc diff --git

[PATCH 2 of 6] py3: byte-stringify test-config.t and test-config-env.py

2018-03-04 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520195186 18000 # Sun Mar 04 15:26:26 2018 -0500 # Node ID 794b80520f0f47171ccb1e2db142e9bff1351cde # Parent f7cd53c5127f248f5d075ad28b6be82558b7c35d py3: byte-stringify test-config.t and test-config-env.py diff --git

[PATCH 6 of 6] py3: work around comparison between int and None in tagmerge

2018-03-04 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520198590 18000 # Sun Mar 04 16:23:10 2018 -0500 # Node ID 75ddae669c3dd713b44a4c87fcc17324ba26f37d # Parent 8267c6e887a9473e849faf2ac2ab439b9cbffcbf py3: work around comparison between int and None in tagmerge diff --git

[PATCH 5 of 6] py3: do not mutate dict while iterating in tagmerge

2018-03-04 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520198026 18000 # Sun Mar 04 16:13:46 2018 -0500 # Node ID 8267c6e887a9473e849faf2ac2ab439b9cbffcbf # Parent 8fe5cf00bb5e51dadafa1811c9fc1aeb2fdb47d4 py3: do not mutate dict while iterating in tagmerge diff --git

D2670: py3: more passing tests (ten this time)

2018-03-04 Thread pulkit (Pulkit Goyal)
pulkit accepted this revision. pulkit added a comment. Many thanks! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2670 To: durin42, pulkit, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D2593: state: add logic to parse the state file in old way if cbor fails

2018-03-04 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > durin42 wrote in state.py:86 > Ugh. Yeah, maybe see if they'd take a patch upstream to raise a more explicit > exception type. @durin42 I feel sorry about adding a TODO but I did that because I won't be able to work for a week or so dur to

D2595: graft: start using the new state file

2018-03-04 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 6620. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2595?vs=6446=6620 REVISION DETAIL https://phab.mercurial-scm.org/D2595 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands.py

D2593: state: add logic to parse the state file in old way if cbor fails

2018-03-04 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 6618. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2593?vs=6444=6618 REVISION DETAIL https://phab.mercurial-scm.org/D2593 AFFECTED FILES mercurial/state.py tests/test-check-code.t CHANGE DETAILS diff --git

D2594: graft: move logic to read current graft state file in state.py

2018-03-04 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 6619. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2594?vs=6445=6619 REVISION DETAIL https://phab.mercurial-scm.org/D2594 AFFECTED FILES mercurial/commands.py mercurial/state.py CHANGE DETAILS diff --git

D2640: cbor: remove tests files and fix core's test-check*

2018-03-04 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 6617. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2640?vs=6547=6617 REVISION DETAIL https://phab.mercurial-scm.org/D2640 AFFECTED FILES mercurial/thirdparty/cbor/cbor/tests/__init__.py

D2673: archival: use py3 friendly replacements for chr() and long()

2018-03-04 Thread durin42 (Augie Fackler)
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/D2673 AFFECTED FILES contrib/python3-whitelist mercurial/archival.py

D2670: py3: more passing tests (ten this time)

2018-03-04 Thread durin42 (Augie Fackler)
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/D2670 AFFECTED FILES contrib/python3-whitelist CHANGE DETAILS diff

D2669: util: fix unsafe url abort with bytestr() on url

2018-03-04 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/D2669 AFFECTED FILES mercurial/util.py CHANGE DETAILS diff --git a/mercurial/util.py

D2672: archival: ensure file mode for gzipfile is sysstr

2018-03-04 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/D2672 AFFECTED FILES mercurial/archival.py CHANGE DETAILS diff --git a/mercurial/archival.py

D2671: archival: fix a missing r'' on a kwargs check

2018-03-04 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 1. skip-blame just an r prefix REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2671 AFFECTED FILES mercurial/archival.py CHANGE

D2596: state: raise ProgrammingError if an invalid key is being accessed

2018-03-04 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D2596#42818, @yuja wrote: > In https://phab.mercurial-scm.org/D2596#42678, @pulkit wrote: > > > In https://phab.mercurial-scm.org/D2596#42672, @durin42 wrote: > > > > > Hmm, really? Do any states have optional entries that

Re: [PATCH] xdiff: fix builds on Windows

2018-03-04 Thread Augie Fackler
> On Mar 4, 2018, at 15:33, Matt Harbison wrote: > > # HG changeset patch > # User Matt Harbison > # Date 1520194602 18000 > # Sun Mar 04 15:16:42 2018 -0500 > # Node ID 0c7679474cdf8077f53e470c1c4e1c7626dc0ba4 > # Parent

D2668: rebase: introduce support for automatically rebasing orphan changes

2018-03-04 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 6611. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2668?vs=6610=6611 REVISION DETAIL https://phab.mercurial-scm.org/D2668 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff

D2623: dispatch: adding config items for overriding flag defaults

2018-03-04 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio added inline comments. INLINE COMMENTS > yuja wrote in dispatch.py:624 > IIUC, an extension author may implement its own customopt subclasses, and > put them into the command table, so we can't make ui.configtyped to > support all of them. Ah, makes sense. See if this addresses that

D2668: rebase: introduce support for automatically rebasing orphan changes

2018-03-04 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY _destautorebase(SRC) is based on the _destrestack(SRC) revset from fbamend. The supporting _possibledestination function is extracted from evolve, with minor

D2623: dispatch: adding config items for overriding flag defaults

2018-03-04 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio updated this revision to Diff 6609. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2623?vs=6548=6609 REVISION DETAIL https://phab.mercurial-scm.org/D2623 AFFECTED FILES mercurial/configitems.py mercurial/dispatch.py mercurial/ui.py

[PATCH] xdiff: fix builds on Windows

2018-03-04 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1520194602 18000 # Sun Mar 04 15:16:42 2018 -0500 # Node ID 0c7679474cdf8077f53e470c1c4e1c7626dc0ba4 # Parent abf252a1c9387f69f2ad493c490a25cb68b88ded xdiff: fix builds on Windows This works on my ancient Fedora

Re: [PATCH STABLE] test-annotate: set stdin and stdout to binary to get CR unmodified

2018-03-04 Thread Augie Fackler
> On Mar 4, 2018, at 15:05, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1520193237 18000 > # Sun Mar 04 14:53:57 2018 -0500 > # Branch stable > # Node ID f89bc48f38c7d87e0810e9308e58bdf6ea565695 > # Parent

D2666: repair: rename _backup to backupbundle

2018-03-04 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY A future commit will introduce a caller from outside the module. The function should have already been public because

D2667: obsolete: refactor function for getting obsolete options

2018-03-04 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The function for returning obsolete option values obtains all options, validates, then returns the option that was requested. Let's create a new function to

D2648: py3: use pycompat.bytestr instead of str

2018-03-04 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG390d16ea7c76: py3: use pycompat.bytestr instead of str (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2648?vs=6597=6603

D2663: py3: use util.forcebytestr to convert testedwith value to bytes

2018-03-04 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3fdba7fb264d: py3: use util.forcebytestr to convert testedwith value to bytes (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2664: py3: use b"%d" instead of str() to convert integers to bytes

2018-03-04 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG981f328d6d16: py3: use b%d instead of str() to convert integers to bytes (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2665: py3: use bytes() instead of str()

2018-03-04 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG6bacb2f663cb: py3: use bytes() instead of str() (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2665?vs=6602=6606 REVISION

[PATCH STABLE] test-annotate: set stdin and stdout to binary to get CR unmodified

2018-03-04 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520193237 18000 # Sun Mar 04 14:53:57 2018 -0500 # Branch stable # Node ID f89bc48f38c7d87e0810e9308e58bdf6ea565695 # Parent 9a08f7d18c207c590bab631b6daeb5ecfcb6d4b0 test-annotate: set stdin and stdout to binary to get CR

Re: [PATCH STABLE] test-annotate: rewrite sed with some python

2018-03-04 Thread Matt Harbison
On Sun, 04 Mar 2018 14:53:00 -0500, Yuya Nishihara wrote: On Sun, 04 Mar 2018 14:45:01 -0500, Matt Harbison wrote: On Sun, 04 Mar 2018 13:24:20 -0500, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1520187545

Re: [PATCH] lock: block signal interrupt while making a lock file

2018-03-04 Thread Yuya Nishihara
On Sun, 04 Mar 2018 14:31:30 -0500, Matt Harbison wrote: > On Sun, 04 Mar 2018 14:18:04 -0500, Yuya Nishihara wrote: > > > On Sun, 04 Mar 2018 13:55:40 -0500, Matt Harbison wrote: > >> On Sun, 04 Mar 2018 12:35:52 -0500, Kevin Bullock > >> wrote:

Re: [PATCH STABLE] test-annotate: rewrite sed with some python

2018-03-04 Thread Yuya Nishihara
On Sun, 04 Mar 2018 14:45:01 -0500, Matt Harbison wrote: > On Sun, 04 Mar 2018 13:24:20 -0500, Yuya Nishihara wrote: > > > # HG changeset patch > > # User Yuya Nishihara > > # Date 1520187545 18000 > > # Sun Mar 04 13:19:05 2018 -0500 > > # Branch stable > > #

D2665: py3: use bytes() instead of str()

2018-03-04 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 6602. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2665?vs=6600=6602 REVISION DETAIL https://phab.mercurial-scm.org/D2665 AFFECTED FILES mercurial/revlog.py CHANGE DETAILS diff --git a/mercurial/revlog.py

D2664: py3: use b"%d" instead of str() to convert integers to bytes

2018-03-04 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 6601. Herald added a reviewer: indygreg. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2664?vs=6599=6601 REVISION DETAIL https://phab.mercurial-scm.org/D2664 AFFECTED FILES mercurial/context.py

Re: [PATCH STABLE] test-annotate: rewrite sed with some python

2018-03-04 Thread Matt Harbison
On Sun, 04 Mar 2018 13:24:20 -0500, Yuya Nishihara wrote: # HG changeset patch # User Yuya Nishihara # Date 1520187545 18000 # Sun Mar 04 13:19:05 2018 -0500 # Branch stable # Node ID 0c042b499ba989d193783a5cd64cca866ce01ae8 # Parent

D2647: setdiscovery: include all local heads in second "known" request (issue5809)

2018-03-04 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D2647#42980, @indygreg wrote: > The commit message looks incomplete? > > We really want a change like this to be documented. Could you please write more in the commit message and inline? The docstring of

D2648: py3: use pycompat.bytestr instead of str

2018-03-04 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 6597. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2648?vs=6562=6597 REVISION DETAIL https://phab.mercurial-scm.org/D2648 AFFECTED FILES mercurial/cmdutil.py mercurial/commands.py mercurial/debugcommands.py

D2664: py3: use b"%d" instead of str() to convert integers to bytes

2018-03-04 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/D2664 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D2665: py3: use bytes() instead of str()

2018-03-04 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2665 AFFECTED FILES mercurial/revlog.py CHANGE DETAILS diff --git

D2663: py3: use util.forcebytestr to convert testedwith value to bytes

2018-03-04 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Bad extensions can put anything in testedwith so we should use util.forcebytestr here. REPOSITORY rHG Mercurial REVISION DETAIL

Re: [PATCH] lock: block signal interrupt while making a lock file

2018-03-04 Thread Matt Harbison
On Sun, 04 Mar 2018 14:18:04 -0500, Yuya Nishihara wrote: On Sun, 04 Mar 2018 13:55:40 -0500, Matt Harbison wrote: On Sun, 04 Mar 2018 12:35:52 -0500, Kevin Bullock wrote: >> On Mar 4, 2018, at 11:48, Yuya Nishihara wrote: >>

D2625: xxhash: vendor external library

2018-03-04 Thread indygreg (Gregory Szorc)
indygreg abandoned this revision. indygreg added a comment. I'm going to let @quark do his work first. I may revive these later if there's still a need. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2625 To: indygreg, #hg-reviewers, quark Cc: mercurial-devel

D2646: setdiscovery: avoid a Yoda condition

2018-03-04 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG59802fa590db: setdiscovery: avoid a Yoda condition (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2646?vs=6558=6596

  1   2   3   >