Closed by commit rHG5171937ad0f9: abort: added support for graft (authored by
taapas1128).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6567?vs=15831&id=15846
CHANGES SINCE LAST A
taapas1128 added a comment.
amended.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6567/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6567
To: taapas1128, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
taapas1128 edited the summary of this revision.
taapas1128 updated this revision to Diff 15831.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6567?vs=15804&id=15831
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6567/new/
REVISION DETAIL
h
pulkit added a comment.
> This logic is registered to the statesetection API as abortfunc.
s/statesection/statedetection
> graft currently supports --dry-run flag.
This sounds ambiguous. Does this means `hg graft` supports `--dry-run` flag?
IIUC, `hg abort` supports `--dry-run`
taapas1128 edited the summary of this revision.
taapas1128 updated this revision to Diff 15804.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6567?vs=15779&id=15804
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6567/new/
REVISION DETAIL
h
taapas1128 edited the summary of this revision.
taapas1128 updated this revision to Diff 15779.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6567?vs=15766&id=15779
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6567/new/
REVISION DETAIL
h
pulkit added a comment.
> Tests have been shown as test-abort.t
There is no such test now. :)
INLINE COMMENTS
> commands.py:2733
>
> +def hgabortgraft(ui, repo, **opts):
> +if opts.get('no_backup'):
let's move this function to cmdutil.py. Should move _readgraftstate,
_abortgrafts
taapas1128 updated this revision to Diff 15766.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6567?vs=15751&id=15766
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6567/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6567
AFFECTED FI
taapas1128 edited the summary of this revision.
taapas1128 retitled this revision from "abort: added functionality for graft"
to "abort: added support for graft".
taapas1128 updated this revision to Diff 15751.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org
pulkit added inline comments.
INLINE COMMENTS
> taapas1128 wrote in commands.py:2738
> @pulkit the wlock is activated later in `graft --abort` during cleanup. That
> is same in the case of `hg abort`
`_dograft()` is called after taking the lock. `_abortgraft` before taking the
lock does a lot
taapas1128 added inline comments.
INLINE COMMENTS
> pulkit wrote in commands.py:2738
> Directly calling `_abortgraft` is not safe. `graft --abort` takes wlock first
> and then calls it. We skipped taking the lock in case of `hg abort`.
@pulkit the wlock is activated later in `graft --abort` dur
taapas1128 updated this revision to Diff 15732.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6567?vs=15647&id=15751
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6567/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6567
AFFECTED FI
12 matches
Mail list logo