D2409: graft: add no-commit mode (issue5631)

khanchi97 added a comment. In https://phab.mercurial-scm.org/D2409#44682, @pulkit wrote: > In https://phab.mercurial-scm.org/D2409#43891, @khanchi97 wrote: > > > pulkit: Can you please review it? I have made the requested changes. > > > I am sorry but I will like this to wait

D3187: phase: add dry-run functionality

khanchi97 added a comment. okay, but I have some queries like 1. How about showing revision no. instead of cset id? 2. And in this https://pastebin.com/raw/kWcr9xVK example if I change revision 2 phase to --secret then how it should print the range, I mean now we have branches in this

D3187: phase: add dry-run functionality

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

D3757: rebase: add dry-run functionality

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY For now, it just notify that if we will hit a conflict or not, but we can improve this like making it a --confirm flag or by showing the graph that would

D3756: rebase: no need to backup rebased csets while aborting

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

D3757: rebase: add dry-run functionality

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf4f1fb1cbfb4: rebase: add dry-run functionality (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3757?vs=9124=9177#toc REPOSITORY rHG Mercurial

D3757: rebase: add dry-run functionality

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

D3757: rebase: add dry-run functionality

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

D3757: rebase: add dry-run functionality

khanchi97 added a comment. @yuja I have the made the requested changes. See if I have made the correct changes. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3757 To: khanchi97, #hg-reviewers, indygreg Cc: yuja, indygreg, mercurial-devel

D3757: rebase: add dry-run functionality

khanchi97 added a comment. In https://phab.mercurial-scm.org/D3757#58993, @yuja wrote: > > +dryrun = opts.get(r'dry_run') > > +if dryrun: > > +if opts.get(r'abort'): > > +raise error.Abort(_('cannot specify both --dry-run and --abort')) > > +

D3757: rebase: add dry-run functionality

khanchi97 added a comment. @indygreg @yuja thanks for your reviews :) I will send some patches to improve --dry-run for rebase as greg suggested. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3757 To: khanchi97, #hg-reviewers, indygreg Cc: yuja, indygreg,

D3764: rebase: improve output of --dry-run

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

D3671: advanceboundary: add dryrun parameter

khanchi97 added inline comments. INLINE COMMENTS > pulkit wrote in phases.py:369 > why are we maintaining this rejected list? rejected list will contain those csets which will be rejected during advancing boundary and then return this list so that we can report for rejected csets during

D3671: advanceboundary: add dryrun parameter

khanchi97 added inline comments. INLINE COMMENTS > khanchi97 wrote in phases.py:371 > I thought we would calculate `rejected` only when we are in dryrun mode. okay its fine. I will remove this unnecessary condition. Because I think `rejected` value can also be used in `phase` method of

D3671: advanceboundary: add dryrun parameter

khanchi97 updated this revision to Diff 8940. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3671?vs=8928=8940 REVISION DETAIL https://phab.mercurial-scm.org/D3671 AFFECTED FILES mercurial/phases.py CHANGE DETAILS diff --git a/mercurial/phases.py

D3671: advanceboundary: add dryrun parameter

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Added logic to find those csets whose phase will be changed (when running without --dryrun) while advancing boundary. And make it return rejected and changed

D3672: retractboundary: add dryrun parameter

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Added the logic to find those csets whose phase will be changed without dry-run while retracting boundary and return those csets. REPOSITORY rHG Mercurial

D3187: phase: add dry-run functionality

khanchi97 added a comment. @pulkit Now I moved the logic for finding revs (those phase will change) to advanceboundry and retractboundry function and for now it shows all nodes. I am working to show range instead. Take a look at this when you are free :) REPOSITORY rHG Mercurial

D2409: graft: add no-commit mode (issue5631)

khanchi97 updated this revision to Diff 8961. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2409?vs=8958=8961 REVISION DETAIL https://phab.mercurial-scm.org/D2409 AFFECTED FILES mercurial/commands.py tests/test-completion.t tests/test-graft.t

D3671: advanceboundary: add dryrun parameter

This revision was automatically updated to reflect the committed changes. Closed by commit rHG36ba5dba372d: advanceboundary: add dryrun parameter (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3671?vs=8950=8957#toc REPOSITORY rHG Mercurial

D3672: retractboundary: add dryrun parameter

khanchi97 updated this revision to Diff 8959. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3672?vs=8948=8959 REVISION DETAIL https://phab.mercurial-scm.org/D3672 AFFECTED FILES mercurial/phases.py CHANGE DETAILS diff --git a/mercurial/phases.py

D3187: phase: add dry-run functionality

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

D2409: graft: add no-commit mode (issue5631)

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

D2409: graft: add no-commit mode (issue5631)

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

D3672: retractboundary: add dryrun parameter

khanchi97 updated this revision to Diff 8960. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3672?vs=8959=8960 REVISION DETAIL https://phab.mercurial-scm.org/D3672 AFFECTED FILES mercurial/phases.py CHANGE DETAILS diff --git a/mercurial/phases.py

D3678: graft: correct documentation about options can be reapplied

This revision was automatically updated to reflect the committed changes. Closed by commit rHGad50f0399e1e: graft: correct documentation about options can be reapplied (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3678: graft: correct documentation about options can be reapplied

khanchi97 added a comment. In https://phab.mercurial-scm.org/D3678#57907, @yuja wrote: > Queued per review, thanks. > > > The -c/--continue option does not reapply earlier options, except > > > > - for --force. + for --force, --user and --date. > > Does it mean

D3671: advanceboundary: add dryrun parameter

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

D3672: retractboundary: add dryrun parameter

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

D3671: advanceboundary: add dryrun parameter

khanchi97 updated this revision to Diff 8949. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3671?vs=8947=8949 REVISION DETAIL https://phab.mercurial-scm.org/D3671 AFFECTED FILES mercurial/phases.py CHANGE DETAILS diff --git a/mercurial/phases.py

D3671: advanceboundary: add dryrun parameter

khanchi97 updated this revision to Diff 8950. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3671?vs=8949=8950 REVISION DETAIL https://phab.mercurial-scm.org/D3671 AFFECTED FILES mercurial/phases.py CHANGE DETAILS diff --git a/mercurial/phases.py

D3672: retractboundary: add dryrun parameter

khanchi97 added inline comments. INLINE COMMENTS > pulkit wrote in phases.py:395 > Add documentation about dry-run and the return value. okay > pulkit wrote in phases.py:417 > Why are we not using this affected set here to find the changesets whose > phase is changed? Because I think this

D2409: graft: add no-commit mode (issue5631)

khanchi97 added a comment. In https://phab.mercurial-scm.org/D2409#57814, @pulkit wrote: > In https://phab.mercurial-scm.org/D2409#56200, @khanchi97 wrote: > > > @pulkit do we have new state format pushed in? > > > Yep, you can go ahead and rebase this patch to make it use the

D2409: graft: add no-commit mode (issue5631)

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

D3678: graft: correct documentation about options can be reapplied

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now options --user and --date can be reapplied after we hit a conflict. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3678

D3764: rebase: improve output of --dry-run

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

D3870: rebase: add --confirm option

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This feature adds a functionality in rebase to confirm before applying changes. And also give useful information about result of rebase i.e will be successful

D3871: rebase: improve output of --confirm option

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this patch --cofirm option was thorwing the same rebasing information two times, one before confirmation and one after. Also added tests to reflect the

D3830: rebase: suppress transaction warns during dry-run

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

D3854: rebase: add lock to cover whole dryrun process

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

D3855: rebase: extract dryrun as a function

khanchi97 added a comment. In https://phab.mercurial-scm.org/D3855#60250, @yuja wrote: > > rbsrt = rebaseruntime(repo, ui, inmemory, opts) > > with repo.wlock(), repo.lock(): > > try: > > > > - overrides = {('rebase', 'singletransaction'): True} > > - with

D3827: rebase: no need to store backup in case of dryrun

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

D3764: rebase: improve output of --dry-run

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

D3857: rebase: suppress warning thrown when aborting rebase in case of dryrun

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

D3830: rebase: suppress transaction warns during dry-run

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

D3856: rebase: split _origrebase() for conveniece in dryrun

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

D3855: rebase: extract dryrun as a function

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

D3827: rebase: no need to store backup in case of dryrun

This revision was automatically updated to reflect the committed changes. Closed by commit rHGc892a30bafb9: rebase: no need to store backup in case of dryrun (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3827?vs=9357=9372#toc REPOSITORY rHG

D3854: rebase: add lock to cover whole dryrun process

This revision was automatically updated to reflect the committed changes. Closed by commit rHGba6d2c32f34a: rebase: add lock to cover whole dryrun process (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3854?vs=9354=9369#toc REPOSITORY rHG

D3855: rebase: extract dryrun as a function

This revision was automatically updated to reflect the committed changes. Closed by commit rHGc92fdc27cbdd: rebase: extract dryrun as a function (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3855?vs=9355=9370#toc REPOSITORY rHG Mercurial

D3857: rebase: suppress warning thrown when aborting rebase in case of dryrun

This revision was automatically updated to reflect the committed changes. Closed by commit rHG999e5c218daf: rebase: suppress warning thrown when aborting rebase in case of dryrun (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT

D3827: rebase: no need to store backup during dry-run while aborting

khanchi97 added a comment. In https://phab.mercurial-scm.org/D3827#59873, @yuja wrote: > > - retcode = rbsrt._prepareabortorcontinue(abortf) +# If in-memory, means aborting during dry-run, no need to backup +backup = not rbsrt.inmemory +retcode =

D2409: graft: add no-commit mode (issue5631)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG622f79e3a1cb: graft: add no-commit mode (issue5631) (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2409?vs=9301=9311#toc REPOSITORY rHG Mercurial

D3849: rebase: refactor dryrun implementation

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

D3827: rebase: no need to store backup during dry-run while aborting

khanchi97 added a comment. In https://phab.mercurial-scm.org/D3827#59878, @yuja wrote: > > > > - retcode = rbsrt._prepareabortorcontinue(abortf) +# If in-memory, means aborting during dry-run, no need to backup +backup = not rbsrt.inmemory +retcode

D3829: rebase: make dry-run return 1 or 0 according to result

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In dry-run mode, if there is no conflict return 0, if any then return 1 REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3829

D3764: rebase: no need to store backup during dry-run while aborting

khanchi97 added a comment. In https://phab.mercurial-scm.org/D3764#59797, @pulkit wrote: > @khanchi97 you should have created a new differential so that we don't loose your earlier patch titled: 'rebase: improve output of --dry-run' which is yet under review. Oh sorry, it was by

D3764: rebase: improve output of --dry-run

khanchi97 updated this revision to Diff 9259. khanchi97 retitled this revision from "rebase: no need to store backup during dry-run while aborting" to "rebase: improve output of --dry-run". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3764?vs=9258=9259

D3827: rebase: no need to store backup during dry-run while aborting

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

D3764: rebase: improve output of --dry-run

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

D3764: rebase: improve output of --dry-run

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

D3829: rebase: make dry-run return 1 or 0 according to result

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe6b643ccf87d: rebase: make dry-run return 1 or 0 according to result (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3827: rebase: no need to store backup during dry-run while aborting

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

D3764: rebase: improve output of --dry-run

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

D3830: rebase: suppress transaction warns during dry-run

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Suppressed warnings thrown while aborting a transaction during dryrun because these warnings does not sound safe to user. REPOSITORY rHG Mercurial REVISION

D3830: rebase: suppress transaction warns during dry-run

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

D3764: rebase: improve output of --dry-run

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

D3829: rebase: make dry-run return 1 or 0 according to result

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

D3828: rebase: add **opts to _prepareabortorcontinue

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Added keyword arguments option so that we can pass some options to abort method like nobackup option. REPOSITORY rHG Mercurial REVISION DETAIL

D3764: rebase: no need to store backup during dry-run while aborting

khanchi97 updated this revision to Diff 9258. khanchi97 edited the summary of this revision. khanchi97 retitled this revision from "rebase: improve output of --dry-run" to "rebase: no need to store backup during dry-run while aborting". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3849: rebase: refactor dryrun implementation

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch refactor dry-run code to make it easy to add additional functionality in dryrun. Otherwise we had to add every functionality through _origrebase()

D3849: rebase: refactor dryrun implementation

khanchi97 added a subscriber: yuja. khanchi97 added a comment. @yuja In this patch rebaseruntime is instantiated two times, one in _dryrunrebase and second in _origrebase, I don't know if it could make any problem although all tests are passing. Maybe _origrebase() also need some

D2409: graft: add no-commit mode (issue5631)

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

D3872: histedit: add --no-backup option (issue5825)

khanchi97 created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This option provides a functionality to not store a backup while aborting histedit in between. Also added tests for the

D2276: a: change a to add some new lines

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY So I have added some code to check how my patch will be look like. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2276 AFFECTED

D2278: bundle: updates the help text for hg bundle (issue5744) [bugzilla]

This revision was automatically updated to reflect the committed changes. Closed by commit rHGff36116f30f3: bundle: updates the help text for hg bundle (issue5744) (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2278?vs=5794=5809#toc REPOSITORY

D2409: graft: add no-commit mode (issue5631)

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/D2409 AFFECTED FILES mercurial/commands.py tests/test-graft.t CHANGE DETAILS diff --git

D2278: bundle: updates the help text for hg bundle (issue5744) [bugzilla]

khanchi97 updated this revision to Diff 5778. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2278?vs=5760=5778 REVISION DETAIL https://phab.mercurial-scm.org/D2278 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git

D2278: bundle: updates the help text for hg bundle (issue5744) [bugzilla]

khanchi97 added a comment. Okay, I will take care of that. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2278 To: khanchi97, #hg-reviewers, yuja Cc: pulkit, yuja, mercurial-devel ___ Mercurial-devel mailing list

D2409: graft: add no-commit mode (issue5631)

khanchi97 added a comment. Hello Pulkit, After spending some time with graft implementation, I hope now I have a good understanding of how graft is working. Let me tell you what I have understood and how I want to implement `--no-commit` mode. So when we hit a merge conflict what we do

D2409: graft: add no-commit mode (issue5631)

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

D3764: rebase: improve output of --dry-run

khanchi97 added a comment. okay @pulkit , let me confirm if IIUC your points. 1. First thing is we would have a function which will accept a `return_code`(0 or 1) and `output_data` (what can happen without --dry-run) from any command (which has dry-run functionality). And will give

D3756: rebase: delete the comment which was not following "do not eat my data"

khanchi97 updated this revision to Diff 9253. khanchi97 retitled this revision from "rebase: no need to backup rebased csets while aborting" to "rebase: delete the comment which was not following "do not eat my data"". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3756: rebase: delete the comment which was not following "do not eat my data"

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd6686f864a70: rebase: delete the comment which was not following do not eat my data (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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'))) > >

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

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

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 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,

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

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

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

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

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

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

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

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

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

  1   2   3   4   >