annotate mercurial/localrepo.py @ 1402:9d2c2e6b32b5

i18n part2: use '_' for all strings who are part of the user interface
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 18 Oct 2005 18:38:39 -0700
parents cf9a1233738a
children c6e6ca96a033
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1089
142b5d5ec9cc Break apart hg.py
mpm@selenic.com
parents: 1072
diff changeset
1 # localrepo.py - read/write repository class for mercurial
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
2 #
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
4 #
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
5 # This software may be used and distributed according to the terms
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
6 # of the GNU General Public License, incorporated herein by reference.
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
7
1097
1f89ccbab6ce localrepo: adjust some imports, remove sys dependency
mpm@selenic.com
parents: 1089
diff changeset
8 import struct, os, util
1100
d6b6a15cc7c6 localrepo: more import/namespace tidying
mpm@selenic.com
parents: 1097
diff changeset
9 import filelog, manifest, changelog, dirstate, repo
d6b6a15cc7c6 localrepo: more import/namespace tidying
mpm@selenic.com
parents: 1097
diff changeset
10 from node import *
1400
cf9a1233738a i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents: 1398
diff changeset
11 from i18n import gettext as _
262
3db700146536 implement demand loading hack
mpm@selenic.com
parents: 256
diff changeset
12 from demandload import *
1353
a0c68981a5f4 Fix misleading abort message when permissions are bad.
Eric Hopper <hopper@omnifarious.org>
parents: 1349
diff changeset
13 demandload(globals(), "re lock transaction tempfile stat mdiff errno")
499
81c563a254be Add exception class for repository errors
mpm@selenic.com
parents: 495
diff changeset
14
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
15 class localrepository:
1102
c81d264cd17d localrepo: minor opener usage restructuring
mpm@selenic.com
parents: 1101
diff changeset
16 def __init__(self, ui, path=None, create=0):
1101
2cf5c8a4eae5 Separate out old-http support
mpm@selenic.com
parents: 1100
diff changeset
17 if not path:
2cf5c8a4eae5 Separate out old-http support
mpm@selenic.com
parents: 1100
diff changeset
18 p = os.getcwd()
2cf5c8a4eae5 Separate out old-http support
mpm@selenic.com
parents: 1100
diff changeset
19 while not os.path.isdir(os.path.join(p, ".hg")):
2cf5c8a4eae5 Separate out old-http support
mpm@selenic.com
parents: 1100
diff changeset
20 oldp = p
2cf5c8a4eae5 Separate out old-http support
mpm@selenic.com
parents: 1100
diff changeset
21 p = os.path.dirname(p)
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
22 if p == oldp: raise repo.RepoError(_("no repo found"))
1101
2cf5c8a4eae5 Separate out old-http support
mpm@selenic.com
parents: 1100
diff changeset
23 path = p
2cf5c8a4eae5 Separate out old-http support
mpm@selenic.com
parents: 1100
diff changeset
24 self.path = os.path.join(path, ".hg")
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
25
1101
2cf5c8a4eae5 Separate out old-http support
mpm@selenic.com
parents: 1100
diff changeset
26 if not create and not os.path.isdir(self.path):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
27 raise repo.RepoError(_("repository %s not found") % self.path)
405
99470ae6b424 Check if repository exists
mpm@selenic.com
parents: 402
diff changeset
28
933
9c43d68ad59f Fixed --repository option when handling relative path
tksoh@users.sf.net
parents: 926
diff changeset
29 self.root = os.path.abspath(path)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
30 self.ui = ui
1102
c81d264cd17d localrepo: minor opener usage restructuring
mpm@selenic.com
parents: 1101
diff changeset
31 self.opener = util.opener(self.path)
c81d264cd17d localrepo: minor opener usage restructuring
mpm@selenic.com
parents: 1101
diff changeset
32 self.wopener = util.opener(self.root)
1100
d6b6a15cc7c6 localrepo: more import/namespace tidying
mpm@selenic.com
parents: 1097
diff changeset
33 self.manifest = manifest.manifest(self.opener)
d6b6a15cc7c6 localrepo: more import/namespace tidying
mpm@selenic.com
parents: 1097
diff changeset
34 self.changelog = changelog.changelog(self.opener)
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
35 self.tagscache = None
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
36 self.nodetagscache = None
1258
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
37 self.encodepats = None
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
38 self.decodepats = None
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
39
1133
899b619a7eb2 Create [web] section with short username as contact on hg init and hg clone.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1117
diff changeset
40 if create:
899b619a7eb2 Create [web] section with short username as contact on hg init and hg clone.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1117
diff changeset
41 os.mkdir(self.path)
899b619a7eb2 Create [web] section with short username as contact on hg init and hg clone.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1117
diff changeset
42 os.mkdir(self.join("data"))
899b619a7eb2 Create [web] section with short username as contact on hg init and hg clone.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1117
diff changeset
43
1101
2cf5c8a4eae5 Separate out old-http support
mpm@selenic.com
parents: 1100
diff changeset
44 self.dirstate = dirstate.dirstate(self.opener, ui, self.root)
2cf5c8a4eae5 Separate out old-http support
mpm@selenic.com
parents: 1100
diff changeset
45 try:
2cf5c8a4eae5 Separate out old-http support
mpm@selenic.com
parents: 1100
diff changeset
46 self.ui.readconfig(self.opener("hgrc"))
2cf5c8a4eae5 Separate out old-http support
mpm@selenic.com
parents: 1100
diff changeset
47 except IOError: pass
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
48
487
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
49 def hook(self, name, **args):
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
50 s = self.ui.config("hooks", name)
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
51 if s:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
52 self.ui.note(_("running hook %s: %s\n") % (name, s))
487
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
53 old = {}
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
54 for k, v in args.items():
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
55 k = k.upper()
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
56 old[k] = os.environ.get(k, None)
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
57 os.environ[k] = v
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
58
1346
88a9c75dc76a Execute hooks in the repository root
mpm@selenic.com
parents: 1316
diff changeset
59 # Hooks run in the repository root
88a9c75dc76a Execute hooks in the repository root
mpm@selenic.com
parents: 1316
diff changeset
60 olddir = os.getcwd()
88a9c75dc76a Execute hooks in the repository root
mpm@selenic.com
parents: 1316
diff changeset
61 os.chdir(self.root)
487
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
62 r = os.system(s)
1346
88a9c75dc76a Execute hooks in the repository root
mpm@selenic.com
parents: 1316
diff changeset
63 os.chdir(olddir)
487
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
64
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
65 for k, v in old.items():
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
66 if v != None:
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
67 os.environ[k] = v
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
68 else:
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
69 del os.environ[k]
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
70
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
71 if r:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
72 self.ui.warn(_("abort: %s hook failed with status %d!\n") %
487
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
73 (name, r))
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
74 return False
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
75 return True
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
76
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
77 def tags(self):
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
78 '''return a mapping of tag to node'''
477
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 471
diff changeset
79 if not self.tagscache:
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
80 self.tagscache = {}
609
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
81 def addtag(self, k, n):
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
82 try:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
83 bin_n = bin(n)
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
84 except TypeError:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
85 bin_n = ''
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
86 self.tagscache[k.strip()] = bin_n
659
3662e3d6b690 Whitespace cleanup
Matt Mackall <mpm@selenic.com>
parents: 658
diff changeset
87
67
a182f2561c8e Add tag support
mpm@selenic.com
parents: 65
diff changeset
88 try:
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
89 # read each head of the tags file, ending with the tip
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
90 # and add each tag found to the map, with "newer" ones
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
91 # taking precedence
67
a182f2561c8e Add tag support
mpm@selenic.com
parents: 65
diff changeset
92 fl = self.file(".hgtags")
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
93 h = fl.heads()
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
94 h.reverse()
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
95 for r in h:
994
88c15682d9b0 Fix callers to file.revision to use file.read
mpm@selenic.com
parents: 993
diff changeset
96 for l in fl.read(r).splitlines():
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
97 if l:
385
e9e1efd5291c Fixed problems with extra spaces around tags in .hgtags
Thomas Arendsen Hein <thomas@intevation.de>
parents: 383
diff changeset
98 n, k = l.split(" ", 1)
609
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
99 addtag(self, k, n)
477
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 471
diff changeset
100 except KeyError:
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 471
diff changeset
101 pass
659
3662e3d6b690 Whitespace cleanup
Matt Mackall <mpm@selenic.com>
parents: 658
diff changeset
102
609
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
103 try:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
104 f = self.opener("localtags")
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
105 for l in f:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
106 n, k = l.split(" ", 1)
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
107 addtag(self, k, n)
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
108 except IOError:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
109 pass
659
3662e3d6b690 Whitespace cleanup
Matt Mackall <mpm@selenic.com>
parents: 658
diff changeset
110
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
111 self.tagscache['tip'] = self.changelog.tip()
659
3662e3d6b690 Whitespace cleanup
Matt Mackall <mpm@selenic.com>
parents: 658
diff changeset
112
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
113 return self.tagscache
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
114
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
115 def tagslist(self):
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
116 '''return a list of tags ordered by revision'''
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
117 l = []
477
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 471
diff changeset
118 for t, n in self.tags().items():
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
119 try:
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
120 r = self.changelog.rev(n)
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
121 except:
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
122 r = -2 # sort to the beginning of the list if unknown
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
123 l.append((r,t,n))
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
124 l.sort()
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
125 return [(t,n) for r,t,n in l]
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
126
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
127 def nodetags(self, node):
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
128 '''return the tags associated with a node'''
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
129 if not self.nodetagscache:
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
130 self.nodetagscache = {}
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
131 for t,n in self.tags().items():
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
132 self.nodetagscache.setdefault(n,[]).append(t)
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
133 return self.nodetagscache.get(node, [])
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
134
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
135 def lookup(self, key):
67
a182f2561c8e Add tag support
mpm@selenic.com
parents: 65
diff changeset
136 try:
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
137 return self.tags()[key]
67
a182f2561c8e Add tag support
mpm@selenic.com
parents: 65
diff changeset
138 except KeyError:
658
f8098ae9f5b6 Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents: 657
diff changeset
139 try:
f8098ae9f5b6 Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents: 657
diff changeset
140 return self.changelog.lookup(key)
f8098ae9f5b6 Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents: 657
diff changeset
141 except:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
142 raise repo.RepoError(_("unknown revision '%s'") % key)
67
a182f2561c8e Add tag support
mpm@selenic.com
parents: 65
diff changeset
143
634
da5378d39269 Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents: 627
diff changeset
144 def dev(self):
da5378d39269 Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents: 627
diff changeset
145 return os.stat(self.path).st_dev
da5378d39269 Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents: 627
diff changeset
146
926
b765e970c9ff Add a local() method to repository classes
mpm@selenic.com
parents: 923
diff changeset
147 def local(self):
1101
2cf5c8a4eae5 Separate out old-http support
mpm@selenic.com
parents: 1100
diff changeset
148 return True
926
b765e970c9ff Add a local() method to repository classes
mpm@selenic.com
parents: 923
diff changeset
149
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
150 def join(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
151 return os.path.join(self.path, f)
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
152
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
153 def wjoin(self, f):
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
154 return os.path.join(self.root, f)
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
155
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
156 def file(self, f):
192
5d8553352d2e Changes to network protocol
mpm@selenic.com
parents: 191
diff changeset
157 if f[0] == '/': f = f[1:]
1100
d6b6a15cc7c6 localrepo: more import/namespace tidying
mpm@selenic.com
parents: 1097
diff changeset
158 return filelog.filelog(self.opener, f)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
159
627
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 624
diff changeset
160 def getcwd(self):
870
a82eae840447 Teach walk code about absolute paths.
Bryan O'Sullivan <bos@serpentine.com>
parents: 839
diff changeset
161 return self.dirstate.getcwd()
627
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 624
diff changeset
162
291
2c4f2be05587 Add wopener for opening files in the working directory
mpm@selenic.com
parents: 288
diff changeset
163 def wfile(self, f, mode='r'):
2c4f2be05587 Add wopener for opening files in the working directory
mpm@selenic.com
parents: 288
diff changeset
164 return self.wopener(f, mode)
2c4f2be05587 Add wopener for opening files in the working directory
mpm@selenic.com
parents: 288
diff changeset
165
1019
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
166 def wread(self, filename):
1258
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
167 if self.encodepats == None:
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
168 l = []
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
169 for pat, cmd in self.ui.configitems("encode"):
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
170 mf = util.matcher("", "/", [pat], [], [])[1]
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
171 l.append((mf, cmd))
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
172 self.encodepats = l
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
173
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
174 data = self.wopener(filename, 'r').read()
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
175
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
176 for mf, cmd in self.encodepats:
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
177 if mf(filename):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
178 self.ui.debug(_("filtering %s through %s\n") % (filename, cmd))
1258
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
179 data = util.filter(data, cmd)
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
180 break
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
181
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
182 return data
1019
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
183
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
184 def wwrite(self, filename, data, fd=None):
1258
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
185 if self.decodepats == None:
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
186 l = []
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
187 for pat, cmd in self.ui.configitems("decode"):
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
188 mf = util.matcher("", "/", [pat], [], [])[1]
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
189 l.append((mf, cmd))
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
190 self.decodepats = l
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
191
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
192 for mf, cmd in self.decodepats:
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
193 if mf(filename):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
194 self.ui.debug(_("filtering %s through %s\n") % (filename, cmd))
1258
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
195 data = util.filter(data, cmd)
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
196 break
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents: 1236
diff changeset
197
1019
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
198 if fd:
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
199 return fd.write(data)
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
200 return self.wopener(filename, 'w').write(data)
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
201
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
202 def transaction(self):
251
3fd8fc14b12f backup dirstate for undo
mpm@selenic.com
parents: 249
diff changeset
203 # save dirstate for undo
263
e8eb427c6d71 Fix empty repository transaction bug
mpm@selenic.com
parents: 262
diff changeset
204 try:
e8eb427c6d71 Fix empty repository transaction bug
mpm@selenic.com
parents: 262
diff changeset
205 ds = self.opener("dirstate").read()
e8eb427c6d71 Fix empty repository transaction bug
mpm@selenic.com
parents: 262
diff changeset
206 except IOError:
e8eb427c6d71 Fix empty repository transaction bug
mpm@selenic.com
parents: 262
diff changeset
207 ds = ""
785
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
208 self.opener("journal.dirstate", "w").write(ds)
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
209
785
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
210 def after():
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
211 util.rename(self.join("journal"), self.join("undo"))
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
212 util.rename(self.join("journal.dirstate"),
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
213 self.join("undo.dirstate"))
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
214
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
215 return transaction.transaction(self.ui.warn, self.opener,
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
216 self.join("journal"), after)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
217
210
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 207
diff changeset
218 def recover(self):
225
1651a3e61925 fix repo locking
mpm@selenic.com
parents: 224
diff changeset
219 lock = self.lock()
557
b9fee419a1bd recover: the journal is named 'journal'
mpm@selenic.com
parents: 556
diff changeset
220 if os.path.exists(self.join("journal")):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
221 self.ui.status(_("rolling back interrupted transaction\n"))
557
b9fee419a1bd recover: the journal is named 'journal'
mpm@selenic.com
parents: 556
diff changeset
222 return transaction.rollback(self.opener, self.join("journal"))
210
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 207
diff changeset
223 else:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
224 self.ui.warn(_("no interrupted transaction available\n"))
210
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 207
diff changeset
225
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 207
diff changeset
226 def undo(self):
225
1651a3e61925 fix repo locking
mpm@selenic.com
parents: 224
diff changeset
227 lock = self.lock()
210
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 207
diff changeset
228 if os.path.exists(self.join("undo")):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
229 self.ui.status(_("rolling back last transaction\n"))
262
3db700146536 implement demand loading hack
mpm@selenic.com
parents: 256
diff changeset
230 transaction.rollback(self.opener, self.join("undo"))
251
3fd8fc14b12f backup dirstate for undo
mpm@selenic.com
parents: 249
diff changeset
231 self.dirstate = None
421
43b8da7420a9 [PATCH] rename under the other OS
mpm@selenic.com
parents: 420
diff changeset
232 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
1100
d6b6a15cc7c6 localrepo: more import/namespace tidying
mpm@selenic.com
parents: 1097
diff changeset
233 self.dirstate = dirstate.dirstate(self.opener, self.ui, self.root)
163
f38c90953c2c Make undo and recover friendlier
mpm@selenic.com
parents: 162
diff changeset
234 else:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
235 self.ui.warn(_("no undo information available\n"))
162
5dcbe4d9a30c Implement recover and undo commands
mpm@selenic.com
parents: 161
diff changeset
236
1062
6d5a62a549fa pep-0008 cleanup
benoit.boissinot@ens-lyon.fr
parents: 1040
diff changeset
237 def lock(self, wait=1):
161
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
238 try:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
239 return lock.lock(self.join("lock"), 0)
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
240 except lock.LockHeld, inst:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
241 if wait:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
242 self.ui.warn(_("waiting for lock held by %s\n") % inst.args[0])
161
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
243 return lock.lock(self.join("lock"), wait)
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
244 raise inst
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
245
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
246 def rawcommit(self, files, text, user, date, p1=None, p2=None):
442
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
247 orig_parent = self.dirstate.parents()[0] or nullid
452
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents: 442
diff changeset
248 p1 = p1 or self.dirstate.parents()[0] or nullid
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents: 442
diff changeset
249 p2 = p2 or self.dirstate.parents()[1] or nullid
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
250 c1 = self.changelog.read(p1)
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
251 c2 = self.changelog.read(p2)
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
252 m1 = self.manifest.read(c1[0])
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
253 mf1 = self.manifest.readflags(c1[0])
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
254 m2 = self.manifest.read(c2[0])
992
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
255 changed = []
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
256
442
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
257 if orig_parent == p1:
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
258 update_dirstate = 1
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
259 else:
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
260 update_dirstate = 0
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
261
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
262 tr = self.transaction()
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
263 mm = m1.copy()
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
264 mfm = mf1.copy()
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
265 linkrev = self.changelog.count()
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
266 for f in files:
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
267 try:
1019
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
268 t = self.wread(f)
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
269 tm = util.is_exec(self.wjoin(f), mfm.get(f, False))
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
270 r = self.file(f)
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
271 mfm[f] = tm
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
272
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
273 fp1 = m1.get(f, nullid)
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
274 fp2 = m2.get(f, nullid)
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
275
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
276 # is the same revision on two branches of a merge?
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
277 if fp2 == fp1:
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
278 fp2 = nullid
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
279
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
280 if fp2 != nullid:
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
281 # is one parent an ancestor of the other?
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
282 fpa = r.ancestor(fp1, fp2)
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
283 if fpa == fp1:
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
284 fp1, fp2 = fp2, nullid
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
285 elif fpa == fp2:
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
286 fp2 = nullid
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
287
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
288 # is the file unmodified from the parent?
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
289 if t == r.read(fp1):
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
290 # record the proper existing parent in manifest
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
291 # no need to add a revision
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
292 mm[f] = fp1
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
293 continue
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
294
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
295 mm[f] = r.add(t, {}, tr, linkrev, fp1, fp2)
992
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
296 changed.append(f)
442
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
297 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
298 self.dirstate.update([f], "n")
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
299 except IOError:
314
3402cb9a4c06 More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents: 313
diff changeset
300 try:
3402cb9a4c06 More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents: 313
diff changeset
301 del mm[f]
3402cb9a4c06 More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents: 313
diff changeset
302 del mfm[f]
442
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
303 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
304 self.dirstate.forget([f])
314
3402cb9a4c06 More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents: 313
diff changeset
305 except:
3402cb9a4c06 More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents: 313
diff changeset
306 # deleted from p2?
3402cb9a4c06 More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents: 313
diff changeset
307 pass
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
308
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
309 mnode = self.manifest.add(mm, mfm, tr, linkrev, c1[0], c2[0])
608
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 588
diff changeset
310 user = user or self.ui.username()
992
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
311 n = self.changelog.add(mnode, changed, text, tr, p1, p2, user, date)
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
312 tr.close()
442
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
313 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
314 self.dirstate.setparents(n, nullid)
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
315
813
80fd2958235a Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 786
diff changeset
316 def commit(self, files = None, text = "", user = None, date = None,
900
ba8cf1f2210c Add force option to repo.commit, allowing commits where no files change
mason@suse.com
parents: 898
diff changeset
317 match = util.always, force=False):
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
318 commit = []
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
319 remove = []
992
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
320 changed = []
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
321
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
322 if files:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
323 for f in files:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
324 s = self.dirstate.state(f)
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
325 if s in 'nmai':
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
326 commit.append(f)
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
327 elif s == 'r':
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
328 remove.append(f)
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
329 else:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
330 self.ui.warn(_("%s not tracked!\n") % f)
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
331 else:
1062
6d5a62a549fa pep-0008 cleanup
benoit.boissinot@ens-lyon.fr
parents: 1040
diff changeset
332 (c, a, d, u) = self.changes(match=match)
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
333 commit = c + a
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
334 remove = d
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
335
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
336 p1, p2 = self.dirstate.parents()
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
337 c1 = self.changelog.read(p1)
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
338 c2 = self.changelog.read(p2)
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
339 m1 = self.manifest.read(c1[0])
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
340 mf1 = self.manifest.readflags(c1[0])
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
341 m2 = self.manifest.read(c2[0])
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
342
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
343 if not commit and not remove and not force and p2 == nullid:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
344 self.ui.status(_("nothing changed\n"))
901
120cba94d5aa Change repo.comit to return None on error or the new revision number on
mason@suse.com
parents: 900
diff changeset
345 return None
151
1f6c61a60586 Bail on attempts to do an empty commit
mpm@selenic.com
parents: 149
diff changeset
346
487
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
347 if not self.hook("precommit"):
901
120cba94d5aa Change repo.comit to return None on error or the new revision number on
mason@suse.com
parents: 900
diff changeset
348 return None
487
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
349
225
1651a3e61925 fix repo locking
mpm@selenic.com
parents: 224
diff changeset
350 lock = self.lock()
151
1f6c61a60586 Bail on attempts to do an empty commit
mpm@selenic.com
parents: 149
diff changeset
351 tr = self.transaction()
1f6c61a60586 Bail on attempts to do an empty commit
mpm@selenic.com
parents: 149
diff changeset
352
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
353 # check in files
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
354 new = {}
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
355 linkrev = self.changelog.count()
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
356 commit.sort()
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
357 for f in commit:
83
9fd5b35cfc45 Add -q quiet option
mpm@selenic.com
parents: 79
diff changeset
358 self.ui.note(f + "\n")
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
359 try:
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
360 mf1[f] = util.is_exec(self.wjoin(f), mf1.get(f, False))
1019
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
361 t = self.wread(f)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
362 except IOError:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
363 self.ui.warn(_("trouble committing %s!\n") % f)
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
364 raise
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
365
1117
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents: 1102
diff changeset
366 r = self.file(f)
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents: 1102
diff changeset
367
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
368 meta = {}
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
369 cp = self.dirstate.copied(f)
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
370 if cp:
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
371 meta["copy"] = cp
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
372 meta["copyrev"] = hex(m1.get(cp, m2.get(cp, nullid)))
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
373 self.ui.debug(_(" %s: copy %s:%s\n") % (f, cp, meta["copyrev"]))
1117
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents: 1102
diff changeset
374 fp1, fp2 = nullid, nullid
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents: 1102
diff changeset
375 else:
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents: 1102
diff changeset
376 fp1 = m1.get(f, nullid)
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents: 1102
diff changeset
377 fp2 = m2.get(f, nullid)
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
378
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
379 # is the same revision on two branches of a merge?
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
380 if fp2 == fp1:
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
381 fp2 = nullid
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
382
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
383 if fp2 != nullid:
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
384 # is one parent an ancestor of the other?
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
385 fpa = r.ancestor(fp1, fp2)
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
386 if fpa == fp1:
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
387 fp1, fp2 = fp2, nullid
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
388 elif fpa == fp2:
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
389 fp2 = nullid
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
390
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
391 # is the file unmodified from the parent?
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
392 if not meta and t == r.read(fp1):
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
393 # record the proper existing parent in manifest
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
394 # no need to add a revision
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
395 new[f] = fp1
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
396 continue
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 981
diff changeset
397
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
398 new[f] = r.add(t, meta, tr, linkrev, fp1, fp2)
992
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
399 # remember what we've added so that we can later calculate
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
400 # the files to pull from a set of changesets
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
401 changed.append(f)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
402
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
403 # update manifest
229
1b11da6ee69e teach commit about dirstate.parents()
mpm@selenic.com
parents: 228
diff changeset
404 m1.update(new)
416
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents: 415
diff changeset
405 for f in remove:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents: 415
diff changeset
406 if f in m1:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents: 415
diff changeset
407 del m1[f]
741
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
408 mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0],
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
409 (new, remove))
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
410
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
411 # add changeset
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
412 new = new.keys()
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
413 new.sort()
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
414
288
97c87ac6d7a4 commit: edit text fixups
mpm@selenic.com
parents: 287
diff changeset
415 if not text:
992
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
416 edittext = ""
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
417 if p2 != nullid:
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
418 edittext += "HG: branch merge\n"
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
419 edittext += "\n" + "HG: manifest hash %s\n" % hex(mn)
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
420 edittext += "".join(["HG: changed %s\n" % f for f in changed])
288
97c87ac6d7a4 commit: edit text fixups
mpm@selenic.com
parents: 287
diff changeset
421 edittext += "".join(["HG: removed %s\n" % f for f in remove])
992
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
422 if not changed and not remove:
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
423 edittext += "HG: no files changed\n"
288
97c87ac6d7a4 commit: edit text fixups
mpm@selenic.com
parents: 287
diff changeset
424 edittext = self.ui.edit(edittext)
97c87ac6d7a4 commit: edit text fixups
mpm@selenic.com
parents: 287
diff changeset
425 if not edittext.rstrip():
901
120cba94d5aa Change repo.comit to return None on error or the new revision number on
mason@suse.com
parents: 900
diff changeset
426 return None
288
97c87ac6d7a4 commit: edit text fixups
mpm@selenic.com
parents: 287
diff changeset
427 text = edittext
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
428
608
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 588
diff changeset
429 user = user or self.ui.username()
992
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
430 n = self.changelog.add(mn, changed, text, tr, p1, p2, user, date)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
431 tr.close()
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
432
229
1b11da6ee69e teach commit about dirstate.parents()
mpm@selenic.com
parents: 228
diff changeset
433 self.dirstate.setparents(n)
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
434 self.dirstate.update(new, "n")
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
435 self.dirstate.forget(remove)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
436
660
2c83350784c3 Move commit hook after commit completes
Matt Mackall <mpm@selenic.com>
parents: 659
diff changeset
437 if not self.hook("commit", node=hex(n)):
901
120cba94d5aa Change repo.comit to return None on error or the new revision number on
mason@suse.com
parents: 900
diff changeset
438 return None
120cba94d5aa Change repo.comit to return None on error or the new revision number on
mason@suse.com
parents: 900
diff changeset
439 return n
660
2c83350784c3 Move commit hook after commit completes
Matt Mackall <mpm@selenic.com>
parents: 659
diff changeset
440
1062
6d5a62a549fa pep-0008 cleanup
benoit.boissinot@ens-lyon.fr
parents: 1040
diff changeset
441 def walk(self, node=None, files=[], match=util.always):
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 723
diff changeset
442 if node:
726
809a870a0e73 Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
443 for fn in self.manifest.read(self.changelog.read(node)[0]):
820
89985a1b3427 Clean up walk and changes code to use normalised names properly.
Bryan O'Sullivan <bos@serpentine.com>
parents: 814
diff changeset
444 if match(fn): yield 'm', fn
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 723
diff changeset
445 else:
726
809a870a0e73 Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
446 for src, fn in self.dirstate.walk(files, match):
809a870a0e73 Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
447 yield src, fn
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
448
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 723
diff changeset
449 def changes(self, node1 = None, node2 = None, files = [],
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 723
diff changeset
450 match = util.always):
566
b2c9b36bd639 repo.changes: fix duplicate changes
mpm@selenic.com
parents: 561
diff changeset
451 mf2, u = None, []
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
452
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
453 def fcmp(fn, mf):
1019
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
454 t1 = self.wread(fn)
994
88c15682d9b0 Fix callers to file.revision to use file.read
mpm@selenic.com
parents: 993
diff changeset
455 t2 = self.file(fn).read(mf.get(fn, nullid))
29
4d3a5dcb6972 Make diffdir take a revision argument
mpm@selenic.com
parents: 25
diff changeset
456 return cmp(t1, t2)
4d3a5dcb6972 Make diffdir take a revision argument
mpm@selenic.com
parents: 25
diff changeset
457
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
458 def mfmatches(node):
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
459 mf = dict(self.manifest.read(node))
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
460 for fn in mf.keys():
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
461 if not match(fn):
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
462 del mf[fn]
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
463 return mf
741
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
464
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
465 # are we comparing the working directory?
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
466 if not node2:
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
467 l, c, a, d, u = self.dirstate.changes(files, match)
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
468
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
469 # are we comparing working dir against its parent?
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
470 if not node1:
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
471 if l:
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
472 # do a full compare of any files that might have changed
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
473 change = self.changelog.read(self.dirstate.parents()[0])
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
474 mf2 = mfmatches(change[0])
548
e2e963e255fd Fix braindamage in repo.changes
mpm@selenic.com
parents: 547
diff changeset
475 for f in l:
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
476 if fcmp(f, mf2):
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
477 c.append(f)
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
478
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
479 for l in c, a, d, u:
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
480 l.sort()
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
481
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
482 return (c, a, d, u)
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
483
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
484 # are we comparing working dir against non-tip?
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
485 # generate a pseudo-manifest for the working dir
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
486 if not node2:
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
487 if not mf2:
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
488 change = self.changelog.read(self.dirstate.parents()[0])
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
489 mf2 = mfmatches(change[0])
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
490 for f in a + c + l:
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
491 mf2[f] = ""
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
492 for f in d:
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
493 if f in mf2: del mf2[f]
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
494 else:
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
495 change = self.changelog.read(node2)
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
496 mf2 = mfmatches(change[0])
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
497
566
b2c9b36bd639 repo.changes: fix duplicate changes
mpm@selenic.com
parents: 561
diff changeset
498 # flush lists from dirstate before comparing manifests
b2c9b36bd639 repo.changes: fix duplicate changes
mpm@selenic.com
parents: 561
diff changeset
499 c, a = [], []
b2c9b36bd639 repo.changes: fix duplicate changes
mpm@selenic.com
parents: 561
diff changeset
500
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
501 change = self.changelog.read(node1)
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
502 mf1 = mfmatches(change[0])
32
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
503
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
504 for fn in mf2:
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
505 if mf1.has_key(fn):
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
506 if mf1[fn] != mf2[fn]:
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
507 if mf2[fn] != "" or fcmp(fn, mf1):
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
508 c.append(fn)
32
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
509 del mf1[fn]
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
510 else:
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
511 a.append(fn)
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
512
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
513 d = mf1.keys()
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
514
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
515 for l in c, a, d, u:
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
516 l.sort()
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
517
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
518 return (c, a, d, u)
32
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
519
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
520 def add(self, list):
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
521 for f in list:
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
522 p = self.wjoin(f)
611
48c3eb2bf844 * clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents: 609
diff changeset
523 if not os.path.exists(p):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
524 self.ui.warn(_("%s does not exist!\n") % f)
611
48c3eb2bf844 * clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents: 609
diff changeset
525 elif not os.path.isfile(p):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
526 self.ui.warn(_("%s not added: only files supported currently\n") % f)
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 723
diff changeset
527 elif self.dirstate.state(f) in 'an':
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
528 self.ui.warn(_("%s already tracked!\n") % f)
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
529 else:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
530 self.dirstate.update([f], "a")
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
531
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
532 def forget(self, list):
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
533 for f in list:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
534 if self.dirstate.state(f) not in 'ai':
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
535 self.ui.warn(_("%s not added!\n") % f)
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
536 else:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
537 self.dirstate.forget([f])
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
538
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
539 def remove(self, list):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
540 for f in list:
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
541 p = self.wjoin(f)
611
48c3eb2bf844 * clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents: 609
diff changeset
542 if os.path.exists(p):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
543 self.ui.warn(_("%s still exists!\n") % f)
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents: 385
diff changeset
544 elif self.dirstate.state(f) == 'a':
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
545 self.ui.warn(_("%s never committed!\n") % f)
657
22bc6fb9aefc dirstate.forget() takes a list
Matt Mackall <mpm@selenic.com>
parents: 656
diff changeset
546 self.dirstate.forget([f])
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
547 elif f not in self.dirstate:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
548 self.ui.warn(_("%s not tracked!\n") % f)
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
549 else:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
550 self.dirstate.update([f], "r")
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
551
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
552 def copy(self, source, dest):
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
553 p = self.wjoin(dest)
781
26f3d353851f Fix copy in subdirectories
mpm@selenic.com
parents: 780
diff changeset
554 if not os.path.exists(p):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
555 self.ui.warn(_("%s does not exist!\n") % dest)
781
26f3d353851f Fix copy in subdirectories
mpm@selenic.com
parents: 780
diff changeset
556 elif not os.path.isfile(p):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
557 self.ui.warn(_("copy failed: %s is not a file\n") % dest)
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
558 else:
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
559 if self.dirstate.state(dest) == '?':
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
560 self.dirstate.update([dest], "a")
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
561 self.dirstate.copy(source, dest)
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
562
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
563 def heads(self):
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
564 return self.changelog.heads()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
565
898
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
566 # branchlookup returns a dict giving a list of branches for
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
567 # each head. A branch is defined as the tag of a node or
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
568 # the branch of the node's parents. If a node has multiple
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
569 # branch tags, tags are eliminated if they are visible from other
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
570 # branch tags.
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
571 #
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
572 # So, for this graph: a->b->c->d->e
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
573 # \ /
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
574 # aa -----/
919
1458d20df2a8 whitespace cleanup
mpm@selenic.com
parents: 911
diff changeset
575 # a has tag 2.6.12
898
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
576 # d has tag 2.6.13
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
577 # e would have branch tags for 2.6.12 and 2.6.13. Because the node
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
578 # for 2.6.12 can be reached from the node 2.6.13, that is eliminated
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
579 # from the list.
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
580 #
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
581 # It is possible that more than one head will have the same branch tag.
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
582 # callers need to check the result for multiple heads under the same
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
583 # branch tag if that is a problem for them (ie checkout of a specific
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
584 # branch).
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
585 #
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
586 # passing in a specific branch will limit the depth of the search
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
587 # through the parents. It won't limit the branches returned in the
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
588 # result though.
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
589 def branchlookup(self, heads=None, branch=None):
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
590 if not heads:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
591 heads = self.heads()
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
592 headt = [ h for h in heads ]
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
593 chlog = self.changelog
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
594 branches = {}
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
595 merges = []
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
596 seenmerge = {}
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
597
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
598 # traverse the tree once for each head, recording in the branches
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
599 # dict which tags are visible from this head. The branches
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
600 # dict also records which tags are visible from each tag
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
601 # while we traverse.
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
602 while headt or merges:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
603 if merges:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
604 n, found = merges.pop()
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
605 visit = [n]
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
606 else:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
607 h = headt.pop()
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
608 visit = [h]
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
609 found = [h]
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
610 seen = {}
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
611 while visit:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
612 n = visit.pop()
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
613 if n in seen:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
614 continue
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
615 pp = chlog.parents(n)
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
616 tags = self.nodetags(n)
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
617 if tags:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
618 for x in tags:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
619 if x == 'tip':
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
620 continue
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
621 for f in found:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
622 branches.setdefault(f, {})[n] = 1
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
623 branches.setdefault(n, {})[n] = 1
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
624 break
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
625 if n not in found:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
626 found.append(n)
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
627 if branch in tags:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
628 continue
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
629 seen[n] = 1
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
630 if pp[1] != nullid and n not in seenmerge:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
631 merges.append((pp[1], [x for x in found]))
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
632 seenmerge[n] = 1
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
633 if pp[0] != nullid:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
634 visit.append(pp[0])
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
635 # traverse the branches dict, eliminating branch tags from each
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
636 # head that are visible from another branch tag for that head.
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
637 out = {}
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
638 viscache = {}
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
639 for h in heads:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
640 def visible(node):
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
641 if node in viscache:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
642 return viscache[node]
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
643 ret = {}
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
644 visit = [node]
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
645 while visit:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
646 x = visit.pop()
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
647 if x in viscache:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
648 ret.update(viscache[x])
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
649 elif x not in ret:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
650 ret[x] = 1
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
651 if x in branches:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
652 visit[len(visit):] = branches[x].keys()
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
653 viscache[node] = ret
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
654 return ret
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
655 if h not in branches:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
656 continue
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
657 # O(n^2), but somewhat limited. This only searches the
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
658 # tags visible from a specific head, not all the tags in the
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
659 # whole repo.
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
660 for b in branches[h]:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
661 vis = False
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
662 for bb in branches[h].keys():
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
663 if b != bb:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
664 if b in visible(bb):
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
665 vis = True
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
666 break
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
667 if not vis:
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
668 l = out.setdefault(h, [])
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
669 l[len(l):] = self.nodetags(b)
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
670 return out
3616c0d7ab88 Add searching for named branches
mason@suse.com
parents: 896
diff changeset
671
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
672 def branches(self, nodes):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
673 if not nodes: nodes = [self.changelog.tip()]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
674 b = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
675 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
676 t = n
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
677 while n:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
678 p = self.changelog.parents(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
679 if p[1] != nullid or p[0] == nullid:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
680 b.append((t, n, p[0], p[1]))
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
681 break
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
682 n = p[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
683 return b
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
684
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
685 def between(self, pairs):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
686 r = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
687
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
688 for top, bottom in pairs:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
689 n, l, i = top, [], 0
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
690 f = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
691
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
692 while n != bottom:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
693 p = self.changelog.parents(n)[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
694 if i == f:
575
7f5ce4bbdd7b More whitespace cleanups
mpm@selenic.com
parents: 566
diff changeset
695 l.append(n)
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
696 f = f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
697 n = p
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
698 i += 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
699
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
700 r.append(l)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
701
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
702 return r
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
703
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
704 def newer(self, nodes):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
705 m = {}
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
706 nl = []
94
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
707 pm = {}
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
708 cl = self.changelog
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
709 t = l = cl.count()
94
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
710
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
711 # find the lowest numbered node
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
712 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
713 l = min(l, cl.rev(n))
94
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
714 m[n] = 1
46
93e868fa0db8 Add changegroup support
mpm@selenic.com
parents: 44
diff changeset
715
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
716 for i in xrange(l, t):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
717 n = cl.node(i)
94
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
718 if n in m: # explicitly listed
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
719 pm[n] = 1
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
720 nl.append(n)
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
721 continue
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
722 for p in cl.parents(n):
94
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
723 if p in pm: # parent listed
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
724 pm[n] = 1
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
725 nl.append(n)
94
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
726 break
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
727
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
728 return nl
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
729
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
730 def findincoming(self, remote, base=None, heads=None):
65
d40cc5aacc31 Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents: 64
diff changeset
731 m = self.changelog.nodemap
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
732 search = []
1072
05dc7aba22eb Fixes for push corner case
mpm@selenic.com
parents: 1069
diff changeset
733 fetch = {}
148
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents: 146
diff changeset
734 seen = {}
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents: 146
diff changeset
735 seenbranch = {}
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
736 if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
737 base = {}
192
5d8553352d2e Changes to network protocol
mpm@selenic.com
parents: 191
diff changeset
738
636
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
739 # assume we're closer to the tip than the root
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
740 # and start by examining the heads
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
741 self.ui.status(_("searching for changes\n"))
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
742
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
743 if not heads:
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
744 heads = remote.heads()
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
745
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
746 unknown = []
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
747 for h in heads:
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
748 if h not in m:
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
749 unknown.append(h)
621
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
750 else:
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
751 base[h] = 1
46
93e868fa0db8 Add changegroup support
mpm@selenic.com
parents: 44
diff changeset
752
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
753 if not unknown:
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
754 return None
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
755
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
756 rep = {}
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
757 reqcnt = 0
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
758
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
759 # search through remote branches
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
760 # a 'branch' here is a linear segment of history, with four parts:
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
761 # head, root, first parent, second parent
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
762 # (a branch always has two parents (or none) by definition)
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
763 unknown = remote.branches(unknown)
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
764 while unknown:
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
765 r = []
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
766 while unknown:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
767 n = unknown.pop(0)
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
768 if n[0] in seen:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
769 continue
148
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents: 146
diff changeset
770
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
771 self.ui.debug(_("examining %s:%s\n") % (short(n[0]), short(n[1])))
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
772 if n[0] == nullid:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
773 break
328
dac675ef6189 hg pull: more query fixes
mpm@selenic.com
parents: 324
diff changeset
774 if n in seenbranch:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
775 self.ui.debug(_("branch already found\n"))
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
776 continue
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
777 if n[1] and n[1] in m: # do we know the base?
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
778 self.ui.debug(_("found incomplete branch %s:%s\n")
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
779 % (short(n[0]), short(n[1])))
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
780 search.append(n) # schedule branch range for scanning
328
dac675ef6189 hg pull: more query fixes
mpm@selenic.com
parents: 324
diff changeset
781 seenbranch[n] = 1
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
782 else:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
783 if n[1] not in seen and n[1] not in fetch:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
784 if n[2] in m and n[3] in m:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
785 self.ui.debug(_("found new changeset %s\n") %
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
786 short(n[1]))
1072
05dc7aba22eb Fixes for push corner case
mpm@selenic.com
parents: 1069
diff changeset
787 fetch[n[1]] = 1 # earliest unknown
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
788 base[n[2]] = 1 # latest known
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
789 continue
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
790
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
791 for a in n[2:4]:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
792 if a not in rep:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
793 r.append(a)
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
794 rep[a] = 1
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
795
328
dac675ef6189 hg pull: more query fixes
mpm@selenic.com
parents: 324
diff changeset
796 seen[n[0]] = 1
dac675ef6189 hg pull: more query fixes
mpm@selenic.com
parents: 324
diff changeset
797
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
798 if r:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
799 reqcnt += 1
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
800 self.ui.debug(_("request %d: %s\n") %
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
801 (reqcnt, " ".join(map(short, r))))
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
802 for p in range(0, len(r), 10):
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
803 for b in remote.branches(r[p:p+10]):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
804 self.ui.debug(_("received %s:%s\n") %
148
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents: 146
diff changeset
805 (short(b[0]), short(b[1])))
1072
05dc7aba22eb Fixes for push corner case
mpm@selenic.com
parents: 1069
diff changeset
806 if b[0] in m:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
807 self.ui.debug(_("found base node %s\n") % short(b[0]))
1072
05dc7aba22eb Fixes for push corner case
mpm@selenic.com
parents: 1069
diff changeset
808 base[b[0]] = 1
05dc7aba22eb Fixes for push corner case
mpm@selenic.com
parents: 1069
diff changeset
809 elif b[0] not in seen:
148
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents: 146
diff changeset
810 unknown.append(b)
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
811
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
812 # do binary search on the branches we found
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
813 while search:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
814 n = search.pop(0)
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
815 reqcnt += 1
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
816 l = remote.between([(n[0], n[1])])[0]
328
dac675ef6189 hg pull: more query fixes
mpm@selenic.com
parents: 324
diff changeset
817 l.append(n[1])
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
818 p = n[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
819 f = 1
328
dac675ef6189 hg pull: more query fixes
mpm@selenic.com
parents: 324
diff changeset
820 for i in l:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
821 self.ui.debug(_("narrowing %d:%d %s\n") % (f, len(l), short(i)))
65
d40cc5aacc31 Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents: 64
diff changeset
822 if i in m:
85
58a1a0425c9b Fix merge bug, I hope
mpm@selenic.com
parents: 83
diff changeset
823 if f <= 2:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
824 self.ui.debug(_("found new branch changeset %s\n") %
83
9fd5b35cfc45 Add -q quiet option
mpm@selenic.com
parents: 79
diff changeset
825 short(p))
1072
05dc7aba22eb Fixes for push corner case
mpm@selenic.com
parents: 1069
diff changeset
826 fetch[p] = 1
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
827 base[i] = 1
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
828 else:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
829 self.ui.debug(_("narrowed branch search to %s:%s\n")
83
9fd5b35cfc45 Add -q quiet option
mpm@selenic.com
parents: 79
diff changeset
830 % (short(p), short(i)))
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
831 search.append((p, i))
65
d40cc5aacc31 Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents: 64
diff changeset
832 break
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
833 p, f = i, f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
834
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
835 # sanity check our fetch list
1072
05dc7aba22eb Fixes for push corner case
mpm@selenic.com
parents: 1069
diff changeset
836 for f in fetch.keys():
65
d40cc5aacc31 Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents: 64
diff changeset
837 if f in m:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
838 raise repo.RepoError(_("already have changeset ") + short(f[:4]))
83
9fd5b35cfc45 Add -q quiet option
mpm@selenic.com
parents: 79
diff changeset
839
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
840 if base.keys() == [nullid]:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
841 self.ui.warn(_("warning: pulling from an unrelated repository!\n"))
511
9f67222186bd Disallow merging of unrelated projects
mpm@selenic.com
parents: 504
diff changeset
842
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
843 self.ui.note(_("found new changesets starting at ") +
83
9fd5b35cfc45 Add -q quiet option
mpm@selenic.com
parents: 79
diff changeset
844 " ".join([short(f) for f in fetch]) + "\n")
65
d40cc5aacc31 Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents: 64
diff changeset
845
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
846 self.ui.debug(_("%d total queries\n") % reqcnt)
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
847
1072
05dc7aba22eb Fixes for push corner case
mpm@selenic.com
parents: 1069
diff changeset
848 return fetch.keys()
516
873228c2f6cf Change getchangegroup to findincoming
mpm@selenic.com
parents: 515
diff changeset
849
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
850 def findoutgoing(self, remote, base=None, heads=None):
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
851 if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
852 base = {}
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
853 self.findincoming(remote, base, heads)
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
854
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
855 self.ui.debug(_("common changesets up to ")
1072
05dc7aba22eb Fixes for push corner case
mpm@selenic.com
parents: 1069
diff changeset
856 + " ".join(map(short, base.keys())) + "\n")
05dc7aba22eb Fixes for push corner case
mpm@selenic.com
parents: 1069
diff changeset
857
621
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
858 remain = dict.fromkeys(self.changelog.nodemap)
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
859
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
860 # prune everything remote has from the tree
637
31e090c34d3b Fix up the broken bits in findoutgoing
Matt Mackall <mpm@selenic.com>
parents: 636
diff changeset
861 del remain[nullid]
621
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
862 remove = base.keys()
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
863 while remove:
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
864 n = remove.pop(0)
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
865 if n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
866 del remain[n]
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
867 for p in self.changelog.parents(n):
637
31e090c34d3b Fix up the broken bits in findoutgoing
Matt Mackall <mpm@selenic.com>
parents: 636
diff changeset
868 remove.append(p)
621
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
869
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
870 # find every node whose parents have been pruned
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
871 subset = []
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
872 for n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
873 p1, p2 = self.changelog.parents(n)
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
874 if p1 not in remain and p2 not in remain:
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
875 subset.append(n)
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
876
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
877 # this is the set of all roots we have to push
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
878 return subset
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
879
622
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
880 def pull(self, remote):
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
881 lock = self.lock()
636
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
882
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
883 # if we have an empty repo, fetch everything
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
884 if self.changelog.tip() == nullid:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
885 self.ui.status(_("requesting all changes\n"))
636
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
886 fetch = [nullid]
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
887 else:
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
888 fetch = self.findincoming(remote)
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
889
622
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
890 if not fetch:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
891 self.ui.status(_("no changes found\n"))
622
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
892 return 1
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
893
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
894 cg = remote.changegroup(fetch)
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
895 return self.addchangegroup(cg)
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
896
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
897 def push(self, remote, force=False):
622
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
898 lock = remote.lock()
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
899
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
900 base = {}
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
901 heads = remote.heads()
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
902 inc = self.findincoming(remote, base, heads)
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
903 if not force and inc:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
904 self.ui.warn(_("abort: unsynced remote changes!\n"))
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
905 self.ui.status(_("(did you forget to sync? use push -f to force)\n"))
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
906 return 1
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
907
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
908 update = self.findoutgoing(remote, base)
622
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
909 if not update:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
910 self.ui.status(_("no changes found\n"))
622
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
911 return 1
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
912 elif not force:
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
913 if len(heads) < len(self.changelog.heads()):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
914 self.ui.warn(_("abort: push creates new remote branches!\n"))
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
915 self.ui.status(_("(did you forget to merge?"
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
916 " use push -f to force)\n"))
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
917 return 1
622
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
918
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
919 cg = self.changegroup(update)
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
920 return remote.addchangegroup(cg)
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
921
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
922 def changegroup(self, basenodes):
1199
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an
Eric Hopper <hopper@omnifarious.org>
parents: 1133
diff changeset
923 genread = util.chunkbuffer
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
924
635
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
925 def gengroup():
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
926 nodes = self.newer(basenodes)
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
927
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
928 # construct the link map
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
929 linkmap = {}
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
930 for n in nodes:
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
931 linkmap[self.changelog.rev(n)] = n
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
932
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
933 # construct a list of all changed files
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
934 changed = {}
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
935 for n in nodes:
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
936 c = self.changelog.read(n)
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
937 for f in c[3]:
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
938 changed[f] = 1
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
939 changed = changed.keys()
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
940 changed.sort()
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
941
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
942 # the changegroup is changesets + manifests + all file revs
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
943 revs = [ self.changelog.rev(n) for n in nodes ]
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
944
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
945 for y in self.changelog.group(linkmap): yield y
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
946 for y in self.manifest.group(linkmap): yield y
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
947 for f in changed:
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
948 yield struct.pack(">l", len(f) + 4) + f
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
949 g = self.file(f).group(linkmap)
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
950 for y in g:
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
951 yield y
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
952
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
953 yield struct.pack(">l", 0)
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
954
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
955 return genread(gengroup())
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
956
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
957 def addchangegroup(self, source):
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
958
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
959 def getchunk():
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
960 d = source.read(4)
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
961 if not d: return ""
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
962 l = struct.unpack(">l", d)[0]
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
963 if l <= 4: return ""
1280
50553b99a5c9 pull/unbundle: raise an exception on premature EOF
mpm@selenic.com
parents: 1260
diff changeset
964 d = source.read(l - 4)
50553b99a5c9 pull/unbundle: raise an exception on premature EOF
mpm@selenic.com
parents: 1260
diff changeset
965 if len(d) < l - 4:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
966 raise repo.RepoError(_("premature EOF reading chunk"
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
967 " (got %d bytes, expected %d)")
1280
50553b99a5c9 pull/unbundle: raise an exception on premature EOF
mpm@selenic.com
parents: 1260
diff changeset
968 % (len(d), l - 4))
50553b99a5c9 pull/unbundle: raise an exception on premature EOF
mpm@selenic.com
parents: 1260
diff changeset
969 return d
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
970
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
971 def getgroup():
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
972 while 1:
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
973 c = getchunk()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
974 if not c: break
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
975 yield c
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
976
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
977 def csmap(x):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
978 self.ui.debug(_("add changeset %s\n") % short(x))
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
979 return self.changelog.count()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
980
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
981 def revmap(x):
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
982 return self.changelog.rev(x)
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
983
635
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
984 if not source: return
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
985 changesets = files = revisions = 0
225
1651a3e61925 fix repo locking
mpm@selenic.com
parents: 224
diff changeset
986
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
987 tr = self.transaction()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
988
1040
35e883d1ff9b Show number of new heads when doing a pull
mpm@selenic.com
parents: 1019
diff changeset
989 oldheads = len(self.changelog.heads())
35e883d1ff9b Show number of new heads when doing a pull
mpm@selenic.com
parents: 1019
diff changeset
990
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
991 # pull off the changeset group
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
992 self.ui.status(_("adding changesets\n"))
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
993 co = self.changelog.tip()
224
ccbcc4d76f81 fix bad assumption about uniqueness of file versions
mpm@selenic.com
parents: 223
diff changeset
994 cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique
1316
b650bfdfc7ee Hook fixups
mpm@selenic.com
parents: 1280
diff changeset
995 cnr, cor = map(self.changelog.rev, (cn, co))
1375
f2b00be33e2c Fix traceback when nothing was added during unbundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1353
diff changeset
996 if cn == nullid:
f2b00be33e2c Fix traceback when nothing was added during unbundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1353
diff changeset
997 cnr = cor
1316
b650bfdfc7ee Hook fixups
mpm@selenic.com
parents: 1280
diff changeset
998 changesets = cnr - cor
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
999
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1000 # pull off the manifest group
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1001 self.ui.status(_("adding manifests\n"))
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1002 mm = self.manifest.tip()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1003 mo = self.manifest.addgroup(getgroup(), revmap, tr)
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1004
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1005 # process the files
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1006 self.ui.status(_("adding file changes\n"))
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1007 while 1:
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1008 f = getchunk()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1009 if not f: break
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1010 self.ui.debug(_("adding %s revisions\n") % f)
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1011 fl = self.file(f)
529
aace5b681fe9 Attempt to fix negative revision count from pull
mpm@selenic.com
parents: 522
diff changeset
1012 o = fl.count()
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1013 n = fl.addgroup(getgroup(), revmap, tr)
529
aace5b681fe9 Attempt to fix negative revision count from pull
mpm@selenic.com
parents: 522
diff changeset
1014 revisions += fl.count() - o
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1015 files += 1
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1016
1040
35e883d1ff9b Show number of new heads when doing a pull
mpm@selenic.com
parents: 1019
diff changeset
1017 newheads = len(self.changelog.heads())
35e883d1ff9b Show number of new heads when doing a pull
mpm@selenic.com
parents: 1019
diff changeset
1018 heads = ""
35e883d1ff9b Show number of new heads when doing a pull
mpm@selenic.com
parents: 1019
diff changeset
1019 if oldheads and newheads > oldheads:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1020 heads = _(" (+%d heads)") % (newheads - oldheads)
1040
35e883d1ff9b Show number of new heads when doing a pull
mpm@selenic.com
parents: 1019
diff changeset
1021
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1022 self.ui.status(_("added %d changesets"
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1023 " with %d changes to %d files%s\n")
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1024 % (changesets, revisions, files, heads))
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1025
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1026 tr.close()
780
5cb8a3a023b2 Add changegroup hook for push/pull
mpm@selenic.com
parents: 772
diff changeset
1027
1375
f2b00be33e2c Fix traceback when nothing was added during unbundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1353
diff changeset
1028 if changesets > 0:
f2b00be33e2c Fix traceback when nothing was added during unbundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1353
diff changeset
1029 if not self.hook("changegroup",
f2b00be33e2c Fix traceback when nothing was added during unbundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1353
diff changeset
1030 node=hex(self.changelog.node(cor+1))):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1031 self.ui.warn(_("abort: changegroup hook returned failure!\n"))
1375
f2b00be33e2c Fix traceback when nothing was added during unbundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1353
diff changeset
1032 return 1
780
5cb8a3a023b2 Add changegroup hook for push/pull
mpm@selenic.com
parents: 772
diff changeset
1033
1375
f2b00be33e2c Fix traceback when nothing was added during unbundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1353
diff changeset
1034 for i in range(cor + 1, cnr + 1):
f2b00be33e2c Fix traceback when nothing was added during unbundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1353
diff changeset
1035 self.hook("commit", node=hex(self.changelog.node(i)))
1316
b650bfdfc7ee Hook fixups
mpm@selenic.com
parents: 1280
diff changeset
1036
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1037 return
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
1038
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
1039 def update(self, node, allow=False, force=False, choose=None,
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
1040 moddirstate=True):
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1041 pl = self.dirstate.parents()
275
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
1042 if not force and pl[1] != nullid:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1043 self.ui.warn(_("aborting: outstanding uncommitted merges\n"))
690
f762860f82c6 Minor merge fixups
mpm@selenic.com
parents: 686
diff changeset
1044 return 1
46
93e868fa0db8 Add changegroup support
mpm@selenic.com
parents: 44
diff changeset
1045
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1046 p1, p2 = pl[0], node
305
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
1047 pa = self.changelog.ancestor(p1, p2)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1048 m1n = self.changelog.read(p1)[0]
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1049 m2n = self.changelog.read(p2)[0]
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1050 man = self.manifest.ancestor(m1n, m2n)
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1051 m1 = self.manifest.read(m1n)
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
1052 mf1 = self.manifest.readflags(m1n)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1053 m2 = self.manifest.read(m2n)
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
1054 mf2 = self.manifest.readflags(m2n)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1055 ma = self.manifest.read(man)
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents: 408
diff changeset
1056 mfa = self.manifest.readflags(man)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1057
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
1058 (c, a, d, u) = self.changes()
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1059
408
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
1060 # is this a jump, or a merge? i.e. is there a linear path
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
1061 # from p1 to p2?
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
1062 linear_path = (pa == p1 or pa == p2)
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
1063
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1064 # resolve the manifest to determine which files
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1065 # we care about merging
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1066 self.ui.note(_("resolving manifests\n"))
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1067 self.ui.debug(_(" force %s allow %s moddirstate %s linear %s\n") %
650
2c934c7b79dc Fix bug in reverting deleted files
Matt Mackall <mpm@selenic.com>
parents: 649
diff changeset
1068 (force, allow, moddirstate, linear_path))
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1069 self.ui.debug(_(" ancestor %s local %s remote %s\n") %
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1070 (short(man), short(m1n), short(m2n)))
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1071
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1072 merge = {}
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1073 get = {}
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1074 remove = []
46
93e868fa0db8 Add changegroup support
mpm@selenic.com
parents: 44
diff changeset
1075
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1076 # construct a working dir manifest
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1077 mw = m1.copy()
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
1078 mfw = mf1.copy()
576
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
1079 umap = dict.fromkeys(u)
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
1080
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
1081 for f in a + c + u:
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
1082 mw[f] = ""
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
1083 mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False))
576
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
1084
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1085 for f in d:
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
1086 if f in mw: del mw[f]
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1087
408
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
1088 # If we're jumping between revisions (as opposed to merging),
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
1089 # and if neither the working directory nor the target rev has
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
1090 # the file, then we need to remove it from the dirstate, to
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
1091 # prevent the dirstate from listing the file when it is no
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
1092 # longer in the manifest.
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
1093 if moddirstate and linear_path and f not in m2:
408
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
1094 self.dirstate.forget((f,))
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
1095
576
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
1096 # Compare manifests
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1097 for f, n in mw.iteritems():
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
1098 if choose and not choose(f): continue
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1099 if f in m2:
277
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
1100 s = 0
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
1101
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents: 405
diff changeset
1102 # is the wfile new since m1, and match m2?
428
183c87d4e1a0 Fix typo in merging new files
mpm@selenic.com
parents: 421
diff changeset
1103 if f not in m1:
1019
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
1104 t1 = self.wread(f)
994
88c15682d9b0 Fix callers to file.revision to use file.read
mpm@selenic.com
parents: 993
diff changeset
1105 t2 = self.file(f).read(m2[f])
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents: 405
diff changeset
1106 if cmp(t1, t2) == 0:
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents: 405
diff changeset
1107 n = m2[f]
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents: 405
diff changeset
1108 del t1, t2
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents: 405
diff changeset
1109
296
a3d83bf86755 hg update: fix clobbering files when going backwards
mpm@selenic.com
parents: 292
diff changeset
1110 # are files different?
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1111 if n != m2[f]:
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
1112 a = ma.get(f, nullid)
296
a3d83bf86755 hg update: fix clobbering files when going backwards
mpm@selenic.com
parents: 292
diff changeset
1113 # are both different from the ancestor?
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
1114 if n != a and m2[f] != a:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1115 self.ui.debug(_(" %s versions differ, resolve\n") % f)
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
1116 # merge executable bits
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
1117 # "if we changed or they changed, change in merge"
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
1118 a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
1119 mode = ((a^b) | (a^c)) ^ a
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
1120 merge[f] = (m1.get(f, nullid), m2[f], mode)
277
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
1121 s = 1
305
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
1122 # are we clobbering?
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
1123 # is remote's version newer?
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
1124 # or are we going back in time?
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
1125 elif force or m2[f] != a or (p2 == pa and mw[f] == m1[f]):
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1126 self.ui.debug(_(" remote %s is newer, get\n") % f)
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
1127 get[f] = m2[f]
277
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
1128 s = 1
576
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
1129 elif f in umap:
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
1130 # this unknown file is the same as the checkout
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
1131 get[f] = m2[f]
277
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
1132
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
1133 if not s and mfw[f] != mf2[f]:
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
1134 if force:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1135 self.ui.debug(_(" updating permissions for %s\n") % f)
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
1136 util.set_exec(self.wjoin(f), mf2[f])
277
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
1137 else:
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
1138 a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
1139 mode = ((a^b) | (a^c)) ^ a
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
1140 if mode != b:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1141 self.ui.debug(_(" updating permissions for %s\n") % f)
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
1142 util.set_exec(self.wjoin(f), mode)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1143 del m2[f]
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1144 elif f in ma:
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
1145 if n != ma[f]:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1146 r = _("d")
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
1147 if not force and (linear_path or allow):
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents: 413
diff changeset
1148 r = self.ui.prompt(
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1149 (_(" local changed %s which remote deleted\n") % f) +
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1150 _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1151 if r == _("d"):
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1152 remove.append(f)
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1153 else:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1154 self.ui.debug(_("other deleted %s\n") % f)
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
1155 remove.append(f) # other deleted it
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1156 else:
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 1234
diff changeset
1157 # file is created on branch or in working directory
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 1234
diff changeset
1158 if force and f not in umap:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1159 self.ui.debug(_("remote deleted %s, clobbering\n") % f)
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 1234
diff changeset
1160 remove.append(f)
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 1234
diff changeset
1161 elif n == m1.get(f, nullid): # same as parent
1234
9ee8428d84a1 Revert unrelated changes in previous commit
mpm@selenic.com
parents: 1233
diff changeset
1162 if p2 == pa: # going backwards?
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1163 self.ui.debug(_("remote deleted %s\n") % f)
1234
9ee8428d84a1 Revert unrelated changes in previous commit
mpm@selenic.com
parents: 1233
diff changeset
1164 remove.append(f)
9ee8428d84a1 Revert unrelated changes in previous commit
mpm@selenic.com
parents: 1233
diff changeset
1165 else:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1166 self.ui.debug(_("local modified %s, keeping\n") % f)
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
1167 else:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1168 self.ui.debug(_("working dir created %s, keeping\n") % f)
46
93e868fa0db8 Add changegroup support
mpm@selenic.com
parents: 44
diff changeset
1169
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1170 for f, n in m2.iteritems():
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
1171 if choose and not choose(f): continue
256
649ed23e4661 minor fixes for update()
mpm@selenic.com
parents: 254
diff changeset
1172 if f[0] == "/": continue
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
1173 if f in ma and n != ma[f]:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1174 r = _("k")
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
1175 if not force and (linear_path or allow):
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents: 413
diff changeset
1176 r = self.ui.prompt(
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1177 (_("remote changed %s which local deleted\n") % f) +
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1178 _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1179 if r == _("k"): get[f] = n
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
1180 elif f not in ma:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1181 self.ui.debug(_("remote created %s\n") % f)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1182 get[f] = n
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
1183 else:
680
4b7b79d2db2c Handle undeletion of files when checking out old revisions
Matt Mackall <mpm@selenic.com>
parents: 679
diff changeset
1184 if force or p2 == pa: # going backwards?
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1185 self.ui.debug(_("local deleted %s, recreating\n") % f)
650
2c934c7b79dc Fix bug in reverting deleted files
Matt Mackall <mpm@selenic.com>
parents: 649
diff changeset
1186 get[f] = n
680
4b7b79d2db2c Handle undeletion of files when checking out old revisions
Matt Mackall <mpm@selenic.com>
parents: 679
diff changeset
1187 else:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1188 self.ui.debug(_("local deleted %s\n") % f)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1189
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1190 del mw, m1, m2, ma
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1191
275
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
1192 if force:
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
1193 for f in merge:
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
1194 get[f] = merge[f][1]
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
1195 merge = {}
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
1196
690
f762860f82c6 Minor merge fixups
mpm@selenic.com
parents: 686
diff changeset
1197 if linear_path or force:
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
1198 # we don't need to do any magic, just jump to the new rev
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1199 branch_merge = False
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
1200 p1, p2 = p2, nullid
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
1201 else:
275
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
1202 if not allow:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1203 self.ui.status(_("this update spans a branch"
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1204 " affecting the following files:\n"))
305
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
1205 fl = merge.keys() + get.keys()
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
1206 fl.sort()
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
1207 for f in fl:
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
1208 cf = ""
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1209 if f in merge: cf = _(" (resolve)")
305
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
1210 self.ui.status(" %s%s\n" % (f, cf))
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1211 self.ui.warn(_("aborting update spanning branches!\n"))
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1212 self.ui.status(_("(use update -m to merge across branches"
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1213 " or -C to lose changes)\n"))
275
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
1214 return 1
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1215 branch_merge = True
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
1216
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
1217 if moddirstate:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
1218 self.dirstate.setparents(p1, p2)
191
d7e859cf2f1b merge: add count of new manifests, files, and revisions
mpm@selenic.com
parents: 190
diff changeset
1219
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1220 # get the files we don't need to change
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1221 files = get.keys()
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1222 files.sort()
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1223 for f in files:
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1224 if f[0] == "/": continue
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1225 self.ui.note(_("getting %s\n") % f)
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
1226 t = self.file(f).read(get[f])
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1227 try:
1019
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
1228 self.wwrite(f, t)
1353
a0c68981a5f4 Fix misleading abort message when permissions are bad.
Eric Hopper <hopper@omnifarious.org>
parents: 1349
diff changeset
1229 except IOError, e:
a0c68981a5f4 Fix misleading abort message when permissions are bad.
Eric Hopper <hopper@omnifarious.org>
parents: 1349
diff changeset
1230 if e.errno != errno.ENOENT:
a0c68981a5f4 Fix misleading abort message when permissions are bad.
Eric Hopper <hopper@omnifarious.org>
parents: 1349
diff changeset
1231 raise
297
0dbcf3c9ff20 Fixed usage of removed variable 'wp'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 292
diff changeset
1232 os.makedirs(os.path.dirname(self.wjoin(f)))
1019
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
1233 self.wwrite(f, t)
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
1234 util.set_exec(self.wjoin(f), mf2[f])
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
1235 if moddirstate:
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1236 if branch_merge:
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1237 self.dirstate.update([f], 'n', st_mtime=-1)
992
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
1238 else:
f859e9cba1b9 Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents: 991
diff changeset
1239 self.dirstate.update([f], 'n')
46
93e868fa0db8 Add changegroup support
mpm@selenic.com
parents: 44
diff changeset
1240
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1241 # merge the tricky bits
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1242 files = merge.keys()
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1243 files.sort()
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1244 for f in files:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1245 self.ui.status(_("merging %s\n") % f)
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1246 my, other, flag = merge[f]
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1247 self.merge3(f, my, other)
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
1248 util.set_exec(self.wjoin(f), flag)
862
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 861
diff changeset
1249 if moddirstate:
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1250 if branch_merge:
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1251 # We've done a branch merge, mark this file as merged
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1252 # so that we properly record the merger later
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1253 self.dirstate.update([f], 'm')
862
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 861
diff changeset
1254 else:
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1255 # We've update-merged a locally modified file, so
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1256 # we set the dirstate to emulate a normal checkout
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1257 # of that file some time in the past. Thus our
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1258 # merge will appear as a normal local file
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1259 # modification.
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1260 f_len = len(self.file(f).read(other))
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1261 self.dirstate.update([f], 'n', st_size=f_len, st_mtime=-1)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1262
681
32b6bbf1c37b Sort files for removal
Matt Mackall <mpm@selenic.com>
parents: 680
diff changeset
1263 remove.sort()
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1264 for f in remove:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1265 self.ui.note(_("removing %s\n") % f)
690
f762860f82c6 Minor merge fixups
mpm@selenic.com
parents: 686
diff changeset
1266 try:
934
ff484cc157d6 Fix path handling for deleting files on merge
mpm@selenic.com
parents: 933
diff changeset
1267 os.unlink(self.wjoin(f))
690
f762860f82c6 Minor merge fixups
mpm@selenic.com
parents: 686
diff changeset
1268 except OSError, inst:
1398
3f76ac60130d make update quieter when nothing is wrong
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1384
diff changeset
1269 if inst.errno != errno.ENOENT:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1270 self.ui.warn(_("update failed to remove %s: %s!\n") %
1398
3f76ac60130d make update quieter when nothing is wrong
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1384
diff changeset
1271 (f, inst.strerror))
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents: 576
diff changeset
1272 # try removing directories that might now be empty
934
ff484cc157d6 Fix path handling for deleting files on merge
mpm@selenic.com
parents: 933
diff changeset
1273 try: os.removedirs(os.path.dirname(self.wjoin(f)))
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents: 576
diff changeset
1274 except: pass
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
1275 if moddirstate:
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1276 if branch_merge:
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1277 self.dirstate.update(remove, 'r')
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 992
diff changeset
1278 else:
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
1279 self.dirstate.forget(remove)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1280
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1281 def merge3(self, fn, my, other):
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1282 """perform a 3-way merge in the working directory"""
249
619e775aa7f9 import and startup cleanups
mpm@selenic.com
parents: 247
diff changeset
1283
96
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
1284 def temp(prefix, node):
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
1285 pre = "%s~%s." % (os.path.basename(fn), prefix)
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
1286 (fd, name) = tempfile.mkstemp("", pre)
417
f2d1f5fd0179 [PATCH] file type fixes for the other 'OS'
mpm@selenic.com
parents: 416
diff changeset
1287 f = os.fdopen(fd, "wb")
1019
a9cca981c423 Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents: 1013
diff changeset
1288 self.wwrite(fn, fl.read(node), f)
96
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
1289 f.close()
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
1290 return name
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
1291
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1292 fl = self.file(fn)
96
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
1293 base = fl.ancestor(my, other)
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
1294 a = self.wjoin(fn)
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents: 344
diff changeset
1295 b = temp("base", base)
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents: 344
diff changeset
1296 c = temp("other", other)
96
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
1297
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1298 self.ui.note(_("resolving %s\n") % fn)
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1299 self.ui.debug(_("file %s: my %s other %s ancestor %s\n") %
1349
c6295d2a361e More info on file merge for update --debug
Matt Mackall <mpm@selenic.com>
parents: 1346
diff changeset
1300 (fn, short(my), short(other), short(base)))
96
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
1301
703
fb6f85ecc863 merge program setting from hgrc wasn't used.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 691
diff changeset
1302 cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge")
fb6f85ecc863 merge program setting from hgrc wasn't used.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 691
diff changeset
1303 or "hgmerge")
240
737c66b68290 Replace tkmerge with hgmerge
mpm@selenic.com
parents: 232
diff changeset
1304 r = os.system("%s %s %s %s" % (cmd, a, b, c))
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1305 if r:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1306 self.ui.warn(_("merging %s failed!\n") % fn)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1307
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1308 os.unlink(b)
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
1309 os.unlink(c)
96
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
1310
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1311 def verify(self):
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1312 filelinkrevs = {}
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1313 filenodes = {}
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1314 changesets = revisions = files = 0
1383
3d6d45faf8b2 hg verify: add an error reporting helper function
Matt Mackall <mpm@selenic.com>
parents: 1382
diff changeset
1315 errors = [0]
1382
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1316 neededmanifests = {}
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1317
1383
3d6d45faf8b2 hg verify: add an error reporting helper function
Matt Mackall <mpm@selenic.com>
parents: 1382
diff changeset
1318 def err(msg):
3d6d45faf8b2 hg verify: add an error reporting helper function
Matt Mackall <mpm@selenic.com>
parents: 1382
diff changeset
1319 self.ui.warn(msg + "\n")
3d6d45faf8b2 hg verify: add an error reporting helper function
Matt Mackall <mpm@selenic.com>
parents: 1382
diff changeset
1320 errors[0] += 1
3d6d45faf8b2 hg verify: add an error reporting helper function
Matt Mackall <mpm@selenic.com>
parents: 1382
diff changeset
1321
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
1322 seen = {}
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1323 self.ui.status(_("checking changesets\n"))
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1324 for i in range(self.changelog.count()):
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1325 changesets += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1326 n = self.changelog.node(i)
1382
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1327 l = self.changelog.linkrev(n)
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1328 if l != i:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1329 err(_("incorrect link (%d) for changeset revision %d") %(l, i))
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
1330 if n in seen:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1331 err(_("duplicate changeset at revision %d") % i)
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
1332 seen[n] = 1
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
1333
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1334 for p in self.changelog.parents(n):
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1335 if p not in self.changelog.nodemap:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1336 err(_("changeset %s has unknown parent %s") %
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1337 (short(n), short(p)))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1338 try:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1339 changes = self.changelog.read(n)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1340 except Exception, inst:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1341 err(_("unpacking changeset %s: %s") % (short(n), inst))
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1342
1382
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1343 neededmanifests[changes[0]] = n
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1344
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1345 for f in changes[3]:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1346 filelinkrevs.setdefault(f, []).append(i)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1347
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
1348 seen = {}
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1349 self.ui.status(_("checking manifests\n"))
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1350 for i in range(self.manifest.count()):
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1351 n = self.manifest.node(i)
1382
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1352 l = self.manifest.linkrev(n)
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1353
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1354 if l < 0 or l >= self.changelog.count():
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1355 err(_("bad manifest link (%d) at revision %d") % (l, i))
1382
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1356
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1357 if n in neededmanifests:
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1358 del neededmanifests[n]
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1359
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
1360 if n in seen:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1361 err(_("duplicate manifest at revision %d") % i)
1383
3d6d45faf8b2 hg verify: add an error reporting helper function
Matt Mackall <mpm@selenic.com>
parents: 1382
diff changeset
1362
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
1363 seen[n] = 1
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
1364
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1365 for p in self.manifest.parents(n):
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1366 if p not in self.manifest.nodemap:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1367 err(_("manifest %s has unknown parent %s") %
1383
3d6d45faf8b2 hg verify: add an error reporting helper function
Matt Mackall <mpm@selenic.com>
parents: 1382
diff changeset
1368 (short(n), short(p)))
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1369
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1370 try:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1371 delta = mdiff.patchtext(self.manifest.delta(n))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1372 except KeyboardInterrupt:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1373 self.ui.warn(_("interrupted"))
1097
1f89ccbab6ce localrepo: adjust some imports, remove sys dependency
mpm@selenic.com
parents: 1089
diff changeset
1374 raise
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1375 except Exception, inst:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1376 err(_("unpacking manifest %s: %s") % (short(n), inst))
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1377
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1378 ff = [ l.split('\0') for l in delta.splitlines() ]
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1379 for f, fn in ff:
284
d7c2efd0b541 verify: don't die from new permission bits
mpm@selenic.com
parents: 279
diff changeset
1380 filenodes.setdefault(f, {})[bin(fn[:40])] = 1
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1381
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1382 self.ui.status(_("crosschecking files in changesets and manifests\n"))
1382
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1383
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1384 for m,c in neededmanifests.items():
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1385 err(_("Changeset %s refers to unknown manifest %s") %
1384
d729850d52fa hg verify: add some bin to hex conversions
Matt Mackall <mpm@selenic.com>
parents: 1383
diff changeset
1386 (short(m), short(c)))
1382
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1387 del neededmanifests
b113e7db06e9 hg verify: more consistency checking between changesets and manifests
Matt Mackall <mpm@selenic.com>
parents: 1375
diff changeset
1388
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1389 for f in filenodes:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1390 if f not in filelinkrevs:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1391 err(_("file %s in manifest but not in changesets") % f)
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1392
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1393 for f in filelinkrevs:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1394 if f not in filenodes:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1395 err(_("file %s in changeset but not in manifest") % f)
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1396
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1397 self.ui.status(_("checking files\n"))
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1398 ff = filenodes.keys()
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1399 ff.sort()
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1400 for f in ff:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1401 if f == "/dev/null": continue
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1402 files += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1403 fl = self.file(f)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1404 nodes = { nullid: 1 }
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
1405 seen = {}
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1406 for i in range(fl.count()):
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1407 revisions += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1408 n = fl.node(i)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1409
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
1410 if n in seen:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1411 err(_("%s: duplicate revision %d") % (f, i))
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1412 if n not in filenodes[f]:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1413 err(_("%s: %d:%s not in manifests") % (f, i, short(n)))
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1414 else:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1415 del filenodes[f][n]
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1416
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1417 flr = fl.linkrev(n)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1418 if flr not in filelinkrevs[f]:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1419 err(_("%s:%s points to unexpected changeset %d")
1383
3d6d45faf8b2 hg verify: add an error reporting helper function
Matt Mackall <mpm@selenic.com>
parents: 1382
diff changeset
1420 % (f, short(n), flr))
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1421 else:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1422 filelinkrevs[f].remove(flr)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1423
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1424 # verify contents
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1425 try:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1426 t = fl.read(n)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1427 except Exception, inst:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1428 err(_("unpacking file %s %s: %s") % (f, short(n), inst))
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1429
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1430 # verify parents
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1431 (p1, p2) = fl.parents(n)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1432 if p1 not in nodes:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1433 err(_("file %s:%s unknown parent 1 %s") %
1383
3d6d45faf8b2 hg verify: add an error reporting helper function
Matt Mackall <mpm@selenic.com>
parents: 1382
diff changeset
1434 (f, short(n), short(p1)))
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1435 if p2 not in nodes:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1436 err(_("file %s:%s unknown parent 2 %s") %
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1437 (f, short(n), short(p1)))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1438 nodes[n] = 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1439
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1440 # cross-check
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1441 for node in filenodes[f]:
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1442 err(_("node %s in manifests not in %s") % (hex(node), f))
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
1443
1402
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1400
diff changeset
1444 self.ui.status(_("%d files, %d changesets, %d total revisions\n") %
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changese