D6478: shelve: first prototype of storing unresolved changes

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Mon Jun 10 13:38:12 EDT 2019


pulkit added inline comments.

INLINE COMMENTS

> shelve.py:497
> +            extra['unresolved-merge'] = True
> +            if not os.path.exists(repo.vfs.join('merge-unresolved')):
> +                util.makedir(repo.vfs.join('merge-unresolved'), False)

`vfs.exists` can be used

> shelve.py:497
> +            extra['unresolved-merge'] = True
> +            if not os.path.exists(repo.vfs.join('merge-unresolved')):
> +                util.makedir(repo.vfs.join('merge-unresolved'), False)

also, this storing a mergestate code should go in a separate function.

> shelve.py:498
> +            if not os.path.exists(repo.vfs.join('merge-unresolved')):
> +                util.makedir(repo.vfs.join('merge-unresolved'), False)
> +            util.rename(repo.vfs.join('merge'),

`vfs.makedir` or `vfs.mkdir` can be used

> shelve.py:499
> +                util.makedir(repo.vfs.join('merge-unresolved'), False)
> +            util.rename(repo.vfs.join('merge'),
> +                        repo.vfs.join('merge-unresolved/%s/' % name))

`vfs.rename` should be used.

> shelve.py:605
>              continue
> +        if os.path.exists(repo.vfs.join('merge-unresolved/%s' % sname)):
> +            sname += ' (unresolved)'

can we look into changeset extras here to decide whether this is an unresolved shelve or not here?

It will be nice to remove any details of our storage layer and only keep them to functions which stores and restores merge states.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6478

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel


More information about the Mercurial-devel mailing list