Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • 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 835
    • Issues 835
    • List
    • Boards
    • Service Desk
    • Milestones
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • mercurial
  • TortoiseHg
  • thgthg
  • Issues
  • #5486

Closed
Open
Created Nov 21, 2019 by Bitbucket Importer@bitbucket_importerOwner

py3: traceback on "merge with local"

Created originally on Bitbucket by cbillington (Chris Billington)

To reproduce:

  • Right click on a different head, click "merge with local"

Result is the following traceback:

    #!python
    ** Mercurial version (5.2+209-d3c4368099ed).  TortoiseHg version (5.1+210-99ffcab6a93a)
    ** Command: --nofork
    ** CWD: /home/bilbo
    ** Encoding: UTF-8
    ** Extensions loaded: strip, mq, churn, rebase, tortoisehg.util.configitems
    ** Python version: 3.8.0 (default, Oct 23 2019, 18:51:26) [GCC 9.2.0]
    ** System: Linux bilbo-arch 4.19.84-1-lts #1 SMP Tue, 12 Nov 2019 22:19:52 +0000 x86_64
    ** Qt-5.13.2 PyQt-5.13.2 QScintilla-2.11.3
    Traceback (most recent call last):
      File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/repowidget.py", line 1850, in mergeWithRevision
        self._dialogs.open(RepoWidget._createMergeDialog, rev)
      File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/qtlib.py", line 1255, in open
        dlg = self._preparedlg(self._genkey(self.parent(), *args, **kwargs),
      File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/qtlib.py", line 1276, in _preparedlg
        return self._populatedlg(key, args, kwargs)
      File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/qtlib.py", line 1279, in _populatedlg
        dlg = self._createdlg(self.parent(), *args, **kwargs)
      File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/repowidget.py", line 172, in <lambda>
        lambda self, dlgmeth, *args: dlgmeth(self, *args), parent=self)
      File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/repowidget.py", line 1853, in _createMergeDialog
        return merge.MergeDialog(self._repoagent, rev, self)
      File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/merge.py", line 73, in __init__
        self.addPage(ResultPage(repoagent, self))
      File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/merge.py", line 680, in __init__
        mergeCsInfo = csinfo.create(self.repo, 'tip', withupdate=True)
      File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/csinfo.py", line 38, in create
        return Factory(repo, custom, style, target, **kargs)()
      File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/csinfo.py", line 105, in __call__
        widget = SummaryPanel(*args)
      File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/csinfo.py", line 412, in __init__
        SummaryBase.__init__(self, target, custom, repo, info)
      File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/csinfo.py", line 375, in __init__
        self.ctx = repo[self.target]
      File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/thgrepo.py", line 796, in __getitem__
        changectx = super(thgrepository, self).__getitem__(changeid)
      File "/usr/lib/python3.8/site-packages/mercurial/localrepo.py", line 1570, in __getitem__
        b"unsupported changeid '%s' of type %s"
    TypeError: %b requires a bytes-like object, or an object that implements __bytes__, not 'str'
    
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking