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
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
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
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
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
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
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
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf10cb49951e1: forget: rename --confirm to --interactive
(authored by khanchi97, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D3405?vs=8379=8381#toc
REPOSITORY
rHG
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/D3405
AFFECTED FILES
hgext/largefiles/overrides.py
mercurial/cmdutil.py
mercurial/commands.py
khanchi97 added a comment.
In https://phab.mercurial-scm.org/D2934#54295, @pulkit wrote:
> In https://phab.mercurial-scm.org/D2934#54256, @yuja wrote:
>
> > The change looks good, but new behavior sounds more like `--interactive`
> > than `--confirm`.
>
>
> I agree.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe7bf5a73e4e1: forget: add --confirm option (authored by
khanchi97, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D2934?vs=7285=8362#toc
REPOSITORY
rHG Mercurial
CHANGES
khanchi97 added a comment.
@pulkit Can you please review it?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3187
To: khanchi97, pulkit, #hg-reviewers
Cc: av6, mercurial-devel
___
Mercurial-devel mailing list
khanchi97 updated this revision to Diff 7877.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3187?vs=7874=7877
REVISION DETAIL
https://phab.mercurial-scm.org/D3187
AFFECTED FILES
mercurial/commands.py
tests/test-completion.t
tests/test-phases.t
khanchi97 updated this revision to Diff 7874.
khanchi97 retitled this revision from "phase: Add dry-run functionality" to
"phase: add dry-run functionality".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3187?vs=7873=7874
REVISION DETAIL
khanchi97 created this revision.
khanchi97 added a reviewer: pulkit.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Added the logic to count the number of csets whose phases will be changed,
for now it just prints the same stats as we get
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG14cd5290c4e6: addremove: remove dry_run, similarity from
scmutil.addremove (API) (authored by khanchi97, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D3000?vs=7524=7535#toc
khanchi97 updated this revision to Diff 7524.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3000?vs=7523=7524
REVISION DETAIL
https://phab.mercurial-scm.org/D3000
AFFECTED FILES
contrib/perf.py
hgext/largefiles/overrides.py
mercurial/commands.py
khanchi97 updated this revision to Diff 7523.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3000?vs=7500=7523
REVISION DETAIL
https://phab.mercurial-scm.org/D3000
AFFECTED FILES
contrib/perf.py
hgext/largefiles/overrides.py
mercurial/commands.py
khanchi97 updated this revision to Diff 7500.
khanchi97 retitled this revision from "addremove: remove opts from
scmutil.addremove" to "addremove: remove dry_run, similarity from
scmutil.addremove".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
khanchi97 added a comment.
I have made the requested changes. Now --confirm will prompt per file and
also added all/skip option which will either include all the remaining files or
skip all the remaining files according the user input.
INLINE COMMENTS
> av6 wrote in cmdutil.py:2007
>
khanchi97 added a subscriber: yuja.
khanchi97 added a comment.
I ran all the tests those are related to addremove and they are passing.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3000
To: khanchi97, #hg-reviewers
Cc: yuja, mercurial-devel
khanchi97 updated this revision to Diff 7285.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2934?vs=7254=7285
REVISION DETAIL
https://phab.mercurial-scm.org/D2934
AFFECTED FILES
mercurial/cmdutil.py
mercurial/commands.py
tests/test-add.t
khanchi97 updated this revision to Diff 7254.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2934?vs=7252=7254
REVISION DETAIL
https://phab.mercurial-scm.org/D2934
AFFECTED FILES
mercurial/cmdutil.py
mercurial/commands.py
tests/test-add.t
khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Also added confirmopts in cmdutil.py
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2934
AFFECTED FILES
mercurial/cmdutil.py
khanchi97 added a comment.
pulkit: Can you please review it? I have made the requested changes.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2409
To: khanchi97, #hg-reviewers
Cc: pulkit, mercurial-devel
___
khanchi97 added a comment.
I have added tests to show the behavior of --no-commit with other flags.
INLINE COMMENTS
> pulkit wrote in commands.py:2309
> To be honest I am not fan of storing data in such format, but that's how we
> store data right now. I have finally a series in review
khanchi97 updated this revision to Diff 6538.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2409?vs=6325=6538
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.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2579
AFFECTED FILES
hgext/mq.py
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py
khanchi97 added a comment.
What I did to store `--no-commit` flag in `graftstate` is:
Add a flag `True/False` in 1st line of `graftstate` and keep it updated from
previous value in `graftstate` for every iteration in `revs`.
REPOSITORY
rHG Mercurial
REVISION DETAIL
khanchi97 updated this revision to Diff 6325.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2409?vs=6132=6325
REVISION DETAIL
https://phab.mercurial-scm.org/D2409
AFFECTED FILES
mercurial/commands.py
tests/test-graft.t
CHANGE DETAILS
diff --git
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
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
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
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
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
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
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
301 - 337 of 337 matches
Mail list logo