##// END OF EJS Templates
hgweb: use ui:username rather than web:contact...
mpm@selenic.com -
r1260:4603eef6 default
parent child Browse files
Show More
@@ -964,8 +964,9 b' class hgwebdir:'
964 url = ('/'.join([req.env["REQUEST_URI"].split('?')[0], name])
964 url = ('/'.join([req.env["REQUEST_URI"].split('?')[0], name])
965 .replace("//", "/"))
965 .replace("//", "/"))
966
966
967 yield dict(contact=get("web", "contact") or
967 yield dict(contact=(get("ui", "username") or # preferred
968 get("web", "author", "unknown"),
968 get("web", "contact") or # deprecated
969 get("web", "author", "unknown")), # also
969 name=get("web", "name", name),
970 name=get("web", "name", name),
970 url=url,
971 url=url,
971 parity=parity,
972 parity=parity,
@@ -39,9 +39,6 b' class localrepository:'
39 if create:
39 if create:
40 os.mkdir(self.path)
40 os.mkdir(self.path)
41 os.mkdir(self.join("data"))
41 os.mkdir(self.join("data"))
42 f = self.opener("hgrc", "w")
43 f.write("[web]\n")
44 f.write("contact = %s\n" % ui.shortuser(ui.username()))
45
42
46 self.dirstate = dirstate.dirstate(self.opener, ui, self.root)
43 self.dirstate = dirstate.dirstate(self.opener, ui, self.root)
47 try:
44 try:
@@ -13,6 +13,7 b' mkdir baz'
13 echo bletch>baz/bletch
13 echo bletch>baz/bletch
14 hg addremove
14 hg addremove
15 hg commit -m 3
15 hg commit -m 3
16 echo "[web]" >> .hg/hgrc
16 echo "name = test-archive" >> .hg/hgrc
17 echo "name = test-archive" >> .hg/hgrc
17 echo "allowzip = true" >> .hg/hgrc
18 echo "allowzip = true" >> .hg/hgrc
18 echo "allowgz = true" >> .hg/hgrc
19 echo "allowgz = true" >> .hg/hgrc
General Comments 0
You need to be logged in to leave comments. Login now