D7667: status: make morestatus call out unresolved conflicts after update

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  This PR is doing more than one thing. I can see following independent things:
  
  - rename of `inmergestate` to `activemerge`
  - introduction of `_formattedpaths` which is used in next patch and not 
related to this one
  - what the commit message says
  
  Can we split them up?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7667/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7667

To: rdamazio, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7644: rebase: use cmdutil.check_incompatible_arguments() for --auto-orphans

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> test-rebase-obsolete.t:2057
>$ hg rebase --stop --dry-run
> -  abort: cannot specify both --dry-run and --stop
> +  abort: cannot specify both --stop and --dry-run
>[255]

Unrelated change?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7644/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7644

To: martinvonz, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7641: rebase: use cmdutil.check_at_most_one_arg() for --confirm/--dry-run

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  In D7641#113027 , @yuja wrote:
  
  >>> Spotted in a later patch, need to replace `_` back to `-` before printing 
output.
  >>
  >> Strings are immutable in Python, so it wasn't actually replaced, right? Or 
do I misunderstand your concern?
  >
  > Maybe he meant `opts[b'dry_run']` vs `--dry-run`. `*args` should follow
  > underscore naming, but the printed option names don't.
  
  Yep what Yuya said. Spotted in D7644 , 
test-rebase-obsolete.t, line 490.

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7641/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7641

To: martinvonz, #hg-reviewers, pulkit
Cc: yuja, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7631: absorb: allowing committed changes to be absorbed into their ancestors

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Can you describe the feature a bit in the commit message. Specific things 
which I feel are missing:
  
  - what happens to wdir changes
  - what happens if source is a commit is not a head
  
  I understand them but after reading the tests, so might be worth to add them 
to description.
  
  Also, it will be nice if you add an entry in releasenotes.

INLINE COMMENTS

> absorb.py:993
>  raise error.Abort(_(b'cannot absorb into a merge'))
> +if len(targetctx.parents()) > 1:
> +raise error.Abort(_(b'cannot absorb a merge'))

need to do more checks here about being public commit etc. 
`rewriteutil.precheck` should help.

> test-absorb-rev.t:73
> +
> +  $ grep 6 a
> +  6

`hg status|diff` should be a better command here.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7631/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7631

To: rdamazio, #hg-reviewers
Cc: pulkit, quark, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7652: test: extract some generic data and utility from test-rust-ancestor.py

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> revlog.py:34
> +cparsers is None,
> +"The C Extension parsers module tests relies on is not available",
> +)

this and next message requires an oxford comma to help understand better.

> test-rust-ancestor.py:34
>  @unittest.skipIf(
> -rustext is None or cparsers is None,
> +rustext is None, "rustext module ancestor relies on is not available",
> +)

this is the next one.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7652/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7652

To: marmoute, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7624: rcutil: don't check if defaultrc/ is a directory -- we know it is

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  I am unable to find some code or understand the reasoning behind `-- we know 
this` part.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7624/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7624

To: martinvonz, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7627: config: drop debug messages saying where config was read from

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  After recent iteration, commit message needs to be reworked. Maybe I am 
biased because I know what the old version was and is still parsing the commit 
message that way.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7627/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7627

To: martinvonz, #hg-reviewers
Cc: pulkit, mharbison72, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7679: windows: if username(uid=None) is loaded, just use getpass

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added inline comments.
pulkit accepted this revision.

INLINE COMMENTS

> windows.py:566
>  
>  If uid is None, return the name of the current user."""
> +if not uid:

Nice, seems like the old documentation was wrong.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7679/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7679

To: durin42, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7641: rebase: use cmdutil.check_at_most_one_arg() for --confirm/--dry-run

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> cmdutil.py:272
>  if previous:
>  raise error.Abort(
>  _(b'cannot specify both --%s and --%s') % (previous, x)

Spotted in a later patch, need to replace `_` back to `-` before printing 
output.

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7641/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7641

To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7637: pathbomb: use cmdutil.check_at_most_one_arg()

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Renaming `pathbomb` to `patchbomb` in message title.

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7637/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7637

To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7633: clone: extract helper for checking mutually exclusive args

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> martinvonz wrote in cmdutil.py:263
> I don't think I'd be able to guess what a function by that name did either.  
> `check_at_most_one_argument` seems clearer, but maybe too long. I'll wait a 
> bit for other ideas before I change anything.

I agree that the current name can be bit misleading. 
`check_at_most_one_argument` seems clearer. Maybe `argument` -> `arg` will make 
it bit smaller ;)

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7633/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7633

To: martinvonz, #hg-reviewers
Cc: pulkit, dlax, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7632: graft: reuse cmdutl.resolvecommitoptions()

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added a comment.
pulkit accepted this revision.


  After this, if both `--currentuser` and `--user` are passed, `--currentuser` 
takes precedence, which is not the behavior right now. But the new behavior is 
better and consistent with other commands.

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7632/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7632

To: martinvonz, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7606: fuzz: fix mpatch_corpus to not have an overridden __repr__ on py3

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Amended following diff to make test-check-format.t happy:
  
diff --git a/contrib/fuzz/mpatch_corpus.py b/contrib/fuzz/mpatch_corpus.py
--- a/contrib/fuzz/mpatch_corpus.py
+++ b/contrib/fuzz/mpatch_corpus.py
@@ -16,11 +16,15 @@ args = ap.parse_args()
 
 
 if sys.version_info[0] < 3:
+
 class py2reprhack(object):
 def __repr__(self):
 """Py2 calls __repr__ for `bytes(foo)`, forward to __bytes__"""
 return self.__bytes__()
+
+
 else:
+
 class py2reprhack(object):
 """Not needed on py3."""

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7606/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7606

To: spectral, #hg-reviewers, pulkit
Cc: mjpieters, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7595: status: outputting structured unfinished-operation information

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Applying this on top of D7605  failed. 
So unfortunately you have to rebase again and resend. Also, I think you are 
`pip install black` away from preventing such conflicts.

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7595/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7595

To: rdamazio, #hg-reviewers, pulkit
Cc: durin42, pulkit, yuja, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7605: formatting: fix some recent formatting regressions

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added a comment.
pulkit accepted this revision.


  Thanks for this. I installed black now, so I hope I will catch these next 
time before pushing changes.

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7605/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7605

To: martinvonz, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7601: fuzz: fix test-fuzz-targets.t to run with python3

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> mharbison72 wrote in mpatch_corpus.py:53
> Doesn't `__repr__` have to return `str` on py3?  It looks like there are few 
> other instances of this.

ha, yep. @spectral can you send a follow-up for this?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7601/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7601

To: spectral, #hg-reviewers, pulkit
Cc: mharbison72, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7506: phabricator: add a "phabstatus" show view

[pulkit (Pulkit Goyal)]

This revision now requires changes to proceed.
pulkit added a comment.
pulkit requested changes to this revision.


  `test-check-module-imports.t` says hi!

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7506/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7506

To: dlax, #hg-reviewers, pulkit
Cc: mharbison72, mjpieters, Kwan, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7593: status: split morestatus data loading from display

[pulkit (Pulkit Goyal)]

pulkit added a comment.
pulkit added a subscriber: martinvonz.


  I pushed @martinvonz D7591 , so these 
need to be rebased. Thanks!

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7593/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7593

To: rdamazio, #hg-reviewers, pulkit
Cc: martinvonz, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7524: rust-dirs-multiset: use `AsRef` instead of concrete types when possible

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  This one fails to apply on default. Skipping pushing this and it's accepted 
children.

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7524/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7524

To: Alphare, #hg-reviewers, kevincox, pulkit
Cc: durin42, kevincox, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7595: status: outputting structured unfinished-operation information

[pulkit (Pulkit Goyal)]

pulkit added inline comments.
pulkit added subscribers: yuja, pulkit.

INLINE COMMENTS

> configitems.py:247
>  coreconfigitem(
> +b'commands', b'status.morestatus-item', default=False,
> +)

IMO the whole morestatus functionality is already behind a config option, so 
lets not have a config option just for that.

But I am not sure whether this change is a BC or not. I believe @yuja might 
have thoughts here.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7595/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7595

To: rdamazio, #hg-reviewers
Cc: pulkit, yuja, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7557: annotate: describe --skip as taking a revset

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Isn't it that where ever we says `revisions` we imply `revsets`?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7557/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7557

To: durin42, #hg-reviewers
Cc: pulkit, mjpieters, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7521: amend: check for file modifications when updating dirstate (issue6233)

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Looks like I forgot to drop this from my queue and pushed it. :(

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7521/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7521

To: spectral, #hg-reviewers, mharbison72, pulkit
Cc: mharbison72, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7556: tests: remove hardcoded errno values

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  This is for stable branch or default?

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7556/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7556

To: jcristau, #hg-reviewers, pulkit
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7521: amend: check for file modifications when updating dirstate (issue6233)

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  I get the following test failure:
  
--- /home/pulkit/repo/hgpush/tests/test-amend.t 
 
+++ /home/pulkit/repo/hgpush/tests/test-amend.t#obsstore-off.err
  
@@ -505,4 +505,23 @@

   
   >   hg diff  

   
   >   hg status

   
   > fi 

 
-  OK.  

+  $TESTTMP.sh: 292: $TESTTMP.sh: [[: not found 
 
+  Bug detected. 'delta' is not part of the commit OR the wdir  
 
+  Diff and status before rebuild:  
   
+  diff --git a/foo b/foo   

+  --- a/foo
   
+  +++ b/foo
   
+  @@ -1,2 +1,3 @@  

+   alpha   
   
+   beta
  
+  +delta   
  
+  M foo
   
+  Diff and status after rebuild:   
   
+  diff --git a/foo b/foo   
 
+  --- a/foo
 
+  +++ b/foo

   
+  @@ -1,2 +1,3 @@  

   
+   alpha   

   
+   beta

 
+  +delta   

   
+  M foo 

 
ERROR: test-amend.t#obsstore-off output changed 
   
!.  

--- /home/pulkit/repo/hgpush/tests/test-amend.t 
   
+++ /home/pulkit/repo/hgpush/tests/test-amend.t#obsstore-on.err 
   
@@ -505,4 +505,23 @@

   >   hg diff  
   
   >   hg status
  
   > fi 
  
-  OK.  
   
+  $TESTTMP.sh: 317: $TESTTMP.sh: [[: not found 
   
+  Bug detected. 'delta' is not part of the commit OR the wdir  
 
+  Diff and status before rebuild:  
 
+  diff --git a/foo b/foo   

   
+  --- a/foo

   
+  +++ b/foo

   
+  @@ -1,2 +1,3 @@  
 

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

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Applied the following diff to commit message as `test-check-commit.t` was 
complaining:
  
--- a/changeset-description
+++ b/changeset-description
@@ -1,3 +1,3 @@
-py3: make doc strings containing the deprected '\.' escape sequence raw 
strings
+py3: make doc strings containing deprecated '\.' escape sequence raw 
strings

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7462/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7462

To: dploch, #hg-reviewers, dlax, pulkit
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7441: match: remove explicitdir attribute

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added a comment.
pulkit accepted this revision.


  Queued the series, many thanks! Thanks @Alphare for reviewing :)

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7441/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7441

To: martinvonz, #hg-reviewers, Alphare, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7198: lock: refactor in preparation for next commit

[pulkit (Pulkit Goyal)]

pulkit added a comment.
pulkit added subscribers: marmoute, pulkit.


  @marmoute can you have a look at these two patches?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7198/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7198

To: valentin.gatienbaron, #hg-reviewers
Cc: pulkit, marmoute, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7221: hghave: fix bytes/string issue on Python 3

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  This has already been pushed as 
https://www.mercurial-scm.org/repo/hg-committed/rev/c3bca833cb92

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7221/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7221

To: durin42, #hg-reviewers, pulkit
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7144: status: use unfiltered repo if we're getting status of working copy

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  I am +1 on this idea. I see @marmoute has some concerns around extensions 
wrapping, once they are addressed, I will push it once the freeze ends.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7144/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7144

To: martinvonz, #hg-reviewers
Cc: pulkit, marmoute, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7146: [RFC] grep: add config option to grep PWD by default

[pulkit (Pulkit Goyal)]

pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This is motivated by a disscussion on IRC.
  
  TODO: need to add tests, register config option and add docs.
  
  Tests are not ran on this yet.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D7146

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3396,6 +3396,9 @@
 
 getfile = util.lrucachefunc(repo.file)
 
+if (not pats and ui.configbool("grep", "pwd")):
+pats = ('.',)
+
 def matchlines(body):
 begin = 0
 linenum = 0



To: pulkit, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7001: share: unmark --relative as EXPERIMENTAL

[pulkit (Pulkit Goyal)]

Closed by commit rHG7b0b902b8c19: share: unmark --relative as EXPERIMENTAL 
(authored by pulkit).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs 
Review".

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D7001?vs=16912&id=17266#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7001?vs=16912&id=17266

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7001/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7001

AFFECTED FILES
  hgext/share.py

CHANGE DETAILS

diff --git a/hgext/share.py b/hgext/share.py
--- a/hgext/share.py
+++ b/hgext/share.py
@@ -66,12 +66,7 @@
 [
 (b'U', b'noupdate', None, _(b'do not create a working directory')),
 (b'B', b'bookmarks', None, _(b'also share bookmarks')),
-(
-b'',
-b'relative',
-None,
-_(b'point to source using a relative path (EXPERIMENTAL)'),
-),
+(b'', b'relative', None, _(b'point to source using a relative path'),),
 ],
 _(b'[-U] [-B] SOURCE [DEST]'),
 helpcategory=command.CATEGORY_REPO_CREATION,



To: pulkit, #hg-reviewers, marmoute
Cc: marmoute, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7113: automation: schedule an EC2Launch run on next boot

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> martinvonz wrote in aws.py:1128
> black wants this line to be wrapped. I'll fix that in flight.

I should install black, I was waiting for Augie's fix to land to prevent doing 
some extra work.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7113/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7113

To: indygreg, #hg-reviewers, pulkit
Cc: martinvonz, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7107: rust-cross-platform: remove `unimplemented!` to get compile-time errors instead

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Edited the commit message and removed `instead` from end because 
`test-check-commit.t` was saying hi.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7107/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7107

To: Alphare, #hg-reviewers, kevincox, pulkit
Cc: durin42, kevincox, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7099: widening: pass in matchers instead of patterns

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added a comment.
pulkit accepted this revision.


  > The oldmatch is not used yet, but it should be used eventually when 
widening no longer resends manifests and files the client already has.
  
  You mean for ellipses case? If yes, nice

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7099/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7099

To: martinvonz, durin42, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7101: fix: match patterns relative to root

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Amended the following in flight:
  
diff --git a/tests/test-fix.t b/tests/test-fix.t
--- a/tests/test-fix.t
+++ b/tests/test-fix.t
@@ -157,8 +157,10 @@ Help text for fix.
   :skipclean suboption to false.
   
   The :pattern suboption determines which files will be passed through each
-  configured tool. See 'hg help patterns' for possible values. If there 
are file
-  arguments to 'hg fix', the intersection of these patterns is used.
+  configured tool. See 'hg help patterns' for possible values. However, all
+  patterns are relative to the repo root, even if that text says they are
+  relative to the current working directory. If there are file arguments 
to 'hg
+  fix', the intersection of these patterns is used.
   
   There is also a configurable limit for the maximum size of file that 
will be
   processed by 'hg fix':

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7101/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7101

To: martinvonz, #hg-reviewers, mharbison72, pulkit
Cc: mharbison72, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7084: fix: make Fixer initialization more explicit for clarity

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Hm, IIUC this was edited in flight, not sure why.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7084/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7084

To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6659: graft: split graft code into seperate functions

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Turned out I have an unsubmitted comment. Also, the codebase was recently 
formatted, so these patches will need to be rebased. 
https://www.mercurial-scm.org/pipermail/mercurial-devel/2019-October/134537.html
 should help

INLINE COMMENTS

> pulkit wrote in cmdutil.py:3431
> let's initialize `graftstate` only where we need it.

I meant near line 3477 on this side.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6659/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6659

To: taapas1128, #hg-reviewers, durin42
Cc: pulkit, durin42, martinvonz, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6987: strip: move strip extension to core as debugstrip

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> strip.py:3
>  
> -This extension allows you to strip changesets and all their descendants from 
> the
> -repository. See the command help for details.
> +strip extension has been renamed to debugstrip and moved to core. However,
> +this extension is to preserve the old `strip` name forusers that are used

the documentation should be left as it is.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6987/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6987

To: navaneeth.suresh, durin42, #hg-reviewers
Cc: pulkit, marmoute, mjpieters, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7026: treemanifest: move out of experimental

[pulkit (Pulkit Goyal)]

pulkit created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  In recent sprint, we discussed that treemanifest should be moved out of
  experimental. The feature has been used inside Google, Facebook in some forms
  and was used inside Yandex too for narrow clones.
  
  There is an issue with diffing of large treemanifests and to fix that some
  Python code needs to be rewritted in C/Rust. This I think is not a blocker for
  taking treemanifest out of experimental.
  
  This patch renames config `experimental.treemanifest` to 
`storage.treemanifest`.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D7026

AFFECTED FILES
  mercurial/changegroup.py
  mercurial/configitems.py
  mercurial/localrepo.py
  tests/test-narrow-clone-stream.t
  tests/test-narrow-commit.t
  tests/test-narrow-merge.t
  tests/test-narrow-share.t
  tests/test-narrow-sparse.t
  tests/test-narrow-strip.t
  tests/test-narrow-trackedcmd.t
  tests/test-narrow-widen-no-ellipsis.t
  tests/test-narrow-widen.t
  tests/test-narrow.t
  tests/test-strip-cross.t
  tests/test-treemanifest.t
  tests/test-upgrade-repo.t

CHANGE DETAILS

diff --git a/tests/test-upgrade-repo.t b/tests/test-upgrade-repo.t
--- a/tests/test-upgrade-repo.t
+++ b/tests/test-upgrade-repo.t
@@ -35,7 +35,7 @@
 
 Do not yet support upgrading treemanifest repos
 
-  $ hg --config experimental.treemanifest=true init treemanifest
+  $ hg --config storage.treemanifest=true init treemanifest
   $ hg -R treemanifest debugupgraderepo
   abort: cannot upgrade repository; unsupported source requirement: 
treemanifest
   [255]
@@ -43,7 +43,7 @@
 Cannot add treemanifest requirement during upgrade
 
   $ hg init disallowaddedreq
-  $ hg -R disallowaddedreq --config experimental.treemanifest=true 
debugupgraderepo
+  $ hg -R disallowaddedreq --config storage.treemanifest=true debugupgraderepo
   abort: cannot upgrade repository; do not support adding requirement: 
treemanifest
   [255]
 
diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t
--- a/tests/test-treemanifest.t
+++ b/tests/test-treemanifest.t
@@ -5,7 +5,7 @@
 
 Set up repo
 
-  $ hg --config experimental.treemanifest=True init repo
+  $ hg --config storage.treemanifest=True init repo
   $ cd repo
 
 Requirements get set on init
@@ -222,7 +222,7 @@
 Create clone with tree manifests enabled
 
   $ cd ..
-  $ hg clone --config experimental.treemanifest=1 \
+  $ hg clone --config storage.treemanifest=1 \
   >   http://localhost:$HGPORT repo-mixed -r 1
   adding changesets
   adding manifests
@@ -305,7 +305,7 @@
0   4 064927a0648a  
1   5 25ecb8cb8618  
   $ echo 2 > dir1/a
-  $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a'
+  $ hg --config storage.treemanifest=False ci -qm 'modify dir1/a'
   $ hg debugindex --dir dir1
  rev linkrev nodeid   p1   p2
0   4 064927a0648a  
@@ -392,7 +392,7 @@
 
 Pushing to an empty repo works
 
-  $ hg --config experimental.treemanifest=1 init clone
+  $ hg --config storage.treemanifest=1 init clone
   $ grep treemanifest clone/.hg/requires
   treemanifest
   $ hg push -R repo clone
@@ -414,7 +414,7 @@
 
 Create deeper repo with tree manifests.
 
-  $ hg --config experimental.treemanifest=True init deeprepo
+  $ hg --config storage.treemanifest=True init deeprepo
   $ cd deeprepo
 
   $ mkdir .A
@@ -673,7 +673,7 @@
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
 We can clone even with the knob turned off and we'll get a treemanifest repo.
-  $ hg clone --config experimental.treemanifest=False \
+  $ hg clone --config storage.treemanifest=False \
   >   --config experimental.changegroup3=True \
   >   http://localhost:$HGPORT deepclone
   requesting all changes
@@ -850,7 +850,7 @@
 
   $ mkdir grafted-dir-repo
   $ cd grafted-dir-repo
-  $ hg --config experimental.treemanifest=1 init
+  $ hg --config storage.treemanifest=1 init
   $ mkdir dir
   $ echo a > dir/file
   $ echo a > file
@@ -868,7 +868,7 @@
   created new head
   $ cd ..
 
-  $ hg --config experimental.treemanifest=1 clone --pull -r 1 \
+  $ hg --config storage.treemanifest=1 clone --pull -r 1 \
   >   grafted-dir-repo grafted-dir-repo-clone
   adding changesets
   adding manifests
diff --git a/tests/test-strip-cross.t b/tests/test-strip-cross.t
--- a/tests/test-strip-cross.t
+++ b/tests/test-strip-cross.t
@@ -164,13 +164,13 @@
 
 Now a similar test for a non-root manifest revlog
   $ cat >> $HGRCPATH < [experimental]
+  > [storage]
   > treemanifests = yes
   > EOF
   $ mkdir treemanifests
   $ cd treemanifests
   $ 
-  $ hg --config experimental.treemanifest=True init orig
+  $ hg --config storage.treemanifest=True init orig
   $ cd orig
   $ commit 'dir/file'
   $ commit 'dir/other'
@@ -179,7 +179,7 @@
   $ commit 'otherdir dir/file'
   $ commit 'otherdir dir/

D7023: tests: fix test-archive to specify feature as py38, not py-38

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Looks like D7016  fixed it. +1 to the 
docs you have added, if you rebase and resend with the commit message updated, 
I will be happy to push it.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7023/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7023

To: spectral, #hg-reviewers, pulkit
Cc: mjpieters, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6989: push: support config option to require revs be specified when running push

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Hm, looks like this needs to be rebased on tip of hg-committed because of 
recent blackening of codebase.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6989/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6989

To: spectral, #hg-reviewers, pulkit
Cc: pulkit, mharbison72, indygreg, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6989: push: support config option to require revs be specified when running push

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added a comment.
pulkit accepted this revision.


  The current place for the check looks good. Can you follow-up by adding it to 
`ui.tweakdefaults`?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6989/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6989

To: spectral, #hg-reviewers, pulkit
Cc: pulkit, mharbison72, indygreg, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7024: destutil: add mechanism to specify ambiguous destination on rebase and merge

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  IIUC, you mean `unambiguous` instead of `ambiguous` in the commit message? 
Re-reading I am confused.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7024/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7024

To: spectral, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7025: rewriteutil: add configurable check to disallow obsoleting someone else cset

[pulkit (Pulkit Goyal)]

pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  One of the things about obsolete markers (especially prune markers) is that
  sharing them can lead to cases where you loose your data. The best example is
  that someone else prune your changeset and you pull from them and your commit
  disappears locally.
  
  There are two parts of solving the above mentioned problem:
  
  1. disallow obsoleting changesets which are not authored by you unless some
  
  config or force is passed
  
  2. notifying the end user and creating a journal of obsolete markers which the
  
  user recieves on their cset from someone else
  
  This patch tries to tackle the first one.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D7025

AFFECTED FILES
  mercurial/rewriteutil.py

CHANGE DETAILS

diff --git a/mercurial/rewriteutil.py b/mercurial/rewriteutil.py
--- a/mercurial/rewriteutil.py
+++ b/mercurial/rewriteutil.py
@@ -16,9 +16,11 @@
 revset,
 )
 
-def precheck(repo, revs, action='rewrite'):
+def precheck(repo, revs, action='rewrite', allowotherusers=True):
 """check if revs can be rewritten
 action is used to control the error message.
