khanchi97 updated this revision to Diff 9502.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3870?vs=9486=9502
REVISION DETAIL
https://phab.mercurial-scm.org/D3870
AFFECTED FILES
hgext/rebase.py
mercurial/cmdutil.py
tests/test-rebase-inmemory.t
khanchi97 updated this revision to Diff 9503.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3871?vs=9487=9503
REVISION DETAIL
https://phab.mercurial-scm.org/D3871
AFFECTED FILES
hgext/rebase.py
tests/test-rebase-inmemory.t
CHANGE DETAILS
diff
khanchi97 updated this revision to Diff 9501.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3830?vs=9384=9501
REVISION DETAIL
https://phab.mercurial-scm.org/D3830
AFFECTED FILES
hgext/rebase.py
mercurial/localrepo.py
mercurial/transaction.py
khanchi97 added inline comments.
INLINE COMMENTS
> histedit.py:240
> +default=False,
> +)
>
What is the right place to register this config option? Because if I register
this in histedit extension then someone who doesn't have enabled histedit
extension won't be able to use this config
khanchi97 created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Instead of passing --no-backup option every time you don't
want to store backup, now you can set config option:
khanchi97 updated this revision to Diff 9486.
khanchi97 edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3870?vs=9386=9486
REVISION DETAIL
https://phab.mercurial-scm.org/D3870
AFFECTED FILES
hgext/rebase.py
khanchi97 updated this revision to Diff 9487.
khanchi97 edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3871?vs=9387=9487
REVISION DETAIL
https://phab.mercurial-scm.org/D3871
AFFECTED FILES
hgext/rebase.py
khanchi97 added a comment.
In https://phab.mercurial-scm.org/D3870#60813, @yuja wrote:
> > def _dryrunrebase(ui, repo, opts):
> > rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts)
> >
> > - ui.status(_('starting dry-run rebase; repository will not be
changed\n')) +
khanchi97 added inline comments.
INLINE COMMENTS
> martinvonz wrote in histedit.py:928
> Maybe "do not back up edited commits"? Is that reasonably accurate? I'm not
> sure what the option actually does. Is it both about the new versions that
> get stripped on --abort and the old versions that
khanchi97 added inline comments.
INLINE COMMENTS
> martinvonz wrote in histedit.py:928
> To me, the "of files" makes it sounds like it's about .orig files, but I
> don't think that's what it actually is. Can we make it clearer?
How about "do not save backup copies of performed actions"?
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf442c9494ec7: strip: improve help text for --no-backup
option (authored by khanchi97, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
khanchi97 added a comment.
@yuja @pulkit Definitely, adding a config option is better than any other
alternative. Can I start to work on this? (I mean adding config option which
will work for all history editing commands)
REPOSITORY
rHG Mercurial
REVISION DETAIL
khanchi97 updated this revision to Diff 9460.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3886?vs=9440=9460
REVISION DETAIL
https://phab.mercurial-scm.org/D3886
AFFECTED FILES
hgext/strip.py
tests/test-strip.t
CHANGE DETAILS
diff --git
khanchi97 added a comment.
In https://phab.mercurial-scm.org/D3887#60749, @yuja wrote:
> > Added --no-backup option which gives functionality to
> > not save backup copies of files.
>
> Can you elaborate why we want this option?
The idea was to add --no-backup option in
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG88e6630dc8d0: histedit: improve help text for --no-backup
option (authored by khanchi97, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Added --no-backup option which gives functionality to
not save backup copies of files.
REPOSITORY
rHG Mercurial
REVISION DETAIL
khanchi97 created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Improved help text for --no-backup option to clearly
define it's meaning.
REPOSITORY
rHG Mercurial
REVISION DETAIL
khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Help text is modified to clearly define the meaning of
--no-backup option.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3886
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7b57b1ed5c0f: histedit: add --no-backup option (issue5825)
(authored by khanchi97, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
khanchi97 added a comment.
In https://phab.mercurial-scm.org/D3854#60248, @yuja wrote:
> > if dryrun:
> >
> > - leaveunfinished = True
> > - inmemory = True rbsrt = rebaseruntime(repo, ui, inmemory, opts)
>
> Perhaps this is wrong. inmemory should be set to True, right?
khanchi97 updated this revision to Diff 9348.
khanchi97 edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3764?vs=9268=9348
REVISION DETAIL
https://phab.mercurial-scm.org/D3764
AFFECTED FILES
hgext/rebase.py
khanchi97 updated this revision to Diff 9347.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3830?vs=9269=9347
REVISION DETAIL
https://phab.mercurial-scm.org/D3830
AFFECTED FILES
hgext/rebase.py
mercurial/localrepo.py
mercurial/transaction.py
khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Before this patch dryrun output contained "rebase aborted" every
time we run rebase in dryrun mode and this warning does not sound
safe from a user
khanchi97 updated this revision to Diff 9345.
khanchi97 edited the summary of this revision.
khanchi97 retitled this revision from "rebase: no need to store backup during
dry-run while aborting" to "rebase: no need to store backup in case of dryrun".
REPOSITORY
rHG Mercurial
CHANGES SINCE
khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch split _origrebase() method by extracting rbsrt part
from that to make it easy to implement dryrun in more elegant way
than before.
REPOSITORY
khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
To avoid more number of indented blocks and make it easier to add
additional functionality in dryrun, extracted as a function.
REPOSITORY
rHG Mercurial
khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Before this patch it is easy for another hg to interrupt
the dryrun. This patch make sure that dryrun will complete
without any interruption.
REPOSITORY
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG56b2074114b1: rebase: refactor dryrun implementation
(authored by khanchi97, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3849?vs=9324=9335
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
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
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()
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
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
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
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 =
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
When we are in dry-run mode in rebasing, there is no need to store backup
when we abort rebase to make wrdir as it was before.
REPOSITORY
rHG Mercurial
khanchi97 added a comment.
I was also thinking to add --confirm option. It will show the same output as
dry-run but at the end, will ask the user to continue. So that user don't have
to write that command again. What do you say?
REPOSITORY
rHG Mercurial
REVISION DETAIL
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
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
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
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
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
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
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'))
> > +
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,
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
201 - 300 of 337 matches
Mail list logo