repoview: only pin obsolete wdir parents while there are unresolved conflicts I noticed after doing an update from an obsolete revision with a dirty wdir that the obsolete commit stayed visible for no obvious reason. It was decided in 85b03b1e4715 not to clear mergestate once all of the conflicts were resolved, in order to allow re-resolving. Since the point of pinning the obsolete parents was to allow resolving in the first place (aaeccdb6e654), it makes sense to also gate it on whether or not there are any remaining files to resolve. This might result in pinning again if files are marked unresolved again, but that seems reasonable, given that it still solves the original issue. Note that this isn't purely cosmetic- pushing with a pinned obsolete revision is likely to cause complaints about pushing multiple heads or other unexpected errors. So the faster it comes out of that state, the better. Differential Revision: https://phab.mercurial-scm.org/D9248

     1

#!/usr/bin/env python

     2

#

     3

# An example hgweb CGI script, edit as necessary

     4

# See also https://mercurial-scm.org/wiki/PublishingRepositories

     5

     6

# Path to repo or hgweb config to serve (see 'hg help hgweb')

     7

config = b"/path/to/repo/or/config"

     8

     9

# Uncomment and adjust if Mercurial is not installed system-wide

    10

# (consult "installed modules" path from 'hg debuginstall'):

    11

# import sys; sys.path.insert(0, "/path/to/python/lib")

    12

    13

# Uncomment to send python tracebacks to the browser if an error occurs:

    14

# import cgitb; cgitb.enable()

    15

    16

from mercurial import demandimport

    17

    18

demandimport.enable()

    19

from mercurial.hgweb import hgweb, wsgicgi

    20

    21

application = hgweb(config)

    22

wsgicgi.launch(application)