Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • thg thg
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 839
    • Issues 839
    • List
    • Boards
    • Service Desk
    • Milestones
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • mercurialmercurial
  • TortoiseHgTortoiseHg
  • thgthg
  • Issues
  • #5615
Closed
Open
Issue created Sep 08, 2020 by alexrayne@alexrayne

crash report: thg 5.5.1+6 py3 on repo conflicted by merge

run thg 5.5.1+6-799ca6335d5b (Mercurial-5.4, Python-3.8.3, PyQt-5.13.2, Qt-5.13.2) on win8 py3.8 from source:

made a ordinary merge into working dir, and got crash:

Traceback (most recent call last):
  File "D:\projects\hg\thg\thg.work\tortoisehg\hgqt\merge.py", line 404, in isComplete
    for root, path, status in thgrepo.recursiveMergeStatus(self.repo):
  File "D:\projects\hg\thg\thg.work\tortoisehg\hgqt\thgrepo.py", line 1138, in recursiveMergeStatus
    for s in wctx.substate:
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\util.py", line 1744, in __get__
    result = self.func(obj)
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\context.py", line 174, in substate
    return subrepoutil.state(self, self._repo.ui)
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\subrepoutil.py", line 59, in state
    read(b'.hgsub')
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\subrepoutil.py", line 52, in read
    p.parse(f, data, sections, remap, read)
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\config.py", line 210, in parse
    raise error.ParseError(l.rstrip(), (b"%s:%d" % (src, line)))
mercurial.error.ParseError: (b'<<<<<<< working copy', b'.hgsub:12')
Traceback (most recent call last):
  File "D:\projects\hg\thg\thg.work\tortoisehg\hgqt\merge.py", line 404, in isComplete
    for root, path, status in thgrepo.recursiveMergeStatus(self.repo):
  File "D:\projects\hg\thg\thg.work\tortoisehg\hgqt\thgrepo.py", line 1138, in recursiveMergeStatus
    for s in wctx.substate:
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\util.py", line 1744, in __get__
    result = self.func(obj)
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\context.py", line 174, in substate
    return subrepoutil.state(self, self._repo.ui)
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\subrepoutil.py", line 59, in state
    read(b'.hgsub')
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\subrepoutil.py", line 52, in read
    p.parse(f, data, sections, remap, read)
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\config.py", line 210, in parse
    raise error.ParseError(l.rstrip(), (b"%s:%d" % (src, line)))
mercurial.error.ParseError: (b'<<<<<<< working copy', b'.hgsub:12')
Traceback (most recent call last):
  File "D:\projects\hg\thg\thg.work\tortoisehg\hgqt\status.py", line 756, in run
    status = self.repo.status(**stopts)
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\localrepo.py", line 3336, in status
    return self[node1].status(
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\context.py", line 426, in status
    r = ctx2._buildstatus(
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\context.py", line 1940, in _buildstatus
    s = self._dirstatestatus(match, listignored, listclean, listunknown)
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\context.py", line 1848, in _dirstatestatus
    subrepos = sorted(self.substate)
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\util.py", line 1744, in __get__
    result = self.func(obj)
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\context.py", line 174, in substate
    return subrepoutil.state(self, self._repo.ui)
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\subrepoutil.py", line 59, in state
    read(b'.hgsub')
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\subrepoutil.py", line 52, in read
    p.parse(f, data, sections, remap, read)
  File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\config.py", line 210, in parse
    raise error.ParseError(l.rstrip(), (b"%s:%d" % (src, line)))
mercurial.error.ParseError: (b'<<<<<<< working copy', b'.hgsub:12')

(venv.py38) D:\projects\hg\thg\thg.work>

crash causes by conflicting merge .hgsub, BUT:

thg 5.5 installed from winx64 msi not crashes, and report error - propose to edit and fix config file .hgsub. thg from source (799ca6335d5b ) - now crash at that repo open - can't show such damaged repo

Edited Sep 08, 2020 by alexrayne
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking