D6025: remotefilelog: fix format str, blobsize isn't always a #, can be "(missing)"

2019-02-26 Thread spectral (Kyle Lippincott)
This revision was automatically updated to reflect the committed changes. spectral marked an inline comment as done. Closed by commit rHG941685500125: remotefilelog: fix format str, blobsize isn't always a #, can be "(missing)" (authored by spectral, committed by ). REPOSITORY rHG Mercurial C

Re: Stop bugzilla bot from marking issues as "RESOLVED ARCHIVED".

2019-02-26 Thread Faheem Mitha
Hi folks, See below. On Tue, 29 Jan 2019, Pulkit Goyal wrote: Hey everyone, I am quite annoyed by the bugzilla bot marking inactive issues as RESOLVED ARCHIVED. Following are the reasons why I want the bot should be stopped to do that. 1) Handful of issues only live in a state of bot mark

D6025: remotefilelog: fix format str, blobsize isn't always a #, can be "(missing)"

2019-02-26 Thread spectral (Kyle Lippincott)
spectral marked an inline comment as done. spectral added inline comments. INLINE COMMENTS > pulkit wrote in debugcommands.py:279 > It was changed to `%d` because `%s % int` does not work on Python 3. I think > `%s % pycompat.bytestr(blobsize)` should work on both python versions. Changed to us

D6025: remotefilelog: fix format str, blobsize isn't always a #, can be "(missing)"

2019-02-26 Thread spectral (Kyle Lippincott)
spectral updated this revision to Diff 14249. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6025?vs=14243&id=14249 REVISION DETAIL https://phab.mercurial-scm.org/D6025 AFFECTED FILES hgext/remotefilelog/debugcommands.py CHANGE DETAILS diff --git a/

Re: [PATCH stable] rebase: add missing dashes in help text

2019-02-26 Thread Pulkit Goyal
On Wed, Feb 27, 2019 at 1:59 AM Manuel Jacob wrote: > # HG changeset patch > # User Manuel Jacob > # Date 1550952807 -3600 > # Sat Feb 23 21:13:27 2019 +0100 > # Branch stable > # Node ID 3db4cf0024af5b880da998e8800c0eb2732e6f5b > # Parent a62690659d6bbe5abd4bb1a45248b0c760cb9188 > # EXP-T

[PATCH stable] rebase: add missing dashes in help text

2019-02-26 Thread Manuel Jacob
# HG changeset patch # User Manuel Jacob # Date 1550952807 -3600 # Sat Feb 23 21:13:27 2019 +0100 # Branch stable # Node ID 3db4cf0024af5b880da998e8800c0eb2732e6f5b # Parent a62690659d6bbe5abd4bb1a45248b0c760cb9188 # EXP-Topic rebase-help-text-typo rebase: add missing dashes in help text di

[Bug 6094] New: `hg incoming` incorrectly reports that csets that are obsolete but present both locally and remotely will be pulled in from remote

2019-02-26 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6094 Bug ID: 6094 Summary: `hg incoming` incorrectly reports that csets that are obsolete but present both locally and remotely will be pulled in from remote Product: Mercurial

D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977)

2019-02-26 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D5940#87925, @martinvonz wrote: > In https://phab.mercurial-scm.org/D5940#87924, @pulkit wrote: > > > In https://phab.mercurial-scm.org/D5940#87923, @martinvonz wrote: > > > > > Do we really want to tell the user to set an e

D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977)

2019-02-26 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D5940#87924, @pulkit wrote: > In https://phab.mercurial-scm.org/D5940#87923, @martinvonz wrote: > > > Do we really want to tell the user to set an experimental option? I prefer exposing it as --allow-dirty-working-copy. >

[Bug 6093] New: pick can great bogus marker to the pick "destination"

2019-02-26 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6093 Bug ID: 6093 Summary: pick can great bogus marker to the pick "destination" Product: Mercurial Version: unspecified Hardware: PC OS: Mac OS Status: UNCONFIRMED

D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977)

2019-02-26 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D5940#87923, @martinvonz wrote: > Do we really want to tell the user to set an experimental option? I prefer exposing it as --allow-dirty-working-copy. Well I am happy with that. We should delete the config option then. RE

D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977)

2019-02-26 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. Do we really want to tell the user to set an experimental option? I prefer exposing it as --allow-dirty-working-copy. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5940 To: navaneeth.suresh, #hg-reviewers Cc: martinvonz, pulkit, mer

D4664: mergecommit: add a new extension to merge in-memory and create a commit

2019-02-26 Thread pulkit (Pulkit Goyal)
pulkit added a comment. I don't aim for this to get reviewed and pushed. This is here right now for sharing. We are using this extension internally for months now and has shown good results. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4664 To: pulkit, #hg-r

D4664: mergecommit: add a new extension to merge in-memory and create a commit

2019-02-26 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 14248. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4664?vs=11198&id=14248 REVISION DETAIL https://phab.mercurial-scm.org/D4664 AFFECTED FILES hgext/mergecommit.py mercurial/filemerge.py tests/test-mergecommi

D6024: remotefilelog: do not specify an explicit version for repack

2019-02-26 Thread spectral (Kyle Lippincott)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG118c1ec4f31b: remotefilelog: do not specify an explicit version for repack (authored by spectral, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6

D6025: remotefilelog: fix format str, blobsize isn't always a #, can be "(missing)"

2019-02-26 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > debugcommands.py:279 > blobsize = "(missing)" > -ui.write("%s %s %s%d\n" % ( > +ui.write("%s %s %s%s\n" % ( > hashformatter(node), It was changed to `%d` because `%s % int` does not work

D6028: branchmap: prevent reading the file twice through different iterators

2019-02-26 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Otherwise, test-static-http.t breaks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6028 AFFECTED FILES mercurial/branchmap.py CH

D6026: lock: Improve the waiting for lock message which will help newcomers(issue6081)

2019-02-26 Thread akshjain.jain74 (Akshit Jain)
akshjain.jain74 added a comment. Ya I am sending that just trying to find out the file REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6026 To: akshjain.jain74, #hg-reviewers Cc: pulkit, mercurial-devel ___ Mercurial-d

D6026: lock: Improve the waiting for lock message which will help newcomers(issue6081)

2019-02-26 Thread pulkit (Pulkit Goyal)
pulkit added a comment. This patch does not changes any code. It only changes some test output. You need to change the error message in the code. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6026 To: akshjain.jain74, #hg-reviewers Cc: pulkit, mercurial-devel

D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977)

2019-02-26 Thread pulkit (Pulkit Goyal)
pulkit added a comment. This patch changes uncommit behavior to always require `experimental.uncommitondirtywdir` option if wdir is dirty. However what we want when wdir is dirty is as follows: `hg uncommit` : abort and require `experimental.uncommitondirtywdir` `hg uncommit PATH`: wor

D6027: mq: make unshelve to apply on modified mq patch (issue4318)

2019-02-26 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a reviewer: martinvonz. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY unshelve wasn't working on a modified mq patch. I added checks for not aborting on a modified mq patch in both rebase

D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977)

2019-02-26 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Ping for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5940 To: navaneeth.suresh, #hg-reviewers Cc: martinvonz, pulkit, mercurial-devel ___ Mercurial-devel mailing list Mercur

D6026: lock: Improve the waiting for lock message which will help newcomers(issue6081)

2019-02-26 Thread akshjain.jain74 (Akshit Jain)
akshjain.jain74 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/D6026 AFFECTED FILES tests/test-lock-badness.t CHANGE DETAILS diff --git a/tests/test-lock-bad