Page MenuHomePhabricator
Feed Advanced Search

Fri, Jun 14

navaneeth.suresh added a comment to D6479: shelve: first prototype of storing/restoring unresolved changes.

Now, we have mergestate information storage in changeset level too with the help of extra mapping.

Fri, Jun 14, 4:19 PM
navaneeth.suresh updated the summary of D6479: shelve: first prototype of storing/restoring unresolved changes.
Fri, Jun 14, 3:57 PM

Thu, Jun 13

navaneeth.suresh updated subscribers of rHG9d31581cc44e: help: add help entry for internals.mergestate.
help: add help entry for internals.mergestate
Thu, Jun 13, 4:39 PM
navaneeth.suresh updated the summary of D6528: tests: fix internals.mergestate entry.
Thu, Jun 13, 1:39 PM
navaneeth.suresh added a comment to D6448: help: add help entry for internals.mergestate.

This needs some fixups to keep test-help.t and the Windows installer happy:
https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/1468/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio
See 876f08f30ade for an example of how to fix the installer.

Thu, Jun 13, 1:23 PM
navaneeth.suresh created D6528: tests: fix internals.mergestate entry.
Thu, Jun 13, 1:22 PM

Wed, Jun 12

navaneeth.suresh closed D6448: help: add help entry for internals.mergestate.
Wed, Jun 12, 12:58 PM
navaneeth.suresh updated subscribers of rHG2ae1e2ad4969: help: add help entry for internals.mergestate.
help: add help entry for internals.mergestate
Wed, Jun 12, 12:58 PM

Tue, Jun 11

navaneeth.suresh abandoned D6478: shelve: first prototype of storing unresolved changes.
Tue, Jun 11, 3:50 PM
navaneeth.suresh added a comment to D6479: shelve: first prototype of storing/restoring unresolved changes.
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.

Tue, Jun 11, 3:49 PM
navaneeth.suresh added a comment to D6478: shelve: first prototype of storing unresolved changes.

Adding changes to D6479 and abandoning.

Tue, Jun 11, 3:49 PM
navaneeth.suresh retitled D6479: shelve: first prototype of storing/restoring unresolved changes from unshelve: first prototype of restoring unresolved changes to shelve: first prototype of storing/restoring unresolved changes.
Tue, Jun 11, 3:45 PM
navaneeth.suresh updated the diff for D6478: shelve: first prototype of storing unresolved changes.
Tue, Jun 11, 3:30 PM
navaneeth.suresh updated the diff for D6479: shelve: first prototype of storing/restoring unresolved changes.
Tue, Jun 11, 3:21 PM
navaneeth.suresh added inline comments to D6478: shelve: first prototype of storing unresolved changes.
Tue, Jun 11, 2:29 PM
navaneeth.suresh updated the diff for D6478: shelve: first prototype of storing unresolved changes.
Tue, Jun 11, 8:09 AM
navaneeth.suresh updated the diff for D6479: shelve: first prototype of storing/restoring unresolved changes.
Tue, Jun 11, 7:30 AM

Mon, Jun 10

navaneeth.suresh added inline comments to D6478: shelve: first prototype of storing unresolved changes.
Mon, Jun 10, 3:50 PM
navaneeth.suresh updated the diff for D6478: shelve: first prototype of storing unresolved changes.
Mon, Jun 10, 3:41 PM
navaneeth.suresh updated the diff for D6479: shelve: first prototype of storing/restoring unresolved changes.
Mon, Jun 10, 2:42 PM
navaneeth.suresh updated the diff for D6479: shelve: first prototype of storing/restoring unresolved changes.
Mon, Jun 10, 1:11 PM
navaneeth.suresh updated the diff for D6479: shelve: first prototype of storing/restoring unresolved changes.
Mon, Jun 10, 12:51 PM
navaneeth.suresh updated the diff for D6479: shelve: first prototype of storing/restoring unresolved changes.
Mon, Jun 10, 12:30 PM
navaneeth.suresh added a comment to D6479: shelve: first prototype of storing/restoring unresolved changes.
In D6479#94556, @pulkit wrote:

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 mergestate. However, we'll be still in a state with only one parent. This merge will help to recreate the exact same state with two parents.

There are other ways to set the second parent, like dirstate.setparents() I think. It is worth investigating to find a way to do it without merging again.

