templates/header.tmpl
author Stephen Darnell
Wed, 14 Sep 2005 12:22:20 -0500
changeset 1241 3b4f05ff3130
parent 672 dbe0ce2ae196
child 1308 2073e5a71008
permissions -rw-r--r--
Add support for cloning with hardlinks on windows. In order to use hardlinks, the win32file module is needed, and this is present in ActivePython. If it isn't present, or hardlinks are not supported on the underlying filesystem, a regular copy is used. When using hardlinks the biggest benefit is probably the saving in space, but cloning can be much quicker. For example cloning the Xen tree (non trivial) without an update goes from about 95s to 15s. Unix-like platforms should be unaffected, although should be more tolerant on filesystems that don't support hard links. (tweaked by mpm to deal with new copyfiles function) --- hg.orig/mercurial/commands.py 2005-09-13 19:32:53.000000000 -0500 +++ hg/mercurial/commands.py 2005-09-14 12:11:34.000000000 -0500 @@ -620,10 +620,6 @@ def clone(ui, source, dest=None, **opts) if other.dev() != -1: abspath = os.path.abspath(source) - copyfile = (os.stat(dest).st_dev == other.dev() - and getattr(os, 'link', None) or shutil.copy2) - if copyfile is not shutil.copy2: - ui.note("cloning by hardlink\n") # we use a lock here because if we race with commit, we can # end up with extra data in the cloned revlogs that's not @@ -638,7 +634,7 @@ def clone(ui, source, dest=None, **opts) for f in files.split(): src = os.path.join(source, ".hg", f) dst = os.path.join(dest, ".hg", f) - util.copyfiles(src, dst, copyfile) + util.copyfiles(src, dst) repo = hg.repository(ui, dest) Index: hg/mercurial/util.py =================================================================== --- hg.orig/mercurial/util.py 2005-09-08 00:15:25.000000000 -0500 +++ hg/mercurial/util.py 2005-09-14 12:16:49.000000000 -0500 @@ -12,7 +12,7 @@ platform-specific details from the core. import os, errno from demandload import * -demandload(globals(), "re cStringIO") +demandload(globals(), "re cStringIO shutil") def binary(s): """return true if a string is binary data using diff's heuristic""" @@ -217,17 +217,28 @@ def rename(src, dst): os.unlink(dst) os.rename(src, dst) -def copyfiles(src, dst, copyfile): - """Copy a directory tree, files are copied using 'copyfile'.""" +def copyfiles(src, dst, hardlink=None): + """Copy a directory tree using hardlinks if possible""" + + if hardlink is None: + hardlink = (os.stat(src).st_dev == + os.stat(os.path.dirname(dst)).st_dev) if os.path.isdir(src): os.mkdir(dst) for name in os.listdir(src): srcname = os.path.join(src, name) dstname = os.path.join(dst, name) - copyfiles(srcname, dstname, copyfile) + copyfiles(srcname, dstname, hardlink) else: - copyfile(src, dst) + if hardlink: + try: + os_link(src, dst) + except: + hardlink = False + shutil.copy2(src, dst) + else: + shutil.copy2(src, dst) def opener(base): """ @@ -244,13 +255,13 @@ def opener(base): if mode[0] != "r": try: - s = os.stat(f) + nlink = nlinks(f) except OSError: d = os.path.dirname(f) if not os.path.isdir(d): os.makedirs(d) else: - if s.st_nlink > 1: + if nlink > 1: file(f + ".tmp", "wb").write(file(f, "rb").read()) rename(f+".tmp", f) @@ -266,10 +277,41 @@ def _makelock_file(info, pathname): def _readlock_file(pathname): return file(pathname).read() +def nlinks(pathname): + """Return number of hardlinks for the given file.""" + return os.stat(pathname).st_nlink + +if hasattr(os, 'link'): + os_link = os.link +else: + def os_link(src, dst): + raise OSError(0, "Hardlinks not supported") + # Platform specific variants if os.name == 'nt': nulldev = 'NUL:' + try: # ActivePython can create hard links using win32file module + import win32file + + def os_link(src, dst): # NB will only succeed on NTFS + win32file.CreateHardLink(dst, src) + + def nlinks(pathname): + """Return number of hardlinks for the given file.""" + try: + fh = win32file.CreateFile(pathname, + win32file.GENERIC_READ, win32file.FILE_SHARE_READ, + None, win32file.OPEN_EXISTING, 0, None) + res = win32file.GetFileInformationByHandle(fh) + fh.Close() + return res[7] + except: + return os.stat(pathname).st_nlink + + except ImportError: + pass + def is_exec(f, last): return last
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     1
Content-type: text/html
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     2
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 142
diff changeset
     3
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     4
<html>
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     5
<head>
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     6
<style type="text/css">
583
415054ea31c1 [PATCH] Hide style from non conformant agents
mpm@selenic.com
parents: 172
diff changeset
     7
<!--
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     8
a { text-decoration:none; }
172
e9b1147db448 hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents: 168
diff changeset
     9
.parity0 { background-color: #dddddd; }
e9b1147db448 hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents: 168
diff changeset
    10
.parity1 { background-color: #eeeeee; }
e9b1147db448 hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents: 168
diff changeset
    11
.lineno { width: 60px; color: #aaaaaa; font-size: smaller; }
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    12
.plusline { color: green; }
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    13
.minusline { color: red; }
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    14
.atline { color: purple; }
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    15
.annotate { font-size: smaller; text-align: right; padding-right: 1em; }
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    16
.buttons a {
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    17
  background-color: #666666;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    18
  padding: 2pt;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    19
  color: white;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    20
  font-family: sans;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    21
  font-weight: bold;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    22
}
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    23
.metatag {
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    24
  background-color: #888888;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    25
  color: white;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    26
  text-align: right; 
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    27
}
585
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 583
diff changeset
    28
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    29
/* Common */
672
dbe0ce2ae196 More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents: 602
diff changeset
    30
pre { margin: 0; }
dbe0ce2ae196 More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents: 602
diff changeset
    31
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    32
585
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 583
diff changeset
    33
/* Changelog entries */
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 583
diff changeset
    34
.changelogEntry { width: 100%; }
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 583
diff changeset
    35
.changelogEntry th { font-weight: normal; text-align: right; vertical-align: top; width: 15%;}
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 583
diff changeset
    36
.changelogEntry th.age, .changelogEntry th.firstline { font-weight: bold; }
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 583
diff changeset
    37
.changelogEntry th.firstline { text-align: left; width: inherit; }
586
11578820b5d7 [PATCH] Tags template cleanup
mpm@selenic.com
parents: 585
diff changeset
    38
11578820b5d7 [PATCH] Tags template cleanup
mpm@selenic.com
parents: 585
diff changeset
    39
/* Tag entries */
11578820b5d7 [PATCH] Tags template cleanup
mpm@selenic.com
parents: 585
diff changeset
    40
#tagEntries { list-style: none; margin: 0; padding: 0; }
11578820b5d7 [PATCH] Tags template cleanup
mpm@selenic.com
parents: 585
diff changeset
    41
#tagEntries .tagEntry { list-style: none; margin: 0; padding: 0; }
11578820b5d7 [PATCH] Tags template cleanup
mpm@selenic.com
parents: 585
diff changeset
    42
#tagEntries .tagEntry span.node { font-family: monospace; }
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    43
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    44
/* Changeset entry */
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    45
#changesetEntry { }
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    46
#changesetEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; }
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    47
#changesetEntry th.files, #changesetEntry th.description { vertical-align: top; }
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    48
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    49
/* File diff view */
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    50
#filediffEntry { }
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    51
#filediffEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; }
672
dbe0ce2ae196 More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents: 602
diff changeset
    52
583
415054ea31c1 [PATCH] Hide style from non conformant agents
mpm@selenic.com
parents: 172
diff changeset
    53
-->
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    54
</style>