D5626: scmutil: drop unreachable except clause

2019-01-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY socket.error is a subclass of IOError, which we catch higher up. It seems to have been this way since https://phab.mercurial-scm.org/rHG020a896a5292b647a920026

D5625: tests: suppress "Checked out 1 paths of " from modern git

2019-01-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY test-convert-git.t is failiing since git commit 0f086e6dca (checkout: print something when checking out paths, 2018-11-13). Suppress the new output by disambi

D5622: localrepo: use context manager for transaction in commit()

2019-01-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY A side-effect is that the transaction is released a little earlier, so the "commit message saved in ..." messages now comes af

D5624: localrepo: use context manager for lock and transaction in commitctx()

2019-01-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D5624 AFFECTED FILES mercurial/localrepo.py CHANGE DETAILS diff --git a/mercurial/localrepo.py b/me

D5623: localrepo: use context manager for locks in commit()

2019-01-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D5623 AFFECTED FILES mercurial/localrepo.py CHANGE DETAILS diff --git a/mercurial/localrepo.py b/me

D5621: commit: print "commit message saved in" message also if bookmark update fails

2019-01-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The bookmark update is done within the same transaction, so if fails, the commit will also be rolled back. I just happened to notice this while messing wit

[PATCH] tests: also skip remotefilelog *.py tests on Windows

2019-01-16 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1547693656 18000 # Wed Jan 16 21:54:16 2019 -0500 # Node ID 4b4a6ca03f04601ea00e6028cbc96882c161e142 # Parent 73b630278375d51137772d30fa93f9fe009441de tests: also skip remotefilelog *.py tests on Windows Otherwise, the buildbot won't even be

[PATCH] exthelper: drop the addattr() decorator

2019-01-16 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1547702160 18000 # Thu Jan 17 00:16:00 2019 -0500 # Node ID 73b630278375d51137772d30fa93f9fe009441de # Parent 4c0d4bbdc39537d00c764b99e88f22e41303cf42 exthelper: drop the addattr() decorator Yuya pointed out that this goes against the typical

D5493: match: support rooted globs in hgignore

2019-01-16 Thread valentin.gatienbaron (Valentin Gatien-Baron)
valentin.gatienbaron added a comment. Alright, I think I did what you asked for. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5493 To: valentin.gatienbaron, #hg-reviewers Cc: yuja, foozy, mercurial-devel ___ Mercuria

D5620: grep: don't look up copy info unless --follow is given

2019-01-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If no --follow was given, then the "copy" variable will become None. In that case we would still look up the copy information from the filelog and then ignore

D5619: tests: sort py3 whitelist to make test-check-code.t happy

2019-01-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D5619 AFFECTED FILES contrib/python3-whitelist CHANGE DETAILS diff

D5618: bdiff: drop duplicate definition of splitnewlines()

2019-01-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It was added in https://phab.mercurial-scm.org/rHG29dd37a418aa26194a40ad603e918a7373e8c5e2 (bdiff: write a native version of splitnewlines, 2018-01-25). REPO

D5590: watchman: ignore some of watchman errors

2019-01-16 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. I don't suppose there's a way to easily test this? I'm guessing not... The change seems reasonable though. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.o

D5589: watchman: add the possibility to set the exact watchman binary location

2019-01-16 Thread indygreg (Gregory Szorc)
indygreg added a comment. Overall I like the feature. But the class initialization logic is wonky. That's not your fault: you happen to be wading into a mess. Since it looks like there will be a v2 on this series, I'd encourage you to add some inline comments about the `__init__` mess at the

D5616: py3: add 11 more passing tests caught by ratchet

2019-01-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9eb8c54471b9: py3: add 11 more passing tests caught by ratchet (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5616?vs=13297&i

D5617: py3: test*gendoc*.t passes on Python 3

2019-01-16 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 The buildbot didn't notice because docutils isn't installed in Python 3 there yet. I verified this locally. REPOSITORY rHG Merc

D5243: resolve: fix mark-check when a file was deleted on one side (issue6020)

2019-01-16 Thread spectral (Kyle Lippincott)
spectral updated this revision to Diff 13298. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5243?vs=12476&id=13298 REVISION DETAIL https://phab.mercurial-scm.org/D5243 AFFECTED FILES mercurial/commands.py tests/test-resolve.t CHANGE DETAILS diff

D5243: resolve: fix mark-check when a file was deleted on one side (issue6020)

2019-01-16 Thread spectral (Kyle Lippincott)
spectral added a comment. Alright that test seems a bit ridiculous now that I'm looking at it in the diff, but it's at least thorough? :) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5243 To: spectral, #hg-reviewers Cc: yuja, mercurial-devel _

D5588: watchman: disable fsmonitor when running non-interactively

2019-01-16 Thread indygreg (Gregory Szorc)
indygreg requested changes to this revision. indygreg added a comment. This revision now requires changes to proceed. Why wouldn't we want automated, non-interactive tools to have the benefits of watchman? There are plenty of use cases where complex Mercurial operations are scripted and would

D5587: watchman: detect nested mercurial repositories and abort

2019-01-16 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added inline comments. This revision is now accepted and ready to land. INLINE COMMENTS > __init__.py:766-768 > +for f in os.listdir(repo.root): > +if os.path.isdir(os.path.join(repo.root, f, '.hg')): > +return True Nit: we should

D5586: watchman: add verbose config knob

2019-01-16 Thread indygreg (Gregory Szorc)
indygreg added a comment. This new config knob defaults to off and we're therefore changing the behavior to not warn when watchman is unavailable. This is a bit concerning to me because someone could have fsmonitor enabled and I don't think they'd ever get an error if watchman isn't working

D5616: py3: add 11 more passing tests caught by ratchet

2019-01-16 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Thanks to Augie who fixed these tests recently. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5616 AFFECTED FILES contrib/python3-

Re: [PATCH 2 of 2] rust-cpython: using rustext.dagop.headrevs in revlog

2019-01-16 Thread Georges Racinet
On 1/16/19 7:40 PM, Pulkit Goyal wrote: > Nice work! Only reviewing the commit message as I don't know rust. Can > you mention on which repo these benchmarks were performed? Thanks! Actually the results are better that I'd thought. The benchmarks are done on a PyPy clone of last summer. If you

Re: [PATCH 2 of 2] rust-cpython: using rustext.dagop.headrevs in revlog

2019-01-16 Thread Pulkit Goyal
On Wed, Jan 16, 2019 at 11:55 PM Georges Racinet < georges.raci...@octobus.net> wrote: > > On 1/16/19 7:15 PM, Georges Racinet wrote: > > # HG changeset patch > > # User Georges Racinet > > # Date 1547651966 -3600 > > # Wed Jan 16 16:19:26 2019 +0100 > > # Node ID 234c106610004aff294268ccda8

Re: [PATCH 2 of 2] rust-cpython: using rustext.dagop.headrevs in revlog

2019-01-16 Thread Georges Racinet
On 1/16/19 7:15 PM, Georges Racinet wrote: > # HG changeset patch > # User Georges Racinet > # Date 1547651966 -3600 > # Wed Jan 16 16:19:26 2019 +0100 > # Node ID 234c106610004aff294268ccda82238164f91f64 > # Parent f32e7d90db76879096f216f23ebbe75772b0201e > # EXP-Topic revset.predicates >

[PATCH 1 of 2] rust-cpython: binding for headrevs()

2019-01-16 Thread Georges Racinet
# HG changeset patch # User Georges Racinet # Date 1547141118 -3600 # Thu Jan 10 18:25:18 2019 +0100 # Node ID f32e7d90db76879096f216f23ebbe75772b0201e # Parent 1271ca42622ad0677f4f1f02ebd95b3943a7d721 # EXP-Topic revset.predicates rust-cpython: binding for headrevs() This uses the core `da

[PATCH 2 of 2] rust-cpython: using rustext.dagop.headrevs in revlog

2019-01-16 Thread Georges Racinet
# HG changeset patch # User Georges Racinet # Date 1547651966 -3600 # Wed Jan 16 16:19:26 2019 +0100 # Node ID 234c106610004aff294268ccda82238164f91f64 # Parent f32e7d90db76879096f216f23ebbe75772b0201e # EXP-Topic revset.predicates rust-cpython: using rustext.dagop.headrevs in revlog As wit

D5496: revset: add "samebranch" keyword argument to the merge revset

2019-01-16 Thread angel.ezquerra (Angel Ezquerra)
angel.ezquerra added a comment. In https://phab.mercurial-scm.org/D5496#82671, @yuja wrote: > > > `[, samebranch]` or [, samebranch=False]`. > > > > I guess that means: > > > > @predicate('merge([withbranch [, samebranch=None]])', safe=True) > > > > Right? (I r

D5599: remotefilelog: import Queue on Python 2, and queue on Python 3

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG92cf293fd93d: remotefilelog: import Queue on Python 2, and queue on Python 3 (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D

D5614: fastannotate: adapt to buffer() going a way in Python 3

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGdfc73c803b77: fastannotate: adapt to buffer() going a way in Python 3 (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5614?vs

D5615: py3: all fastannotate tests now pass

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG433c736f6f1c: py3: all fastannotate tests now pass (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5615?vs=13276&id=13294 RE

D5612: fastannotate: slice strings to get single character

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGe40b7a504b1d: fastannotate: slice strings to get single character (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5612?vs=132

D5611: fastannotate: fix isinstance checks to be against bytes instead of str

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG1198c86beb73: fastannotate: fix isinstance checks to be against bytes instead of str (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-s

D5613: fastannotate: use pycompat.maplist instead of map

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc2f62720e37d: fastannotate: use pycompat.maplist instead of map (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5613?vs=13274

D5610: absorb: add a pycompat.bytestr() to fix --edit-lines functionality on Python 3

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc146651a78e1: absorb: add a pycompat.bytestr() to fix --edit-lines functionality on Python 3 (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mer

D5609: remotefilelog: fix some bytes/str portability issues for Python 3

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG194e43c2bac9: remotefilelog: fix some bytes/str portability issues for Python 3 (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.or

D5608: shallowutil: fsdecode the bytes group name before passing to os

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa6b98c95bcf0: shallowutil: fsdecode the bytes group name before passing to os (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/

D5604: tests: fix up uses of xrange in remotefilelog tests for py3

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG2888d12b80a6: tests: fix up uses of xrange in remotefilelog tests for py3 (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D560

D5607: shallowutil: slice off a byte instead of subscripting

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd08c816a11d3: shallowutil: slice off a byte instead of subscripting (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5607?vs=1

D5606: remotefilelog: check against bytes type instead of buffer and coerce to bytes

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGebda5d4265ec: remotefilelog: check against bytes type instead of buffer and coerce to bytes (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.merc

D5605: remotefilelog: use list comprehension instead of filter for py3 portability

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG60b3edccf2f7: remotefilelog: use list comprehension instead of filter for py3 portability (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercur

D5602: tests: make python oneliner portable to python 3 in remotefilelog test

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa495435d980e: tests: make python oneliner portable to python 3 in remotefilelog test (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-s

D5603: tests: add missing b prefixes in remotefilelog-getflogheads.py

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG29996f6c2687: tests: add missing b prefixes in remotefilelog-getflogheads.py (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D

D5601: remotefilelog: implement __bool__ as well as __nonzero__ for py3

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGbeb0d944a99b: remotefilelog: implement __bool__ as well as __nonzero__ for py3 (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org

D5600: remotefilelog: fix logging in retry decorator

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8a6995513d9a: remotefilelog: fix logging in retry decorator (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5600?vs=13260&id=

D5597: remotefilelog: do file IO in terms of bytes

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG312afd164009: remotefilelog: do file IO in terms of bytes (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5597?vs=13257&id=13

D5598: basepack: avoid 'rbe' mode in Python 3

2019-01-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc891a11ffe27: basepack: avoid 'rbe' mode in Python 3 (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5598?vs=13258&id=13279

mercurial@41234: 8 new changesets

2019-01-16 Thread Mercurial Commits
8 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/b74481038438 changeset: 41227:b74481038438 user:Martin von Zweigbergk date:Sat Dec 29 22:27:39 2018 -0800 summary: narrow: make dirstateguard back up and restore working copy narrowspec instead https:

D5599: remotefilelog: import Queue on Python 2, and queue on Python 3

2019-01-16 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 13277. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5599?vs=13259&id=13277 REVISION DETAIL https://phab.mercurial-scm.org/D5599 AFFECTED FILES hgext/remotefilelog/basestore.py CHANGE DETAILS diff --git a/hgext

D5615: py3: all fastannotate tests now pass

2019-01-16 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/D5615 AFFECTED FILES contrib/python3-whitelist CHANGE DETAILS diff --

D5614: fastannotate: adapt to buffer() going a way in Python 3

2019-01-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY There's probably something more efficient I could do here, but I'm disinclined to spend much time on this at the moment. REPOSITORY rHG Mercurial REVISION DETA

D5613: fastannotate: use pycompat.maplist instead of map

2019-01-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/D5613 AFFECTED FILES hgext/fastannotate/formatter.py CHANGE DETAILS diff --git a/hgext/fastannotate/fo

D5612: fastannotate: slice strings to get single character

2019-01-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Behaves identically on Python 3 and Python 2. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5612 AFFECTED FILES hgext/fastannotat

D5611: fastannotate: fix isinstance checks to be against bytes instead of str

2019-01-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/D5611 AFFECTED FILES hgext/fastannotate/context.py CHANGE DETAILS diff --git a/hgext/fastannotate/cont

D5602: tests: make python oneliner portable to python 3 in remotefilelog test

2019-01-16 Thread durin42 (Augie Fackler)
durin42 added a comment. In https://phab.mercurial-scm.org/D5602#82808, @pulkit wrote: > It's weird that print works as a function too in Python 2. It's a hack: in the case of `print(one_item)` the parens are a noop on Python 2 and a function call on Python 3. REPOSITORY rHG Me

D5602: tests: make python oneliner portable to python 3 in remotefilelog test

2019-01-16 Thread pulkit (Pulkit Goyal)
pulkit accepted this revision. pulkit added a comment. It's weird that print works as a function too in Python 2. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5602 To: durin42, #hg-reviewers, pulkit Cc: pulkit, mercurial-devel _

D5599: remotefilelog: import Queue on Python 2, and queue on Python 3

2019-01-16 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D5599#82802, @pulkit wrote: > Let's use pycompat.queue() for consistency. s/queue()/queue/ REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5599 To: durin42, #hg-reviewers Cc: pulkit, mjpieters

D5599: remotefilelog: import Queue on Python 2, and queue on Python 3

2019-01-16 Thread pulkit (Pulkit Goyal)
pulkit added a comment. Let's use pycompat.queue() for consistency. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5599 To: durin42, #hg-reviewers Cc: pulkit, mjpieters, mercurial-devel ___ Mercurial-devel mailing list

D5610: absorb: add a pycompat.bytestr() to fix --edit-lines functionality on Python 3

2019-01-16 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/D5610 AFFECTED FILES contrib/python3-whitelist hgext/absorb.py CHANG

D5493: match: support rooted globs in hgignore

2019-01-16 Thread valentin.gatienbaron (Valentin Gatien-Baron)
valentin.gatienbaron updated this revision to Diff 13270. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5493?vs=13229&id=13270 REVISION DETAIL https://phab.mercurial-scm.org/D5493 AFFECTED FILES mercurial/help/hgignore.txt mercurial/help/patterns.t

D5510: narrow: reuse narrowspec.updateworkingcopy() when widening

2019-01-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D5510#82651, @yuja wrote: > Fixed pyflakes warnings in flight. > > hgext/narrow/narrowcommands.py:13: 'mercurial.merge' imported but unused > hgext/narrow/narrowcommands.py:262: local variable 'newmatch' is assigned t

D5609: remotefilelog: fix some bytes/str portability issues for Python 3

2019-01-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY A few remotefilelog tests still fail on Python 3, but it's a much better story now. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D

D5608: shallowutil: fsdecode the bytes group name before passing to os

2019-01-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/D5608 AFFECTED FILES hgext/remotefilelog/shallowutil.py CHANGE DETAILS diff --git a/hgext/remotefilelo

D5604: tests: fix up uses of xrange in remotefilelog tests for py3

2019-01-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/D5604 AFFECTED FILES tests/test-remotefilelog-cacheprocess.t tests/test-remotefilelog-datapack.py CHA

D5607: shallowutil: slice off a byte instead of subscripting

2019-01-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This behaves identically on Python 2 and 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5607 AFFECTED FILES hgext/remotefilelog

D5605: remotefilelog: use list comprehension instead of filter for py3 portability

2019-01-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/D5605 AFFECTED FILES hgext/remotefilelog/repack.py CHANGE DETAILS diff --git a/hgext/remotefilelog/rep

D5606: remotefilelog: check against bytes type instead of buffer and coerce to bytes

2019-01-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Fixes Python 3 compat here. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5606 AFFECTED FILES hgext/remotefilelog/shallowbundle.p

D5603: tests: add missing b prefixes in remotefilelog-getflogheads.py

2019-01-16 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 b prefixes REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5603 AFFECTED FILES tests/remotefilelog-getflogheads.

D5602: tests: make python oneliner portable to python 3 in remotefilelog test

2019-01-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/D5602 AFFECTED FILES tests/test-remotefilelog-http.t CHANGE DETAILS diff --git a/tests/test-remotefile

D5601: remotefilelog: implement __bool__ as well as __nonzero__ for py3

2019-01-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/D5601 AFFECTED FILES hgext/remotefilelog/remotefilelog.py CHANGE DETAILS diff --git a/hgext/remotefile

D5600: remotefilelog: fix logging in retry decorator

2019-01-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This still fails with an error about no exception being available to re-raise, but so it goes. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercuria

D5599: remotefilelog: import Queue on Python 2, and queue on Python 3

2019-01-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5599 AFFECTED FILES hgext/remotefilelog/basestore.py CHANGE DETAILS diff --git a/hgext/remo

D5598: basepack: avoid 'rbe' mode in Python 3

2019-01-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5598 AFFECTED FILES hgext/remotefilelog/basepack.py CHANGE DETAILS diff --git a/hgext/remot

D5597: remotefilelog: do file IO in terms of bytes

2019-01-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/D5597 AFFECTED FILES hgext/remotefilelog/__init__.py CHANGE DETAILS diff --git a/hgext/remotefilelog/_

mercurial@41226: 3 new changesets

2019-01-16 Thread Mercurial Commits
3 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/b129837190f7 changeset: 41224:b129837190f7 user:Kyle Lippincott date:Tue Jan 15 15:43:00 2019 -0800 summary: context: use scmutil.matchfiles instead of matchmod.match(exact=True) https://www.mercurial

D5579: rust: factorized testing Graphs

2019-01-16 Thread gracinet (Georges Racinet)
gracinet added a comment. @yuja the doc you're linking is about integration tests, so it wouldn't apply to these tests which are really unitary in my mind. Usually the main difference would be the access to the private constructs that the integration tests can't perform, but it's true that m

Re: [PATCH 4 of 4] mmapindex: set default to 1MB

2019-01-16 Thread Boris FELD
On 11/01/2019 15:46, Yuya Nishihara wrote: > On Fri, 11 Jan 2019 09:59:49 +0100, Boris FELD wrote: >> On 11/01/2019 01:05, Gregory Szorc wrote: >>> On Thu, Jan 10, 2019 at 9:03 AM Boris FELD >> > wrote: >>> >>> On 08/01/2019 15:41, Yuya Nishihara wrote: >>> >

Re: [PATCH V2] revset: support ranges in #generations relation

2019-01-16 Thread Yuya Nishihara
On Wed, 16 Jan 2019 18:29:57 +0800, Anton Shestakov wrote: > # HG changeset patch > # User Anton Shestakov > # Date 1547564229 -28800 > # Tue Jan 15 22:57:09 2019 +0800 > # Node ID 039a0d0d913afac1464bfc1ea8a49b22e803b081 > # Parent 8aca89a694d4bd7d25877b3652fb83e187ea1802 > revset: support

D5493: match: support rooted globs in hgignore

2019-01-16 Thread yuja (Yuya Nishihara)
yuja added a comment. > I haven't handled your other remark, I think `rootglob:` can be easily added. As we already have cwd-relative `glob:`, we'll just need some "if"s to not rewrite a repo.root-relative path to cwd-relative path. This patch works, but it's technically incorrect

Re: D5493: match: support rooted globs in hgignore

2019-01-16 Thread Yuya Nishihara
> I haven't handled your other remark, I think `rootglob:` can be easily added. As we already have cwd-relative `glob:`, we'll just need some "if"s to not rewrite a repo.root-relative path to cwd-relative path. This patch works, but it's technically incorrect since `glob:` isn't a repo.root-relat

D5496: revset: add "samebranch" keyword argument to the merge revset

2019-01-16 Thread yuja (Yuya Nishihara)
yuja added a comment. > > `[, samebranch]` or [, samebranch=False]`. > > I guess that means: > > @predicate('merge([withbranch [, samebranch=None]])', safe=True) > > Right? (I realized that it is incorrect to say that samebranch's default value is False). Okay

Re: D5496: revset: add "samebranch" keyword argument to the merge revset

2019-01-16 Thread Yuya Nishihara
> > `[, samebranch]` or [, samebranch=False]`. > > I guess that means: > > @predicate('merge([withbranch [, samebranch=None]])', safe=True) > > Right? (I realized that it is incorrect to say that samebranch's default > value is False). Okay, I didn't notice that. And it's tricky

D5551: rust-cpython: using MissingAncestors from Python code

2019-01-16 Thread gracinet (Georges Racinet)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa89b20a49c13: rust-cpython: using MissingAncestors from Python code (authored by gracinet, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5551?vs=

D5584: rust: MissingAncestors.basesheads()

2019-01-16 Thread gracinet (Georges Racinet)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG619ee4039bd4: rust: MissingAncestors.basesheads() (authored by gracinet, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D5584?vs=13218&id=13255#toc REPOSITORY rHG Mercurial

D5579: rust: factorized testing Graphs

2019-01-16 Thread gracinet (Georges Racinet)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG168041fa6d5f: rust: factorized testing Graphs (authored by gracinet, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5579?vs=13213&id=13250 REVISI

D5582: ancestor: incrementalmissingancestors.basesheads()

2019-01-16 Thread gracinet (Georges Racinet)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4856c9b8cbaf: ancestor: incrementalmissingancestors.basesheads() (authored by gracinet, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5582?vs=132

D5583: discovery: using the new basesheads()

2019-01-16 Thread gracinet (Georges Racinet)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG2a8782cc2e16: discovery: using the new basesheads() (authored by gracinet, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5583?vs=13217&id=13253

D5578: rust-cpython: moved generic conversion fn out of ancestors module

2019-01-16 Thread gracinet (Georges Racinet)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGff333620a4cc: rust-cpython: moved generic conversion fn out of ancestors module (authored by gracinet, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.o

D5580: rust: dagop.headrevs() Rust counterparts

2019-01-16 Thread Phabricator
This revision was automatically updated to reflect the committed changes. Closed by commit rHG47881d2a9d99: rust: dagop.headrevs() Rust counterparts (authored by Georges Racinet on ishtar.racinet.fr , committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE htt

D5581: rust-cpython: set conversion for MissingAncestors.bases()

2019-01-16 Thread gracinet (Georges Racinet)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5257e6299d4c: rust-cpython: set conversion for MissingAncestors.bases() (authored by gracinet, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5581

D5579: rust: factorized testing Graphs

2019-01-16 Thread yuja (Yuya Nishihara)
yuja added a comment. Queued the series, thanks. > +++ b/rust/hg-core/src/testing.rs Maybe we can add separate test files, but I don't know which is preferred. https://doc.rust-lang.org/book/ch11-03-test-organization.html#submodules-in-integration-tests REPOSITORY rHG Mercuri

Re: D5579: rust: factorized testing Graphs

2019-01-16 Thread Yuya Nishihara
Queued the series, thanks. > +++ b/rust/hg-core/src/testing.rs Maybe we can add separate test files, but I don't know which is preferred. https://doc.rust-lang.org/book/ch11-03-test-organization.html#submodules-in-integration-tests ___ Mercurial-devel

D5510: narrow: reuse narrowspec.updateworkingcopy() when widening

2019-01-16 Thread yuja (Yuya Nishihara)
yuja added a comment. Fixed pyflakes warnings in flight. hgext/narrow/narrowcommands.py:13: 'mercurial.merge' imported but unused hgext/narrow/narrowcommands.py:262: local variable 'newmatch' is assigned to but never used REPOSITORY rHG Mercurial REVISION DETAIL https://phab.m

Re: D5510: narrow: reuse narrowspec.updateworkingcopy() when widening

2019-01-16 Thread Yuya Nishihara
Fixed pyflakes warnings in flight. ``` hgext/narrow/narrowcommands.py:13: 'mercurial.merge' imported but unused hgext/narrow/narrowcommands.py:262: local variable 'newmatch' is assigned to but never used ``` ___ Mercurial-devel mailing list Mercurial-de

[PATCH V2] revset: support ranges in #generations relation

2019-01-16 Thread Anton Shestakov
# HG changeset patch # User Anton Shestakov # Date 1547564229 -28800 # Tue Jan 15 22:57:09 2019 +0800 # Node ID 039a0d0d913afac1464bfc1ea8a49b22e803b081 # Parent 8aca89a694d4bd7d25877b3652fb83e187ea1802 revset: support ranges in #generations relation diff --git a/mercurial/revset.py b/mercu

Re: [PATCH FOLLOW-UP] revset: transparently forward _intlist argument in all case

2019-01-16 Thread Augie Fackler
On Tue, Jan 15, 2019 at 08:43:39PM +0100, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1547580257 -3600 > # Tue Jan 15 20:24:17 2019 +0100 > # Node ID 7c8a8c0ea0c4cd1c1cbd0fb96342a45e9437d939 > # Parent 32ef47b3c91c2913ab13cabf9efcdde3ef137987 > # EXP-Topic revs-effi

Re: [PATCH 2 of 5 RFC] rust: iterator bindings to C code

2019-01-16 Thread Augie Fackler
> On Jan 16, 2019, at 11:13, Georges Racinet > wrote: > > Hi Augie, > > On 10/1/18 5:02 PM, Augie Fackler wrote: >> On Fri, Sep 28, 2018 at 03:31:09PM +0200, Georges Racinet wrote: >>> # HG changeset patch >>> # User Georges Racinet >>> # Date 1538059896 -7200 >>> # Thu Sep 27 16:51:36

Re: [PATCH 2 of 5 RFC] rust: iterator bindings to C code

2019-01-16 Thread Georges Racinet
Hi Augie, On 10/1/18 5:02 PM, Augie Fackler wrote: > On Fri, Sep 28, 2018 at 03:31:09PM +0200, Georges Racinet wrote: >> # HG changeset patch >> # User Georges Racinet >> # Date 1538059896 -7200 >> # Thu Sep 27 16:51:36 2018 +0200 >> # Node ID de88c09512565ed1c12e2ff9159e06ed8d762d15 >> # Pa

Re: [PATCH] bookmark: add an --active flag to display the active bookmark

2019-01-16 Thread Augie Fackler
(+TheMystic) On Fri, Aug 17, 2018 at 06:25:23PM +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1534432767 -7200 > # Thu Aug 16 17:19:27 2018 +0200 > # Node ID 743d3dfd61a275c393a19121de3cc24e70555c5c > # Parent 46da52f4b820f2668b120fcf93f09fb730065da6 > # EXP-T

Re: [PATCH 6 of 6] templatekw: add {size} keyword as an example of fctx-based keyword

2019-01-16 Thread Augie Fackler
On Sun, Sep 02, 2018 at 04:43:03PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1532867331 -32400 > # Sun Jul 29 21:28:51 2018 +0900 > # Node ID fabfd409466f6320b99a38a1c3e9ca5fe6f22a6d > # Parent 699afc590069f20c593f3f45c0fdc7395d567a19 > templatekw:

  1   2   >