Mon, Jun 10, 12:00 PM
navaneeth.suresh added a comment to D6479: shelve: first prototype of storing/restoring unresolved changes.

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?

Mon, Jun 10, 11:48 AM

Wed, Jun 5

navaneeth.suresh created D6478: shelve: first prototype of storing unresolved changes.
Wed, Jun 5, 3:05 PM
navaneeth.suresh created D6479: shelve: first prototype of storing/restoring unresolved changes.
Wed, Jun 5, 3:05 PM

Mon, May 27

navaneeth.suresh created D6448: help: add help entry for internals.mergestate.
Mon, May 27, 9:24 AM

Apr 9 2019

navaneeth.suresh added inline comments to D5628: diffstat: make --git work properly on renames (issue6025).
Apr 9 2019, 11:55 AM

Apr 2 2019

navaneeth.suresh added a comment to D6169: unshelve: disable unshelve during merge (issue5123).

Thanks for queuing Yuya.

Apr 2 2019, 11:48 PM
navaneeth.suresh closed D6169: unshelve: disable unshelve during merge (issue5123).
Apr 2 2019, 6:40 PM
navaneeth.suresh committed rHG03f6480bfdda: unshelve: disable unshelve during merge (issue5123).
unshelve: disable unshelve during merge (issue5123)
Apr 2 2019, 6:40 PM
navaneeth.suresh updated the diff for D6169: unshelve: disable unshelve during merge (issue5123).
Apr 2 2019, 9:06 AM

Apr 1 2019

navaneeth.suresh added a comment to D6169: unshelve: disable unshelve during merge (issue5123).

I saw some patches[0][1][2] trying to fix this issue. It seems like it's difficult to preserve the second parent.

Apr 1 2019, 4:12 AM

Mar 26 2019

navaneeth.suresh added a comment to D6027: mq: make unshelve to apply on modified mq patch (issue4318).

It doesn't make sense to check the existence of 'shelvedstate' in a static
table.
Can't we somehow get around the mq in a similar way to shelve.getcommitfunc()?
I don't think it's good idea to rely on state files saved on disk.

Mar 26 2019, 2:21 PM
navaneeth.suresh added a comment to D6169: unshelve: disable unshelve during merge (issue5123).

Is it difficult to fix unshelve to not lose merge parents?
https://bz.mercurial-scm.org/show_bug.cgi?id=5123#c2

Mar 26 2019, 2:11 PM

Mar 25 2019

navaneeth.suresh created D6169: unshelve: disable unshelve during merge (issue5123).
Mar 25 2019, 3:17 AM

Mar 24 2019

navaneeth.suresh added a comment to D6027: mq: make unshelve to apply on modified mq patch (issue4318).

Gentle ping for review.

Mar 24 2019, 2:09 PM
navaneeth.suresh added a comment to D6056: patch: stop aborting when add/rename/copy files on --interactive (issue5727).

Gentle ping for review.

Mar 24 2019, 2:08 PM

Mar 17 2019

navaneeth.suresh added inline comments to D6056: patch: stop aborting when add/rename/copy files on --interactive (issue5727).
Mar 17 2019, 12:59 AM

Mar 16 2019

navaneeth.suresh added inline comments to D6056: patch: stop aborting when add/rename/copy files on --interactive (issue5727).
Mar 16 2019, 4:57 AM

Mar 14 2019

navaneeth.suresh updated the diff for D6056: patch: stop aborting when add/rename/copy files on --interactive (issue5727).
Mar 14 2019, 2:21 AM

Mar 8 2019

navaneeth.suresh updated the diff for D6027: mq: make unshelve to apply on modified mq patch (issue4318).
Mar 8 2019, 1:26 PM

Mar 7 2019

navaneeth.suresh added inline comments to D6069: uncommit: add flag --allow-dirty-working-copy.
Mar 7 2019, 2:51 PM

Mar 6 2019

navaneeth.suresh closed D6069: uncommit: add flag --allow-dirty-working-copy.
Mar 6 2019, 8:39 AM
navaneeth.suresh closed D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Mar 6 2019, 8:39 AM
navaneeth.suresh committed rHGaa284d9a33ca: uncommit: add flag --allow-dirty-working-copy.
uncommit: add flag --allow-dirty-working-copy
Mar 6 2019, 8:39 AM
navaneeth.suresh committed rHGbf22e370ae9a: uncommit: don't allow dirty working copy with PATH (issue5977).
uncommit: don't allow dirty working copy with PATH (issue5977)
Mar 6 2019, 8:39 AM
navaneeth.suresh added a comment to D5940: uncommit: don't allow dirty working copy with PATH (issue5977).

Can you fix the first line of the commit message to say "don't allow dirty working copy with PATH" (the "don't" was missing). It was allowed before this patch, it is not allowed with this patch (unless the config is set, of course).

Mar 6 2019, 12:50 AM
navaneeth.suresh retitled D5940: uncommit: don't allow dirty working copy with PATH (issue5977) from uncommit: allow dirty working copy with PATH (issue5977) to uncommit: don't allow dirty working copy with PATH (issue5977).
Mar 6 2019, 12:49 AM
navaneeth.suresh added a comment to D6027: mq: make unshelve to apply on modified mq patch (issue4318).

Ping for review.

Mar 6 2019, 12:45 AM
navaneeth.suresh updated the diff for D6069: uncommit: add flag --allow-dirty-working-copy.
Mar 6 2019, 12:35 AM
navaneeth.suresh updated the diff for D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Mar 6 2019, 12:35 AM

Mar 4 2019

navaneeth.suresh added inline comments to D6069: uncommit: add flag --allow-dirty-working-copy.
Mar 4 2019, 10:40 AM
navaneeth.suresh updated the diff for D6069: uncommit: add flag --allow-dirty-working-copy.
Mar 4 2019, 10:39 AM
navaneeth.suresh created D6069: uncommit: add flag --allow-dirty-working-copy.
Mar 4 2019, 10:04 AM
navaneeth.suresh updated the diff for D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Mar 4 2019, 9:11 AM
navaneeth.suresh added inline comments to D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Mar 4 2019, 9:08 AM

Mar 3 2019

navaneeth.suresh added inline comments to D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Mar 3 2019, 11:11 PM
navaneeth.suresh created D6056: patch: stop aborting when add/rename/copy files on --interactive (issue5727).
Mar 3 2019, 2:24 PM

Mar 2 2019

navaneeth.suresh added a comment to D5940: uncommit: don't allow dirty working copy with PATH (issue5977).

I don't understand the commit message. experimental.uncommitondirtydir already works with PATH, doesn't it? I think you mean something like "uncommit: allow dirty working copy with PATH". Did I understand that right?

Mar 2 2019, 12:35 AM

Mar 1 2019

navaneeth.suresh added inline comments to D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Mar 1 2019, 2:39 PM
navaneeth.suresh updated the diff for D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Mar 1 2019, 2:36 PM

Feb 28 2019

navaneeth.suresh updated the diff for D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Feb 28 2019, 11:47 PM

Feb 26 2019

navaneeth.suresh created D6027: mq: make unshelve to apply on modified mq patch (issue4318).
Feb 26 2019, 7:24 AM
navaneeth.suresh added a comment to D5940: uncommit: don't allow dirty working copy with PATH (issue5977).

Ping for review.

Feb 26 2019, 5:59 AM

Feb 25 2019

navaneeth.suresh added a comment to D5997: mq: disable qrecord during histedit (issue5981).

Thanks for queuing @pulkit. @yuja thanks for the review.

Feb 25 2019, 10:43 AM
navaneeth.suresh closed D5997: mq: disable qrecord during histedit (issue5981).
Feb 25 2019, 10:40 AM
navaneeth.suresh committed rHG4d21ebc4cb47: mq: disable qrecord during histedit (issue5981).
mq: disable qrecord during histedit (issue5981)
Feb 25 2019, 10:40 AM

Feb 24 2019

navaneeth.suresh updated the diff for D5997: mq: disable qrecord during histedit (issue5981).
Feb 24 2019, 10:52 PM

Feb 21 2019

navaneeth.suresh created D5997: mq: disable qrecord during histedit (issue5981).
Feb 21 2019, 2:33 PM

Feb 16 2019

navaneeth.suresh updated the diff for D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Feb 16 2019, 12:26 AM
navaneeth.suresh added inline comments to D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Feb 16 2019, 12:13 AM
navaneeth.suresh updated the diff for D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Feb 16 2019, 12:07 AM

Feb 15 2019

navaneeth.suresh added inline comments to D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Feb 15 2019, 2:31 PM
navaneeth.suresh updated the diff for D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Feb 15 2019, 2:08 PM
navaneeth.suresh added inline comments to D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Feb 15 2019, 11:53 AM

Feb 14 2019

navaneeth.suresh committed rHG5fe4de392edb: revset: improve documentation on expectsize().
revset: improve documentation on expectsize()
Feb 14 2019, 4:17 PM
navaneeth.suresh updated the diff for D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Feb 14 2019, 11:56 AM
navaneeth.suresh added a comment to D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
In D5940#87026, @pulkit wrote:

Hi, it will be good if you specify that the patch is authored by someone else, mention their name and also provide the link to the original PR of this patch.

Feb 14 2019, 9:48 AM
navaneeth.suresh closed D5953: revset: improve documentation on expectsize().
Feb 14 2019, 8:24 AM
navaneeth.suresh committed rHG735da363556d: revset: improve documentation on expectsize().
revset: improve documentation on expectsize()
Feb 14 2019, 8:23 AM

Feb 13 2019

navaneeth.suresh updated the diff for D5953: revset: improve documentation on expectsize().
Feb 13 2019, 8:00 AM
navaneeth.suresh created D5953: revset: improve documentation on expectsize().
Feb 13 2019, 7:51 AM
navaneeth.suresh added inline comments to D5813: revset: add expect to check the size of a set.
Feb 13 2019, 7:27 AM

Feb 12 2019

navaneeth.suresh closed D5813: revset: add expect to check the size of a set.
Feb 12 2019, 7:51 AM
navaneeth.suresh committed rHG8185c8abce87: revset: add expectsize to check the size of a set.
revset: add expectsize to check the size of a set
Feb 12 2019, 7:50 AM

Feb 11 2019

navaneeth.suresh created D5940: uncommit: don't allow dirty working copy with PATH (issue5977).
Feb 11 2019, 2:02 PM
navaneeth.suresh updated the diff for D5813: revset: add expect to check the size of a set.
Feb 11 2019, 10:14 AM

Feb 10 2019

navaneeth.suresh added a comment to D5813: revset: add expect to check the size of a set.

nit-pick is resolved. getintrange() will throw a ParseError on setting size to one of min:, :max or :. In ideal case, on calling from expectsize() it shouldn't fail.

Feb 10 2019, 11:13 PM
navaneeth.suresh updated the diff for D5813: revset: add expect to check the size of a set.
Feb 10 2019, 11:09 PM
navaneeth.suresh updated the diff for D5813: revset: add expect to check the size of a set.
Feb 10 2019, 12:19 AM

Feb 7 2019

navaneeth.suresh added a comment to D5813: revset: add expect to check the size of a set.

@yuja I've updated the revision with the suggested changes.

Feb 7 2019, 2:34 PM
navaneeth.suresh updated the diff for D5813: revset: add expect to check the size of a set.
Feb 7 2019, 2:28 PM
navaneeth.suresh abandoned D5490: commit: remove ignore whitespace option on --interactive (issue6042).

rHG66399f2e92aa solves this issue, many thanks @spectral. Closing this.

Feb 7 2019, 11:46 AM

Feb 6 2019

navaneeth.suresh updated subscribers of D5490: commit: remove ignore whitespace option on --interactive (issue6042).

@spectral @yuja Can I close this?

Feb 6 2019, 11:26 AM
navaneeth.suresh added a comment to D5813: revset: add expect to check the size of a set.

Can you share your failed attempt?
Maybe you can get how revset works by testing expression with
hg debugrevspec -v.

Feb 6 2019, 11:19 AM
navaneeth.suresh updated the diff for D5813: revset: add expect to check the size of a set.
Feb 6 2019, 11:16 AM

Feb 5 2019

navaneeth.suresh added a comment to D5813: revset: add expect to check the size of a set.

First, I think the word expect is too general. Perhaps, this should be called
expectsize() or expectlen().

Feb 5 2019, 12:33 PM

Feb 4 2019

navaneeth.suresh committed rHG09f1c17e24dd: tags: avoid generating commit for an already deleted tag (issue5752).
tags: avoid generating commit for an already deleted tag (issue5752)
Feb 4 2019, 4:54 PM