+allowotherusers can be passed as false if you want to disallow users to
+obsolete someone else changesets
 
 Make sure this function is called after taking the lock.
 """
@@ -40,6 +42,13 @@
 if newunstable:
 raise error.Abort(_("cannot %s changeset with children") % action)
 
+if not allowotherusers:
+curuser = repo.ui.username()
+for r in revs:
+if repo[r].user() != curuser:
+raise error.Abort(_("cannot obsolete %s changeset which is not"
+" authored by you") % r)
+
 def disallowednewunstable(repo, revs):
 """Checks whether editing the revs will create new unstable changesets and
 are we allowed to create them.



To: pulkit, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7001: share: unmark --relative as EXPERIMENTAL

[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/D7001

AFFECTED FILES
  hgext/share.py

CHANGE DETAILS

diff --git a/hgext/share.py b/hgext/share.py
--- a/hgext/share.py
+++ b/hgext/share.py
@@ -70,7 +70,7 @@
 b'',
 b'relative',
 None,
-_(b'point to source using a relative path ' b'(EXPERIMENTAL)'),
+_(b'point to source using a relative path '),
 ),
 ],
 _(b'[-U] [-B] SOURCE [DEST]'),



To: pulkit, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6876: phabricator: support automatically obsoleting old revisions of pulled commits

[pulkit (Pulkit Goyal)]

pulkit added a comment.
pulkit added subscribers: sheehan, pulkit.


  @sheehan this might be of interest to you.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6876/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6876

To: mharbison72, #hg-reviewers
Cc: pulkit, sheehan, Kwan, mercurial-devel, marmoute
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6813: flagprocessors: have the read transform function return side data (API)

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Can you follow-up and add an entry about the API changes resulted by this 
sidedata series in `relnotes/next`?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6813/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6813

To: marmoute, yuja, durin42, indygreg, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6885: relnotes: mention API change from https://phab.mercurial-scm.org/D6884

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Thanks! In D6884 's commit message,  
Augie used the releasenotes format. So this is not required.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6885/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6885

To: martinvonz, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6874: uncommit: fix typo in help text

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Amended the following in flight:
  
diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
--- a/tests/test-uncommit.t
+++ b/tests/test-uncommit.t
@@ -34,7 +34,7 @@ Help for uncommit
   
   options ([+] can be repeated):
   
-  --keep allow an empty commit after uncommiting
+  --keep allow an empty commit after uncommitting
   --allow-dirty-working-copy allow uncommit with outstanding changes
-n --note TEXTstore a note on uncommit
-I --include PATTERN [+]  include names matching the given patterns

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6874/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6874

To: mharbison72, #hg-reviewers, pulkit
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6848: narrow: add option for automatically removing unused includes

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> narrowcommands.py:369
> +If --auto-remove-includes is specified, then those includes that don't 
> match
> +any files modified by currently visible commits will be added to the set 
> of
> +explicitly specified includes to remove.

sorry, but `currently visible commits` sounds like not correct as this can be 
used in case of non-ellipses repository also.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6848/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6848

To: martinvonz, durin42, #hg-reviewers
Cc: pulkit, rdamazio, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6848: narrow: add option for automatically removing unused includes

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> narrowcommands.py:331
>   ('', 'removeinclude', [], _('old paths to no longer include')),
> + ('', 'auto-remove-includes', False,
> +  _('automatically choose unused includes to remove (EXPERIMENTAL)')),

Following pattern of other flags, `auto-removeinclude(s)` seems better.

> martinvonz wrote in narrowcommands.py:332
> Even though it's marked EXPERIMENTAL? Or maybe I should do that and just drop 
> the EXPERIMENTAL since the whole feature (narrow clones) is experimental 
> anyway?

I don't have a strong opinion on having or dropping EXPERIMENTAL, but we should 
have some help text. It can be added under verbose section.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6848/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6848

To: martinvonz, durin42, #hg-reviewers
Cc: pulkit, rdamazio, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6851: narrow: don't hexify paths and double-hexify known nodes on wire (BC)

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added a comment.
pulkit accepted this revision.


  In D6851#100690 , @idlsoft wrote:
  
  >>> Just `tracked --add-include`. A workaround to simplify the upgrade would 
be to change `wireprototypes.SUPPORTED_ELLIPSESCAP` to be `(ELLIPSESCAP1, )` on 
the server from now until all clients have upgraded. But that may still be 
annoying and error-prone for you to deal with. @pulkit, I suppose we should 
just add a `exp-narrow-2` capability to deal with this? It doesn't seem fair to 
make @idlsoft deal with it.
  >>
  >> Sounds like a good idea!
  >
  > If it's just `tracked --add-include` then it's not a big deal, it won't 
disrupt regular flow.
  > If backward compatibility doesn't complicate the code - great, if not - 
don't worry about it.
  
  Great, thanks!

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6851/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6851

To: martinvonz, durin42, #hg-reviewers, pulkit
Cc: pulkit, idlsoft, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6848: narrow: add option for automatically removing unused includes

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> narrowcommands.py:332
> + ('', 'auto-remove-includes', False,
> +  _('automatically choose unused includes to remove (EXPERIMENTAL)')),
>   ('', 'addexclude', [], _('new paths to exclude')),

