Re: D2409: graft: add no-commit mode (issue5631)

Hello there, Can I get a little review on this :) On Tue, Feb 27, 2018 at 1:58 AM, khanchi97 (Sushil khanchi) < phabrica...@mercurial-scm.org> wrote: > khanchi97 updated this revision to Diff 6132. > > REPOSITORY > rHG Mercurial > > CHANGES SINCE LAST UPDATE >

D2495: narrow: drop safehasattr() checks for always-present repo.narrowmatch

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa9d88301d495: narrow: drop safehasattr() checks for always-present repo.narrowmatch (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2489: narrow: move checking for narrow requirement into _narrowmatch()

This revision was automatically updated to reflect the committed changes. Closed by commit rHGcb0449f3d9fc: narrow: move checking for narrow requirement into _narrowmatch() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2487: narrow: move requirement constant to core

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd93553662d0a: narrow: move requirement constant to core (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2487?vs=6187=6220

D2490: narrow: consider both local and remote matchers in narrowchangegroup

This revision was automatically updated to reflect the committed changes. Closed by commit rHGae95b0c81051: narrow: consider both local and remote matchers in narrowchangegroup (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2494: narrow: move narrowmatch-related methods to localrepo

This revision was automatically updated to reflect the committed changes. Closed by commit rHG759a79ce785e: narrow: move narrowmatch-related methods to localrepo (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2493: narrow: remove dependency from narrowspec module to hg module

This revision was automatically updated to reflect the committed changes. Closed by commit rHG0abed045d325: narrow: remove dependency from narrowspec module to hg module (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2491: narrow: always wrap repo

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd0baa181342a: narrow: always wrap repo (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2491?vs=6191=6224 REVISION DETAIL

D2492: narrow: reduce depedence on narrowspec.save()

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe5005ade8860: narrow: reduce depedence on narrowspec.save() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2488: narrow: move changegroup.supportedoutgoingversions() override to core

This revision was automatically updated to reflect the committed changes. Closed by commit rHGbd947b538f0e: narrow: move changegroup.supportedoutgoingversions() override to core (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2494: narrow: move narrowmatch-related methods to localrepo

indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. I know we're trying to remove methods from `localrepository` so it is smaller. `narrowpats` and `_narrowmatch` need to be there because of `@repofilecache`. And `narrowmatch` is the

D2493: narrow: remove dependency from narrowspec module to hg module

indygreg accepted this revision. indygreg added inline comments. This revision is now accepted and ready to land. INLINE COMMENTS > narrowrepo.py:76-78 > +source = self > +if self.shared(): > +source = hg.sharedreposource(self) It feels like there could

D2491: narrow: always wrap repo

indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. Yay for getting rid of `__bases__` hackery! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2491 To: martinvonz, durin42, #hg-reviewers, indygreg Cc:

D2489: narrow: move checking for narrow requirement into _narrowmatch()

indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. Having the requirement imply the use of a narrow matcher seems OK to me. It is easy enough to change if we need something else. REPOSITORY rHG Mercurial REVISION DETAIL

D2487: narrow: move requirement constant to core

indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. I could bikeshed the location. But meh. Anywhere in core is better than nowhere in core. (I would have suggested repository.py) REPOSITORY rHG Mercurial REVISION DETAIL

[Bug 5806] New: looks like evolve commit 25155eb0 made it incompatible with core < ef3a24a023e

https://bz.mercurial-scm.org/show_bug.cgi?id=5806 Bug ID: 5806 Summary: looks like evolve commit 25155eb0 made it incompatible with core < ef3a24a023e Product: Mercurial Version: unspecified Hardware: PC

D2402: stack: introduce an option to limit the selection on the current branch

lothiraldan updated this revision to Diff 6218. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2402?vs=6016=6218 REVISION DETAIL https://phab.mercurial-scm.org/D2402 AFFECTED FILES mercurial/configitems.py mercurial/stack.py tests/test-stack.t

D2403: stack: remove destutil.stackbase

lothiraldan updated this revision to Diff 6219. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2403?vs=6017=6219 REVISION DETAIL https://phab.mercurial-scm.org/D2403 AFFECTED FILES hgext/show.py mercurial/destutil.py CHANGE DETAILS diff --git

D2400: stack: begin to make the stack revset configurable

lothiraldan updated this revision to Diff 6216. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2400?vs=6014=6216 REVISION DETAIL https://phab.mercurial-scm.org/D2400 AFFECTED FILES mercurial/configitems.py mercurial/stack.py CHANGE DETAILS diff

D2401: stack: introduce an option to disable the restriction on ancestor

lothiraldan updated this revision to Diff 6217. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2401?vs=6015=6217 REVISION DETAIL https://phab.mercurial-scm.org/D2401 AFFECTED FILES mercurial/configitems.py mercurial/stack.py CHANGE DETAILS diff

D2396: stack: import Evolve stack test file

lothiraldan updated this revision to Diff 6213. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2396?vs=6010=6213 REVISION DETAIL https://phab.mercurial-scm.org/D2396 AFFECTED FILES mercurial/revset.py tests/test-stack.t CHANGE DETAILS diff --git

D2398: histedit: use the new stack definition for histedit

lothiraldan updated this revision to Diff 6214. Herald added a reviewer: durin42. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2398?vs=6012=6214 REVISION DETAIL https://phab.mercurial-scm.org/D2398 AFFECTED FILES hgext/histedit.py

D2399: stack: return a sorted smartrev by default

lothiraldan updated this revision to Diff 6215. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2399?vs=6013=6215 REVISION DETAIL https://phab.mercurial-scm.org/D2399 AFFECTED FILES mercurial/destutil.py mercurial/stack.py tests/test-stack.t

D2395: stack: add a new module for stack-related commands

lothiraldan updated this revision to Diff 6212. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2395?vs=6009=6212 REVISION DETAIL https://phab.mercurial-scm.org/D2395 AFFECTED FILES mercurial/stack.py CHANGE DETAILS diff --git a/mercurial/stack.py

D2511: py3: add 14 new passing tests to whitelist

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/D2511 AFFECTED FILES contrib/python3-whitelist CHANGE DETAILS diff --git a/contrib/python3-whitelist

D2509: py3: add b'' prefix in tests/test-revlog-v2.t

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY After this, the test works on Python 3. There is some extra return value by open().write() I think which needs to be handled. 1. skip-blame because just b''

D2510: py3: add b'' prefixes in tests/test-rollback.t

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This makes the test run succesfully on Python 3. There is just a b'' prefix extra in the output. 1. skip-blame because we added just b'' prefixes REPOSITORY

D2506: py3: add b'' prefixes in tests/test-revlog-ancestry.py

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 1. skip-blame because just b'' prefixes REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2506 AFFECTED FILES

D2508: py3: add b'' prefixes in tests/test-revlog.t

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 1. skip-blame because just b'' prefixes REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2508 AFFECTED FILES tests/test-revlog.t

D2507: py3: make sure we open the file in bytes mode

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This makes the test pass on Python 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2507 AFFECTED FILES

D2498: py3: use pycompat.bytestr to convert str to bytes

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/D2498 AFFECTED FILES mercurial/exchange.py CHANGE DETAILS diff --git a/mercurial/exchange.py

D2502: py3: use '%d' for integers instead of b'%s'

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/D2502 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py ---

D2496: py3: slice over bytes or use startswith() to prevent getting ascii values

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/D2496 AFFECTED FILES mercurial/commands.py mercurial/fileset.py CHANGE DETAILS diff --git

D2504: py3: backout changeset 56635c506608 which wrongly added couple of b''

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I am not sure what I was thinking when I added that but while fixing rebase tests, I revisited the file and found that I did wrong. I am sorry for this.

D2501: py3: make sure we write in mergestate in bytes mode

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/D2501 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py

D2503: py3: add a missing b'' in tests/bruterebase.py

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/D2503 AFFECTED FILES tests/bruterebase.py CHANGE DETAILS diff --git a/tests/bruterebase.py

D2505: py3: port the markdirver extension in tests/test-resolve.t

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/D2505 AFFECTED FILES tests/test-resolve.t CHANGE DETAILS diff --git a/tests/test-resolve.t

D2499: py3: replace str() calls with their preferred bytes equivalent

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/D2499 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py ---

D2500: py3: add b'' prefixes in tests/test-rebase-scenario-global.t

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 1. skip-blame because just b'' prefixes REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2500 AFFECTED FILES

D2497: py3: convert error messages to bytes using util.forcebytestr()

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/D2497 AFFECTED FILES mercurial/branchmap.py CHANGE DETAILS diff --git a/mercurial/branchmap.py

mercurial@36442: 4 new changesets

4 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/02cd2fb6de72 changeset: 36439:02cd2fb6de72 user:Yuya Nishihara date:Sun Feb 25 13:42:51 2018 +0900 summary: narrow: drop redundant templatekw/revset names from help text

D2487: narrow: move requirement constant to core

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY My short-term goal is to move narrowrepo.narrowmatch() onto localrepo and this is a necessary step for that. I put the

D2489: narrow: move checking for narrow requirement into _narrowmatch()

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We want to move narrowmatch() and others into core, so we need to get rid of the dependence on the "narrow_opts" from the

D2488: narrow: move changegroup.supportedoutgoingversions() override to core

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Also document why we need cg3 or higher. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2488

D2495: narrow: drop safehasattr() checks for always-present repo.narrowmatch

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I've added checks for repo.narrowmatch().always() in order to restore some of the fast paths for non-narrow repos.

D2494: narrow: move narrowmatch-related methods to localrepo

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch makes it so localrepo.narrowmatch() and a few more are always available, which will let us simplify the use sites

D2492: narrow: reduce depedence on narrowspec.save()

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I think narrowspec should be a simple, low-level module and not depend on the hg module. This prepares for moving that

D2493: narrow: remove dependency from narrowspec module to hg module

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2493 AFFECTED FILES hgext/narrow/narrowrepo.py

D2490: narrow: consider both local and remote matchers in narrowchangegroup

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The existing code that picked one or the other seemed very suspicious. This patch makes us intersect the local matcher with

D2491: narrow: always wrap repo

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It's simpler to always wrap the repo. This prepares for moving narrowrepo.narrowmatch() onto localrepo by showing that it's