D5477: branches: add -r option to show branch name(s) of a given rev (issue5948)

2018-12-27 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In https://phab.mercurial-scm.org/D5477#81186, @yuja wrote: > I tried to queue this, but the patch doesn't include any metadata (e.g. author > and date.) Please check your configuration. > > https://www.mercurial-scm.org/wiki/Phabricator

D5486: branches: add -r option to show branch name(s) of a given rev (issue5948)

2018-12-27 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/D5486 AFFECTED FILES mercurial/commands.py tests/test-branches.t tests/test-completion.t

D5486: branches: add -r option to show branch name(s) of a given rev (issue5948)

2018-12-27 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4506f801e492: branches: add -r option to show branch name(s) of a given rev (issue5948) (authored by navaneeth.suresh, committed by ). CHANGED PRIOR TO COMMIT

D5485: log: fixes line wrap on diffstat (issue5800)

2018-12-30 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 12995. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5485?vs=12983=12995 REVISION DETAIL https://phab.mercurial-scm.org/D5485 AFFECTED FILES mercurial/logcmdutil.py CHANGE DETAILS diff --git

D5485: log: fixes line wrap on diffstat (issue5800)

2018-12-30 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. > IIUC, the problem is that the `width` parameter is incorrect because of > graph lines. Thanks for the insight Yuya! I guess my current revision addresses what you meant by abusing `graphwidth` REPOSITORY rHG Mercurial REVISION DETAIL

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

2019-01-05 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In https://phab.mercurial-scm.org/D5490#81294, @pulkit wrote: > I am not sure whether this change is correct or not, but please add more description to your commit message explaining what this patch is doing, what the issue is about and how it fixes

D5485: log: fixes line wrap on diffstat (issue5800)

2019-01-03 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Thanks for queuing Yuya! > Reordered arguments to fix mq failure. Next time, please run all tests. Sure will do. Sorry about that. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5485 To: navaneeth.suresh,

D5485: log: fixes line wrap on diffstat (issue5800)

2019-01-03 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG6a63ba61e71f: log: fix line wrap on diffstat with -G/--graph (issue5800) (authored by navaneeth.suresh, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D5485?vs=12996=12997#toc

D5494: histedit: add user input to warning message on editing tagged commits

2019-01-05 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh 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/D5494 AFFECTED FILES hgext/histedit.py CHANGE DETAILS diff

D5489: histedit: add warning message on editing tagged commits (issue4017)

2019-01-05 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. @mharbison72 @yuja Thank you for the suggestions. I've created a follow-up patch making the suggested changes. Please see https://phab.mercurial-scm.org/D5494. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5489 To:

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

2019-01-17 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 diff --stat --git` shows only the new filename on renames. I added the old filename also to the output to make it identical with the output of `$

D5475: branch:Added option to show branch name of a given rev (Issue5948)

2018-12-23 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Thanks for the info @yuja. I'm thinking to move --rev/-r to branches command and replacing --show/-s that I've made to --rev/-r in the branch command itself. How's that sound to you guys, @pulkit @yuja ? REPOSITORY rHG Mercurial REVISION DETAIL

D5477: branches: add -r option to show branch name(s) of a given rev (issue5948)

2018-12-26 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 12980. navaneeth.suresh retitled this revision from "branches: Added -r option to show branch name(s) of a given rev (Issue5948)" to "branches: add -r option to show branch name(s) of a given rev (issue5948)". REPOSITORY rHG Mercurial CHANGES

D5477: branches: add -r option to show branch name(s) of a given rev (issue5948)

2018-12-26 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In https://phab.mercurial-scm.org/D5477#81155, @yuja wrote: > Looks mostly good. > > Can you update the commit message to conform to our style? > https://www.mercurial-scm.org/wiki/ContributingChanges#Submission_checklist Updated. >

D5475: branch:Added option to show branch name of a given rev (Issue5948)

2018-12-23 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/D5475 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands.py

D5485: log: fixes line wrap on diffstat (issue5800)

2018-12-27 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/D5485 AFFECTED FILES mercurial/patch.py CHANGE DETAILS diff --git a/mercurial/patch.py

D5477: branches: add -r option to show branch name(s) of a given rev (issue5948)

2018-12-27 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 12988. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5477?vs=12980=12988 REVISION DETAIL https://phab.mercurial-scm.org/D5477 AFFECTED FILES mercurial/commands.py tests/test-branches.t

D5477: branches: Added -r option to show branch name(s) of a given rev (Issue5948)

2018-12-24 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/D5477 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands.py

D5475: branch:Added option to show branch name of a given rev (Issue5948)

2018-12-24 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In https://phab.mercurial-scm.org/D5475#81071, @yuja wrote: > > Thanks for the info @yuja. I'm thinking to move --rev/-r to branches command and replacing --show/-s that I've made to --rev/-r in the branch command itself. > > I'm not sure if I get

D5477: branches: Added -r option to show branch name(s) of a given rev (Issue5948)

2018-12-24 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In https://phab.mercurial-scm.org/D5477#81095, @yuja wrote: > > fm.startitem() > > > > +rev = ctx.rev() > > +if opts.get('rev') and rev not in revs: > > +continue > > ctx points to the tipmost branch head. so

D5477: branches: Added -r option to show branch name(s) of a given rev (Issue5948)

2018-12-25 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 12978. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5477?vs=12969=12978 REVISION DETAIL https://phab.mercurial-scm.org/D5477 AFFECTED FILES mercurial/commands.py tests/test-branches.t CHANGE DETAILS

D5477: branches: Added -r option to show branch name(s) of a given rev (Issue5948)

2018-12-25 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. @yuja Thank you so much for the information. I've updated the revision. Please review when you're free. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5477 To: navaneeth.suresh, #hg-reviewers Cc: pulkit, yuja, mercurial-devel

D5552: tests: add test for warning on histedit with tagged commits

2019-01-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a follow-up patch to https://phab.mercurial-scm.org/D5494. REPOSITORY rHG Mercurial REVISION DETAIL

D5494: histedit: add user input to warning message on editing tagged commits

2019-01-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In https://phab.mercurial-scm.org/D5494#81855, @pulkit wrote: > Sorry for bumping on this now, can you add tests for this as follow-up? My bad. Doing that right away! REPOSITORY rHG Mercurial REVISION DETAIL

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

2019-01-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. > Could you add a test? > > (Bonus points if you add a test that shows the wrong behavior and then fix it in this change.) Sure. Will do. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5490 To: navaneeth.suresh,

D5503: vfs: add support for repo names with `$` when using with env vars (issue5739)

2019-01-07 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 13046. navaneeth.suresh retitled this revision from "vfs: add support for repo names with `$` sign while using with env vars (issue5739)" to "vfs: add support for repo names with `$` when using with env vars (issue5739)". REPOSITORY rHG Mercurial

D5503: vfs: add support for repo names with `$` when using with env vars (issue5739)

2019-01-07 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. > This is logically incorrect. The problem is that we're doing variable > expansion at too lower layer. `vfs(expand(user_specified_path))` makes > some sense, but `vfs(expand(getcwd()))` is clearly wrong. And the vfs class > can't know where the

D5503: vfs: add support for repo names with `$` sign while using with env vars (issue5739)

2019-01-07 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `$ foo=bar hg root` fails to recognise the repo `$foo`. I stopped expanding env vars from vfs when there exists a repo with the same name as the env

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

2019-01-04 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/D5490 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS diff --git a/mercurial/cmdutil.py

D5489: histedit: add warning message on editing tagged commits (issue4017)

2019-01-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > mharbison72 wrote in histedit.py:1707 > Out of curiosity, why the sleep? Otherwise, the user won't be able to see the warning as the editor opens for histedit. REPOSITORY rHG Mercurial REVISION DETAIL

D5489: histedit: add warning message on editing tagged commits (issue4017)

2019-01-03 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Thanks for queuing! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5489 To: navaneeth.suresh, durin42, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D5485: log: fixes line wrap on diffstat (issue5800)

2019-01-02 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. @yuja Requested changes have been made in the current revision. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5485 To: navaneeth.suresh, #hg-reviewers Cc: yuja, mercurial-devel ___

D5485: log: fixes line wrap on diffstat (issue5800)

2019-01-02 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 12996. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5485?vs=12995=12996 REVISION DETAIL https://phab.mercurial-scm.org/D5485 AFFECTED FILES mercurial/logcmdutil.py tests/test-log.t CHANGE DETAILS

D5477: branches: add -r option to show branch name(s) of a given rev (issue5948)

2019-01-02 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. @yuja Can this be closed? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5477 To: navaneeth.suresh, #hg-reviewers Cc: lothiraldan, pulkit, yuja, mercurial-devel ___ Mercurial-devel

D5489: histedit: add warning message on editing tagged commits (issue4017)

2019-01-03 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh 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/D5489 AFFECTED FILES hgext/histedit.py CHANGE DETAILS diff

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

2019-01-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 13166. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5490?vs=13003=13166 REVISION DETAIL https://phab.mercurial-scm.org/D5490 AFFECTED FILES mercurial/cmdutil.py tests/test-commit-interactive.t

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

2019-01-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. @durin42 I've added test for the current revision. Unfortunately, I'm unable to write a test for the wrong behaviour. I'll try writing it again. Any hints from your side? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5490

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

2019-01-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 13177. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5490?vs=13166=13177 REVISION DETAIL https://phab.mercurial-scm.org/D5490 AFFECTED FILES hgext/record.py mercurial/cmdutil.py

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

2019-01-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. > Sorry for late, but doesn't it break `hg record --ignore-all-space`, etc.? Yes. Exactly! Thanks for pointing that out. > It was intentionally added by https://phab.mercurial-scm.org/rHG3f1dccea9510c122cf9ab0e7a5a19ceed3600a7f (with no tests.)

D5552: tests: add test for warning on histedit with tagged commits

2019-01-12 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG172296c6db91: tests: add test for warning on histedit with tagged commits (authored by navaneeth.suresh, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D5552?vs=13134=13188#toc

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

2019-01-13 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. > `_performrevert()` would be in the same boat, but it was explicitly flagged on > at https://phab.mercurial-scm.org/rHGf37a69ec3f4717fdb4f00699ca06c225f106696c. This implies that the `diff.ignorews` option would be used > in practice to exclude

D5494: histedit: add user input to warning message on editing tagged commits

2019-01-09 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7b7e081f8954: histedit: add user input to warning message on editing tagged commits (authored by navaneeth.suresh, committed by ). CHANGED PRIOR TO COMMIT

D5489: histedit: add warning message on editing tagged commits (issue4017)

2019-01-03 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG86f0ed7ac688: histedit: add warning message on editing tagged commits (issue4017) (authored by navaneeth.suresh, committed by ). CHANGED PRIOR TO COMMIT

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

2019-01-25 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. > One nit: better to not use `.split()` since a filename may include whitespace. Nice catch! I will send a follow-up on this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5628 To: navaneeth.suresh, #hg-reviewers Cc:

D5709: diffstat: support filenames with whitespaces on renames

2019-01-26 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 https://phab.mercurial-scm.org/D5628. `line.split()` cannot get filenames with whitespaces as mentioned by @yuja. This

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

2019-01-25 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Thanks for queuing this! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5628 To: navaneeth.suresh, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D5709: diffstat: support filenames with whitespaces on renames

2019-01-26 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4a33a6bf2b52: diffstat: support filenames with whitespaces on renames (authored by navaneeth.suresh, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6169: unshelve: disable unshelve during merge (issue5123)

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

D6169: unshelve: disable unshelve during merge (issue5123)

2019-04-02 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG03f6480bfdda: unshelve: disable unshelve during merge (issue5123) (authored by navaneeth.suresh, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6169?vs=14616=14635#toc

D6169: unshelve: disable unshelve during merge (issue5123)

2019-04-02 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Thanks for queuing Yuya. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6169 To: navaneeth.suresh, #hg-reviewers Cc: yuja, mercurial-devel ___ Mercurial-devel mailing list

D6169: unshelve: disable unshelve during merge (issue5123)

2019-03-26 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. > Is it difficult to fix unshelve to not lose merge parents? > > https://bz.mercurial-scm.org/show_bug.cgi?id=5123#c2 I'll try to come up with a fix. But, `hg shelve` is aborting during a merge. Can `unshelve` be aborted too? I don't have a strong

D6027: mq: make unshelve to apply on modified mq patch (issue4318)

2019-03-26 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. > 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. I

D6169: unshelve: disable unshelve during merge (issue5123)

2019-03-25 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As stated in the issue5123, unshelve can destroy the second parent of the context when tried to unshelve with an uncommitted merge. This patch makes

D6056: patch: stop aborting when add/rename/copy files on --interactive (issue5727)

2019-03-24 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Gentle ping for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6056 To: navaneeth.suresh, #hg-reviewers Cc: pulkit, mercurial-devel ___ Mercurial-devel mailing list

D6027: mq: make unshelve to apply on modified mq patch (issue4318)

2019-03-24 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Gentle ping for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6027 To: navaneeth.suresh, martinvonz, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D6169: unshelve: disable unshelve during merge (issue5123)

2019-04-01 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. I saw some patches[0][1][2] trying to fix this issue. It seems like it's difficult to preserve the second parent. [0]: http://mercurial.808500.n3.nabble.com/PATCH-shelve-adds-restoring-original-parents-after-unshelve-issue5123-tc4035657.html#none [1]:

D6027: mq: make unshelve to apply on modified mq patch (issue4318)

2019-02-26 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a reviewer: martinvonz. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY unshelve wasn't working on a modified mq patch. I added checks for not aborting on a modified mq patch in both

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

2019-02-28 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14280. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5940?vs=14131=14280 REVISION DETAIL https://phab.mercurial-scm.org/D5940 AFFECTED FILES hgext/uncommit.py tests/test-uncommit.t CHANGE DETAILS

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

2019-03-01 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh marked an inline comment as done. navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in uncommit.py:162 > how about `if not pats or isdirtypath`? That's sweet. I've tried that earlier and failed to work because I thought bailifchanged couldn't handle dirty

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

2019-03-01 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14281. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5940?vs=14280=14281 REVISION DETAIL https://phab.mercurial-scm.org/D5940 AFFECTED FILES hgext/uncommit.py tests/test-uncommit.t CHANGE DETAILS

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

2019-03-03 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > martinvonz wrote in test-uncommit.t:421 > Ideally that patch would come first (so we don't have to remember to roll > back this patch if that other patch doesn't come before we cut the next > release). I'm up for anything. I can send a

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

2019-03-01 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh marked 5 inline comments as done. navaneeth.suresh added a comment. In https://phab.mercurial-scm.org/D5940#88065, @martinvonz wrote: > I don't understand the commit message. `experimental.uncommitondirtydir` already works with PATH, doesn't it? I think you mean

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

2019-03-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in test-uncommit.t:421 > @navaneeth.suresh can you send the patch adding the flag also. You can also > send that patch based on this patch. Yes flags do support hypens in names. > The hypens are converted to underscores. So

D5940: uncommit: allow dirty working copy with PATH (issue5977)

2019-03-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14342. navaneeth.suresh retitled this revision from "uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977)" to "uncommit: allow dirty working copy with PATH (issue5977)". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6069: uncommit: add flag --allow-dirty-working-copy

2019-03-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 adds a flag `--allow-dirty-working-copy` as an alias for the experimental config option `experimental.uncommitondirtydir`. REPOSITORY rHG

D6069: uncommit: add flag --allow-dirty-working-copy

2019-03-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in uncommit.py:162 > how about making this as: > > `allowdirty = opts['allow_dirty_working_copy'] or > repo.ui.configbool('experimental', 'uncommitondirtywdir')` > > This will make the if condition more simpler to

D6069: uncommit: add flag --allow-dirty-working-copy

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

D5997: mq: disable qrecord during histedit (issue5981)

2019-02-21 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY qrecord during histedit may lead to deadlock-like situations. qpop will throw an error on called during histedit even after qrecord-ing those changes.

D5940: uncommit: don't allow dirty working copy with PATH (issue5977)

2019-03-06 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGbf22e370ae9a: uncommit: dont allow dirty working copy with PATH (issue5977) (authored by navaneeth.suresh, committed by ). CHANGED PRIOR TO COMMIT

D6069: uncommit: add flag --allow-dirty-working-copy

2019-03-06 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGaa284d9a33ca: uncommit: add flag --allow-dirty-working-copy (authored by navaneeth.suresh, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6069?vs=14372=14375#toc REPOSITORY

D6069: uncommit: add flag --allow-dirty-working-copy

2019-03-05 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14372. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6069?vs=14344=14372 REVISION DETAIL https://phab.mercurial-scm.org/D6069 AFFECTED FILES hgext/uncommit.py tests/test-uncommit.t CHANGE DETAILS

D5940: uncommit: allow dirty working copy with PATH (issue5977)

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

D5940: uncommit: don't allow dirty working copy with PATH (issue5977)

2019-03-05 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In https://phab.mercurial-scm.org/D5940#88529, @martinvonz wrote: > 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

D6027: mq: make unshelve to apply on modified mq patch (issue4318)

2019-03-05 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Ping for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6027 To: navaneeth.suresh, martinvonz, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D5997: mq: disable qrecord during histedit (issue5981)

2019-02-24 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14233. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5997?vs=14176=14233 REVISION DETAIL https://phab.mercurial-scm.org/D5997 AFFECTED FILES hgext/record.py tests/test-qrecord.t CHANGE DETAILS diff

D6056: patch: stop aborting when ADD/RENAME/COPY files on --interactive (issue5727)

2019-03-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 issue5727 was reported specifically for mq on using qrefresh. On investigating further, I realized that it was a check in `patch.py` that resulting in

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

2019-02-26 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Ping for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5940 To: navaneeth.suresh, #hg-reviewers Cc: martinvonz, pulkit, mercurial-devel ___ Mercurial-devel mailing list

D5997: mq: disable qrecord during histedit (issue5981)

2019-02-25 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4d21ebc4cb47: mq: disable qrecord during histedit (issue5981) (authored by navaneeth.suresh, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5997: mq: disable qrecord during histedit (issue5981)

2019-02-25 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Thanks for queuing @pulkit. @yuja thanks for the review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5997 To: navaneeth.suresh, #hg-reviewers, pulkit Cc: yuja, mercurial-devel ___

D6056: patch: stop aborting when add/rename/copy files on --interactive (issue5727)

2019-03-16 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in test-mq-qrefresh.t:570 > does this prompt ended here? it didn't show changes in 'foo.h'? i think that's usual here as the file `foo.h` is empty. i have the following case running successfully with this patch: $ echo

D6056: patch: stop aborting when add/rename/copy files on --interactive (issue5727)

2019-03-14 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14492. navaneeth.suresh retitled this revision from "patch: stop aborting when ADD/RENAME/COPY files on --interactive (issue5727)" to "patch: stop aborting when add/rename/copy files on --interactive (issue5727)". REPOSITORY rHG Mercurial

D6056: patch: stop aborting when add/rename/copy files on --interactive (issue5727)

2019-03-16 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in test-mq-qrefresh.t:570 > I don't see the output which asks for `record this change to foo.h` here in > the test. IIUC, the current scenario is running into `abort: cannot create foo.h: destination already exists` if an

D6027: mq: make unshelve to apply on modified mq patch (issue4318)

2019-03-08 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14400. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6027?vs=14245=14400 REVISION DETAIL https://phab.mercurial-scm.org/D6027 AFFECTED FILES hgext/mq.py hgext/rebase.py tests/test-mq.t CHANGE

D6069: uncommit: add flag --allow-dirty-working-copy

2019-03-07 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > mharbison72 wrote in test-uncommit.t:164 > Did we lose test coverage here? The output before the prior patch noted it > was keeping an empty commit, so maybe the suggested flag needs to be used > after this abort? I'm not quite sure

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

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

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

2019-02-07 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh abandoned this revision. navaneeth.suresh added a comment. https://phab.mercurial-scm.org/rHG66399f2e92aac38855caab69a4c0acafead90c91 solves this issue, many thanks @spectral. Closing this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5490

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

2019-02-07 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. @yuja I've updated the revision with the suggested changes. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5813 To: navaneeth.suresh, #hg-reviewers Cc: yuja, pulkit, durin42, mjpieters, mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

2019-02-06 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a subscriber: spectral. navaneeth.suresh added a comment. @spectral @yuja Can I close this? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5490 To: navaneeth.suresh, #hg-reviewers Cc: spectral, yuja, durin42, pulkit, mercurial-devel

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

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

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

2019-02-06 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. > Can you share your failed attempt? > > Maybe you can get how revset works by testing expression with > `hg debugrevspec -v`. I somehow managed to meet your requirements in the current revision @yuja. Please let me know if I missed out something

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

2019-02-12 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8185c8abce87: revset: add expectsize to check the size of a set (authored by navaneeth.suresh, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D5813?vs=14029=14043#toc

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

2019-02-09 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14000. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5813?vs=13899=14000 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-13 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in revset.py:866 > Can you improve this documentation as a follow-up? We should mentioned about > specifying ranges, and also if the set has the given size, that set is > returned. Doing that right away! REPOSITORY rHG

D5953: revset: improve documentation on expectsize()

2019-02-13 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a follow-up patch to https://phab.mercurial-scm.org/D5813. It improves the documentation of `expectsize(set, size)`. REPOSITORY rHG

D5953: revset: improve documentation on expectsize()

2019-02-13 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14068. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5953?vs=14063=14068 REVISION DETAIL https://phab.mercurial-scm.org/D5953 AFFECTED FILES mercurial/revset.py CHANGE DETAILS diff --git

D5953: revset: improve documentation on expectsize()

2019-02-14 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG735da363556d: revset: improve documentation on expectsize() (authored by navaneeth.suresh, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D5953?vs=14068=14087#toc REPOSITORY

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

2019-02-14 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In https://phab.mercurial-scm.org/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. @pulkit the link of WIP

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

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

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

2019-02-11 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The behaviour of uncommit may confuse a new user. Although it never destroys the data, it can hide instead. I added a `-f/--force` flag when the

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

2019-02-10 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. 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. REPOSITORY rHG Mercurial REVISION DETAIL

  1   2   3   4   >