upstream/mercurial-mirror Files · mercurial/hgweb

ancestor: silence multiple ancestor warning outside of merge (issue4234)...

ancestor: silence multiple ancestor warning outside of merge (issue4234) The current situation is a bit of a layering violation as merge-specific knowledge is pushed down to lower layers and leaks merge assumptions into other code paths. Here, we simply silence the warning with a hack. Both the warning and the hack will probably go away in the near future when bid merge is made the default.

Matt Mackall -


            r21203:9f12d866

stable

Name	Size	Modified	Last Commit	Author
/ mercurial / hgweb
__init__.py	Loading ...
common.py	Loading ...
hgweb_mod.py	Loading ...
hgwebdir_mod.py	Loading ...
protocol.py	Loading ...
request.py	Loading ...
server.py	Loading ...
webcommands.py	Loading ...
webutil.py	Loading ...
wsgicgi.py	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages