D5813: revset: add expect to check the size of a set

2019-02-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14013. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5813?vs=14000=14013 REVISION DETAIL https://phab.mercurial-scm.org/D5813 AFFECTED FILES mercurial/revset.py tests/test-revset.t CHANGE DETAILS

D5940: uncommit: add -f/--force when possibly hiding data (issue5977)

2019-02-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > martinvonz wrote in test-uncommit.t:176-179 > Why did this change? > > I don't understand what the new flag is for since we already how the config > option. They seem to me to do the same thing. I'm also surprised at the change in that

D5940: uncommit: add --allowdirtywcopy when possibly hiding data (issue5977)

2019-02-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > martinvonz wrote in uncommit.py:140 > Doesn't that mean the whole patch is unnecessary? It pretty much just > provides an easier way of saying `--config > experimental.uncommitondirtywdir=yes`, doesn't it? I tried with

D5940: uncommit: add --allowdirtywcopy when possibly hiding data (issue5977)

2019-02-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14100. navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "uncommit: add -f/--force when possibly hiding data (issue5977)" to "uncommit: add --allowdirtywcopy when possibly hiding data (issue5977)".

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

2019-02-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14130. navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "uncommit: add --allowdirtywcopy when possibly hiding data (issue5977)" to "uncommit: make experimental.uncommitondirtydir to work on PATH

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

2019-02-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh marked 4 inline comments as done. navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in uncommit.py:140 > Nice point. I had to revisit the bug to understand more now. IMO the bug says > as following: > > `uncommit` should require a flag or config when it is

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

2019-02-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14131. navaneeth.suresh marked an inline comment as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5940?vs=14130=14131 REVISION DETAIL https://phab.mercurial-scm.org/D5940 AFFECTED FILES

D5813: revset: add expect to check the size of a set

2019-02-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14029. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5813?vs=14013=14029 REVISION DETAIL https://phab.mercurial-scm.org/D5813 AFFECTED FILES mercurial/revset.py tests/test-revset.t CHANGE DETAILS

D5628: diffstat: make --git work properly on renames (issue6025)

2019-01-25 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGffdac0067a14: diffstat: make --git work properly on renames (issue6025) (authored by navaneeth.suresh, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5780: tags: avoid generating commit for an already deleted tag (issue5752)

2019-01-31 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. @durin42 Thanks for the quick review. @mharbison72 Yup. I should not be making changes to the ui as this can be fixed simply within the call itself. My bad. I've updated the revision as per your suggestion, many thanks! REPOSITORY rHG Mercurial

D5780: tags: avoid generating commit for an already deleted tag (issue5752)

2019-01-31 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8db09278f7e0: tags: avoid generating commit for an already deleted tag (issue5752) (authored by navaneeth.suresh, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5780: tags: avoid generating commit for an already deleted tag (issue5752)

2019-01-31 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 13647. navaneeth.suresh edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5780?vs=13641=13647 REVISION DETAIL https://phab.mercurial-scm.org/D5780 AFFECTED FILES

D5813: revset: add expect to check the size of a set

2019-02-03 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `expect(, )` revset fails if `` is not exactly `` elements. `expect(, , )` revset fails if `` is not exactly between `` and `` inclusive.

D5813: revset: add expect to check the size of a set

2019-02-03 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 13735. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5813?vs=13731=13735 REVISION DETAIL https://phab.mercurial-scm.org/D5813 AFFECTED FILES mercurial/revset.py tests/test-revset.t CHANGE DETAILS

D5813: revset: add expect to check the size of a set

2019-02-03 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh marked 2 inline comments as done. navaneeth.suresh added a comment. @pulkit Thanks for the quick review! I've updated the revision with the suggested changes. @durin42 It would be great if you let us know your opinion on `one()` as an alias for `expect(, 1)`. I did it as it

D5813: revset: add expect to check the size of a set

2019-02-03 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 13736. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5813?vs=13735=13736 REVISION DETAIL https://phab.mercurial-scm.org/D5813 AFFECTED FILES mercurial/revset.py tests/test-revset.t CHANGE DETAILS

D5744: commit: ignore diff whitespace settings when doing `commit -i` (issue5839)

2019-01-30 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Sorry for bumping this up. I worked on a similar issue on https://phab.mercurial-scm.org/D5490. My initial revision was similar to this one. @spectral Don't you think it'll affect record extension which was written with zero test coverage? Please don't feel

D5780: tags: avoid generating commit for an already deleted tag (issue5752)

2019-01-31 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `$ hg tag --remove ` will keep on generating commits regardless of checking whether the tag is deleted or not. I added a new function

D5813: revset: add expect to check the size of a set

2019-02-05 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. > First, I think the word `expect` is too general. Perhaps, this should be called > `expectsize()` or `expectlen()`. I can make it `expectsize()`. > It's also unclear what's the difference between `size` and `min`/`max`. > Instead of these

D6448: help: add help entry for internals.mergestate

2019-05-27 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds an entry for `internals.mergestate` as suggested by @marmoute. Most of the help text is taken from `merge.mergestate`. REPOSITORY rHG

D6478: shelve: first prototype of storing unresolved changes

2019-06-05 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before storing unresolved mergestate information in changeset level, I tried to make the user store the partially resolved merge to restore for later

D6479: unshelve: first prototype of restoring unresolved changes

2019-06-05 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds an `--unresolved` flag to `unshelve`. This will get the user back to the old unresolved merge by the following steps: step 1:

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

2019-06-14 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh edited the summary of this revision. navaneeth.suresh updated this revision to Diff 15517. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15451=15517 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION

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

2019-06-14 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Now, we have mergestate information storage in changeset level too with the help of extra mapping. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6479 To:

D6478: shelve: first prototype of storing unresolved changes

2019-06-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15432. navaneeth.suresh marked 4 inline comments as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6478?vs=15345=15432 REVISION DETAIL https://phab.mercurial-scm.org/D6478 AFFECTED FILES

D6478: shelve: first prototype of storing unresolved changes

2019-06-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:605 > can we look into changeset extras here to decide whether this is an > unresolved shelve or not here? > > It will be nice to remove any details of our storage layer and only keep them > to functions which

D6478: shelve: first prototype of storing unresolved changes

2019-06-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15436. navaneeth.suresh marked 6 inline comments as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6478?vs=15432=15436 REVISION DETAIL https://phab.mercurial-scm.org/D6478 AFFECTED FILES

D6479: unshelve: first prototype of restoring unresolved changes

2019-06-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15435. navaneeth.suresh marked 2 inline comments as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15431=15435 REVISION DETAIL https://phab.mercurial-scm.org/D6479 AFFECTED FILES

D6478: shelve: first prototype of storing unresolved changes

2019-06-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:618 > let's do `namewidth += len('unresolved)'` ideally, that should be len(' (unresolved)'), right? i haven't seen such use cases in the codebase though. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

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

2019-06-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "unshelve: first prototype of restoring unresolved changes" to "shelve: first prototype of storing/restoring unresolved changes". navaneeth.suresh updated this revision to Diff 15451. REPOSITORY

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

2019-06-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In D6479#94711 , @pulkit wrote: > Can you fold both the commits, it will be better to see code for both storing and restoring mergestates in one patch. @pulkit I've folded the changesets and updated the

D6479: unshelve: first prototype of restoring unresolved changes

2019-06-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh marked 2 inline comments as done. navaneeth.suresh updated this revision to Diff 15449. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15435=15449 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION

D6478: shelve: first prototype of storing unresolved changes

2019-06-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15450. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6478?vs=15436=15450 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6478/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6478

D6478: shelve: first prototype of storing unresolved changes

2019-06-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Adding changes to D6479 and abandoning. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6478/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6478 To: navaneeth.suresh,

D6448: help: add help entry for internals.mergestate

2019-06-12 Thread navaneeth.suresh (Navaneeth Suresh)
Closed by commit rHG2ae1e2ad4969: help: add help entry for internals.mergestate (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial

D6528: tests: fix internals.mergestate entry

2019-06-13 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh 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/D6528 AFFECTED FILES tests/test-help.t CHANGE DETAILS diff --git a/tests/test-help.t

D6528: tests: fix internals.mergestate entry

2019-06-13 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh edited the summary of this revision. navaneeth.suresh updated this revision to Diff 15492. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6528?vs=15491=15492 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6528/new/ REVISION

D6448: help: add help entry for internals.mergestate

2019-06-13 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In D6448#94994 , @mharbison72 wrote: > This needs some fixups to keep test-help.t and the Windows installer happy: >

D6479: unshelve: first prototype of restoring unresolved changes

2019-06-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. > Can we prevent merging again? Since we are getting content from old unresolved commit, copying mergestate from previously stored one, what purpose does this merging serves? The usual unshelve mechanism restores the content of the files in the

D6528: tests: fix internals.mergestate entry

2019-06-19 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. navaneeth.suresh abandoned this revision. Abandoning since changes are reflected by the commit 9d31581cc44e . REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6553: shelve: move shelve extension to core

2019-06-20 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Until now,`shelve` was bootstrapped as an extension. This patch adds `shelve` on core. REPOSITORY rHG Mercurial REVISION DETAIL

D6553: shelve: move shelve extension to core

2019-06-20 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15621. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6553?vs=15616=15621 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6553/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6553

D6553: shelve: move shelve extension to core

2019-06-23 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15634. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6553?vs=15621=15634 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6553/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6553

D6553: shelve: move shelve extension to core

2019-06-23 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. @Kwan Thanks for the review. I have updated the patch as you suggested. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6553/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6553 To: navaneeth.suresh,

D6479: unshelve: first prototype of restoring unresolved changes

2019-06-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15423. navaneeth.suresh marked 2 inline comments as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15422=15423 REVISION DETAIL https://phab.mercurial-scm.org/D6479 AFFECTED FILES

D6479: unshelve: first prototype of restoring unresolved changes

2019-06-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In https://phab.mercurial-scm.org/D6479#94556, @pulkit wrote: > In https://phab.mercurial-scm.org/D6479#94555, @navaneeth.suresh wrote: > > > > Can we prevent merging again? Since we are getting content from old unresolved commit, copying mergestate

D6479: unshelve: first prototype of restoring unresolved changes

2019-06-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15420. navaneeth.suresh edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15346=15420 REVISION DETAIL https://phab.mercurial-scm.org/D6479 AFFECTED FILES

D6479: unshelve: first prototype of restoring unresolved changes

2019-06-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15422. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15420=15422 REVISION DETAIL https://phab.mercurial-scm.org/D6479 AFFECTED FILES hgext/shelve.py tests/test-shelve-unresolved.t CHANGE

D6479: unshelve: first prototype of restoring unresolved changes

2019-06-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15431. navaneeth.suresh marked an inline comment as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15423=15431 REVISION DETAIL https://phab.mercurial-scm.org/D6479 AFFECTED FILES

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

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15765. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15764=15765 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6479

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

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In D6479#96318 , @pulkit wrote: > Since you did the nice work of moving shelve to core, how about rebasing this patch on tip of default with shelve in core? Doing that right away! REPOSITORY rHG

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

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15764. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15693=15764 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6479

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh marked an inline comment as done. navaneeth.suresh updated this revision to Diff 15739. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6596?vs=15738=15757 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6596/new/ REVISION

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15738. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6596?vs=15737=15757 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6596/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6596

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. navaneeth.suresh marked 2 inline comments as done. INLINE COMMENTS > pulkit wrote in shelve.py:990 > To have this patch in a good state to be reviewed, it will be nice you take > out the addition of interactive flag to the patch where you add that >

D6553: shelve: move shelve extension to core

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. navaneeth.suresh marked an inline comment as done. INLINE COMMENTS > pulkit wrote in commands.py:6207 > I just noticed that the function `_dounshelve()` still has `_` prefix. We > generally have that to mark if functions are local to that file or class.

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "unshelve: add interactive mode (issue6162)" to "unshelve: make unshelve accept files (issue6162)". navaneeth.suresh updated this revision to Diff 15757. REPOSITORY rHG Mercurial CHANGES SINCE

D6605: unshelve: rename _dounshelve() to dounshelve()

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a follow-up patch to 3de4f17f4824 . REPOSITORY rHG Mercurial

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:990 > The interactive flag should work the same way as it work for revert, commit > and shelve commands. That's either ask hunk by hunk or pop up a curses UI. > > As you suggested before, maybe we can have `-f`

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. navaneeth.suresh updated this revision to Diff 15738. pulkit added a comment. navaneeth.suresh updated this revision to Diff 15739. navaneeth.suresh marked an inline comment

D6553: shelve: move shelve extension to core

2019-06-28 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:643 > We don't import things from hgext in mercurial. I am not sure why. > > I think it will be fine to duplicate clearstatus() from rebase to shelve.py > for the movement and add a comment that it's copied.

D6553: shelve: move shelve extension to core

2019-06-28 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh marked an inline comment as done. navaneeth.suresh updated this revision to Diff 15692. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6553?vs=15634=15692 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6553/new/ REVISION

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

2019-06-28 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15693. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15534=15693 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6479

D6596: unshelve: add interactive mode

2019-07-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "unshelve: make unshelve accept files (issue6162)" to "unshelve: add interactive mode". navaneeth.suresh updated this revision to Diff 15890. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. navaneeth.suresh marked 2 inline comments as done. INLINE COMMENTS > pulkit wrote in shelve.py:961 > Can you explain why we are not processing this if files are present? okay. on unshelving with `--files` flag, we don't want to clear the shelvedstate

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15888. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6596?vs=15757=15888 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6596/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6596

D6596: unshelve: add interactive mode

2019-07-12 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh edited the summary of this revision. navaneeth.suresh updated this revision to Diff 15891. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6596?vs=15890=15891 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6596/new/ REVISION

D6596: unshelve: add interactive mode

2019-07-12 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15892. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6596?vs=15891=15892 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6596/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6596

D6605: unshelve: rename _dounshelve() to dounshelve()

2019-07-07 Thread navaneeth.suresh (Navaneeth Suresh)
Closed by commit rHG70f1a84d0794: unshelve: rename _dounshelve() to dounshelve() (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6605?vs=15762=15784

D6589: extensions: add shelve to _builtin

2019-06-30 Thread navaneeth.suresh (Navaneeth Suresh)
Closed by commit rHG6a3872e34503: extensions: add shelve to _builtin (authored by navaneeth.suresh). 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

D6584: shelve: remove rebase.clearstatus()

2019-06-28 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a follow-up patch to c829749e7639 . After this, shelve will be no

D6553: shelve: move shelve extension to core

2019-06-28 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh edited the summary of this revision. navaneeth.suresh updated this revision to Diff 15700. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6553?vs=15692=15700 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6553/new/ REVISION

D6553: shelve: move shelve extension to core

2019-06-30 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In D6553#96119 , @yuja wrote: > Need to update `extensions._builtin` so the shelve "extension" is silently > ignored. > Please send a follow up. Doing that right away! Thanks @yuja! REPOSITORY rHG

D6589: extensions: add shelve to _builtin

2019-06-30 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a follow-up patch to 3de4f17f4824 . This adds `shelve` to

D6553: shelve: move shelve extension to core

2019-06-29 Thread navaneeth.suresh (Navaneeth Suresh)
Closed by commit rHG46087aeb8ae2: shelve: move shelve extension to core (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6553?vs=15701=15707#toc REPOSITORY rHG Mercurial CHANGES

D5628: diffstat: make --git work properly on renames (issue6025)

2019-04-09 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in patch.py:2811 > This is unfortunately not working with hglib. hglib seems to be splitting > data on '>' or only reading data after that. > > @yuja do you have any idea what can cause that? @pulkit Can you add a possible

D6596: unshelve: add interactive mode

2019-07-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15907. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6596?vs=15892=15907 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6596/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6596

D6596: unshelve: add interactive mode

2019-07-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15908. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6596?vs=15907=15908 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6596/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6596

D6553: shelve: move shelve extension to core

2019-06-28 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > martinvonz wrote in shelve.py:296-304 > This doesn't seem right. It seems D3693 > just forgot to delete `clearstatus()`. > Could you send a patch before this one to do that? Doing that right away!

D6553: shelve: move shelve extension to core

2019-06-28 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. @pulkit Changes have been made. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6553/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6553 To: navaneeth.suresh, #hg-reviewers, pulkit Cc: martinvonz, pulkit,

D6584: shelve: remove rebase.clearstatus()

2019-06-28 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh marked an inline comment as done. navaneeth.suresh updated this revision to Diff 15699. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6584?vs=15698=15699 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6584/new/ REVISION

D6584: shelve: remove rebase.clearstatus()

2019-06-28 Thread navaneeth.suresh (Navaneeth Suresh)
Closed by commit rHGead3a723bcef: shelve: remove rebase.clearstatus() (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES

D6553: shelve: move shelve extension to core

2019-06-28 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh marked an inline comment as done. navaneeth.suresh updated this revision to Diff 15701. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6553?vs=15700=15701 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6553/new/ REVISION

D6724: unshelve: forget unknown files after a partial unshelve

2019-08-13 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a follow-up patch to 6957f7b93e03 . This allows hg to forget

D6724: unshelve: forget unknown files after a partial unshelve

2019-08-13 Thread navaneeth.suresh (Navaneeth Suresh)
Closed by commit rHGd684449eef67: unshelve: forget unknown files after a partial unshelve (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

2019-08-03 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. navaneeth.suresh marked an inline comment as done. INLINE COMMENTS > av6 wrote in commands.py:1774 > This needs a better description to differentiate this flag and the default > mode (see line 1786). Could you please suggest something better? > av6

D6704: config: add defaultvalue template keyword

2019-08-03 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. @yuja Thanks for the review. Will send a follow-up soon. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6704/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6704 To: navaneeth.suresh, #hg-reviewers Cc: yuja,

D6712: config: fix defaultvalue template keyword

2019-08-03 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a follow-up patch to 51a2e3102db2 . This does three things. -

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

2019-08-02 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 16117. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6709?vs=16114=16117 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6709/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6709

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

2019-08-03 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh retitled this revision from "config: add --all flag to show all known configs" to "config: add --registered flag to show all known configs". navaneeth.suresh edited the summary of this revision. navaneeth.suresh marked an inline comment as done. navaneeth.suresh updated this

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

2019-08-16 Thread navaneeth.suresh (Navaneeth Suresh)
Closed by commit rHG4b0c9d47f714: unshelve: abort on using --keep and --interactive together (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6728: config: add experimental argument to the config registrar

2019-08-18 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in perf.py:244 > This breaks `contrib/perf.py` with older versions of mercurial. Can you send > a compatibility fix as followup? I'm not sure I understood that. Do you want me to remove the changes in `contrib/perf.py`?

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

2019-08-16 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Until now, if there is a bookmark points to a changeset which is in secret phase, hg will push the bookmark, but not the changeset referenced by that

D6730: config: handle default values of type list

2019-08-17 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. navaneeth.suresh abandoned this revision. In D6730#98852 , @av6 wrote: > The changes in tests that this patch causes are actually already present in the D6709 , so let's

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

2019-08-17 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 16247. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6709?vs=16229=16247 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6709/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6709

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

2019-08-17 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 16248. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6709?vs=16247=16248 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6709/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6709

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

2019-08-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 16209. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6709?vs=16172=16209 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6709/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6709

D6728: config: add experimental argument to the config registrar

2019-08-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Until now, there are almost 28 config items which are considered as `experimental` but, not present in the `experimental` section of the registrar.

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

2019-08-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In D6709#98718 , @marmoute wrote: > I get 28 of them. > I think we need to add an `experimental` or `status` argument ot the config registration. Created D6728 to

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

2019-08-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 16211. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6699?vs=16168=16211 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6699/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6699

<    1   2   3   4   >