D6738: unshelve: add --unresolved flag to unshelve mergestate with unresolved files

[navaneeth.suresh (Navaneeth Suresh)]

navaneeth.suresh added inline comments.

INLINE COMMENTS

> pulkit wrote in shelve.py:754
> we should write both the versions, `_writerecords()` should be used.

i had tried to support it earlier. but, it throws the following error. i think it's okay to use the latest format only since, we haven't stored any mergestate using the previous format. the repo won't get corrupted.

  +  Traceback (most recent call last):
  +    File "/tmp/hgtests.TEheee/install/bin/hg", line 43, in <module>
  +      dispatch.run()
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 99, in run
  +      status = dispatch(req)
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 225, in dispatch
  +      ret = _runcatch(req) or 0
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 376, in _runcatch
  +      return _callcatch(ui, _runcatchfunc)
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 384, in _callcatch
  +      return scmutil.callcatch(ui, func)
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/scmutil.py", line 167, in callcatch
  +      return func()
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 367, in _runcatchfunc
  +      return _dispatch(req)
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 1021, in _dispatch
  +      cmdpats, cmdoptions)
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 756, in runcommand
  +      ret = _runcommand(ui, options, cmd, d)
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 1030, in _runcommand
  +      return cmdfunc()
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 1018, in <lambda>
  +      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/util.py", line 1682, in check
  +      return func(*args, **kwargs)
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/commands.py", line 6229, in unshelve
  +      return shelvemod.dounshelve(ui, repo, *shelved, **opts)
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/shelve.py", line 1090, in dounshelve
  +      restoreunresolvedshelve(ui, repo, shelvectx, basename)
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/shelve.py", line 754, in restoreunresolvedshelve
  +      ms._writerecords(_decodemergerecords(records))
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/merge.py", line 452, in _writerecords
  +      self._writerecordsv1(records)
  +    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/merge.py", line 460, in _writerecordsv1
  +      assert lrecords[0] == RECORD_LOCAL
  +  AssertionError
  +  [1]

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6738/new/

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

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