D5964: copies: return True instead of filename as it is expected to return boolean

This revision was automatically updated to reflect the committed changes. Closed by commit rHG35158796f52f: copies: return True instead of filename as it is expected to return boolean (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5963: copies: handle the case when both merging csets are not descendant of merge base

khanchi97 added inline comments. INLINE COMMENTS > copies.py:571 > + copy, bothdiverge, bothincompletediverge) > +remainder.update(remainder1) > +elif dirtyc1: I am not sure if combining of partial copies in this case is correct or not. But I did

D5964: copies: return True instead of filename as it is expected to return boolean

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As the function documentation says this function should True if we hit a match and False otherwise. And I see that we are not using that returned filename

D5963: copies: handle the case when both merging csets are not descendant of merge base

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previous discussion on this issue can be found at this link: https://phab.mercurial-scm.org/D3896 Copying description from previous patch sent by Pulkit:

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Discussion related to this issue can be found here: https://phab.mercurial-scm.org/D3896 There can be cases when both the changesets which we are

D5961: copies: add test that makes both the merging csets dirty and run w/o error

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Adding a test for fullcopytracing algorithm where both the merging csets are dirty, which means no cset is descendant of merging base. This test shows that

D5474: obsutil: fix the issue5686

This revision was automatically updated to reflect the committed changes. Closed by commit rHG191fac9ff9d3: obsutil: fix the issue5686 (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5474?vs=12962=13105 REVISION

D5476: merge: modify the logical statement

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6faaf3a1c6ec: merge: modify the logical statement (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5476?vs=12963=12964

D5476: merge: modify the logical statement

khanchi97 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/D5476 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py

D5474: obsutil: fix the issue5686

khanchi97 updated this revision to Diff 12962. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5474?vs=12956=12962 REVISION DETAIL https://phab.mercurial-scm.org/D5474 AFFECTED FILES mercurial/obsutil.py tests/test-obsmarker-template.t

D5474: obsutil: fix the issue5686

khanchi97 added a comment. @av6 Thanks for the review. I will update it. INLINE COMMENTS > av6 wrote in test-obsmarker-template.t:2511 > The new output looks somewhat more correct, but not quite. This changeset > definitely wasn't just pruned, but it also wasn't rewritten either: it was >

D5474: obsutil: fix the issue5686

khanchi97 added a comment. Please take a look at tests changes, as I accepted these changes using --interactive flag thinking it as a expected change. I think I can't add tests which will reflect the expected bahivour for this issue here in mercurial, so I will send a test patch in evolve.

D5474: obsutil: fix the issue5686

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY While traversing the obsolescence graph to find the successors sets of csets: In its 4th case (read comments of obsutil.successorssets to see all 4

D5473: config: register evolution.stackaliases as a config option

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In evolve, stackaliases (s#) are also used in some command outputs, where s# replaces the revision no. in that output. By default it is set to true, as s#

D4380: revert: fix the inconsistency of status msgs in --interactive mode

This revision was automatically updated to reflect the committed changes. Closed by commit rHGcb70501d8b71: revert: fix the inconsistency of status msgs in --interactive mode (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D4380?vs=10715=10722#toc

D4448: revert: remove unnecessary check as `msg` should never be a callable now

This revision was automatically updated to reflect the committed changes. Closed by commit rHG90afd61ef8a2: revert: remove unnecessary check as `msg` should never be a callable now (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4380: revert: fix the inconsistency of status msgs in --interactive mode

khanchi97 added a comment. Ready to review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4380 To: khanchi97, #hg-reviewers Cc: yuja, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D4380: revert: fix the inconsistency of status msgs in --interactive mode

khanchi97 updated this revision to Diff 10715. khanchi97 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4380?vs=10679=10715 REVISION DETAIL https://phab.mercurial-scm.org/D4380 AFFECTED FILES mercurial/cmdutil.py

D4448: revert: remove unnecessary check as `msg` should never be a callable now

khanchi97 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/D4448 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS diff --git a/mercurial/cmdutil.py

D4380: revert: fix the inconsistency of status msgs in --interactive mode

khanchi97 added a comment. Made changes. Ready to review. In https://phab.mercurial-scm.org/D4380#67537, @yuja wrote: > > $ hg revert a > > > > + undeleting a > > As you can see, there was no status message if "a" is an explicitly specified > file. Oh yes,

D4380: revert: fix the inconsistency of status msgs in --interactive mode

khanchi97 updated this revision to Diff 10679. khanchi97 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4380?vs=10578=10679 REVISION DETAIL https://phab.mercurial-scm.org/D4380 AFFECTED FILES mercurial/cmdutil.py

D4381: cmdutil: fix typo in revert()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6b81d2ff118f: cmdutil: fix typo in revert() (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4381?vs=10579=10586 REVISION

D4381: cmdutil: fix typo in revert()

khanchi97 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/D4381 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS diff --git a/mercurial/cmdutil.py

D4380: revert: fix the inconsistency of status msgs in --interactive mode

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this patch we were priting every action msg before actually performing that action and that would result in inconsistencies like if user decided to not

D4282: rebase: cover restorestatus() by lock to prevent it from being updated

This revision was automatically updated to reflect the committed changes. Closed by commit rHGffb34ee6de9e: rebase: cover restorestatus() by lock to prevent it from being updated (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT

D4282: rebase: cover restorestatus() by lock to prevent it from being updated

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY To prevent it from being updated by another process `restorestatus()` is moved under lock. REPOSITORY rHG Mercurial REVISION DETAIL

D3970: rebase: include --stop option in documentation

This revision was automatically updated to reflect the committed changes. Closed by commit rHG571361e47137: rebase: include --stop option in documentation (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3970?vs=10288=10356#toc REPOSITORY rHG

D3982: rebase: add test to show --stop moves bookmarks

This revision was automatically updated to reflect the committed changes. Closed by commit rHG33f5cffe725f: rebase: add test to show --stop moves bookmarks (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3959: rebase: add --stop option to stop rebase at any point (issue5206)

This revision was automatically updated to reflect the committed changes. Closed by commit rHGcc37009e95ca: rebase: add --stop option to stop rebase at any point (issue5206) (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3959?vs=10286=10354#toc

D3969: rebase: raise error for options conflicting with --stop

This revision was automatically updated to reflect the committed changes. Closed by commit rHG2cf0b8b830ba: rebase: raise error for options conflicting with --stop (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3969?vs=10287=10355#toc

D3982: rebase: add test to show --stop moves bookmarks

khanchi97 updated this revision to Diff 10289. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3982?vs=9666=10289 REVISION DETAIL https://phab.mercurial-scm.org/D3982 AFFECTED FILES tests/test-rebase-obsolete.t CHANGE DETAILS diff --git

D3970: rebase: include --stop option in documentation

khanchi97 updated this revision to Diff 10288. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3970?vs=9656=10288 REVISION DETAIL https://phab.mercurial-scm.org/D3970 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

D3969: rebase: raise error for options conflicting with --stop

khanchi97 updated this revision to Diff 10287. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3969?vs=9655=10287 REVISION DETAIL https://phab.mercurial-scm.org/D3969 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff

D3959: rebase: add --stop option to stop rebase at any point (issue5206)

khanchi97 updated this revision to Diff 10286. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3959?vs=9654=10286 REVISION DETAIL https://phab.mercurial-scm.org/D3959 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff

D4123: resolve: organize 'if confirm' conditionals

This revision was automatically updated to reflect the committed changes. Closed by commit rHG49b51f41fb46: resolve: organize if confirm conditionals (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4123?vs=9940=9976

D4123: resolve: organize 'if confirm' conditionals

khanchi97 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/D4123 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands.py

D4102: resolve: support confirm config option with --unmark flag

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf35f6791595f: resolve: support confirm config option with --unmark flag (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4103: resolve: update commands.resolve.confirm help text

This revision was automatically updated to reflect the committed changes. Closed by commit rHG755741c39230: resolve: update commands.resolve.confirm help text (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D4103?vs=9906=9939#toc REPOSITORY rHG

D4102: resolve: support confirm config option with --unmark flag

khanchi97 updated this revision to Diff 9905. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4102?vs=9899=9905 REVISION DETAIL https://phab.mercurial-scm.org/D4102 AFFECTED FILES mercurial/commands.py tests/test-resolve.t CHANGE DETAILS diff

D4103: resolve: update commands.resolve.confirm help text

khanchi97 updated this revision to Diff 9906. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4103?vs=9900=9906 REVISION DETAIL https://phab.mercurial-scm.org/D4103 AFFECTED FILES mercurial/help/config.txt CHANGE DETAILS diff --git

D4102: resolve: support confirm config option with --unmark flag

khanchi97 added inline comments. INLINE COMMENTS > pulkit wrote in commands.py:4555 > This should be 'mark all resolved files as unresolved'. Oops, sorry. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4102 To: khanchi97, #hg-reviewers Cc: pulkit,

D4101: resolve: support commands.resolve.confirm option with --mark flag

This revision was automatically updated to reflect the committed changes. Closed by commit rHGdb03e5cefc82: resolve: support commands.resolve.confirm option with --mark flag (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D4101?vs=9898=9903#toc

D4103: resolve: update commands.resolve.confirm help text

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Included --mark and --unmark in the help text of resolve.confirm.config. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4103

D4102: resolve: support confirm config option with --unmark flag

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now, commands.resolve.confirm also respect --unmark option; and confirm to unresolve all resolved files. It will confirm only when no files pats are passed

D4101: resolve: support commands.resolve.confirm option with --mark flag

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now, commands.resolve.confirm config option also respect --mark; and confirm to mark all 'unresolved' files as 'resolved'. It will confirm only when you

D3988: resolve: add confirm config option

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf8732e33bcbc: resolve: add confirm config option (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3988?vs=9816=9823#toc REPOSITORY rHG Mercurial

D3968: amend: support "history-editing-backup" config option

This revision was automatically updated to reflect the committed changes. Closed by commit rHG32ece991955c: amend: support history-editing-backup config option (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4055: rebase: move "backup" flag to rbsrt

This revision was automatically updated to reflect the committed changes. Closed by commit rHG2b728789edfd: rebase: move backup flag to rebaseruntime (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4055?vs=9815=9817

D3988: resolve: add confirm config option

khanchi97 updated this revision to Diff 9816. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3988?vs=9785=9816 REVISION DETAIL https://phab.mercurial-scm.org/D3988 AFFECTED FILES mercurial/commands.py mercurial/configitems.py

D4055: rebase: move "backup" flag to rbsrt

khanchi97 updated this revision to Diff 9815. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4055?vs=9793=9815 REVISION DETAIL https://phab.mercurial-scm.org/D4055 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

D4055: rebase: move "backup" flag to rbsrt

khanchi97 added inline comments. INLINE COMMENTS > pulkit wrote in rebase.py:349 > not A or not B = not (A and B) > not(not A or not B) = A and B Ah, right. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4055 To: khanchi97, #hg-reviewers Cc: pulkit,

D3968: amend: support "history-editing-backup" config option

khanchi97 updated this revision to Diff 9794. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3968?vs=9640=9794 REVISION DETAIL https://phab.mercurial-scm.org/D3968 AFFECTED FILES mercurial/cmdutil.py tests/test-amend.t CHANGE DETAILS diff --git

D4055: rebase: move "backup" flag to rbsrt

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It was getting messy to populate "backup" flag to calls of `_finishrebase()` and `_prepareabortorcontinue`, so made some changes to move "backup" flag to

D3887: rebase: support "history-editing-backup" config option

khanchi97 added a comment. In https://phab.mercurial-scm.org/D3887#62850, @pulkit wrote: > In https://phab.mercurial-scm.org/D3887#62825, @yuja wrote: > > > Queued, thanks. > > > > > @@ -829,6 +833,8 @@ > > > > > > userrevs = list(repo.revs(opts.get('auto_orphans'))) > >

D3887: rebase: support "history-editing-backup" config option

This revision was automatically updated to reflect the committed changes. Closed by commit rHG7de767e15f52: rebase: support history-editing-backup config option (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3988: resolve: add confirm config option

khanchi97 updated this revision to Diff 9785. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3988?vs=9678=9785 REVISION DETAIL https://phab.mercurial-scm.org/D3988 AFFECTED FILES mercurial/commands.py mercurial/configitems.py

D3988: resolve: add confirm config option

khanchi97 updated this revision to Diff 9678. khanchi97 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3988?vs=9676=9678 REVISION DETAIL https://phab.mercurial-scm.org/D3988 AFFECTED FILES mercurial/commands.py

D3988: resolve: add confirm config option

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This config setting gives a functionality to confirm before it re-merge all unresolved files. If this config is enabled, when you run 'hg resolve' it will

D3959: rebase: add --stop option to stop rebase at any point (issue5206)

khanchi97 added a comment. In https://phab.mercurial-scm.org/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. @pulkit I think

D3982: rebase: add test to show --stop moves bookmarks

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Added tests to show that --stop option moves bookmarks of rebased csets to their succs. REPOSITORY rHG Mercurial REVISION DETAIL

D3970: rebase: include --stop option in documentation

khanchi97 updated this revision to Diff 9656. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3970?vs=9644=9656 REVISION DETAIL https://phab.mercurial-scm.org/D3970 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

D3969: rebase: raise error for options conflicting with --stop

khanchi97 updated this revision to Diff 9655. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3969?vs=9643=9655 REVISION DETAIL https://phab.mercurial-scm.org/D3969 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff

D3959: rebase: add --stop option to stop rebase at any point (issue5206)

khanchi97 updated this revision to Diff 9654. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3959?vs=9642=9654 REVISION DETAIL https://phab.mercurial-scm.org/D3959 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff

D3959: rebase: add --stop option to stop rebase at any point (issue5206)

khanchi97 added a comment. @pulkit I will send a follow up which will take care of bookmarks movement. Thanks for review! INLINE COMMENTS > pulkit wrote in rebase.py:595 > nit: 'cannot stop in --collapse session' > > Also, if we cannot stop, we should not fallback to aborting. Ah, right.

D3969: rebase: raise error for options conflicting with --stop

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Make sure --stop feature raise error for conflicting options --continue, --abort, --confirm, --dry-run. Tests are added to reflect the same. REPOSITORY rHG

D3970: rebase: include --stop option in documentation

khanchi97 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/D3970 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py

D3959: rebase: add --stop option to stop rebase at any point (issue5206)

khanchi97 updated this revision to Diff 9642. khanchi97 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3959?vs=9617=9642 REVISION DETAIL https://phab.mercurial-scm.org/D3959 AFFECTED FILES hgext/rebase.py

D3959: rebase: add --stop option to stop rebase at any point (issue5206)

khanchi97 added a comment. In https://phab.mercurial-scm.org/D3959#61670, @yuja wrote: > > +def _stoprebase(self): > > +"""stop the interrupted rebase""" > > +self.restorestatus() > > +if not self.stateobj.exists(): > > +raise

D3901: histedit: add history-editing-backup config option

khanchi97 added inline comments. INLINE COMMENTS > pulkit wrote in configitems.py:1096 > sorry for noticing late, but can me move it somewhere else instead of ui. I > don't think ui is the right place for it. @yuja what do you think? @pulkit I do also think ui is not right place for it. And in

D3968: amend: support "history-editing-backup" config option

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now, amend is in the list of those history editing commands which support `history-editing-backup` config option. If you don't want to store any backup then

D3887: rebase: support "history-editing-backup" config option

khanchi97 updated this revision to Diff 9639. khanchi97 edited the summary of this revision. khanchi97 retitled this revision from "rebase: add --no-backup option" to "rebase: support "history-editing-backup" config option". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3965: histedit: drop --no-backup option

This revision was automatically updated to reflect the committed changes. Closed by commit rHGfaea9b1980d9: histedit: drop --no-backup option (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3965?vs=9634=9636

D3965: histedit: drop --no-backup option

khanchi97 created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Dropping this option because now we have a better option than passing --no-backup flag every time, now user can set a config

D3901: histedit: add history-editing-backup config option

This revision was automatically updated to reflect the committed changes. Closed by commit rHGc2586a6e5884: histedit: add history-editing-backup config option (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3901?vs=9625=9632#toc REPOSITORY rHG

D3901: histedit: add history-editing-backup config option

khanchi97 added a comment. >> 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

D3901: histedit: add history-editing-backup config option

khanchi97 added a comment. > Because this option has not been part of a release yet. There is no point of releasing a deprecated feature. Got it. Thanks! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3901 To: khanchi97, durin42, #hg-reviewers Cc: pulkit,

D3901: histedit: add history-editing-backup config option

khanchi97 added a comment. > 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? REPOSITORY rHG Mercurial REVISION

D3901: histedit: add history-editing-backup config option

khanchi97 updated this revision to Diff 9625. khanchi97 edited the summary of this revision. khanchi97 retitled this revision from "histedit: add nobackup config option" to "histedit: add history-editing-backup config option". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3959: rebase: add --stop option to stop rebase at any point (issue5206)

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this patch, during a rebase if you get a point where you can't figure out what to do next then either you had to complete your series or abandon all

D3945: rebase: remove unnecessary confirm block

This revision was automatically updated to reflect the committed changes. Closed by commit rHG70448ec995c2: rebase: remove unnecessary confirm block (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3945?vs=9595=9598

D3947: rebase: remove unused variable "release" and an extra blank line

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8eeed92475d5: rebase: remove unused variable release and an extra blank line (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3947?vs=9597=9599#toc

D3947: rebase: remove unused variable "release" and an extra blank line

khanchi97 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/D3947 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py

D3945: rebase: remove unnecessary confirm block

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Removed unnecessary 'if confirm:' block as that thing is now handled at 'finally'. REPOSITORY rHG Mercurial REVISION DETAIL

D3944: rebase: in --confirm option just abort if hit a conflict

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb3d0c97a0820: rebase: in --confirm option just abort if hit a conflict (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3944: rebase: in --confirm option just abort if hit a conflict

khanchi97 added inline comments. INLINE COMMENTS > rebase.py:875 > needsabort = False > -if not ui.promptchoice(_(b'apply changes (yn)?' > - b'$$ $$ ')): In the case when we hit a conflict, yuya suggested me to either

D3830: rebase: suppress transaction warns during dry-run

khanchi97 updated this revision to Diff 9593. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3830?vs=9501=9593 REVISION DETAIL https://phab.mercurial-scm.org/D3830 AFFECTED FILES hgext/rebase.py mercurial/localrepo.py mercurial/transaction.py

D3871: rebase: improve output of --confirm option

khanchi97 added a comment. In https://phab.mercurial-scm.org/D3871#61439, @durin42 wrote: > This doesn't apply cleanly, could you rebase it? @durin42 I have made a change in --confirm option https://phab.mercurial-scm.org/D3944 if this functionality (don't prompt if hit a

D3944: rebase: in --confirm option just abort if hit a conflict

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this patch, it was prompting the user in both cases 1) when there is no conflict 2) when there is atleast one conlict. But for simplicity we can just

D3939: rebase: correct misleading message in --confirm option

This revision was automatically updated to reflect the committed changes. Closed by commit rHG35b3f686157a: rebase: correct misleading message in --confirm option (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3938: rebase: make sure we don't loose the return code in --confirm option

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa50482254b0a: rebase: make sure we dont loose the return code in --confirm option (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3870: rebase: add --confirm option

khanchi97 added a comment. >> except error.InMemoryMergeConflictsError: >> ui.status(_('hit a merge conflict\n')) >> >> +if confirm: >> +# abort as in-memory merge doesn't support conflict >> +

D3939: rebase: correct misleading message in --confirm option

khanchi97 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/D3939 AFFECTED FILES hgext/rebase.py tests/test-rebase-inmemory.t CHANGE DETAILS diff --git

D3938: rebase: make sure we don't loose the return code in --confirm option

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY return _dorebase() to make sure it returns 'return code'. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3938 AFFECTED FILES

D3870: rebase: add --confirm option

This revision was automatically updated to reflect the committed changes. Closed by commit rHG572dff5c946e: rebase: add --confirm option (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3870?vs=9538=9568#toc REPOSITORY rHG Mercurial CHANGES

D3870: rebase: add --confirm option

khanchi97 added inline comments. INLINE COMMENTS > khanchi97 wrote in rebase.py:895 > @yuja will this work? Now instead of using "confirm" flag, I added > "needsabort" variable. And I rebased this revision to not depend on https://phab.mercurial-scm.org/D3830. REPOSITORY rHG Mercurial

D3870: rebase: add --confirm option

khanchi97 added inline comments. INLINE COMMENTS > rebase.py:895 > finally: > -# no need to store backup in case of dryrun > -rbsrt._prepareabortorcontinue(isabort=True, backup=False, > - suppwarns=True) > +if

D3870: rebase: add --confirm option

khanchi97 updated this revision to Diff 9538. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3870?vs=9502=9538 REVISION DETAIL https://phab.mercurial-scm.org/D3870 AFFECTED FILES hgext/rebase.py mercurial/cmdutil.py tests/test-rebase-inmemory.t

D3901: histedit: add nobackup config option

khanchi97 updated this revision to Diff 9531. khanchi97 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3901?vs=9493=9531 REVISION DETAIL https://phab.mercurial-scm.org/D3901 AFFECTED FILES hgext/histedit.py

D3870: rebase: add --confirm option

khanchi97 added a comment. In https://phab.mercurial-scm.org/D3870#61079, @yuja wrote: > Still can't apply. Which revision is this patch based on? Ah, this patch is based on https://phab.mercurial-scm.org/D3830 which is not reviewed. Do I need to rebase this to hg-commited

D3870: rebase: add --confirm option

khanchi97 added a comment. @yuja Rebased, removed variable "needsabort/conflict" and moved that code to "except" and "else" clause accordingly. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3870 To: khanchi97, #hg-reviewers Cc: yuja, mercurial-devel

<    1   2   3   4   >