##// END OF EJS Templates
update: better logic and messages for updates...
update: better logic and messages for updates - complain about attempts to merge with ancestor - when updating, differentiate between - crossing named branches with no local changes (jump) - crossing named branches with local changes (complain) - nonlinear update on the same named branch, no changes (complain some more) - nonlinear update on the same named branch, changes (different complaining)

File last commit:

r3877:abaee83c default
r6375:cdc458b1 default
Show More
__init__.py
16 lines | 502 B | text/x-python | PythonLexer
Eric Hopper
Fixing up comment headers for split up code.
r2391 # hgweb/__init__.py - web interface to a mercurial repository
Eric Hopper
Moving hgweb.py into it's own module in preparation for breaking it up.
r2311 #
# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
# Copyright 2005 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
Matt Mackall
Replace demandload with new demandimport
r3877 import hgweb_mod, hgwebdir_mod
def hgweb(*args, **kwargs):
return hgweb_mod.hgweb(*args, **kwargs)
def hgwebdir(*args, **kwargs):
return hgwebdir_mod.hgwebdir(*args, **kwargs)