Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/hgweb/__init__.py @ 2795:135823f37304
new extension: fetch -> combine pull and merge/update
pull changes from remote repo.
if changes add new head: merge with new head, commit result.
else: update working dir to new head.
this makes useful command like git 'pull' command.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Mon, 07 Aug 2006 17:27:38 -0700 |
parents | d351a3be3371 |
children | abaee83ce0a6 |
line wrap: on
line source
# hgweb/__init__.py - web interface to a mercurial repository # # 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. from mercurial.demandload import demandload demandload(globals(), "mercurial.hgweb.hgweb_mod:hgweb") demandload(globals(), "mercurial.hgweb.hgwebdir_mod:hgwebdir")