khanchi97 (Sushil khanchi)
User

Projects

User does not belong to any projects.

User Details

User Since
Jan 29 2018, 11:31 AM (38 w, 1 d)

Recent Activity

Sun, Oct 21

khanchi97 added a comment to D5178: archive: use manifest.matches() to simplify and speed up matching.

LGTM :)

Sun, Oct 21, 2:55 AM

Sep 3 2018

khanchi97 committed rHGcb70501d8b71: revert: fix the inconsistency of status msgs in --interactive mode.
revert: fix the inconsistency of status msgs in --interactive mode
Sep 3 2018, 8:02 AM
khanchi97 closed D4380: revert: fix the inconsistency of status msgs in --interactive mode.
Sep 3 2018, 8:01 AM
khanchi97 committed rHG90afd61ef8a2: revert: remove unnecessary check as `msg` should never be a callable now.
revert: remove unnecessary check as `msg` should never be a callable now
Sep 3 2018, 8:00 AM
khanchi97 closed D4448: revert: remove unnecessary check as `msg` should never be a callable now.
Sep 3 2018, 8:00 AM
khanchi97 added a comment to D4380: revert: fix the inconsistency of status msgs in --interactive mode.

Ready to review.

Sep 3 2018, 2:23 AM
khanchi97 updated the diff for D4380: revert: fix the inconsistency of status msgs in --interactive mode.
Sep 3 2018, 1:54 AM
khanchi97 created D4448: revert: remove unnecessary check as `msg` should never be a callable now.
Sep 3 2018, 1:53 AM

Aug 30 2018

khanchi97 added a comment to D4380: revert: fix the inconsistency of status msgs in --interactive mode.

Made changes. Ready to review.

Aug 30 2018, 5:12 PM
khanchi97 updated the diff for D4380: revert: fix the inconsistency of status msgs in --interactive mode.
Aug 30 2018, 4:55 PM

Aug 27 2018

khanchi97 closed D4381: cmdutil: fix typo in revert().
Aug 27 2018, 10:28 AM
khanchi97 committed rHG6b81d2ff118f: cmdutil: fix typo in revert().
cmdutil: fix typo in revert()
Aug 27 2018, 10:28 AM

Aug 26 2018

khanchi97 created D4381: cmdutil: fix typo in revert().
Aug 26 2018, 7:06 PM
khanchi97 created D4380: revert: fix the inconsistency of status msgs in --interactive mode.
Aug 26 2018, 7:06 PM
khanchi97 added a dependent revision for D4380: revert: fix the inconsistency of status msgs in --interactive mode: D4381: cmdutil: fix typo in revert().
Aug 26 2018, 7:06 PM

Aug 16 2018

khanchi97 closed D4282: rebase: cover restorestatus() by lock to prevent it from being updated.
Aug 16 2018, 6:34 AM
khanchi97 committed rHGffb34ee6de9e: rebase: cover restorestatus() by lock to prevent it from being updated.
rebase: cover restorestatus() by lock to prevent it from being updated
Aug 16 2018, 6:33 AM

Aug 15 2018

khanchi97 created D4282: rebase: cover restorestatus() by lock to prevent it from being updated.
Aug 15 2018, 2:00 AM

Aug 14 2018

khanchi97 committed rHG571361e47137: rebase: include --stop option in documentation.
rebase: include --stop option in documentation
Aug 14 2018, 8:48 PM
khanchi97 closed D3970: rebase: include --stop option in documentation.
Aug 14 2018, 8:48 PM
khanchi97 committed rHG33f5cffe725f: rebase: add test to show --stop moves bookmarks.
rebase: add test to show --stop moves bookmarks
Aug 14 2018, 8:48 PM
khanchi97 closed D3959: rebase: add --stop option to stop rebase at any point (issue5206).
Aug 14 2018, 8:48 PM
khanchi97 closed D3969: rebase: raise error for options conflicting with --stop.
Aug 14 2018, 8:48 PM
khanchi97 closed D3982: rebase: add test to show --stop moves bookmarks.
Aug 14 2018, 8:48 PM
khanchi97 committed rHG2cf0b8b830ba: rebase: raise error for options conflicting with --stop.
rebase: raise error for options conflicting with --stop
Aug 14 2018, 8:47 PM
khanchi97 committed rHGcc37009e95ca: rebase: add --stop option to stop rebase at any point (issue5206).
rebase: add --stop option to stop rebase at any point (issue5206)
Aug 14 2018, 8:47 PM

Aug 10 2018

khanchi97 updated the diff for D3982: rebase: add test to show --stop moves bookmarks.
Aug 10 2018, 7:15 AM
khanchi97 updated the diff for D3970: rebase: include --stop option in documentation.
Aug 10 2018, 7:15 AM
khanchi97 updated the diff for D3969: rebase: raise error for options conflicting with --stop.
Aug 10 2018, 7:15 AM
khanchi97 updated the diff for D3959: rebase: add --stop option to stop rebase at any point (issue5206).
Aug 10 2018, 7:15 AM

Aug 7 2018

khanchi97 added a comment to D3968: amend: support "history-editing-backup" config option.

@yuja Is there any command left which we can consider to add
'history-editing-backup' config option?

Aug 7 2018, 5:30 PM

Aug 6 2018

khanchi97 closed D4123: resolve: organize 'if confirm' conditionals.
Aug 6 2018, 9:13 AM
khanchi97 committed rHG49b51f41fb46: resolve: organize 'if confirm' conditionals.
resolve: organize 'if confirm' conditionals
Aug 6 2018, 9:13 AM
khanchi97 created D4123: resolve: organize 'if confirm' conditionals.
Aug 6 2018, 12:36 AM

Aug 5 2018

khanchi97 closed D4102: resolve: support confirm config option with --unmark flag.
Aug 5 2018, 10:40 PM
khanchi97 committed rHG755741c39230: resolve: update commands.resolve.confirm help text.
resolve: update commands.resolve.confirm help text
Aug 5 2018, 10:40 PM
khanchi97 committed rHGf35f6791595f: resolve: support confirm config option with --unmark flag.
resolve: support confirm config option with --unmark flag
Aug 5 2018, 10:40 PM
khanchi97 closed D4103: resolve: update commands.resolve.confirm help text.
Aug 5 2018, 10:40 PM

Aug 4 2018

khanchi97 updated the diff for D4102: resolve: support confirm config option with --unmark flag.
Aug 4 2018, 2:20 PM
khanchi97 updated the diff for D4103: resolve: update commands.resolve.confirm help text.
Aug 4 2018, 2:19 PM
khanchi97 added inline comments to D4102: resolve: support confirm config option with --unmark flag.
Aug 4 2018, 2:18 PM
khanchi97 closed D4101: resolve: support commands.resolve.confirm option with --mark flag.
Aug 4 2018, 1:39 PM
khanchi97 committed rHGdb03e5cefc82: resolve: support commands.resolve.confirm option with --mark flag.
resolve: support commands.resolve.confirm option with --mark flag
Aug 4 2018, 1:38 PM
khanchi97 created D4102: resolve: support confirm config option with --unmark flag.
Aug 4 2018, 3:32 AM
khanchi97 created D4101: resolve: support commands.resolve.confirm option with --mark flag.
Aug 4 2018, 3:32 AM
khanchi97 created D4103: resolve: update commands.resolve.confirm help text.
Aug 4 2018, 3:32 AM
khanchi97 added a dependent revision for D4102: resolve: support confirm config option with --unmark flag: D4103: resolve: update commands.resolve.confirm help text.
Aug 4 2018, 3:32 AM
khanchi97 added a dependent revision for D4101: resolve: support commands.resolve.confirm option with --mark flag: D4102: resolve: support confirm config option with --unmark flag.
Aug 4 2018, 3:31 AM

Aug 3 2018

khanchi97 abandoned D2579: WIP: fix unshelve refuses to apply on modified MQ patch (issue4318).
Aug 3 2018, 5:02 PM
khanchi97 abandoned D3871: rebase: improve output of --confirm option.
Aug 3 2018, 4:38 PM
khanchi97 abandoned D3828: rebase: add **opts to _prepareabortorcontinue.
Aug 3 2018, 4:36 PM
khanchi97 closed D3988: resolve: add confirm config option.
Aug 3 2018, 10:28 AM
khanchi97 committed rHGf8732e33bcbc: resolve: add confirm config option.
resolve: add confirm config option
Aug 3 2018, 10:27 AM
khanchi97 closed D3968: amend: support "history-editing-backup" config option.
Aug 3 2018, 9:44 AM
khanchi97 closed D4055: rebase: move "backup" flag to rbsrt.
Aug 3 2018, 9:44 AM
khanchi97 committed rHG32ece991955c: amend: support "history-editing-backup" config option.
amend: support "history-editing-backup" config option
Aug 3 2018, 9:44 AM
khanchi97 committed rHG2b728789edfd: rebase: move "backup" flag to rebaseruntime.
rebase: move "backup" flag to rebaseruntime
Aug 3 2018, 9:44 AM
khanchi97 updated the diff for D3988: resolve: add confirm config option.
Aug 3 2018, 3:39 AM
khanchi97 updated the diff for D4055: rebase: move "backup" flag to rbsrt.
Aug 3 2018, 3:35 AM
khanchi97 added inline comments to D4055: rebase: move "backup" flag to rbsrt.
Aug 3 2018, 3:33 AM

Aug 2 2018

khanchi97 updated the diff for D3968: amend: support "history-editing-backup" config option.
Aug 2 2018, 2:59 PM
khanchi97 created D4055: rebase: move "backup" flag to rbsrt.
Aug 2 2018, 2:42 PM
khanchi97 added a comment to D3887: rebase: support "history-editing-backup" config option.
In D3887#62850, @pulkit wrote:
In D3887#62825, @yuja wrote:

Queued, thanks.

@@ -829,6 +833,8 @@

userrevs = list(repo.revs(opts.get('auto_orphans')))
opts['rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
opts['dest'] = '_destautoorphanrebase(SRC)'

+ backup = ui.configbool('ui', 'history-editing-backup')
+ opts['backup'] = backup

This seems getting ugly. Maybe the option can be carried by rbsrt instead?

self.backupf = ui.configbool('ui', 'history-editing-backup')

I like Yuya's suggestion here. @khanchi97 can you please follow-up?

Aug 2 2018, 2:04 PM
khanchi97 committed rHG2002c193f2bc: rebase: support "history-editing-backup" config option.
rebase: support "history-editing-backup" config option
Aug 2 2018, 10:48 AM
khanchi97 closed D3887: rebase: support "history-editing-backup" config option.
Aug 2 2018, 9:51 AM
khanchi97 committed rHG7de767e15f52: rebase: support "history-editing-backup" config option.
rebase: support "history-editing-backup" config option
Aug 2 2018, 9:51 AM
khanchi97 updated the diff for D3988: resolve: add confirm config option.
Aug 2 2018, 4:26 AM

Aug 1 2018

khanchi97 updated the diff for D3988: resolve: add confirm config option.
Aug 1 2018, 10:26 AM

Jul 31 2018

khanchi97 created D3988: resolve: add confirm config option.
Jul 31 2018, 9:51 AM

Jul 27 2018

khanchi97 added a comment to D3959: rebase: add --stop option to stop rebase at any point (issue5206).
In D3959#61803, @pulkit wrote:

You also need to take care of bookmark movements. Bookmark from changesets which have successfully rebased should be moved to their successors when we call --stop.

Jul 27 2018, 5:05 AM
khanchi97 created D3982: rebase: add test to show --stop moves bookmarks.
Jul 27 2018, 5:05 AM

Jul 24 2018

khanchi97 updated the diff for D3970: rebase: include --stop option in documentation.
Jul 24 2018, 2:04 PM
khanchi97 updated the diff for D3969: rebase: raise error for options conflicting with --stop.
Jul 24 2018, 2:04 PM
khanchi97 updated the diff for D3959: rebase: add --stop option to stop rebase at any point (issue5206).
Jul 24 2018, 2:04 PM
khanchi97 added a comment to D3959: rebase: add --stop option to stop rebase at any point (issue5206).

@pulkit I will send a follow up which will take care of bookmarks movement. Thanks for review!

Jul 24 2018, 6:28 AM

Jul 22 2018

khanchi97 created D3970: rebase: include --stop option in documentation.
Jul 22 2018, 12:55 PM
khanchi97 created D3969: rebase: raise error for options conflicting with --stop.
Jul 22 2018, 12:55 PM
khanchi97 added a dependent revision for D3969: rebase: raise error for options conflicting with --stop: D3970: rebase: include --stop option in documentation.
Jul 22 2018, 12:55 PM
khanchi97 updated the diff for D3959: rebase: add --stop option to stop rebase at any point (issue5206).
Jul 22 2018, 12:55 PM
khanchi97 added a dependent revision for D3959: rebase: add --stop option to stop rebase at any point (issue5206): D3969: rebase: raise error for options conflicting with --stop.
Jul 22 2018, 12:55 PM

Jul 21 2018

khanchi97 added a comment to D3959: rebase: add --stop option to stop rebase at any point (issue5206).
In D3959#61670, @yuja wrote:

+ def _stoprebase(self):
+ """stop the interrupted rebase"""
+ self.restorestatus()
+ if not self.stateobj.exists():
+ raise error.Abort(_("no interrupted rebase found"))
+ allowunstable = obsolete.isenabled(self.repo, obsolete.allowunstableopt)
+ if not (self.keepf or allowunstable):
+ raise error.Abort(_("can't remove original changesets with"
+ " unrebased descendants"),
+ hint=_('either enable evolve extension to allow unstable '
+ 'revisions or use --keep to keep original changesets'))
+
+ # update to the last rebased node if any
+ ctx = self.repo[None]
+ pars = [p.node() for p in ctx.parents()]
+ p1 = pars[0]
+ hg.updaterepo(self.repo, p1, overwrite=True)

Perhaps this differs from what a successful rebase would do. Unlike graft,
hg rebase goes back to the original working directory.

right, will change it.

+ # either mark obsolete or keep rebased revisions
+ repo, ui, opts = self.repo, self.ui, self.opts
+ fm = ui.formatter('rebase', opts)
+ fm.startitem()
+ clearrebased(ui, repo, self.destmap, self.state, self.skipped,
+ collapsedas=None, keepf=self.keepf, fm=fm)
+ clearstatus(self.repo)
+ fm.end()
+ return 0

I doubt if this would work with --collapse. Can you try writing some tests?

What is the expected behaviour in case of --collapse? Should it collapse only those revisions which are rebased, then we may have to ask user to change commit message accordingly.

I'm not pretty sure, but it might be possible to utilize _finishrebase()
to implement --stop, roughly by:

  1. restore status
  2. drop revisions that aren't rebased yet
  3. finish it

yeah, trying to do it in _finishrebase()

+ elif stop:
+ #todo: raise error for conflicting options

Yes!

Jul 21 2018, 1:31 PM

Jul 20 2018

khanchi97 added inline comments to D3901: histedit: add history-editing-backup config option.
Jul 20 2018, 4:13 PM
khanchi97 created D3968: amend: support "history-editing-backup" config option.
Jul 20 2018, 4:05 PM
khanchi97 added a dependent revision for D3887: rebase: support "history-editing-backup" config option: D3968: amend: support "history-editing-backup" config option.
Jul 20 2018, 4:04 PM
khanchi97 updated the diff for D3887: rebase: support "history-editing-backup" config option.
Jul 20 2018, 4:04 PM

Jul 19 2018

khanchi97 closed D3965: histedit: drop --no-backup option.
Jul 19 2018, 2:13 PM
khanchi97 committed rHGfaea9b1980d9: histedit: drop --no-backup option.
histedit: drop --no-backup option
Jul 19 2018, 2:13 PM
khanchi97 created D3965: histedit: drop --no-backup option.
Jul 19 2018, 1:52 PM
khanchi97 closed D3901: histedit: add history-editing-backup config option.
Jul 19 2018, 8:29 AM
khanchi97 committed rHGc2586a6e5884: histedit: add history-editing-backup config option.
histedit: add history-editing-backup config option
Jul 19 2018, 8:28 AM

Jul 18 2018

khanchi97 added a comment to D3901: histedit: add history-editing-backup config option.

And, should we drop the --no-backup option? @pulkit what do you think?

Yep, we should either have this option everywhere or not have it anywhere. I too think that config option is better suited here. Let's drop it and comment on the bug which needed the flag about the config option.

How do we drop a feature? Do I need to remove all the code related to --no-backup option?

Jul 18 2018, 4:01 PM
khanchi97 added a comment to D3901: histedit: add history-editing-backup config option.

Because this option has not been part of a release yet. There is no point of releasing a deprecated feature.

Got it. Thanks!

Jul 18 2018, 3:56 PM
khanchi97 added a comment to D3901: histedit: add history-editing-backup config option.

And, should we drop the --no-backup option?

IIUC,
dropped -> user won't be able to use that option
deprecated -> can use, but this is not preferred option to use
Am I right above?
If yes, why not deprecate then?

Jul 18 2018, 1:45 PM
khanchi97 updated the diff for D3901: histedit: add history-editing-backup config option.
Jul 18 2018, 1:29 PM

Jul 17 2018

khanchi97 created D3959: rebase: add --stop option to stop rebase at any point (issue5206).
Jul 17 2018, 3:43 PM

Jul 15 2018

khanchi97 closed D3947: rebase: remove unused variable "release" and an extra blank line.
Jul 15 2018, 9:29 AM
khanchi97 closed D3945: rebase: remove unnecessary confirm block.
Jul 15 2018, 9:29 AM
khanchi97 committed rHG8eeed92475d5: rebase: remove unused variable "release" and an extra blank line.
rebase: remove unused variable "release" and an extra blank line
Jul 15 2018, 9:29 AM
khanchi97 committed rHG70448ec995c2: rebase: remove unnecessary confirm block.
rebase: remove unnecessary confirm block
Jul 15 2018, 9:29 AM
khanchi97 created D3947: rebase: remove unused variable "release" and an extra blank line.
Jul 15 2018, 6:20 AM