Can you add some help text below on how these unused includes are calculated?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6848/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6848

To: martinvonz, durin42, #hg-reviewers
Cc: pulkit, rdamazio, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6709: config: add --registered flag to show all known configs

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  In D6709#100698 , @av6 wrote:
  
  > And to make the review process easier, I propose doing this in 3 or 4 
patches:
  >
  > - adding `--registered`: will simply show all registered options in 
key=value format
  > - adding defaults and experimental/devel/debug statuses to `showconfig 
--debug` output (this one can be split into two)
  > - showing config options in a human-friendly format
  
  +1. I also agree that splitting it into patches will help ease the discussion 
and review.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6709/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6709

To: navaneeth.suresh, #hg-reviewers, av6, marmoute, durin42
Cc: durin42, mharbison72, yuja, pulkit, marmoute, av6, mjpieters, 
mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6851: narrow: don't hexify paths and double-hexify known nodes on wire (BC)

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  In D6851#100667 , @martinvonz 
wrote:
  
  > In D6851#100666 , @idlsoft 
wrote:
  >
  >>> @idlsoft and their company does use narrow extension. @idlsoft can you 
upgrade server and client at the same time?
  >>
  >> I did that a little while ago to move to 5.0. It was not fun. It's server, 
teamcity, clients, docker images.
  >> What operations does this affect? Regular `push/pull/clone` or only 
`tracked --add-include`?
  >
  > Just `tracked --add-include`. A workaround to simplify the upgrade would be 
to change `wireprototypes.SUPPORTED_ELLIPSESCAP` to be `(ELLIPSESCAP1, )` on 
the server from now until all clients have upgraded. But that may still be 
annoying and error-prone for you to deal with. @pulkit, I suppose we should 
just add a `exp-narrow-2` capability to deal with this? It doesn't seem fair to 
make @idlsoft deal with it.
  
  Sounds like a good idea!

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6851/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6851

To: martinvonz, durin42, #hg-reviewers
Cc: pulkit, idlsoft, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6851: narrow: don't hexify paths and double-hexify known nodes on wire (BC)

[pulkit (Pulkit Goyal)]

pulkit added a comment.
pulkit added subscribers: idlsoft, pulkit.


  > This is clearly a breaking change, but the feature is experimental and
  > we're not aware of anyone running a server using this command yet.
  
  @idlsoft and their company does use narrow extension. @idlsoft can you 
upgrade server and client at the same time?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6851/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6851

To: martinvonz, durin42, #hg-reviewers
Cc: pulkit, idlsoft, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6857: uncommit: enable support for adding a note

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added a comment.
pulkit accepted this revision.


  > Should these note options (including on amend) be marked advanced to keep 
the
  > help text clutter level down?
  
  Maybe, I don't have strong opinion here on any of the options.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6857/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6857

