Mercurial > hg
annotate hgext/relink.py @ 21708:2668a78df8ba stable
keyword: suppress keyword expansion while 'hg fetch' for internal merge
Before this patch, 'hg fetch' may cause unexpected conflict, if 'hg
fetch'-ed changes are located near lines in which keywords are
embedded, because keywords are substituted with other strings in the
working directory.
This patch suppresses keyword expansion while 'hg fetch' for internal
merge by adding 'fetch' to 'restricted' command list like 'merge'.
This patch uses 'hg import' to safely create the new head to be merged
at succeeding 'hg fetch', because:
- branch of revision #10 is different from one of #11 in 'Test'
repository, so just 'hg fetch -r 11' doesn't cause merging between
them
this means the new head should be created manually.
- 'hg import' is easier and safer than 'cat <<EOF' and 'hg commit'
to replay same changes including special characters like '$'
safeness of 'hg import' with keyword extension is already examined
in 'test-keyword.t'.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Thu, 05 Jun 2014 16:47:14 +0900 |
parents | c69e5911888d |
children | da0eb4970913 |
rev | line source |
---|---|
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
1 # Mercurial extension to provide 'hg relink' command |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
2 # |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
3 # Copyright (C) 2007 Brendan Cully <brendan@kublai.com> |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
4 # |
8225
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
4270
diff
changeset
|
5 # This software may be used and distributed according to the terms of the |
10263 | 6 # GNU General Public License version 2 or any later version. |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
7 |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
8 """recreates hardlinks between repository clones""" |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
9 |
12062
c327bfa5e831
cleanup: remove unused imports
Brodie Rao <brodie@bitheap.org>
parents:
11357
diff
changeset
|
10 from mercurial import hg, util |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
11 from mercurial.i18n import _ |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
12 import os, stat |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
13 |
16743
38caf405d010
hgext: mark all first-party extensions as such
Augie Fackler <raf@durin42.com>
parents:
16686
diff
changeset
|
14 testedwith = 'internal' |
38caf405d010
hgext: mark all first-party extensions as such
Augie Fackler <raf@durin42.com>
parents:
16686
diff
changeset
|
15 |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
16 def relink(ui, repo, origin=None, **opts): |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
17 """recreate hardlinks between two repositories |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
18 |
9886
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
19 When repositories are cloned locally, their data files will be |
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
20 hardlinked so that they only use the space of a single repository. |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
21 |
9886
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
22 Unfortunately, subsequent pulls into either repository will break |
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
23 hardlinks for any files touched by the new changesets, even if |
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
24 both repositories end up pulling the same changes. |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
25 |
9886
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
26 Similarly, passing --rev to "hg clone" will fail to use any |
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
27 hardlinks, falling back to a complete copy of the source |
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
28 repository. |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
29 |
9886
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
30 This command lets you recreate those hardlinks and reclaim that |
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
31 wasted space. |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
32 |
9886
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
33 This repository will be relinked to share space with ORIGIN, which |
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
34 must be on the same local disk. If ORIGIN is omitted, looks for |
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
35 "default-relink", then "default", in [paths]. |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
36 |
9886
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
37 Do not attempt any read operations on this repository while the |
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
38 command is running. (Both repositories will be locked against |
56af3f240a22
relink: wrap long lines in docstring
Martin Geisler <mg@lazybytes.net>
parents:
9790
diff
changeset
|
39 writes.) |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
40 """ |
14945
11aad09a6370
hgext: replace uses of hasattr with util.safehasattr
Augie Fackler <durin42@gmail.com>
parents:
14709
diff
changeset
|
41 if (not util.safehasattr(util, 'samefile') or |
11aad09a6370
hgext: replace uses of hasattr with util.safehasattr
Augie Fackler <durin42@gmail.com>
parents:
14709
diff
changeset
|
42 not util.safehasattr(util, 'samedevice')): |
10218
750b7a4f01f6
Add support for relinking on Windows.
Siddharth Agarwal <sid.bugzilla@gmail.com>
parents:
9790
diff
changeset
|
43 raise util.Abort(_('hardlinks are not supported on this system')) |
18825
f0564402d059
repo: repo isolation, do not pass on repo.ui for creating new repos
Simon Heimberg <simohe@besonet.ch>
parents:
17191
diff
changeset
|
44 src = hg.repository(repo.baseui, ui.expandpath(origin or 'default-relink', |
14556
517e1d88bf7e
hg: change various repository() users to use peer() where appropriate
Matt Mackall <mpm@selenic.com>
parents:
14235
diff
changeset
|
45 origin or 'default')) |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
46 ui.status(_('relinking %s to %s\n') % (src.store.path, repo.store.path)) |
13657
b69102740e57
relink: avoid trying to lock the same repo twice
Martin Geisler <mg@lazybytes.net>
parents:
12744
diff
changeset
|
47 if repo.root == src.root: |
b69102740e57
relink: avoid trying to lock the same repo twice
Martin Geisler <mg@lazybytes.net>
parents:
12744
diff
changeset
|
48 ui.status(_('there is nothing to relink\n')) |
b69102740e57
relink: avoid trying to lock the same repo twice
Martin Geisler <mg@lazybytes.net>
parents:
12744
diff
changeset
|
49 return |
b69102740e57
relink: avoid trying to lock the same repo twice
Martin Geisler <mg@lazybytes.net>
parents:
12744
diff
changeset
|
50 |
20083
c69e5911888d
relink: abort earlier when on different devices (issue3916)
Simon Heimberg <simohe@besonet.ch>
parents:
18825
diff
changeset
|
51 if not util.samedevice(src.store.path, repo.store.path): |
c69e5911888d
relink: abort earlier when on different devices (issue3916)
Simon Heimberg <simohe@besonet.ch>
parents:
18825
diff
changeset
|
52 # No point in continuing |
c69e5911888d
relink: abort earlier when on different devices (issue3916)
Simon Heimberg <simohe@besonet.ch>
parents:
18825
diff
changeset
|
53 raise util.Abort(_('source and destination are on different devices')) |
c69e5911888d
relink: abort earlier when on different devices (issue3916)
Simon Heimberg <simohe@besonet.ch>
parents:
18825
diff
changeset
|
54 |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
55 locallock = repo.lock() |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
56 try: |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
57 remotelock = src.lock() |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
58 try: |
11355
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
59 candidates = sorted(collect(src, ui)) |
10218
750b7a4f01f6
Add support for relinking on Windows.
Siddharth Agarwal <sid.bugzilla@gmail.com>
parents:
9790
diff
changeset
|
60 targets = prune(candidates, src.store.path, repo.store.path, ui) |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
61 do_relink(src.store.path, repo.store.path, targets, ui) |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
62 finally: |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
63 remotelock.release() |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
64 finally: |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
65 locallock.release() |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
66 |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
67 def collect(src, ui): |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
68 seplen = len(os.path.sep) |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
69 candidates = [] |
11355
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
70 live = len(src['tip'].manifest()) |
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
71 # Your average repository has some files which were deleted before |
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
72 # the tip revision. We account for that by assuming that there are |
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
73 # 3 tracked files for every 2 live files as of the tip version of |
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
74 # the repository. |
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
75 # |
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
76 # mozilla-central as of 2010-06-10 had a ratio of just over 7:5. |
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
77 total = live * 3 // 2 |
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
78 src = src.store.path |
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
79 pos = 0 |
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
80 ui.status(_("tip has %d files, estimated total number of files: %s\n") |
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
81 % (live, total)) |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
82 for dirpath, dirnames, filenames in os.walk(src): |
11357
7914628b4751
relink: ensure deterministic directory walk in collect
Martin Geisler <mg@aragost.com>
parents:
11355
diff
changeset
|
83 dirnames.sort() |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
84 relpath = dirpath[len(src) + seplen:] |
11357
7914628b4751
relink: ensure deterministic directory walk in collect
Martin Geisler <mg@aragost.com>
parents:
11355
diff
changeset
|
85 for filename in sorted(filenames): |
16686
67964cda8701
cleanup: "not x in y" -> "x not in y"
Brodie Rao <brodie@sf.io>
parents:
14945
diff
changeset
|
86 if filename[-2:] not in ('.d', '.i'): |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
87 continue |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
88 st = os.stat(os.path.join(dirpath, filename)) |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
89 if not stat.S_ISREG(st.st_mode): |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
90 continue |
11355
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
91 pos += 1 |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
92 candidates.append((os.path.join(relpath, filename), st)) |
11355
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
93 ui.progress(_('collecting'), pos, filename, _('files'), total) |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
94 |
11355
9011036ba79d
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com>
parents:
11354
diff
changeset
|
95 ui.progress(_('collecting'), None) |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
96 ui.status(_('collected %d candidate storage files\n') % len(candidates)) |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
97 return candidates |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
98 |
10218
750b7a4f01f6
Add support for relinking on Windows.
Siddharth Agarwal <sid.bugzilla@gmail.com>
parents:
9790
diff
changeset
|
99 def prune(candidates, src, dst, ui): |
750b7a4f01f6
Add support for relinking on Windows.
Siddharth Agarwal <sid.bugzilla@gmail.com>
parents:
9790
diff
changeset
|
100 def linkfilter(src, dst, st): |
4270
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
101 try: |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
102 ts = os.stat(dst) |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
103 except OSError: |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
104 # Destination doesn't have this file? |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
105 return False |
10218
750b7a4f01f6
Add support for relinking on Windows.
Siddharth Agarwal <sid.bugzilla@gmail.com>
parents:
9790
diff
changeset
|
106 if util.samefile(src, dst): |
4270
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
107 return False |
10218
750b7a4f01f6
Add support for relinking on Windows.
Siddharth Agarwal <sid.bugzilla@gmail.com>
parents:
9790
diff
changeset
|
108 if not util.samedevice(src, dst): |
4270
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
109 # No point in continuing |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
110 raise util.Abort( |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
111 _('source and destination are on different devices')) |
4270
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
112 if st.st_size != ts.st_size: |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
113 return False |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
114 return st |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
115 |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
116 targets = [] |
11354
412a6e749f8d
relink/progress: Adding progress for pruning stage
timeless <timeless@gmail.com>
parents:
11273
diff
changeset
|
117 total = len(candidates) |
412a6e749f8d
relink/progress: Adding progress for pruning stage
timeless <timeless@gmail.com>
parents:
11273
diff
changeset
|
118 pos = 0 |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
119 for fn, st in candidates: |
11354
412a6e749f8d
relink/progress: Adding progress for pruning stage
timeless <timeless@gmail.com>
parents:
11273
diff
changeset
|
120 pos += 1 |
10218
750b7a4f01f6
Add support for relinking on Windows.
Siddharth Agarwal <sid.bugzilla@gmail.com>
parents:
9790
diff
changeset
|
121 srcpath = os.path.join(src, fn) |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
122 tgt = os.path.join(dst, fn) |
10218
750b7a4f01f6
Add support for relinking on Windows.
Siddharth Agarwal <sid.bugzilla@gmail.com>
parents:
9790
diff
changeset
|
123 ts = linkfilter(srcpath, tgt, st) |
4270
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
124 if not ts: |
14709
6c7283faa967
check-code: don't mark debug messages for translation
Matt Mackall <mpm@selenic.com>
parents:
14556
diff
changeset
|
125 ui.debug('not linkable: %s\n' % fn) |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
126 continue |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
127 targets.append((fn, ts.st_size)) |
12744
0793d763e413
progress: dropping superfluous space from units
timeless <timeless@gmail.com>
parents:
12062
diff
changeset
|
128 ui.progress(_('pruning'), pos, fn, _('files'), total) |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
129 |
11354
412a6e749f8d
relink/progress: Adding progress for pruning stage
timeless <timeless@gmail.com>
parents:
11273
diff
changeset
|
130 ui.progress(_('pruning'), None) |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
131 ui.status(_('pruned down to %d probably relinkable files\n') % len(targets)) |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
132 return targets |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
133 |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
134 def do_relink(src, dst, files, ui): |
4270
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
135 def relinkfile(src, dst): |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
136 bak = dst + '.bak' |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
137 os.rename(dst, bak) |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
138 try: |
14235
b9e1b041744f
rename util.os_link to oslink
Adrian Buehlmann <adrian@cadifra.com>
parents:
13898
diff
changeset
|
139 util.oslink(src, dst) |
4270
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
140 except OSError: |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
141 os.rename(bak, dst) |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
142 raise |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
143 os.remove(bak) |
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
144 |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
145 CHUNKLEN = 65536 |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
146 relinked = 0 |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
147 savedbytes = 0 |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
148 |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
149 pos = 0 |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
150 total = len(files) |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
151 for f, sz in files: |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
152 pos += 1 |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
153 source = os.path.join(src, f) |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
154 tgt = os.path.join(dst, f) |
10218
750b7a4f01f6
Add support for relinking on Windows.
Siddharth Agarwal <sid.bugzilla@gmail.com>
parents:
9790
diff
changeset
|
155 # Binary mode, so that read() works correctly, especially on Windows |
750b7a4f01f6
Add support for relinking on Windows.
Siddharth Agarwal <sid.bugzilla@gmail.com>
parents:
9790
diff
changeset
|
156 sfp = file(source, 'rb') |
750b7a4f01f6
Add support for relinking on Windows.
Siddharth Agarwal <sid.bugzilla@gmail.com>
parents:
9790
diff
changeset
|
157 dfp = file(tgt, 'rb') |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
158 sin = sfp.read(CHUNKLEN) |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
159 while sin: |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
160 din = dfp.read(CHUNKLEN) |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
161 if sin != din: |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
162 break |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
163 sin = sfp.read(CHUNKLEN) |
10218
750b7a4f01f6
Add support for relinking on Windows.
Siddharth Agarwal <sid.bugzilla@gmail.com>
parents:
9790
diff
changeset
|
164 sfp.close() |
750b7a4f01f6
Add support for relinking on Windows.
Siddharth Agarwal <sid.bugzilla@gmail.com>
parents:
9790
diff
changeset
|
165 dfp.close() |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
166 if sin: |
14709
6c7283faa967
check-code: don't mark debug messages for translation
Matt Mackall <mpm@selenic.com>
parents:
14556
diff
changeset
|
167 ui.debug('not linkable: %s\n' % f) |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
168 continue |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
169 try: |
4270
29eb88bd5c8d
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com>
parents:
4249
diff
changeset
|
170 relinkfile(source, tgt) |
12744
0793d763e413
progress: dropping superfluous space from units
timeless <timeless@gmail.com>
parents:
12062
diff
changeset
|
171 ui.progress(_('relinking'), pos, f, _('files'), total) |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
172 relinked += 1 |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
173 savedbytes += sz |
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
174 except OSError, inst: |
9790
819e6c7085fc
relink: do not translate format string with no text
Martin Geisler <mg@lazybytes.net>
parents:
9729
diff
changeset
|
175 ui.warn('%s: %s\n' % (tgt, str(inst))) |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
176 |
10724
cb0a7faa29ea
progress: drop extra args for pos=None calls (issue2087)
Matt Mackall <mpm@selenic.com>
parents:
10698
diff
changeset
|
177 ui.progress(_('relinking'), None) |
10424
93b5abcf5101
relink: properly use the progress API
Augie Fackler <durin42@gmail.com>
parents:
10264
diff
changeset
|
178 |
13656
0e200e1801f4
relink: format reclaimed byte count nicely
Martin Geisler <mg@lazybytes.net>
parents:
12744
diff
changeset
|
179 ui.status(_('relinked %d files (%s reclaimed)\n') % |
0e200e1801f4
relink: format reclaimed byte count nicely
Martin Geisler <mg@lazybytes.net>
parents:
12744
diff
changeset
|
180 (relinked, util.bytecount(savedbytes))) |
4249
7663780b55a7
Add hg-relink script to contrib
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
181 |
9729
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
182 cmdtable = { |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
183 'relink': ( |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
184 relink, |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
185 [], |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
186 _('[ORIGIN]') |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
187 ) |
aa9ccab5af37
Issue919: add a standard extension to recreate hardlinks between repositories.
Jesse Glick <jesse.glick@sun.com>
parents:
8225
diff
changeset
|
188 } |