mercurial-crew-with-dirclash: templates/filerevision.tmpl@3b4f05ff3130 (annotated)

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

142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	1	#header#
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 168 diff changeset	2	<title>#repo\|escape#:#file#</title>
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	3	</head>
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	4	<body>
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	5
154 1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes jake@edge2.net parents: 153 diff changeset	6	<div class="buttons">
153 e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ; jake@edge2.net parents: 142 diff changeset	7	<a href="?cmd=changelog;rev=#rev#">changelog</a>
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 167 diff changeset	8	<a href="?cmd=tags">tags</a>
153 e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ; jake@edge2.net parents: 142 diff changeset	9	<a href="?cmd=changeset;node=#node#">changeset</a>
e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ; jake@edge2.net parents: 142 diff changeset	10	<a href="?cmd=manifest;manifest=#manifest#;path=#path#">manifest</a>
e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ; jake@edge2.net parents: 142 diff changeset	11	<a href="?cmd=filelog;file=#file#;filenode=#filenode#">revisions</a>
e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ; jake@edge2.net parents: 142 diff changeset	12	<a href="?cmd=annotate;file=#file#;filenode=#filenode#">annotate</a>
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 168 diff changeset	13	<a href="?cmd=file;file=#file#;filenode=#filenode#;style=raw">raw</a>
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	14	</div>
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	15
375 b29219389b00 Show nice short hashes in hgweb mpm@selenic.com parents: 359 diff changeset	16	<h2>#file# (revision #filenode\|short#)</h2>
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	17
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	18	<table>
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	19	<tr>
167 fad9ad1ec7c7 Hide most revision numbers in hgweb mpm@selenic.com parents: 155 diff changeset	20	<td class="metatag">changeset #rev#:</td>
375 b29219389b00 Show nice short hashes in hgweb mpm@selenic.com parents: 359 diff changeset	21	<td><a href="?cmd=changeset;node=#node#">#node\|short#</a></td></tr>
570 2ee819a950aa [PATCH 2/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 377 diff changeset	22	#parent#
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	23	<tr>
154 1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes jake@edge2.net parents: 153 diff changeset	24	<td class="metatag">manifest:</td>
375 b29219389b00 Show nice short hashes in hgweb mpm@selenic.com parents: 359 diff changeset	25	<td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest\|short#</a></td></tr>
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	26	<tr>
154 1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes jake@edge2.net parents: 153 diff changeset	27	<td class="metatag">author:</td>
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 168 diff changeset	28	<td>#author\|obfuscate#</td></tr>
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	29	<tr>
154 1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes jake@edge2.net parents: 153 diff changeset	30	<td class="metatag">date:</td>
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 168 diff changeset	31	<td>#date\|date# (#date\|age# ago)</td></tr>
359 0c4688e9ee5c hgweb: add file permissions mpm@selenic.com parents: 201 diff changeset	32	<tr>
0c4688e9ee5c hgweb: add file permissions mpm@selenic.com parents: 201 diff changeset	33	<td class="metatag">permissions:</td>
0c4688e9ee5c hgweb: add file permissions mpm@selenic.com parents: 201 diff changeset	34	<td>#permissions\|permissions#</td></tr>
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	35	</table>
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	36
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	37	<pre>
976 5d5ab159d197 hgweb: Changed file page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 570 diff changeset	38	#text%fileline#
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	39	</pre>
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	40
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	41	#footer#

author	Stephen Darnell
	Wed, 14 Sep 2005 12:22:20 -0500
changeset 1241	3b4f05ff3130
parent 981	4f81068ed8cd
child 1370	710079d2a821
permissions	-rw-r--r--