To: mharbison72, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6776: bookmarks: validate changes on push (issue6193) (BC)

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  I agree with @valentin.gatienbaron that `--force` is quite generic :(.  It 
may create new heads on the server even if I don't want to.

INLINE COMMENTS

> bundle2.py:2149
> +hint=
> +_("run 'hg pull', resolve conflicts, and push 
> again"))
> +hookargs = tr.hookargs.copy()

Hm, I think `conflicts` can be confusing but I don't have better suggestions 
here.

> repository.py:194
>  
> -def unbundle(bundle, heads, url):
> +def unbundle(bundle, heads, url, force=None):
>  """Transfer repository data to the peer.

It will be nice to have documentation about what `force` does in the interface.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6776/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6776

To: idlsoft, #hg-reviewers, durin42
Cc: pulkit, durin42, valentin.gatienbaron, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

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

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  In D4664#100404 , @durin42 wrote:
  
  > Neat. I assume you normally check these out later?
  
  For now yes. The plan was to make `hg cat` support cat-ing maultiple files 
preventing to checkout.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D4664/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D4664

To: pulkit, #hg-reviewers
Cc: durin42, marcink, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6738: unshelve: add --unresolved flag to unshelve mergestate with unresolved files

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> pulkit wrote in shelve.py:754
> Then we are somehow parsing or building the records in not correct way.

Did you manage to find why that error comes up?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6738/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6738

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6736: shelve: add method for storing mergestate in changeset extras

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> navaneeth.suresh wrote in shelve.py:416
> i feel like the current approach is more simpler and easy to understand.

It will be nice to use only way to encode mergestates at all the places.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6736/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6736

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6828: uncommit: add options to update to the current user or current date

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  In D6828#100190 , @mharbison72 
wrote:
  
  > In D6828#100139 , @pulkit 
wrote:
  >
  >> I guess `--interactive` is the only flag left which is extra in evolve 
version, right?
  >
  > No:
  >
  >   -a --all uncommit all changes when no arguments given
  >   -i --interactive interactive mode to uncommit (EXPERIMENTAL)
  >   -r --rev REV revert commit content to REV instead
  >  --revert  discard working directory changes after uncommit
  >   -n --note TEXT   store a note on uncommit
  >
  > I'd like to port `--interactive`.
  
  That will be great. https://phab.mercurial-scm.org/D6005 should help :)

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6828/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6828

To: mharbison72, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6828: uncommit: add options to update to the current user or current date

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added a comment.
pulkit accepted this revision.


  I guess `--interactive` is the only flag left which is extra in evolve 
version, right?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6828/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6828

To: mharbison72, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6825: contrib: start building a library for simple hooks

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Thanks a lot for putting efforts here. I am +1 on this. I haven't looked at 
the code though, will try to review if no one else beats me to it.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6825/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6825

To: joerg.sonnenberger, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6757: bdiff-torture: fix pyflakes warning reporting undefined name 'inst'

[pulkit (Pulkit Goyal)]

Closed by commit rHG3316e59b0105: bdiff-torture: fix pyflakes warning reporting 
undefined name 'inst' (authored by pulkit).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6757?vs=16295&id=16376

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6757/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6757

AFFECTED FILES
  contrib/bdiff-torture.py

CHANGE DETAILS

diff --git a/contrib/bdiff-torture.py b/contrib/bdiff-torture.py
--- a/contrib/bdiff-torture.py
+++ b/contrib/bdiff-torture.py
@@ -53,8 +53,7 @@
 test1(a, b)
 return
 except Exception as inst:
-pass
-print("exception:", inst)
+print("exception:", inst)
 reducetest(a, b)
 
 def test(a, b):



To: pulkit, #hg-reviewers, av6
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6741: interfaces: create a new folder for interfaces and move repository.py in it

[pulkit (Pulkit Goyal)]

Closed by commit rHG268662aac075: interfaces: create a new folder for 
interfaces and move repository.py in it (authored by pulkit).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6741?vs=16259&id=16312

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6741/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6741

AFFECTED FILES
  contrib/import-checker.py
  hgext/lfs/__init__.py
  hgext/lfs/wrapper.py
  hgext/narrow/__init__.py
  hgext/narrow/narrowbundle2.py
  hgext/narrow/narrowcommands.py
  hgext/sqlitestore.py
  mercurial/changegroup.py
  mercurial/exchange.py
  mercurial/exchangev2.py
  mercurial/filelog.py
  mercurial/hg.py
  mercurial/httppeer.py
  mercurial/interfaces/__init__.py
  mercurial/interfaces/repository.py
  mercurial/localrepo.py
  mercurial/manifest.py
  mercurial/narrowspec.py
  mercurial/repository.py
  mercurial/revlog.py
  mercurial/revlogutils/constants.py
  mercurial/streamclone.py
  mercurial/testing/storage.py
  mercurial/utils/storageutil.py
  mercurial/wireprotov1peer.py
  setup.py
  tests/notcapable
  tests/pullext.py
  tests/simplestorerepo.py
  tests/test-check-interfaces.py
  tests/wireprotosimplecache.py

CHANGE DETAILS

diff --git a/tests/wireprotosimplecache.py b/tests/wireprotosimplecache.py
--- a/tests/wireprotosimplecache.py
+++ b/tests/wireprotosimplecache.py
@@ -10,12 +10,14 @@
 from mercurial import (
 extensions,
 registrar,
-repository,
 util,
 wireprotoserver,
 wireprototypes,
 wireprotov2server,
 )
+from mercurial.interfaces import (
+repository,
+)
 from mercurial.utils import (
 interfaceutil,
 stringutil,
diff --git a/tests/test-check-interfaces.py b/tests/test-check-interfaces.py
--- a/tests/test-check-interfaces.py
+++ b/tests/test-check-interfaces.py
@@ -14,6 +14,9 @@
 'test-repo']):
 sys.exit(80)
 
+from mercurial.interfaces import (
+repository,
+)
 from mercurial.thirdparty.zope import (
 interface as zi,
 )
@@ -27,7 +30,6 @@
 localrepo,
 manifest,
 pycompat,
-repository,
 revlog,
 sshpeer,
 statichttprepo,
diff --git a/tests/simplestorerepo.py b/tests/simplestorerepo.py
--- a/tests/simplestorerepo.py
+++ b/tests/simplestorerepo.py
@@ -32,11 +32,13 @@
 localrepo,
 mdiff,
 pycompat,
-repository,
 revlog,
 store,
 verify,
 )
+from mercurial.interfaces import (
+repository,
+)
 from mercurial.utils import (
 cborutil,
 interfaceutil,
diff --git a/tests/pullext.py b/tests/pullext.py
--- a/tests/pullext.py
+++ b/tests/pullext.py
@@ -13,6 +13,8 @@
 error,
 extensions,
 localrepo,
+)
+from mercurial.interfaces import (
 repository,
 )
 
diff --git a/tests/notcapable b/tests/notcapable
--- a/tests/notcapable
+++ b/tests/notcapable
@@ -6,7 +6,8 @@
 fi
 
 cat > notcapable-$CAP.py << EOF
-from mercurial import extensions, localrepo, repository
+from mercurial import extensions, localrepo
+from mercurial.interfaces import repository
 def extsetup(ui):
 extensions.wrapfunction(repository.peer, 'capable', wrapcapable)
 extensions.wrapfunction(localrepo.localrepository, 'peer', wrappeer)
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1067,6 +1067,7 @@
 'mercurial.cext',
 'mercurial.cffi',
 'mercurial.hgweb',
+'mercurial.interfaces',
 'mercurial.pure',
 'mercurial.thirdparty',
 'mercurial.thirdparty.attr',
diff --git a/mercurial/wireprotov1peer.py b/mercurial/wireprotov1peer.py
--- a/mercurial/wireprotov1peer.py
+++ b/mercurial/wireprotov1peer.py
@@ -22,10 +22,12 @@
 error,
 pushkey as pushkeymod,
 pycompat,
-repository,
 util,
 wireprototypes,
 )
+from .interfaces import (
+repository,
+)
 from .utils import (
 interfaceutil,
 )
diff --git a/mercurial/utils/storageutil.py b/mercurial/utils/storageutil.py
--- a/mercurial/utils/storageutil.py
+++ b/mercurial/utils/storageutil.py
@@ -22,8 +22,8 @@
 error,
 mdiff,
 pycompat,
-repository,
 )
+from ..interfaces import repository
 
 _nullhash = hashlib.sha1(nullid)
 
diff --git a/mercurial/testing/storage.py b/mercurial/testing/storage.py
--- a/mercurial/testing/storage.py
+++ b/mercurial/testing/storage.py
@@ -17,6 +17,8 @@
 from .. import (
 error,
 mdiff,
+)
+from ..interfaces import (
 repository,
 )
 from ..utils import (
diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py
--- a/mercurial/streamclone.py
+++ b/mercurial/streamclone.py
@@ -12,13 +12,15 @@
 import struct
 
 from .i18n import _
+from .interfaces import (
+repository,
+)
 from . import (
 cacheutil,
 error,
 narrowspec,
 phases,
 pycompat,
-repository,
 store,
 util,
 )
diff --git a/mercurial/revlogutils/constants.py 
b/mercurial/revlogutils/constants.py
--

D6742: interfaceutil: move to interfaces/

[pulkit (Pulkit Goyal)]

Closed by commit rHG2c4f656c8e9f: interfaceutil: move to interfaces/ (authored 
by pulkit).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6742?vs=16260&id=16311

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6742/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6742

AFFECTED FILES
  hgext/sqlitestore.py
  mercurial/filelog.py
  mercurial/httppeer.py
  mercurial/interfaces/repository.py
  mercurial/interfaces/util.py
  mercurial/localrepo.py
  mercurial/manifest.py
  mercurial/revlog.py
  mercurial/utils/interfaceutil.py
  mercurial/wireprotoserver.py
  mercurial/wireprototypes.py
  mercurial/wireprotov1peer.py
  mercurial/wireprotov2server.py
  tests/simplestorerepo.py
  tests/wireprotosimplecache.py

CHANGE DETAILS

diff --git a/tests/wireprotosimplecache.py b/tests/wireprotosimplecache.py
--- a/tests/wireprotosimplecache.py
+++ b/tests/wireprotosimplecache.py
@@ -17,9 +17,9 @@
 )
 from mercurial.interfaces import (
 repository,
+util as interfaceutil,
 )
 from mercurial.utils import (
-interfaceutil,
 stringutil,
 )
 
diff --git a/tests/simplestorerepo.py b/tests/simplestorerepo.py
--- a/tests/simplestorerepo.py
+++ b/tests/simplestorerepo.py
@@ -38,10 +38,10 @@
 )
 from mercurial.interfaces import (
 repository,
+util as interfaceutil,
 )
 from mercurial.utils import (
 cborutil,
-interfaceutil,
 storageutil,
 )
 from mercurial.revlogutils import (
diff --git a/mercurial/wireprotov2server.py b/mercurial/wireprotov2server.py
--- a/mercurial/wireprotov2server.py
+++ b/mercurial/wireprotov2server.py
@@ -28,9 +28,11 @@
 wireprotoframing,
 wireprototypes,
 )
+from .interfaces import (
+util as interfaceutil,
+)
 from .utils import (
 cborutil,
-interfaceutil,
 stringutil,
 )
 
diff --git a/mercurial/wireprotov1peer.py b/mercurial/wireprotov1peer.py
--- a/mercurial/wireprotov1peer.py
+++ b/mercurial/wireprotov1peer.py
@@ -27,9 +27,7 @@
 )
 from .interfaces import (
 repository,
-)
-from .utils import (
-interfaceutil,
+util as interfaceutil,
 )
 
 urlreq = util.urlreq
diff --git a/mercurial/wireprototypes.py b/mercurial/wireprototypes.py
--- a/mercurial/wireprototypes.py
+++ b/mercurial/wireprototypes.py
@@ -17,9 +17,11 @@
 error,
 util,
 )
+from .interfaces import (
+util as interfaceutil,
+)
 from .utils import (
 compression,
-interfaceutil,
 )
 
 # Names of the SSH protocol implementations.
diff --git a/mercurial/wireprotoserver.py b/mercurial/wireprotoserver.py
--- a/mercurial/wireprotoserver.py
+++ b/mercurial/wireprotoserver.py
@@ -21,10 +21,12 @@
 wireprotov1server,
 wireprotov2server,
 )
+from .interfaces import (
+util as interfaceutil,
+)
 from .utils import (
 cborutil,
 compression,
-interfaceutil,
 )
 
 stringio = util.stringio
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -70,13 +70,13 @@
 )
 from .interfaces import (
 repository,
+util as interfaceutil,
 )
 from .revlogutils import (
 deltas as deltautil,
 flagutil,
 )
 from .utils import (
-interfaceutil,
 storageutil,
 stringutil,
 )
diff --git a/mercurial/manifest.py b/mercurial/manifest.py
--- a/mercurial/manifest.py
+++ b/mercurial/manifest.py
@@ -29,9 +29,7 @@
 )
 from .interfaces import (
 repository,
-)
-from .utils import (
-interfaceutil,
+util as interfaceutil,
 )
 
 parsers = policy.importmod(r'parsers')
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -68,10 +68,10 @@
 
 from .interfaces import (
 repository,
+util as interfaceutil,
 )
 
 from .utils import (
-interfaceutil,
 procutil,
 stringutil,
 )
diff --git a/mercurial/utils/interfaceutil.py b/mercurial/interfaces/util.py
rename from mercurial/utils/interfaceutil.py
rename to mercurial/interfaces/util.py
--- a/mercurial/utils/interfaceutil.py
+++ b/mercurial/interfaces/util.py
@@ -1,4 +1,4 @@
-# interfaceutil.py - Utilities for declaring interfaces.
+# util.py - Utilities for declaring interfaces.
 #
 # Copyright 2018 Gregory Szorc 
 #
diff --git a/mercurial/interfaces/repository.py 
b/mercurial/interfaces/repository.py
--- a/mercurial/interfaces/repository.py
+++ b/mercurial/interfaces/repository.py
@@ -11,8 +11,8 @@
 from .. import (
 error,
 )
-from ..utils import (
-interfaceutil,
+from . import (
+util as interfaceutil,
 )
 
 # When narrowing is finalized and no longer subject to format changes,
diff --git a/mercurial/httppeer.py b/mercurial/httppeer.py
--- a/mercurial/httppeer.py
+++ b/mercurial/httppeer.py
@@ -16,9 +16,6 @@
 import weakref
 
 from .i18n import _
-from .interfaces import (
-repository,
-)
 from . import (
 bundle2,
 error,
@@ -33,9 +30,12 @@
 wireprotov2peer,
 wireprotov2server,

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Queued the patches for stable, many thanks!

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6731/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6731

To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added inline comments.
pulkit accepted this revision.

INLINE COMMENTS

> test-bookmarks-pushpull.t:1347
>  Pushing the bookmark "foo" now fails as it contains a secret changeset
>  #if b2-pushkey
>$ hg push -r foo

removing the casing in flight as it's no longer required.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6731/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6731

To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6738: unshelve: add --unresolved flag to unshelve mergestate with unresolved files

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> navaneeth.suresh wrote in shelve.py:754
> i had tried to support it earlier. but, it throws the following error. i 
> think it's okay to use the latest format only since, we haven't stored any 
> mergestate using the previous format. the repo won't get corrupted.
> 
>   +  Traceback (most recent call last):
>   +File "/tmp/hgtests.TEheee/install/bin/hg", line 43, in 
>   +  dispatch.run()
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 99, in run
>   +  status = dispatch(req)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 225, in dispatch
>   +  ret = _runcatch(req) or 0
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 376, in _runcatch
>   +  return _callcatch(ui, _runcatchfunc)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 384, in _callcatch
>   +  return scmutil.callcatch(ui, func)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/scmutil.py", 
> line 167, in callcatch
>   +  return func()
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 367, in _runcatchfunc
>   +  return _dispatch(req)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 1021, in _dispatch
>   +  cmdpats, cmdoptions)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 756, in runcommand
>   +  ret = _runcommand(ui, options, cmd, d)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 1030, in _runcommand
>   +  return cmdfunc()
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 1018, in 
>   +  d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/util.py", line 
> 1682, in check
>   +  return func(*args, **kwargs)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/commands.py", 
> line 6229, in unshelve
>   +  return shelvemod.dounshelve(ui, repo, *shelved, **opts)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/shelve.py", 
> line 1090, in dounshelve
>   +  restoreunresolvedshelve(ui, repo, shelvectx, basename)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/shelve.py", 
> line 754, in restoreunresolvedshelve
>   +  ms._writerecords(_decodemergerecords(records))
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/merge.py", line 
> 452, in _writerecords
>   +  self._writerecordsv1(records)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/merge.py", line 
> 460, in _writerecordsv1
>   +  assert lrecords[0] == RECORD_LOCAL
>   +  AssertionError
>   +  [1]

Then we are somehow parsing or building the records in not correct way.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6738/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6738

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Looks like you forgot to update tests.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6731/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6731

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6757: bdiff-torture: fix pyflakes warning reporting undefined name 'inst'

[pulkit (Pulkit Goyal)]

pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Looks like I got a latest version of pyflakes somehow or it's running on py3 
and
  it spotted this.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6757

AFFECTED FILES
  contrib/bdiff-torture.py

CHANGE DETAILS

diff --git a/contrib/bdiff-torture.py b/contrib/bdiff-torture.py
--- a/contrib/bdiff-torture.py
+++ b/contrib/bdiff-torture.py
@@ -53,8 +53,7 @@
 test1(a, b)
 return
 except Exception as inst:
-pass
-print("exception:", inst)
+print("exception:", inst)
 reducetest(a, b)
 
 def test(a, b):



To: pulkit, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6718: repository: suppress typing errors on functions without arguments

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  I tried to queue but `test-check-code.t` and `test-check-commit.t` fails.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6718/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6718

To: indygreg, #hg-reviewers, durin42
Cc: pulkit, durin42, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6746: perf: don't pass experimental argument in config for older Mercurial versions

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Folded https://www.mercurial-scm.org/repo/hg-committed/rev/9f2189b6bf2a. This 
can be closed now. Thanks for the quick fix.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6746/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6746

To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: martinvonz, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6746: perf: don't pass experimental argument in config for older Mercurial versions

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  In D6746#99035 , @martinvonz 
wrote:
  
  > When this patch is ready, could we fold this into `a11fd395e83f`? I have 
`extensions.perf=contrib/perf.py` in my config and it's pretty annoying to have 
any commit in the broken range checked out.
  
  Folding this into `a11fd395e83f`.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6746/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6746

To: navaneeth.suresh, #hg-reviewers
Cc: martinvonz, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6741: interfaces: create a new folder for interfaces and move repository.py in it

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  In D6741#98947 , @martinvonz 
wrote:
  
  >> I was trying to understand current interfaces and write new ones and I 
realized
  >> we need to improve how current interfaces are organised.
  >
  > And what was the reason we need to improve it? I assume we don't really 
"need" to change it. Will it somehow help with future patches? Or you just like 
this structure better?
  
  Looking through Augie's hgit patch, I found we need to add more interfaces 
and decided to work on adding for `store.basicstore`. I found all the current 
interfaces in repository.py which has grown very large. I decided to create a 
new file to have interface for the store class, and maybe a new one for 
dirstate too, and having them in a separate folder dedicated to interfaces will 
be nice.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6741/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6741

To: pulkit, indygreg, durin42, martinvonz, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6748: hgit: define invalidatecaches for gitstore()

[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/D6748

AFFECTED FILES
  hgext/git/__init__.py

CHANGE DETAILS

diff --git a/hgext/git/__init__.py b/hgext/git/__init__.py
--- a/hgext/git/__init__.py
+++ b/hgext/git/__init__.py
@@ -71,6 +71,9 @@
 # TODO handle storenarrowmatch and figure out if we need the repo arg
 return gitlog.manifestlog(self.git, self._db)
 
+def invalidatecaches(self):
+pass
+
 def _makestore(orig, requirements, storebasepath, vfstype):
 if (os.path.exists(os.path.join(storebasepath, 'this-is-git'))
 and os.path.exists(os.path.join(storebasepath, '..', '.git'))):



To: pulkit, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6747: hgit: fix some pyflakes and check-code warning

[pulkit (Pulkit Goyal)]

pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I mostly added absolute_import and fixed warnings related to undefined name.
  This should get folded in the main hgit RFC patch.
  
  There are still more failures but they are harmless as of now.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6747

AFFECTED FILES
  hgext/git/__init__.py
  hgext/git/dirstate.py
  hgext/git/gitlog.py
  hgext/git/index.py

CHANGE DETAILS

diff --git a/hgext/git/index.py b/hgext/git/index.py
--- a/hgext/git/index.py
+++ b/hgext/git/index.py
@@ -1,8 +1,13 @@
+from __future__ import absolute_import
+
 import os
 import sqlite3
 
+from mercurial.i18n import _
+
 from mercurial import (
 encoding,
+error,
 node as nodemod,
 )
 
diff --git a/hgext/git/gitlog.py b/hgext/git/gitlog.py
--- a/hgext/git/gitlog.py
+++ b/hgext/git/gitlog.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+
+from mercurial.i18n import _
+
 from mercurial import (
 ancestor,
 changelog as hgchangelog,
@@ -24,7 +28,7 @@
 'SELECT rev FROM changelog WHERE node = ?',
 (nodemod.hex(n),)).fetchone()
 if t is None:
-raise error.LookupError(node, '00changelog.i', _('no node'))
+raise error.LookupError(n, '00changelog.i', _('no node'))
 return t[0]
 
 def node(self, r):
@@ -34,7 +38,7 @@
 'SELECT node FROM changelog WHERE rev = ?',
 (r,)).fetchone()
 if t is None:
-raise error.LookupError(node, '00changelog.i', _('no node'))
+raise error.LookupError(r, '00changelog.i', _('no node'))
 return nodemod.bin(t[0])
 
 
@@ -112,7 +116,7 @@
 if c.parents:
 p1 = self.rev(c.parents[0].id.raw)
 if len(c.parents) > 2:
-raise util.Abort('TODO octopus merge handling')
+raise error.Abort('TODO octopus merge handling')
 if len(c.parents) == 2:
 p2 = self.rev(c.parents[0].id.raw)
 return p1, p2
@@ -172,7 +176,7 @@
 parts = relpath.split('/')
 for p in parts:
 te = t[p]
-t = repo[te.id]
+t = self.gitrepo[te.id]
 return gittreemanifestctx(t)
 
 class filelog(baselog):
diff --git a/hgext/git/dirstate.py b/hgext/git/dirstate.py
--- a/hgext/git/dirstate.py
+++ b/hgext/git/dirstate.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import errno
 import os
 import stat
@@ -18,7 +20,7 @@
 
 
 def readpatternfile(orig, filepath, warn, sourceinfo=False):
-if not ('info/exclude' in fp.name or fp.name.endswith('.gitignore')):
+if not ('info/exclude' in filepath or filepath.endswith('.gitignore')):
 return orig(filepath, warn, sourceinfo=False)
 result = []
 warnings = []
@@ -270,7 +272,7 @@
 
 # git stores symlinks with a mode of 000, we need it to be 777
 if mode == stat.S_IFLNK:
-mode = mode | 0777
+mode = mode | 0o777
 
 # this is a crude hack, but makes 'hg forget' work
 if p not in p1:
diff --git a/hgext/git/__init__.py b/hgext/git/__init__.py
--- a/hgext/git/__init__.py
+++ b/hgext/git/__init__.py
@@ -4,6 +4,8 @@
 firstborn a la Rumpelstiltskin, etc.
 """
 
+from __future__ import absolute_import
+
 import os
 
 from mercurial import (



To: pulkit, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6746: perf: don't pass experimental argument in config for older Mercurial versions

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> perf.py:270
>  pass
> +except TypeError:
> +configitem(b'perf', b'presleep',

Can you add the commit hash and hg version (5.2 in this case) as comment due to 
which the compatibility is need?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6746/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6746

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> navaneeth.suresh wrote in exchange.py:1044
> I'm getting the following error with the code snippet that you've suggested:
> 
>   +  Traceback (most recent call last):
>   +File "/tmp/hgtests.nS3TJv/install/bin/hg", line 43, in 
>   +  dispatch.run()
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/dispatch.py", 
> line 99, in run
>   +  status = dispatch(req)
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/dispatch.py", 
> line 225, in dispatch
>   +  ret = _runcatch(req) or 0
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/dispatch.py", 
> line 376, in _runcatch
>   +  return _callcatch(ui, _runcatchfunc)
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/dispatch.py", 
> line 384, in _callcatch
>   +  return scmutil.callcatch(ui, func)
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/scmutil.py", 
> line 167, in callcatch
>   +  return func()
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/dispatch.py", 
> line 367, in _runcatchfunc
>   +  return _dispatch(req)
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/dispatch.py", 
> line 1021, in _dispatch
>   +  cmdpats, cmdoptions)
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/dispatch.py", 
> line 756, in runcommand
>   +  ret = _runcommand(ui, options, cmd, d)
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/dispatch.py", 
> line 1030, in _runcommand
>   +  return cmdfunc()
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/dispatch.py", 
> line 1018, in 
>   +  d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/util.py", line 
> 1682, in check
>   +  return func(*args, **kwargs)
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/commands.py", 
> line 4666, in push
>   +  opargs=opargs)
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/exchange.py", 
> line 568, in push
>   +  _pushbundle2(pushop)
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/exchange.py", 
> line 1149, in _pushbundle2
>   +  ret = partgen(pushop, bundler)
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/exchange.py", 
> line 1025, in _pushb2bookmarks
>   +  return _pushb2bookmarkspart(pushop, bundler)
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/exchange.py", 
> line 1052, in _pushb2bookmarkspart
>   +  _abortonsecretctx(pushop, new, book)
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/exchange.py", 
> line 1039, in _abortonsecretctx
>   +  ctx = pushop.repo[node]
>   +File "/tmp/hgtests.nS3TJv/install/lib/python/mercurial/localrepo.py", 
> line 1430, in __getitem__
>   +  (changeid, type(changeid)))
>   +  mercurial.error.ProgrammingError: unsupported changeid '' of type  'str'>
>  [1]

You won't need `ctx = pushop.repo[node]` anymore then.

In general, I suggest understanding the error as why are they are happening and 
you will find a fix.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6731/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6731

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> navaneeth.suresh wrote in exchange.py:1044
> updated to get rid of one return. if node is `None`, then hg will throw an 
> error there.

If the node is None, then `if node and ` will be false and the second 
condition won't be executed.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6731/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6731

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6735: update: added support for --abort flag(issue4404)

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Nice start! If I remember correctly, the mergestate stores the local version 
of the file. We can use that directly instead.

INLINE COMMENTS

> hg.py:992
> +for f in ms:
> +ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
> +ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)

this line is not required.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6735/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6735

To: taapas1128, #hg-reviewers
Cc: pulkit, mjpieters, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Can you also add a test where we are pushing multiple heads/bookmarks and one 
of the bookmark is problematic?

INLINE COMMENTS

> exchange.py:1043
> +if ctx.phase() == phases.secret:
> +raise error.Abort(_('bookmark %s points to a secret changeset') % b)
> +return False

it will be nice to mention that the failure is about pushing that specific 
bookmark. something like: `cannot push bookmark %s as it points ...`

> exchange.py:1044
> +raise error.Abort(_('bookmark %s points to a secret changeset') % b)
> +return False
> +

What does the return value mean here? I think we can get rid of this.

Something like this:

  if node and pushop.repo[node].phase() == phases.secret:
 raise 

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6731/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6731

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6740: tests: add test to demonstrate issue6159

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> test-bookmarks-pushpull.t:1344
> +Move the bookmark "foo" to point at a secret changeset
> +  $ hg commit -qAm_
> +  $ hg phase -s -f

`--config phases.new-commit=secret` can be used here instead to create a secret 
commit.

> test-bookmarks-pushpull.t:1371
> +#if b2-pushkey
> +  $ cd ../a
> +  $ hg bookmark

we should cd to `issue6519remote` here right?

> test-bookmarks-pushpull.t:1381
> + foobar2:9b140be10808
> +  $ cat .hg/bookmarks
> +  0d2164f0ce0d8f1d6f94351eba04b794909be66c @

No need for this.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6740/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6740

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6738: unshelve: add --unresolved flag to unshelve mergestate with unresolved files

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> shelve.py:754
> +ms = merge.mergestate.clean(repo)
> +ms._writerecordsv2(_decodemergerecords(records))
> +

we should write both the versions, `_writerecords()` should be used.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6738/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6738

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6736: shelve: add method for storing mergestate in changeset extras

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> shelve.py:416
>  
> +def _encodemergerecords(records):
> +"""Encode mergestate records to store in changeset extras.

What do you think about refactoring the code to write mergestate v2 on disk and 
use that encoding to achieve this?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6736/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6736

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6741: interfaces: create a new folder for interfaces and move repository.py in it

[pulkit (Pulkit Goyal)]

pulkit created this revision.
Herald added a reviewer: indygreg.
Herald added a reviewer: durin42.
Herald added a reviewer: martinvonz.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I was trying to understand current interfaces and write new ones and I 
realized
  we need to improve how current interfaces are organised. This creates a
  dedicated folder for defining interfaces and move `repository.py` which 
defines
  all the current interfaces inside it.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6741

AFFECTED FILES
  contrib/import-checker.py
  hgext/lfs/__init__.py
  hgext/lfs/wrapper.py
  hgext/narrow/__init__.py
  hgext/narrow/narrowbundle2.py
  hgext/narrow/narrowcommands.py
  hgext/sqlitestore.py
  mercurial/changegroup.py
  mercurial/exchange.py
  mercurial/exchangev2.py
  mercurial/filelog.py
  mercurial/hg.py
  mercurial/httppeer.py
  mercurial/interfaces/__init__.py
  mercurial/interfaces/repository.py
  mercurial/localrepo.py
  mercurial/manifest.py
  mercurial/narrowspec.py
  mercurial/repository.py
  mercurial/revlog.py
  mercurial/revlogutils/constants.py
  mercurial/streamclone.py
  mercurial/testing/storage.py
  mercurial/utils/storageutil.py
  mercurial/wireprotov1peer.py
  setup.py
  tests/notcapable
  tests/pullext.py
  tests/simplestorerepo.py
  tests/test-check-interfaces.py
  tests/wireprotosimplecache.py

CHANGE DETAILS

diff --git a/tests/wireprotosimplecache.py b/tests/wireprotosimplecache.py
--- a/tests/wireprotosimplecache.py
+++ b/tests/wireprotosimplecache.py
@@ -10,12 +10,14 @@
 from mercurial import (
 extensions,
 registrar,
-repository,
 util,
 wireprotoserver,
 wireprototypes,
 wireprotov2server,
 )
+from mercurial.interfaces import (
+repository,
+)
 from mercurial.utils import (
 interfaceutil,
 stringutil,
diff --git a/tests/test-check-interfaces.py b/tests/test-check-interfaces.py
--- a/tests/test-check-interfaces.py
+++ b/tests/test-check-interfaces.py
@@ -14,6 +14,9 @@
 'test-repo']):
 sys.exit(80)
 
+from mercurial.interfaces import (
+repository,
+)
 from mercurial.thirdparty.zope import (
 interface as zi,
 )
@@ -27,7 +30,6 @@
 localrepo,
 manifest,
 pycompat,
-repository,
 revlog,
 sshpeer,
 statichttprepo,
diff --git a/tests/simplestorerepo.py b/tests/simplestorerepo.py
--- a/tests/simplestorerepo.py
+++ b/tests/simplestorerepo.py
@@ -32,11 +32,13 @@
 localrepo,
 mdiff,
 pycompat,
-repository,
 revlog,
 store,
 verify,
 )
+from mercurial.interfaces import (
+repository,
+)
 from mercurial.utils import (
 cborutil,
 interfaceutil,
diff --git a/tests/pullext.py b/tests/pullext.py
--- a/tests/pullext.py
+++ b/tests/pullext.py
@@ -13,6 +13,8 @@
 error,
 extensions,
 localrepo,
+)
+from mercurial.interfaces import (
 repository,
 )
 
diff --git a/tests/notcapable b/tests/notcapable
--- a/tests/notcapable
+++ b/tests/notcapable
@@ -6,7 +6,8 @@
 fi
 
 cat > notcapable-$CAP.py << EOF
-from mercurial import extensions, localrepo, repository
+from mercurial import extensions, localrepo
+from mercurial.interfaces import repository
 def extsetup(ui):
 extensions.wrapfunction(repository.peer, 'capable', wrapcapable)
 extensions.wrapfunction(localrepo.localrepository, 'peer', wrappeer)
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1067,6 +1067,7 @@
 'mercurial.cext',
 'mercurial.cffi',
 'mercurial.hgweb',
+'mercurial.interfaces',
 'mercurial.pure',
 'mercurial.thirdparty',
 'mercurial.thirdparty.attr',
diff --git a/mercurial/wireprotov1peer.py b/mercurial/wireprotov1peer.py
--- a/mercurial/wireprotov1peer.py
+++ b/mercurial/wireprotov1peer.py
@@ -22,10 +22,12 @@
 error,
 pushkey as pushkeymod,
 pycompat,
-repository,
 util,
 wireprototypes,
 )
+from .interfaces import (
+repository,
+)
 from .utils import (
 interfaceutil,
 )
diff --git a/mercurial/utils/storageutil.py b/mercurial/utils/storageutil.py
--- a/mercurial/utils/storageutil.py
+++ b/mercurial/utils/storageutil.py
@@ -22,8 +22,8 @@
 error,
 mdiff,
 pycompat,
-repository,
 )
+from ..interfaces import repository
 
 _nullhash = hashlib.sha1(nullid)
 
diff --git a/mercurial/testing/storage.py b/mercurial/testing/storage.py
--- a/mercurial/testing/storage.py
+++ b/mercurial/testing/storage.py
@@ -17,6 +17,8 @@
 from .. import (
 error,
 mdiff,
+)
+from ..interfaces import (
 repository,
 )
 from ..utils import (
diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py
--- a/mercurial/streamclone.py
+++ b/mercurial/streamclone.py
@@ -12,13 +12,15 @@
 import struct
 
 from .i18n import _
+from .interfaces import (
+repository,
+)
 from . import (
 cacheutil,
 error,
 narrowspec,

D6742: interfaceutil: move to interfaces/

[pulkit (Pulkit Goyal)]

pulkit created this revision.
Herald added a reviewer: indygreg.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Now that we have a dedicated folder for interfaces, let's move interfaceutil
  there.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6742

AFFECTED FILES
  hgext/sqlitestore.py
  mercurial/filelog.py
  mercurial/httppeer.py
  mercurial/interfaces/repository.py
  mercurial/interfaces/util.py
  mercurial/localrepo.py
  mercurial/manifest.py
  mercurial/revlog.py
  mercurial/utils/interfaceutil.py
  mercurial/wireprotoserver.py
  mercurial/wireprototypes.py
  mercurial/wireprotov1peer.py
  mercurial/wireprotov2server.py
  tests/simplestorerepo.py
  tests/wireprotosimplecache.py

CHANGE DETAILS

diff --git a/tests/wireprotosimplecache.py b/tests/wireprotosimplecache.py
--- a/tests/wireprotosimplecache.py
+++ b/tests/wireprotosimplecache.py
@@ -17,9 +17,9 @@
 )
 from mercurial.interfaces import (
 repository,
+util as interfaceutil,
 )
 from mercurial.utils import (
-interfaceutil,
 stringutil,
 )
 
diff --git a/tests/simplestorerepo.py b/tests/simplestorerepo.py
--- a/tests/simplestorerepo.py
+++ b/tests/simplestorerepo.py
@@ -38,10 +38,10 @@
 )
 from mercurial.interfaces import (
 repository,
+util as interfaceutil,
 )
 from mercurial.utils import (
 cborutil,
-interfaceutil,
 storageutil,
 )
 from mercurial.revlogutils import (
diff --git a/mercurial/wireprotov2server.py b/mercurial/wireprotov2server.py
--- a/mercurial/wireprotov2server.py
+++ b/mercurial/wireprotov2server.py
@@ -28,9 +28,11 @@
 wireprotoframing,
 wireprototypes,
 )
+from .interfaces import (
+util as interfaceutil,
+)
 from .utils import (
 cborutil,
-interfaceutil,
 stringutil,
 )
 
diff --git a/mercurial/wireprotov1peer.py b/mercurial/wireprotov1peer.py
--- a/mercurial/wireprotov1peer.py
+++ b/mercurial/wireprotov1peer.py
@@ -27,9 +27,7 @@
 )
 from .interfaces import (
 repository,
-)
-from .utils import (
-interfaceutil,
+util as interfaceutil,
 )
 
 urlreq = util.urlreq
diff --git a/mercurial/wireprototypes.py b/mercurial/wireprototypes.py
--- a/mercurial/wireprototypes.py
+++ b/mercurial/wireprototypes.py
@@ -17,9 +17,11 @@
 error,
 util,
 )
+from .interfaces import (
+util as interfaceutil,
+)
 from .utils import (
 compression,
-interfaceutil,
 )
 
 # Names of the SSH protocol implementations.
diff --git a/mercurial/wireprotoserver.py b/mercurial/wireprotoserver.py
--- a/mercurial/wireprotoserver.py
+++ b/mercurial/wireprotoserver.py
@@ -21,10 +21,12 @@
 wireprotov1server,
 wireprotov2server,
 )
+from .interfaces import (
+util as interfaceutil,
+)
 from .utils import (
 cborutil,
 compression,
-interfaceutil,
 )
 
 stringio = util.stringio
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -70,13 +70,13 @@
 )
 from .interfaces import (
 repository,
+util as interfaceutil,
 )
 from .revlogutils import (
 deltas as deltautil,
 flagutil,
 )
 from .utils import (
-interfaceutil,
 storageutil,
 stringutil,
 )
diff --git a/mercurial/manifest.py b/mercurial/manifest.py
--- a/mercurial/manifest.py
+++ b/mercurial/manifest.py
@@ -29,9 +29,7 @@
 )
 from .interfaces import (
 repository,
-)
-from .utils import (
-interfaceutil,
+util as interfaceutil,
 )
 
 parsers = policy.importmod(r'parsers')
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -68,10 +68,10 @@
 
 from .interfaces import (
 repository,
+util as interfaceutil,
 )
 
 from .utils import (
-interfaceutil,
 procutil,
 stringutil,
 )
diff --git a/mercurial/utils/interfaceutil.py b/mercurial/interfaces/util.py
rename from mercurial/utils/interfaceutil.py
rename to mercurial/interfaces/util.py
--- a/mercurial/utils/interfaceutil.py
+++ b/mercurial/interfaces/util.py
@@ -1,4 +1,4 @@
-# interfaceutil.py - Utilities for declaring interfaces.
+# util.py - Utilities for declaring interfaces.
 #
 # Copyright 2018 Gregory Szorc 
 #
diff --git a/mercurial/interfaces/repository.py 
b/mercurial/interfaces/repository.py
--- a/mercurial/interfaces/repository.py
+++ b/mercurial/interfaces/repository.py
@@ -11,8 +11,8 @@
 from .. import (
 error,
 )
-from ..utils import (
-interfaceutil,
+from . import (
+util as interfaceutil,
 )
 
 # When narrowing is finalized and no longer subject to format changes,
diff --git a/mercurial/httppeer.py b/mercurial/httppeer.py
--- a/mercurial/httppeer.py
+++ b/mercurial/httppeer.py
@@ -16,9 +16,6 @@
 import weakref
 
 from .i18n import _
-from .interfaces import (
-repository,
-)
 from . import (
 bundle2,
 error,
@@ -33,9 +30,12 @@
 wireprotov2peer,
 wireprotov2server,
 )
+from .interfaces import (
+repository,
+util as interf

D6479: shelve: first prototype of storing/restoring unresolved changes

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  In D6479#98757 , 
@navaneeth.suresh wrote:
  
  > In D6479#98737 , @durin42 wrote:
  >
  >> The only thing I'm curious about really is why we have extrastorage and 
usualstorge. Can we get away with only one of those choices instead of having 
more options?
  >
  > The ultimate goal is to store the mergestate info in the changeset extras 
only. But, now , it has no support to store the local version of the files 
which are stored in the mergestate. This lacks info when the user gets 
conflicts other than a usual `hg merge`.
  
  Hm, sorry for missing this earlier. If we start the merge with a clean 
working directory, we don't need to store the local version of file then.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6479/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6479

To: navaneeth.suresh, #hg-reviewers
Cc: durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6735: update: added support for --abort flag(issue4404)

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> test-merge-tools.t:2092
> +
> +Test for 'hg update --abort'
> +

I suggest taking `update --abort` tests in a new file as we will need to 
extensively test that.

> test-merge-tools.t:2129
> +  merging file
> +  warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
> +  update aborted

we need to hide this, maybe use more low level APIs. I haven't look at code in 
details, will try to look soon.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6735/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6735

To: taapas1128, #hg-reviewers
Cc: pulkit, mjpieters, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  In such cases, I like the idea of having fix as two patches, first which 
demonstrates the bug and the second which fixes the bug. What do you think?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6731/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6731

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6728: config: add experimental argument to the config registrar

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> perf.py:244
>  default=mercurial.configitems.dynamicdefault,
> +experimental=True,
>  )

This breaks `contrib/perf.py` with older versions of mercurial. Can you send a 
compatibility fix as followup?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6728/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6728

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6695: transplant: added support for --abort flag

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Let's rename this to `transplant --stop` instead.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6695/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6695

To: taapas1128, #hg-reviewers
Cc: pulkit, mjpieters, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6699: unshelve: abort on using --keep and --interactive together

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added inline comments.
pulkit accepted this revision.

INLINE COMMENTS

> shelve.py:970
>  basename = shelved[0]
> +if interactive and opts.get('keep'):
> +raise error.Abort(_('--keep on --interactive is not yet supported'))

Sorry for missing this earlier, let's move this check above. Maybe before line 
944 on this side.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6699/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6699

To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6709: config: add --registered flag to show all known configs

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  In D6709#98716 , @marmoute wrote:
  
  > We will need more than just matching the categoie name to detect 
experimental/deprecated config. There are such option outside of the 
`experimental` section, and we still need to hide them by default. You can grep 
for `# experimental config:` to see some example.
  
  I only see one of them `rebase.experimental.inmemory`. I think it will be 
nice to have configs option correctly put inside `experimental` section instead 
of adding more filtering here.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6709/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6709

To: navaneeth.suresh, #hg-reviewers, av6, marmoute
Cc: mharbison72, yuja, pulkit, marmoute, av6, mjpieters, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6724: unshelve: forget unknown files after a partial unshelve

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added inline comments.
pulkit accepted this revision.

INLINE COMMENTS

> shelve.py:1009
>  if not ispartialunshelve:
> -_forgetunknownfiles(repo, shelvectx, addedbefore)
>  unshelvecleanup(ui, repo, basename, opts)
>  finally:

Can you add a comment here about why we don't perform `unshelvecleanup()` in 
the case of partial unshelve?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6724/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6724

To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6722: fncache: make debugrebuildfncache not fail on broken fncache

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added a comment.
pulkit accepted this revision.


  Queued these for stable branch. Many thanks!

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6722/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6722

To: valentin.gatienbaron, #hg-reviewers, pulkit
Cc: pulkit, mjpieters, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6699: unshelve: abort on using --keep and --interactive together

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> shelve.py:971
> +if interactive and opts.get('keep'):
> +raise error.Abort(_('--keep on interactive is not yet supported'))
>  

`--keep on --interactive ...`

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6699/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6699

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6709: config: add --registered flag to show all known configs

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> commands.py:1888
>  fm.condwrite(ui.debugflag, 'source', '%s: ', source)
> +fm.data(defaultvalue=defaultvalue)
>  if uniquesel:

unrequired change I guess

> marmoute wrote in test-config.t:228
> Displaying the default vs current is good idea, but the current proposal 
> might be a bit odd:
> 
> If nothing is set we will have:
> 
>   annotate.ignoreblanklines=False
> 
> If something is set and is the same as the default we'll have
> 
>   annotate.ignoreblanklines=False
> 
> If something is set and is different from the repo we will have
> 
>   annotate.ignoreblanklines=True (default: False)
> 
> The first two cases can't be distinguish while they probably should, and the 
> default value is displayed differently between the first and third case.

In the second case above,

How about something like:

  annotate.ignoreblanklines=False  (default: False)

i.e. we show `(default ..)` if the user has set that config option.

> test-config.t:990
> +  worker.backgroundclosemaxqueue=384
> +  worker.backgroundcloseminfilecount=2048
> +  worker.backgroundclosethreadcount=4

Can you add some tests for `hg config  --registered`?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6709/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6709

To: navaneeth.suresh, #hg-reviewers, av6, marmoute
Cc: pulkit, marmoute, av6, mjpieters, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6709: config: add --registered flag to show all known configs

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  In D6709#98493 , @marmoute wrote:
  
  > In D6709#98479 , 
@navaneeth.suresh wrote:
  >
  >> @pulkit I couldn't figure out why the devel-warnings are coming. It's 
being shown for the following 
  >> items in `configitems.py`. IIUC, it should be visible when we are trying 
to read a config item which is
  >> not in the registered items.  But, we are iterating over registered items 
only.
  >
  > There are "generic" config option. So it does not hold the option "name", 
but a regexp to match valid entry.
  >
  >> @av6 If you have a strong opinion on replacing `True/False` with `yes/no`, 
I can do that.
  >
  > Not sure is @av6 has a strong opinion, but I do :-)
  
  I don't want to discuss whether `yes/no` are better or `True/False` but when 
showing the default value, let's show the exact same which is there even though 
they mean the same?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6709/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6709

To: navaneeth.suresh, #hg-reviewers, av6, marmoute
Cc: pulkit, marmoute, av6, mjpieters, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel