Page MenuHomePhabricator

khanchi97 (Sushil khanchi)
User

Projects

User does not belong to any projects.

User Details

User Since
Jan 29 2018, 11:31 AM (138 w, 2 d)

Recent Activity

Fri, Sep 11

khanchi97 closed D9009: py3: fix bytes and str mixup in run-tests.
Fri, Sep 11, 5:48 AM
khanchi97 committed rHGc6e332a451d0: py3: fix bytes and str mixup in run-tests.
py3: fix bytes and str mixup in run-tests
Fri, Sep 11, 5:47 AM
khanchi97 created D9009: py3: fix bytes and str mixup in run-tests.
Fri, Sep 11, 3:42 AM

Thu, Sep 3

khanchi97 closed D8938: run-tests: refactor filtering logic for --retest flag.
Thu, Sep 3, 3:07 AM
khanchi97 closed D8979: run-tests: extract logic to get errpath in a utility func.
Thu, Sep 3, 3:07 AM
khanchi97 closed D8964: test-run-tests.t: add a --retest test to demonstrate a fix in next patch.
Thu, Sep 3, 3:07 AM
khanchi97 committed rHG543e446204c6: run-tests: extract logic to get errpath in a utility func.
run-tests: extract logic to get errpath in a utility func
Thu, Sep 3, 3:07 AM
khanchi97 committed rHGde9ec12ee53c: run-tests: refactor filtering logic for --retest flag.
run-tests: refactor filtering logic for --retest flag
Thu, Sep 3, 3:07 AM
khanchi97 closed D8963: test-run-tests.t: remove a sub-test since we are done with it.
Thu, Sep 3, 3:07 AM
khanchi97 committed rHGfa1a5527f642: tests: add a --retest test to demonstrate a fix in next patch.
tests: add a --retest test to demonstrate a fix in next patch
Thu, Sep 3, 3:06 AM
khanchi97 committed rHG601ec3faeb6b: tests: remove a sub-test since we are done with it in test-run-tests.t.
tests: remove a sub-test since we are done with it in test-run-tests.t
Thu, Sep 3, 3:06 AM

Wed, Sep 2

khanchi97 created D8979: run-tests: extract logic to get errpath in a utility func.
Wed, Sep 2, 1:43 PM
khanchi97 updated the diff for D8938: run-tests: refactor filtering logic for --retest flag.
Wed, Sep 2, 1:42 PM
khanchi97 updated the diff for D8964: test-run-tests.t: add a --retest test to demonstrate a fix in next patch.
Wed, Sep 2, 1:41 PM
khanchi97 added inline comments to D8938: run-tests: refactor filtering logic for --retest flag.
Wed, Sep 2, 1:12 PM
khanchi97 added inline comments to D8963: test-run-tests.t: remove a sub-test since we are done with it.
Wed, Sep 2, 1:11 PM

Thu, Aug 27

khanchi97 updated the summary of D8938: run-tests: refactor filtering logic for --retest flag.
Thu, Aug 27, 3:05 AM
khanchi97 created D8964: test-run-tests.t: add a --retest test to demonstrate a fix in next patch.
Thu, Aug 27, 3:04 AM
khanchi97 created D8963: test-run-tests.t: remove a sub-test since we are done with it.
Thu, Aug 27, 3:03 AM

Wed, Aug 26

khanchi97 added inline comments to D8938: run-tests: refactor filtering logic for --retest flag.
Wed, Aug 26, 1:25 PM

Aug 24 2020

khanchi97 added inline comments to D8938: run-tests: refactor filtering logic for --retest flag.
Aug 24 2020, 4:20 AM

Aug 22 2020

khanchi97 created D8938: run-tests: refactor filtering logic for --retest flag.
Aug 22 2020, 7:05 AM

Jul 16 2020

khanchi97 planned changes to D8646: update: suggest --merge while `hg up` across topo branches.
Jul 16 2020, 2:40 PM

Jun 29 2020

khanchi97 added a comment to D8353: debugcommands: create new debugantivirusrunning command.

Sadly I have no idea on that.

Do we have a poor windows user that could serve an a guinea pig here ?

Seems like we are not able to find a guinea pig here. How about pushing the patch and finding one in wild? :D

Jun 29 2020, 6:58 PM

Jun 22 2020

khanchi97 closed D8643: absorb: make it clear what happens when no input.
Jun 22 2020, 6:21 AM
khanchi97 committed rHG65d19d9c8e76: absorb: make it clear what happens when no input.
absorb: make it clear what happens when no input
Jun 22 2020, 6:21 AM
khanchi97 added a comment to D8646: update: suggest --merge while `hg up` across topo branches.

We have not made this change before because there is no hg update --abort. Do we have that feature yet (I haven't followed all the changes recently)?

Jun 22 2020, 2:22 AM

Jun 21 2020

khanchi97 created D8646: update: suggest --merge while `hg up` across topo branches.
Jun 21 2020, 10:12 PM

Jun 20 2020

khanchi97 created D8643: absorb: make it clear what happens when no input.
Jun 20 2020, 2:20 AM

Jun 9 2020

khanchi97 closed D8620: tests: make it clear what happen when no response entered.
Jun 9 2020, 1:53 PM
khanchi97 closed D8621: phabricator: make it clear what happen when no response.
Jun 9 2020, 1:52 PM
khanchi97 committed rHG7a0a1be721a3: phabricator: make it clear what happen when no response.
phabricator: make it clear what happen when no response
Jun 9 2020, 1:52 PM
khanchi97 committed rHG617cd3b1e9cd: tests: make it clear what happen when no response entered.
tests: make it clear what happen when no response entered
Jun 9 2020, 1:52 PM
khanchi97 created D8621: phabricator: make it clear what happen when no response.
Jun 9 2020, 12:32 PM
khanchi97 updated the diff for D8620: tests: make it clear what happen when no response entered.
Jun 9 2020, 12:19 PM

Jun 8 2020

khanchi97 created D8620: tests: make it clear what happen when no response entered.
Jun 8 2020, 2:26 AM

Mar 16 2020

khanchi97 added a comment to D6735: update: added support for --abort flag(issue4404).

Here's a case I stumbled upon that is a problem. It looks like it thinks it isn't in the middle of an update, but .hgsubstate isn't put back to the pre-update state.

diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -1027,10 +1027,38 @@ filesystem (see also issue4583))
   > [extensions]
   > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py
   > EOF
+  $ hg -R repo st -S
+  ? s/b
+  $ hg -R repo diff -S
+  $ hg -R repo log -r .
+  changeset:   0:c4018e9aea1b
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     1
+
+  $ cat repo/.hgsubstate
+  f7b1eb17ad24730a1651fccd46c43826d1bbc2ac s
   $ hg -R repo update
   b: untracked file differs
   abort: untracked files in working directory differ from files in requested revision (in subrepository "s")

@mharbison72 I am bit confused here.

  1. Since hg -R repo update resulted with an abort then why we have dirty working directory now? Isn't transaction rollback worked correctly?
  2. Also if you run hg status it says "To continue: run hg update ." but I don't think it's really a "continue", since we are still on the same changeset where we ran the first update command and running hg update . won't take us to the changeset we wanted to go.
  3. I found that for interrupted update (only for some particular kind of interrupted update) we store target node value in .hg/updatestate but I couldn't find where we exactly use that value. I found some code which check if that file exists but not one where we use the value stored in that file.
[255]

+ $ hg -R repo update --abort
+ abort: no update in progress
+ [255]
+ $ hg -R repo diff -S
+ diff -r c4018e9aea1b .hgsubstate
+ --- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
+ +++ b/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
+ @@ -1,1 +1,1 @@
+ -f7b1eb17ad24730a1651fccd46c43826d1bbc2ac s
+ +cc505f09a8b2644adffa368adb4abc6f70d07bc0 s
+ $ hg -R repo log -r .
+ changeset: 0:c4018e9aea1b
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: 1
+
+

$ cat >> repo/.hg/hgrc <<EOF
> [extensions]
> fakedirstatewritetime = !
Another good way to induce this .hgsubstate issue is to `hg pull -u` on a repo, where the remote subrepo isn't available.  You don't need http for this- you can just rename the remote subrepo.
Mar 16 2020, 5:47 PM

Feb 1 2020

khanchi97 updated the diff for D7730: rebase: make sure pruning does not confuse rebase (issue6180).
Feb 1 2020, 1:40 PM
khanchi97 updated the diff for D7728: rebase: add test to demonstrate issue6180.
Feb 1 2020, 1:40 PM

Jan 15 2020

khanchi97 added inline comments to D7730: rebase: make sure pruning does not confuse rebase (issue6180).
Jan 15 2020, 8:05 AM
khanchi97 added a comment to D7730: rebase: make sure pruning does not confuse rebase (issue6180).

Unrelated to the fix, we need better way to skip commits during rebasing. Pruning manually is not a good option, IIRC git rebase have a --skip flag.

Jan 15 2020, 8:03 AM
khanchi97 updated the diff for D7730: rebase: make sure pruning does not confuse rebase (issue6180).
Jan 15 2020, 5:42 AM
khanchi97 updated the diff for D7728: rebase: add test to demonstrate issue6180.
Jan 15 2020, 5:42 AM

Jan 8 2020

khanchi97 added a comment to D7730: rebase: make sure pruning does not confuse rebase (issue6180).

Ping.

Jan 8 2020, 6:33 AM
khanchi97 added a comment to D7728: rebase: add test to demonstrate issue6180.

Ping.

Jan 8 2020, 6:33 AM

Jan 3 2020

khanchi97 created D7786: update: add --abort option in hg update command (issue4404).
Jan 3 2020, 10:06 AM

Dec 27 2019

khanchi97 created D7730: rebase: make sure pruning does not confuse rebase (issue6180).
Dec 27 2019, 12:06 PM
khanchi97 added a comment to D7727: rebase: make sure pruning does not confuse rebase (issue6180).

abandoing because I phabsent them in reverse order and it got messed up saying 'Graph cycle detected'

Dec 27 2019, 12:04 PM
khanchi97 created D7728: rebase: add test to demonstrate issue6180.
Dec 27 2019, 11:56 AM
khanchi97 created D7727: rebase: make sure pruning does not confuse rebase (issue6180).
Dec 27 2019, 11:56 AM

Oct 21 2019

khanchi97 closed D7000: grep: enable all-files by default (BC).
Oct 21 2019, 11:08 AM
khanchi97 committed rHG8cb5f96db235: grep: enable all-files by default (BC).
grep: enable all-files by default (BC)
Oct 21 2019, 11:07 AM

Oct 8 2019

khanchi97 added a comment to D7000: grep: enable all-files by default (BC).

Sure :)

Oct 8 2019, 3:46 PM

Oct 6 2019

khanchi97 created D7000: grep: enable all-files by default (BC).
Oct 6 2019, 12:15 PM

Jul 4 2019

khanchi97 committed rHG4cafbd3b50c6: relnotes: document the new --force-close-branch flag.
relnotes: document the new --force-close-branch flag
Jul 4 2019, 11:01 AM
khanchi97 closed D6590: relnotes: document the new --force-close-branch flag.
Jul 4 2019, 11:00 AM

Jun 30 2019

khanchi97 created D6590: relnotes: document the new --force-close-branch flag.
Jun 30 2019, 3:18 PM
khanchi97 committed rHG2e1d9414ff71: commit: add --force-close-branch flag to close a non-head changeset.
commit: add --force-close-branch flag to close a non-head changeset
Jun 30 2019, 12:14 AM

Jun 29 2019

khanchi97 closed D6490: commit: add --force-close-branch flag to close a non-head changeset.
Jun 29 2019, 7:05 PM
khanchi97 committed rHG171a367b7cf1: commit: add --force-close-branch flag to close a non-head changeset.
commit: add --force-close-branch flag to close a non-head changeset
Jun 29 2019, 7:04 PM

Jun 23 2019

khanchi97 retitled D6490: commit: add --force-close-branch flag to close a non-head changeset from commit: add --force flag to close branch from a non-head changeset to commit: add --force-close-branch flag to close a non-head changeset.
Jun 23 2019, 3:25 AM

Jun 22 2019

khanchi97 added a comment to D6490: commit: add --force-close-branch flag to close a non-head changeset.
In D6490#95305, @pulkit wrote:

I think adding a --force flag to hg commit is not a nice option. force can mean a lot of things and here except in closing the non-head changeset, it is no-op.
For example, I am in middle of a rebase, tried to commit, it says rebase in progress. I see there is a --force flag, I try to use that to force the commit.
We can do one of the following:

  1. maybe a more specific flag name like --allow-close-branch or something like that
  2. a config option instead of a flag name

Fair point. Specific is better.
I'd suggest --force-close-branch as a standalone flag (i.e. you don't need to also use --close-branch; it wasn't clear to me if that's what you meant). --allow-close-branch and --close-branch don't seem different enough to remember the difference.

Just my $0.02.
I think that hg commit already has many options that do not even belong to committing (such as -A, --close-branch). Let's not add an option that is not related to commit. To my opinion closing a branch should be done with hg branch not commit (unfortunately this was never the case). Anyway if you really want to do it with commit, I would suggest that --close-branch takes an optional argument rather than adding a new option. This makes UX a bit more convenient
e.g.

hg commit --close-branch --force-close-branch (not that)
hg commit --close-branch forced (or force or something like that)

I think it's a little hard to make user understand (by providing a hint like "use force arg with --close-branch") that you need to provide an argument as compared to just providing a standalone flag --force-close-branch as @mharbison72 suggested. I do agree with you that it would make +1 in the no. of flags which don't make sense with hg commit. What do you say?

What if you mark it (ADVANCED) so that it doesn't show in the help without a -v? Then the hint informs the user when it might be needed, otherwise they don't need to see it all the time.

Jun 22 2019, 1:38 PM

Jun 21 2019

khanchi97 added a comment to D6490: commit: add --force-close-branch flag to close a non-head changeset.

Could you also update relnotes/next (documenting either the new flag or config option, whatever this patch ends up doing)?

Jun 21 2019, 9:54 AM
khanchi97 added a comment to D6490: commit: add --force-close-branch flag to close a non-head changeset.
In D6490#95305, @pulkit wrote:

I think adding a --force flag to hg commit is not a nice option. force can mean a lot of things and here except in closing the non-head changeset, it is no-op.
For example, I am in middle of a rebase, tried to commit, it says rebase in progress. I see there is a --force flag, I try to use that to force the commit.
We can do one of the following:

  1. maybe a more specific flag name like --allow-close-branch or something like that
  2. a config option instead of a flag name

Fair point. Specific is better.
I'd suggest --force-close-branch as a standalone flag (i.e. you don't need to also use --close-branch; it wasn't clear to me if that's what you meant). --allow-close-branch and --close-branch don't seem different enough to remember the difference.

Just my $0.02.
I think that hg commit already has many options that do not even belong to committing (such as -A, --close-branch). Let's not add an option that is not related to commit. To my opinion closing a branch should be done with hg branch not commit (unfortunately this was never the case). Anyway if you really want to do it with commit, I would suggest that --close-branch takes an optional argument rather than adding a new option. This makes UX a bit more convenient
e.g.

hg commit --close-branch --force-close-branch (not that)
hg commit --close-branch forced (or force or something like that)
Jun 21 2019, 9:54 AM

Jun 18 2019

khanchi97 closed D6493: commit: make the error message more specific while aborting branch closing.
Jun 18 2019, 7:41 AM
khanchi97 closed D6491: commit: add a check if it is trying to close an already closed branch head.
Jun 18 2019, 7:41 AM
khanchi97 committed rHGabd4783db5a7: commit: make the error message more specific while aborting branch closing.
commit: make the error message more specific while aborting branch closing
Jun 18 2019, 7:41 AM
khanchi97 committed rHG9f7cb777b654: commit: add a check if it is trying to close an already closed branch head.
commit: add a check if it is trying to close an already closed branch head
Jun 18 2019, 7:41 AM

Jun 15 2019

khanchi97 retitled D6490: commit: add --force-close-branch flag to close a non-head changeset from branch: add --force flag to close branch from a not-head changeset to commit: add --force flag to close branch from a non-head changeset.
Jun 15 2019, 8:02 AM
khanchi97 retitled D6493: commit: make the error message more specific while aborting branch closing from branch: make the error message more specific while aborting branch closing to commit: make the error message more specific while aborting branch closing.
Jun 15 2019, 8:02 AM
khanchi97 retitled D6491: commit: add a check if it is trying to close an already closed branch head from branch: add a check if it is trying to close an already closed branch head to commit: add a check if it is trying to close an already closed branch head.
Jun 15 2019, 8:01 AM

Jun 11 2019

khanchi97 added a comment to D6490: commit: add --force-close-branch flag to close a non-head changeset.

LGTM, thanks.
Minor nit that I don't care too much about, but I'm wondering what others think of not-head changeset vs non-head changeset. The latter sounds more natural to me, but I'm not sure if there's another example of this phrasing.

Jun 11 2019, 1:49 AM

Jun 10 2019

khanchi97 added inline comments to D6490: commit: add --force-close-branch flag to close a non-head changeset.
Jun 10 2019, 9:02 AM

Jun 8 2019

khanchi97 updated the diff for D6490: commit: add --force-close-branch flag to close a non-head changeset.
Jun 8 2019, 6:23 AM
khanchi97 updated the diff for D6493: commit: make the error message more specific while aborting branch closing.
Jun 8 2019, 6:23 AM
khanchi97 updated the diff for D6491: commit: add a check if it is trying to close an already closed branch head.
Jun 8 2019, 6:23 AM

Jun 7 2019

khanchi97 added a comment to D6492: branch: add test covering the case when we have no branchheads to close.

Abandoned.. because I assumed this revision won't be pushed by phabsend as it's in secret phase. Is it right behavior?

Jun 7 2019, 10:11 AM
khanchi97 abandoned D6492: branch: add test covering the case when we have no branchheads to close.
Jun 7 2019, 10:06 AM
khanchi97 created D6493: commit: make the error message more specific while aborting branch closing.
Jun 7 2019, 9:57 AM
khanchi97 created D6490: commit: add --force-close-branch flag to close a non-head changeset.
Jun 7 2019, 9:57 AM
khanchi97 created D6491: commit: add a check if it is trying to close an already closed branch head.
Jun 7 2019, 9:56 AM
khanchi97 created D6492: branch: add test covering the case when we have no branchheads to close.
Jun 7 2019, 9:56 AM

Apr 25 2019

khanchi97 closed D6282: branch: abort if closing branch from a non-branchhead cset.
Apr 25 2019, 2:08 PM
khanchi97 committed rHG8d14d91584f1: branch: abort if closing branch from a non-branchhead cset.
branch: abort if closing branch from a non-branchhead cset
Apr 25 2019, 2:07 PM
khanchi97 closed D6281: branch: add tests which shows branch can be closed from a non-branchhead cset.
Apr 25 2019, 2:07 PM
khanchi97 committed rHG258821f2d465: branch: add tests which shows branch can be closed from a non-branchhead cset.
branch: add tests which shows branch can be closed from a non-branchhead cset
Apr 25 2019, 2:07 PM
khanchi97 added inline comments to D6281: branch: add tests which shows branch can be closed from a non-branchhead cset.
Apr 25 2019, 1:47 PM

Apr 19 2019

khanchi97 created D6282: branch: abort if closing branch from a non-branchhead cset.
Apr 19 2019, 3:49 AM
khanchi97 created D6281: branch: add tests which shows branch can be closed from a non-branchhead cset.
Apr 19 2019, 3:48 AM

Mar 19 2019

khanchi97 committed rHGf8c5225b9054: patch: include flag-only file changes in "special" when filtering (issue5864).
patch: include flag-only file changes in "special" when filtering (issue5864)
Mar 19 2019, 2:28 AM

Mar 18 2019

khanchi97 closed D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864).
Mar 18 2019, 7:36 PM
khanchi97 committed rHG6308aa828cf4: patch: include flag-only file changes in "special" while filtering patch….
patch: include flag-only file changes in "special" while filtering patch…
Mar 18 2019, 7:35 PM

Mar 16 2019

khanchi97 added a comment to D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864).

Thanks, it is more clear now.

Mar 16 2019, 11:22 PM
khanchi97 added inline comments to D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864).
Mar 16 2019, 10:45 AM
khanchi97 updated the diff for D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864).
Mar 16 2019, 10:35 AM

Mar 13 2019

khanchi97 added inline comments to D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864).
Mar 13 2019, 3:27 PM
khanchi97 updated the diff for D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864).
Mar 13 2019, 3:22 PM

Mar 11 2019

khanchi97 added inline comments to D5963: copies: handle a case when both merging csets are not descendant of merge base.
Mar 11 2019, 12:32 PM
khanchi97 closed D5963: copies: handle a case when both merging csets are not descendant of merge base.
Mar 11 2019, 11:45 AM
khanchi97 committed rHG7694b685bb10: copies: handle a case when both merging csets are not descendant of merge base.
copies: handle a case when both merging csets are not descendant of merge base
Mar 11 2019, 11:44 AM