D7465: filemerge: fix a missing attribute usage

2019-11-20 Thread mharbison72 (Matt Harbison)
mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Flagged by both pytype and VSCode. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7465 AFFECTED FILES mercurial/filemerge.py

D7464: filemerge: drop a default argument to appease pytype

2019-11-20 Thread mharbison72 (Matt Harbison)
mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The function slices and takes the length of this argument without internally setting it if not provided. There was no bug here because both callers passed

D7463: wireprotov1server: capture Abort type before accessing the `hint` attribute

2019-11-20 Thread mharbison72 (Matt Harbison)
mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Although the previous code worked, pytypes complained because `exc` is caught above as `BundleValueError, Abort, PushRaced`, and the other two don't have

D7462: py3: make doc strings containing the deprected '\.' escape sequence raw strings

2019-11-20 Thread dploch (Daniel Ploch)
dploch 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/D7462 AFFECTED FILES mercurial/match.py CHANGE DETAILS diff --git a/mercurial/match.py

[PATCH STABLE] singlehead: making config item a bool again

2019-11-20 Thread Georges Racinet
# HG changeset patch # User Georges Racinet # Date 1574273222 -3600 # Wed Nov 20 19:07:02 2019 +0100 # Branch stable # Node ID c557e15674ea6adfe1b034e5b4af1e26bca850dd # Parent ca3dca416f8d5863ca6f5a4a6a6bb835dcd5feeb # EXP-Topic single_head_is_boolean singlehead: making config item a bool

D7204: fsmonitor: reapply b1f62cd39b5c

2019-11-20 Thread marmoute (Pierre-Yves David)
marmoute added a comment. Same question as for D7203 Out of curiosity, was the fix submitted upstream too ? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7204/new/ REVISION DETAIL

D7203: fsmonitor: reapply dd35abc409ee

2019-11-20 Thread marmoute (Pierre-Yves David)
marmoute added a comment. Out of curiosity, was the fix submitted upstream too ? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7203/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7203 To: indygreg, #hg-reviewers Cc: marmoute, mercurial-devel

mercurial@43718: 8 new changesets

2019-11-20 Thread Mercurial Commits
8 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/7f443cce2972 changeset: 43711:7f443cce2972 parent: 43709:039fbd14d4e2 user:Martin von Zweigbergk date:Fri Nov 15 14:41:00 2019 -0800 summary: commit: rewrite check for `hg ci ` being a directory

D7461: py3: wrap a __func__ in sysbytes() before logging as bytes

2019-11-20 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D7461 AFFECTED FILES hgext/remotefilelog/basestore.py CHANGE DETAILS diff --git

D7460: tests: add more tests for "hg shelve --delete"

2019-11-20 Thread mharbison72 (Matt Harbison)
mharbison72 added a comment. mharbison72 accepted this revision. LGTM REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7460/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7460 To: dlax, #hg-reviewers, mharbison72 Cc: mharbison72,

D7458: shelve: add the missing `create` parameter to the bundlerepo constructor

2019-11-20 Thread mharbison72 (Matt Harbison)
mharbison72 added a comment. In D7458#109743 , @dlax wrote: > Good catch. > On the other hand, it's not clear to me what's the point of this "create" argument given `bundlerepo.instance()` will just use it to raise Abort if it is true.

D7460: tests: add more tests for "hg shelve --delete"

2019-11-20 Thread dlax (Denis Laxalde)
dlax updated this revision to Diff 18250. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7460?vs=18249=18250 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7460/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7460

D7460: tests: add more tests for "hg shelve --delete"

2019-11-20 Thread mharbison72 (Matt Harbison)
mharbison72 added inline comments. INLINE COMMENTS > test-shelve.t:958 > + $ hg shelve --list > + default (1s ago)changes to: create conflict > + $ hg shelve --delete doesnotexist The exact time should probably be globbed away. REPOSITORY rHG Mercurial CHANGES SINCE LAST

D7458: shelve: add the missing `create` parameter to the bundlerepo constructor

2019-11-20 Thread dlax (Denis Laxalde)
dlax added a comment. dlax accepted this revision. Good catch. On the other hand, it's not clear to me what's the point of this "create" argument given `bundlerepo.instance()` will just use it to raise Abort if it is true. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D7460: tests: add more tests for "hg shelve --delete"

2019-11-20 Thread dlax (Denis Laxalde)
dlax created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It appears that the only tests for "hg shelve --delete" concern command errors (e.g. incompatible command options). Adding some more to check that non-existent