mercurial-crew-with-dirclash: mercurial/localrepo.py annotate

annotate mercurial/localrepo.py @ 1562:2f97af0b522c

Fix walkhelper on windows. The ''seen'' dictionary stores paths in canonical form, so the walkhelp must also provide paths in that form, otherwise the changed files are listed twice.

author	Christian Boos <cboos@neuf.fr>
date	Thu, 01 Dec 2005 10:48:18 -0600
parents	59b3639df0a9
children	db10b7114de0 63799b01985c

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
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	15 class localrepository(object):
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:
1510 755e7ac351ef use self.{w,}join when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1495 diff changeset	46 self.ui.readconfig(self.join("hgrc"))
1101 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):
1480 ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	50 def runhook(name, cmd):
ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	51 self.ui.note(_("running hook %s: %s\n") % (name, cmd))
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	52 old = {}
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	53 for k, v in args.items():
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	54 k = k.upper()
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	55 old[k] = os.environ.get(k, None)
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	56 os.environ[k] = v
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	57
1346 88a9c75dc76a Execute hooks in the repository root mpm@selenic.com parents: 1316 diff changeset	58 # Hooks run in the repository root
88a9c75dc76a Execute hooks in the repository root mpm@selenic.com parents: 1316 diff changeset	59 olddir = os.getcwd()
88a9c75dc76a Execute hooks in the repository root mpm@selenic.com parents: 1316 diff changeset	60 os.chdir(self.root)
1480 ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	61 r = os.system(cmd)
1346 88a9c75dc76a Execute hooks in the repository root mpm@selenic.com parents: 1316 diff changeset	62 os.chdir(olddir)
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	63
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	64 for k, v in old.items():
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	65 if v != None:
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	66 os.environ[k] = v
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	67 else:
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	68 del os.environ[k]
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	69
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	70 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	71 self.ui.warn(_("abort: %s hook failed with status %d!\n") %
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	72 (name, r))
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	73 return False
1480 ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	74 return True
ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	75
ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	76 r = True
ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	77 for hname, cmd in self.ui.configitems("hooks"):
ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	78 s = hname.split(".")
ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	79 if s[0] == name and cmd:
ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	80 r = runhook(hname, cmd) and r
ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	81 return r
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	82
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	83 def tags(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	84 '''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	85 if not self.tagscache:
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	86 self.tagscache = {}
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	87 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	88 try:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	89 bin_n = bin(n)
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	90 except TypeError:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	91 bin_n = ''
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	92 self.tagscache[k.strip()] = bin_n
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	93
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	94 try:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	95 # 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	96 # 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	97 # taking precedence
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	98 fl = self.file(".hgtags")
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	99 h = fl.heads()
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	100 h.reverse()
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	101 for r in h:
994 88c15682d9b0 Fix callers to file.revision to use file.read mpm@selenic.com parents: 993 diff changeset	102 for l in fl.read(r).splitlines():
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	103 if l:
385 e9e1efd5291c Fixed problems with extra spaces around tags in .hgtags Thomas Arendsen Hein <thomas@intevation.de> parents: 383 diff changeset	104 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	105 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	106 except KeyError:
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 471 diff changeset	107 pass
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	108
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	109 try:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	110 f = self.opener("localtags")
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	111 for l in f:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	112 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	113 addtag(self, k, n)
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	114 except IOError:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	115 pass
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	116
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	117 self.tagscache['tip'] = self.changelog.tip()
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	118
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	119 return self.tagscache
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	120
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	121 def tagslist(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	122 '''return a list of tags ordered by revision'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	123 l = []
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 471 diff changeset	124 for t, n in self.tags().items():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	125 try:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	126 r = self.changelog.rev(n)
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	127 except:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	128 r = -2 # sort to the beginning of the list if unknown
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	129 l.append((r,t,n))
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	130 l.sort()
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	131 return [(t,n) for r,t,n in l]
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	132
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	133 def nodetags(self, node):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	134 '''return the tags associated with a node'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	135 if not self.nodetagscache:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	136 self.nodetagscache = {}
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	137 for t,n in self.tags().items():
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	138 self.nodetagscache.setdefault(n,[]).append(t)
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	139 return self.nodetagscache.get(node, [])
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	140
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	141 def lookup(self, key):
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	142 try:
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	143 return self.tags()[key]
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	144 except KeyError:
658 f8098ae9f5b6 Generate a friendlier except for failed lookups Matt Mackall <mpm@selenic.com> parents: 657 diff changeset	145 try:
f8098ae9f5b6 Generate a friendlier except for failed lookups Matt Mackall <mpm@selenic.com> parents: 657 diff changeset	146 return self.changelog.lookup(key)
f8098ae9f5b6 Generate a friendlier except for failed lookups Matt Mackall <mpm@selenic.com> parents: 657 diff changeset	147 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	148 raise repo.RepoError(_("unknown revision '%s'") % key)
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	149
634 da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	150 def dev(self):
da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	151 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	152
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	153 def local(self):
1101 2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1100 diff changeset	154 return True
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	155
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	156 def join(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	157 return os.path.join(self.path, f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	158
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	159 def wjoin(self, f):
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	160 return os.path.join(self.root, f)
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	161
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	162 def file(self, f):
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	163 if f[0] == '/': f = f[1:]
1100 d6b6a15cc7c6 localrepo: more import/namespace tidying mpm@selenic.com parents: 1097 diff changeset	164 return filelog.filelog(self.opener, f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	165
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	166 def getcwd(self):
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	167 return self.dirstate.getcwd()
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	168
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	169 def wfile(self, f, mode='r'):
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	170 return self.wopener(f, mode)
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	171
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	172 def wread(self, filename):
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	173 if self.encodepats == None:
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	174 l = []
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	175 for pat, cmd in self.ui.configitems("encode"):
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	176 mf = util.matcher("", "/", [pat], [], [])[1]
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	177 l.append((mf, cmd))
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	178 self.encodepats = l
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	179
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	180 data = self.wopener(filename, 'r').read()
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 for mf, cmd in self.encodepats:
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	183 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	184 self.ui.debug(_("filtering %s through %s\n") % (filename, cmd))
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	185 data = util.filter(data, cmd)
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	186 break
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	187
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	188 return data
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	189
a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	190 def wwrite(self, filename, data, fd=None):
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	191 if self.decodepats == None:
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	192 l = []
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	193 for pat, cmd in self.ui.configitems("decode"):
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	194 mf = util.matcher("", "/", [pat], [], [])[1]
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	195 l.append((mf, cmd))
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	196 self.decodepats = l
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	197
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	198 for mf, cmd in self.decodepats:
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	199 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	200 self.ui.debug(_("filtering %s through %s\n") % (filename, cmd))
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	201 data = util.filter(data, cmd)
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	202 break
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	203
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	204 if fd:
a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	205 return fd.write(data)
a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	206 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	207
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	208 def transaction(self):
251 3fd8fc14b12f backup dirstate for undo mpm@selenic.com parents: 249 diff changeset	209 # save dirstate for undo
263 e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	210 try:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	211 ds = self.opener("dirstate").read()
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	212 except IOError:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	213 ds = ""
785 46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	214 self.opener("journal.dirstate", "w").write(ds)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	215
785 46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	216 def after():
46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	217 util.rename(self.join("journal"), self.join("undo"))
46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	218 util.rename(self.join("journal.dirstate"),
46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	219 self.join("undo.dirstate"))
46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	220
46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	221 return transaction.transaction(self.ui.warn, self.opener,
46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	222 self.join("journal"), after)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	223
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	224 def recover(self):
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	225 lock = self.lock()
557 b9fee419a1bd recover: the journal is named 'journal' mpm@selenic.com parents: 556 diff changeset	226 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	227 self.ui.status(_("rolling back interrupted transaction\n"))
1516 0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1510 diff changeset	228 transaction.rollback(self.opener, self.join("journal"))
0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1510 diff changeset	229 return True
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	230 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	231 self.ui.warn(_("no interrupted transaction available\n"))
1516 0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1510 diff changeset	232 return False
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	233
d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	234 def undo(self):
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	235 wlock = self.wlock()
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	236 lock = self.lock()
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	237 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	238 self.ui.status(_("rolling back last transaction\n"))
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	239 transaction.rollback(self.opener, self.join("undo"))
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 420 diff changeset	240 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	241 self.dirstate.read()
163 f38c90953c2c Make undo and recover friendlier mpm@selenic.com parents: 162 diff changeset	242 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	243 self.ui.warn(_("no undo information available\n"))
162 5dcbe4d9a30c Implement recover and undo commands mpm@selenic.com parents: 161 diff changeset	244
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1040 diff changeset	245 def lock(self, wait=1):
161 0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	246 try:
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	247 return lock.lock(self.join("lock"), 0)
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	248 except lock.LockHeld, inst:
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	249 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	250 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	251 return lock.lock(self.join("lock"), wait)
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	252 raise inst
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	253
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	254 def wlock(self, wait=1):
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	255 try:
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	256 wlock = lock.lock(self.join("wlock"), 0, self.dirstate.write)
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	257 except lock.LockHeld, inst:
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	258 if not wait:
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	259 raise inst
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	260 self.ui.warn(_("waiting for lock held by %s\n") % inst.args[0])
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	261 wlock = lock.lock(self.join("wlock"), wait, self.dirstate.write)
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	262 self.dirstate.read()
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	263 return wlock
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	264
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	265 def rawcommit(self, files, text, user, date, p1=None, p2=None):
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	266 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	267 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	268 p2 = p2 or self.dirstate.parents()[1] or nullid
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	269 c1 = self.changelog.read(p1)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	270 c2 = self.changelog.read(p2)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	271 m1 = self.manifest.read(c1[0])
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	272 mf1 = self.manifest.readflags(c1[0])
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	273 m2 = self.manifest.read(c2[0])
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	274 changed = []
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	275
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	276 if orig_parent == p1:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	277 update_dirstate = 1
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	278 else:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	279 update_dirstate = 0
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	280
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	281 wlock = self.wlock()
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	282 lock = self.lock()
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	283 tr = self.transaction()
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	284 mm = m1.copy()
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	285 mfm = mf1.copy()
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	286 linkrev = self.changelog.count()
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	287 for f in files:
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	288 try:
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	289 t = self.wread(f)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	290 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	291 r = self.file(f)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	292 mfm[f] = tm
990 5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	293
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	294 fp1 = m1.get(f, nullid)
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	295 fp2 = m2.get(f, nullid)
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	296
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	297 # is the same revision on two branches of a merge?
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	298 if fp2 == fp1:
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	299 fp2 = nullid
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	300
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	301 if fp2 != nullid:
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	302 # is one parent an ancestor of the other?
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	303 fpa = r.ancestor(fp1, fp2)
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	304 if fpa == fp1:
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	305 fp1, fp2 = fp2, nullid
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	306 elif fpa == fp2:
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	307 fp2 = nullid
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	308
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	309 # is the file unmodified from the parent?
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	310 if t == r.read(fp1):
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	311 # record the proper existing parent in manifest
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	312 # no need to add a revision
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	313 mm[f] = fp1
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	314 continue
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	315
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	316 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	317 changed.append(f)
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	318 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	319 self.dirstate.update([f], "n")
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	320 except IOError:
314 3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	321 try:
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	322 del mm[f]
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	323 del mfm[f]
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	324 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	325 self.dirstate.forget([f])
314 3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	326 except:
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	327 # deleted from p2?
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	328 pass
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	329
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	330 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	331 user = user or self.ui.username()
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	332 n = self.changelog.add(mnode, changed, text, tr, p1, p2, user, date)
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	333 tr.close()
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	334 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	335 self.dirstate.setparents(n, nullid)
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	336
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 786 diff changeset	337 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	338 match = util.always, force=False):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	339 commit = []
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	340 remove = []
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	341 changed = []
f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	342
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	343 if files:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	344 for f in files:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	345 s = self.dirstate.state(f)
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	346 if s in 'nmai':
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	347 commit.append(f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	348 elif s == 'r':
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	349 remove.append(f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	350 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	351 self.ui.warn(_("%s not tracked!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	352 else:
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1040 diff changeset	353 (c, a, d, u) = self.changes(match=match)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	354 commit = c + a
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	355 remove = d
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	356
990 5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	357 p1, p2 = self.dirstate.parents()
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	358 c1 = self.changelog.read(p1)
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	359 c2 = self.changelog.read(p2)
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	360 m1 = self.manifest.read(c1[0])
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	361 mf1 = self.manifest.readflags(c1[0])
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	362 m2 = self.manifest.read(c2[0])
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	363
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	364 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	365 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	366 return None
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	367
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	368 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	369 return None
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	370
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	371 wlock = self.wlock()
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	372 lock = self.lock()
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	373 tr = self.transaction()
1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	374
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	375 # check in files
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	376 new = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	377 linkrev = self.changelog.count()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	378 commit.sort()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	379 for f in commit:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	380 self.ui.note(f + "\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	381 try:
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	382 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	383 t = self.wread(f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	384 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	385 self.ui.warn(_("trouble committing %s!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	386 raise
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	387
1117 30ab5b8ee8ec fix some rename/copy bugs mpm@selenic.com parents: 1102 diff changeset	388 r = self.file(f)
30ab5b8ee8ec fix some rename/copy bugs mpm@selenic.com parents: 1102 diff changeset	389
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	390 meta = {}
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	391 cp = self.dirstate.copied(f)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	392 if cp:
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	393 meta["copy"] = cp
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	394 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	395 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	396 fp1, fp2 = nullid, nullid
30ab5b8ee8ec fix some rename/copy bugs mpm@selenic.com parents: 1102 diff changeset	397 else:
30ab5b8ee8ec fix some rename/copy bugs mpm@selenic.com parents: 1102 diff changeset	398 fp1 = m1.get(f, nullid)
30ab5b8ee8ec fix some rename/copy bugs mpm@selenic.com parents: 1102 diff changeset	399 fp2 = m2.get(f, nullid)
990 5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	400
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	401 # is the same revision on two branches of a merge?
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	402 if fp2 == fp1:
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	403 fp2 = nullid
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	404
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	405 if fp2 != nullid:
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	406 # is one parent an ancestor of the other?
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	407 fpa = r.ancestor(fp1, fp2)
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	408 if fpa == fp1:
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	409 fp1, fp2 = fp2, nullid
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	410 elif fpa == fp2:
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	411 fp2 = nullid
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	412
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	413 # is the file unmodified from the parent?
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	414 if not meta and t == r.read(fp1):
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	415 # record the proper existing parent in manifest
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	416 # no need to add a revision
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	417 new[f] = fp1
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	418 continue
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	419
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	420 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	421 # 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	422 # 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	423 changed.append(f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	424
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	425 # update manifest
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	426 m1.update(new)
416 5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	427 for f in remove:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	428 if f in m1:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	429 del m1[f]
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	430 mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0],
156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	431 (new, remove))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	432
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	433 # add changeset
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	434 new = new.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	435 new.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	436
288 97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	437 if not text:
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	438 edittext = ""
f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	439 if p2 != nullid:
f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	440 edittext += "HG: branch merge\n"
f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	441 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	442 edittext += "".join(["HG: changed %s\n" % f for f in changed])
288 97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	443 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	444 if not changed and not remove:
f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	445 edittext += "HG: no files changed\n"
288 97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	446 edittext = self.ui.edit(edittext)
97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	447 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	448 return None
288 97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	449 text = edittext
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	450
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 588 diff changeset	451 user = user or self.ui.username()
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	452 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	453 tr.close()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	454
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	455 self.dirstate.setparents(n)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	456 self.dirstate.update(new, "n")
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	457 self.dirstate.forget(remove)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	458
660 2c83350784c3 Move commit hook after commit completes Matt Mackall <mpm@selenic.com> parents: 659 diff changeset	459 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	460 return None
120cba94d5aa Change repo.comit to return None on error or the new revision number on mason@suse.com parents: 900 diff changeset	461 return n
660 2c83350784c3 Move commit hook after commit completes Matt Mackall <mpm@selenic.com> parents: 659 diff changeset	462
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1040 diff changeset	463 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	464 if node:
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	465 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	466 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	467 else:
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	468 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	469 yield src, fn
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	470
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	471 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	472 match = util.always):
566 b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	473 mf2, u = None, []
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	474
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	475 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	476 t1 = self.wread(fn)
994 88c15682d9b0 Fix callers to file.revision to use file.read mpm@selenic.com parents: 993 diff changeset	477 t2 = self.file(fn).read(mf.get(fn, nullid))
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	478 return cmp(t1, t2)
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	479
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	480 def mfmatches(node):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	481 mf = dict(self.manifest.read(node))
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	482 for fn in mf.keys():
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	483 if not match(fn):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	484 del mf[fn]
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	485 return mf
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	486
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	487 # are we comparing the working directory?
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	488 if not node2:
1532 27077812fffb reset mtime when two files are equal Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1531 diff changeset	489 try:
27077812fffb reset mtime when two files are equal Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1531 diff changeset	490 wlock = self.wlock(wait=0)
27077812fffb reset mtime when two files are equal Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1531 diff changeset	491 except lock.LockHeld:
27077812fffb reset mtime when two files are equal Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1531 diff changeset	492 wlock = None
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	493 l, c, a, d, u = self.dirstate.changes(files, match)
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	494
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	495 # are we comparing working dir against its parent?
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	496 if not node1:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	497 if l:
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	498 # do a full compare of any files that might have changed
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	499 change = self.changelog.read(self.dirstate.parents()[0])
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	500 mf2 = mfmatches(change[0])
548 e2e963e255fd Fix braindamage in repo.changes mpm@selenic.com parents: 547 diff changeset	501 for f in l:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	502 if fcmp(f, mf2):
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	503 c.append(f)
1532 27077812fffb reset mtime when two files are equal Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1531 diff changeset	504 elif wlock is not None:
27077812fffb reset mtime when two files are equal Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1531 diff changeset	505 self.dirstate.update([f], "n")
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	506
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	507 for l in c, a, d, u:
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	508 l.sort()
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	509
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	510 return (c, a, d, u)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	511
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	512 # are we comparing working dir against non-tip?
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	513 # generate a pseudo-manifest for the working dir
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	514 if not node2:
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	515 if not mf2:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	516 change = self.changelog.read(self.dirstate.parents()[0])
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	517 mf2 = mfmatches(change[0])
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	518 for f in a + c + l:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	519 mf2[f] = ""
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	520 for f in d:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	521 if f in mf2: del mf2[f]
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	522 else:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	523 change = self.changelog.read(node2)
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	524 mf2 = mfmatches(change[0])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	525
566 b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	526 # flush lists from dirstate before comparing manifests
b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	527 c, a = [], []
b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	528
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	529 change = self.changelog.read(node1)
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	530 mf1 = mfmatches(change[0])
32 6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	531
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	532 for fn in mf2:
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	533 if mf1.has_key(fn):
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	534 if mf1[fn] != mf2[fn]:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	535 if mf2[fn] != "" or fcmp(fn, mf1):
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	536 c.append(fn)
32 6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	537 del mf1[fn]
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	538 else:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	539 a.append(fn)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	540
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	541 d = mf1.keys()
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	542
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	543 for l in c, a, d, u:
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	544 l.sort()
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	545
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	546 return (c, a, d, u)
32 6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	547
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	548 def add(self, list):
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	549 wlock = self.wlock()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	550 for f in list:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	551 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	552 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	553 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	554 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	555 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	556 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	557 self.ui.warn(_("%s already tracked!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	558 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	559 self.dirstate.update([f], "a")
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	560
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	561 def forget(self, list):
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	562 wlock = self.wlock()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	563 for f in list:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	564 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	565 self.ui.warn(_("%s not added!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	566 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	567 self.dirstate.forget([f])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	568
1415 c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	569 def remove(self, list, unlink=False):
c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	570 if unlink:
c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	571 for f in list:
c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	572 try:
c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	573 util.unlink(self.wjoin(f))
c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	574 except OSError, inst:
c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	575 if inst.errno != errno.ENOENT: raise
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	576 wlock = self.wlock()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	577 for f in list:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	578 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	579 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	580 self.ui.warn(_("%s still exists!\n") % f)
402 2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: 385 diff changeset	581 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	582 self.ui.warn(_("%s never committed!\n") % f)
657 22bc6fb9aefc dirstate.forget() takes a list Matt Mackall <mpm@selenic.com> parents: 656 diff changeset	583 self.dirstate.forget([f])
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	584 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	585 self.ui.warn(_("%s not tracked!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	586 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	587 self.dirstate.update([f], "r")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	588
1447 508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	589 def undelete(self, list):
1448 182879d71922 Allow reverting a deleted file with two parents Matt Mackall <mpm@selenic.com> parents: 1447 diff changeset	590 p = self.dirstate.parents()[0]
1447 508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	591 mn = self.changelog.read(p)[0]
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	592 mf = self.manifest.readflags(mn)
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	593 m = self.manifest.read(mn)
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	594 wlock = self.wlock()
1447 508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	595 for f in list:
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	596 if self.dirstate.state(f) not in "r":
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	597 self.ui.warn("%s not removed!\n" % f)
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	598 else:
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	599 t = self.file(f).read(m[f])
1477 d3566eda2bcb util.opener already create the base directory if it doesn't exist Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1473 diff changeset	600 self.wwrite(f, t)
1447 508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	601 util.set_exec(self.wjoin(f), mf[f])
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	602 self.dirstate.update([f], "n")
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	603
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	604 def copy(self, source, dest):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	605 p = self.wjoin(dest)
781 26f3d353851f Fix copy in subdirectories mpm@selenic.com parents: 780 diff changeset	606 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	607 self.ui.warn(_("%s does not exist!\n") % dest)
781 26f3d353851f Fix copy in subdirectories mpm@selenic.com parents: 780 diff changeset	608 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	609 self.ui.warn(_("copy failed: %s is not a file\n") % dest)
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	610 else:
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	611 wlock = self.wlock()
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	612 if self.dirstate.state(dest) == '?':
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	613 self.dirstate.update([dest], "a")
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	614 self.dirstate.copy(source, dest)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	615
1551 e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	616 def heads(self, start=None):
1550 ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1532 diff changeset	617 heads = self.changelog.heads(start)
ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1532 diff changeset	618 # sort the output in rev descending order
ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1532 diff changeset	619 heads = [(-self.changelog.rev(h), h) for h in heads]
ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1532 diff changeset	620 heads.sort()
ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1532 diff changeset	621 return [n for (r, n) in heads]
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	622
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	623 # branchlookup returns a dict giving a list of branches for
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	624 # 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	625 # 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	626 # branch tags, tags are eliminated if they are visible from other
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	627 # branch tags.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	628 #
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	629 # So, for this graph: a->b->c->d->e
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	630 # \ /
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	631 # aa -----/
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	632 # a has tag 2.6.12
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	633 # d has tag 2.6.13
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	634 # 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	635 # 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	636 # from the list.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	637 #
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	638 # 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	639 # 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	640 # 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	641 # branch).
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	642 #
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	643 # 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	644 # 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	645 # result though.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	646 def branchlookup(self, heads=None, branch=None):
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	647 if not heads:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	648 heads = self.heads()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	649 headt = [ h for h in heads ]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	650 chlog = self.changelog
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	651 branches = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	652 merges = []
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	653 seenmerge = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	654
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	655 # traverse the tree once for each head, recording in the branches
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	656 # dict which tags are visible from this head. The branches
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	657 # dict also records which tags are visible from each tag
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	658 # while we traverse.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	659 while headt or merges:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	660 if merges:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	661 n, found = merges.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	662 visit = [n]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	663 else:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	664 h = headt.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	665 visit = [h]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	666 found = [h]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	667 seen = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	668 while visit:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	669 n = visit.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	670 if n in seen:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	671 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	672 pp = chlog.parents(n)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	673 tags = self.nodetags(n)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	674 if tags:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	675 for x in tags:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	676 if x == 'tip':
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	677 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	678 for f in found:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	679 branches.setdefault(f, {})[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	680 branches.setdefault(n, {})[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	681 break
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	682 if n not in found:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	683 found.append(n)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	684 if branch in tags:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	685 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	686 seen[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	687 if pp[1] != nullid and n not in seenmerge:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	688 merges.append((pp[1], [x for x in found]))
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	689 seenmerge[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	690 if pp[0] != nullid:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	691 visit.append(pp[0])
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	692 # traverse the branches dict, eliminating branch tags from each
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	693 # head that are visible from another branch tag for that head.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	694 out = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	695 viscache = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	696 for h in heads:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	697 def visible(node):
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	698 if node in viscache:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	699 return viscache[node]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	700 ret = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	701 visit = [node]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	702 while visit:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	703 x = visit.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	704 if x in viscache:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	705 ret.update(viscache[x])
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	706 elif x not in ret:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	707 ret[x] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	708 if x in branches:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	709 visit[len(visit):] = branches[x].keys()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	710 viscache[node] = ret
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	711 return ret
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	712 if h not in branches:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	713 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	714 # O(n^2), but somewhat limited. This only searches the
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	715 # 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	716 # whole repo.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	717 for b in branches[h]:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	718 vis = False
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	719 for bb in branches[h].keys():
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	720 if b != bb:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	721 if b in visible(bb):
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	722 vis = True
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	723 break
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	724 if not vis:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	725 l = out.setdefault(h, [])
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	726 l[len(l):] = self.nodetags(b)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	727 return out
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	728
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	729 def branches(self, nodes):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	730 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	731 b = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	732 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	733 t = n
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	734 while n:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	735 p = self.changelog.parents(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	736 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	737 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	738 break
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	739 n = p[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	740 return b
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	741
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	742 def between(self, pairs):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	743 r = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	744
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	745 for top, bottom in pairs:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	746 n, l, i = top, [], 0
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	747 f = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	748
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	749 while n != bottom:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	750 p = self.changelog.parents(n)[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	751 if i == f:
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 566 diff changeset	752 l.append(n)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	753 f = f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	754 n = p
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	755 i += 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	756
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	757 r.append(l)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	758
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	759 return r
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	760
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	761 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	762 m = self.changelog.nodemap
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	763 search = []
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	764 fetch = {}
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	765 seen = {}
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	766 seenbranch = {}
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	767 if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	768 base = {}
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	769
636 ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	770 # 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	771 # 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	772 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	773
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	774 if not heads:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	775 heads = remote.heads()
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	776
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	777 unknown = []
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	778 for h in heads:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	779 if h not in m:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	780 unknown.append(h)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	781 else:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	782 base[h] = 1
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	783
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	784 if not unknown:
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	785 return None
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	786
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	787 rep = {}
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	788 reqcnt = 0
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	789
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	790 # search through remote branches
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	791 # 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	792 # head, root, first parent, second parent
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	793 # (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	794 unknown = remote.branches(unknown)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	795 while unknown:
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	796 r = []
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	797 while unknown:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	798 n = unknown.pop(0)
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	799 if n[0] in seen:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	800 continue
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	801
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	802 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	803 if n[0] == nullid:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	804 break
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	805 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	806 self.ui.debug(_("branch already found\n"))
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	807 continue
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	808 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	809 self.ui.debug(_("found incomplete branch %s:%s\n")
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	810 % (short(n[0]), short(n[1])))
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	811 search.append(n) # schedule branch range for scanning
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	812 seenbranch[n] = 1
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	813 else:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	814 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	815 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	816 self.ui.debug(_("found new changeset %s\n") %
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	817 short(n[1]))
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	818 fetch[n[1]] = 1 # earliest unknown
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	819 base[n[2]] = 1 # latest known
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	820 continue
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	821
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	822 for a in n[2:4]:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	823 if a not in rep:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	824 r.append(a)
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	825 rep[a] = 1
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	826
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	827 seen[n[0]] = 1
dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	828
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	829 if r:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	830 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	831 self.ui.debug(_("request %d: %s\n") %
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	832 (reqcnt, " ".join(map(short, r))))
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	833 for p in range(0, len(r), 10):
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	834 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	835 self.ui.debug(_("received %s:%s\n") %
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	836 (short(b[0]), short(b[1])))
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	837 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	838 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	839 base[b[0]] = 1
05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	840 elif b[0] not in seen:
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	841 unknown.append(b)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	842
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	843 # 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	844 while search:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	845 n = search.pop(0)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	846 reqcnt += 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	847 l = remote.between([(n[0], n[1])])[0]
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	848 l.append(n[1])
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	849 p = n[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	850 f = 1
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	851 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	852 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	853 if i in m:
85 58a1a0425c9b Fix merge bug, I hope mpm@selenic.com parents: 83 diff changeset	854 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	855 self.ui.debug(_("found new branch changeset %s\n") %
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	856 short(p))
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	857 fetch[p] = 1
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	858 base[i] = 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	859 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	860 self.ui.debug(_("narrowed branch search to %s:%s\n")
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	861 % (short(p), short(i)))
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	862 search.append((p, i))
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	863 break
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	864 p, f = i, f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	865
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	866 # sanity check our fetch list
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	867 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	868 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	869 raise repo.RepoError(_("already have changeset ") + short(f[:4]))
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	870
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	871 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	872 self.ui.warn(_("warning: pulling from an unrelated repository!\n"))
511 9f67222186bd Disallow merging of unrelated projects mpm@selenic.com parents: 504 diff changeset	873
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	874 self.ui.note(_("found new changesets starting at ") +
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	875 " ".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	876
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	877 self.ui.debug(_("%d total queries\n") % reqcnt)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	878
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	879 return fetch.keys()
516 873228c2f6cf Change getchangegroup to findincoming mpm@selenic.com parents: 515 diff changeset	880
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	881 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	882 if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	883 base = {}
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	884 self.findincoming(remote, base, heads)
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	885
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	886 self.ui.debug(_("common changesets up to ")
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	887 + " ".join(map(short, base.keys())) + "\n")
05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	888
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	889 remain = dict.fromkeys(self.changelog.nodemap)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	890
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	891 # 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	892 del remain[nullid]
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	893 remove = base.keys()
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	894 while remove:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	895 n = remove.pop(0)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	896 if n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	897 del remain[n]
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	898 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	899 remove.append(p)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	900
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	901 # 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	902 subset = []
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	903 for n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	904 p1, p2 = self.changelog.parents(n)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	905 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	906 subset.append(n)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	907
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	908 # 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	909 return subset
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	910
1461 02099220ad49 Implementing clone -r, which clones all changesets needed to reach a Eric Hopper <hopper@omnifarious.org> parents: 1460 diff changeset	911 def pull(self, remote, heads = None):
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	912 lock = self.lock()
636 ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	913
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	914 # 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	915 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	916 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	917 fetch = [nullid]
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	918 else:
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	919 fetch = self.findincoming(remote)
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	920
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	921 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	922 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	923 return 1
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	924
1461 02099220ad49 Implementing clone -r, which clones all changesets needed to reach a Eric Hopper <hopper@omnifarious.org> parents: 1460 diff changeset	925 if heads is None:
02099220ad49 Implementing clone -r, which clones all changesets needed to reach a Eric Hopper <hopper@omnifarious.org> parents: 1460 diff changeset	926 cg = remote.changegroup(fetch)
02099220ad49 Implementing clone -r, which clones all changesets needed to reach a Eric Hopper <hopper@omnifarious.org> parents: 1460 diff changeset	927 else:
02099220ad49 Implementing clone -r, which clones all changesets needed to reach a Eric Hopper <hopper@omnifarious.org> parents: 1460 diff changeset	928 cg = remote.changegroupsubset(fetch, heads)
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	929 return self.addchangegroup(cg)
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	930
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	931 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	932 lock = remote.lock()
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	933
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	934 base = {}
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	935 heads = remote.heads()
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	936 inc = self.findincoming(remote, base, heads)
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	937 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	938 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	939 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	940 return 1
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	941
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	942 update = self.findoutgoing(remote, base)
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	943 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	944 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	945 return 1
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	946 elif not force:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	947 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	948 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	949 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	950 " use push -f to force)\n"))
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	951 return 1
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	952
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	953 cg = self.changegroup(update)
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	954 return remote.addchangegroup(cg)
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	955
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	956 def changegroupsubset(self, bases, heads):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	957 """This function generates a changegroup consisting of all the nodes
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	958 that are descendents of any of the bases, and ancestors of any of
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	959 the heads.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	960
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	961 It is fairly complex as determining which filenodes and which
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	962 manifest nodes need to be included for the changeset to be complete
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	963 is non-trivial.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	964
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	965 Another wrinkle is doing the reverse, figuring out which changeset in
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	966 the changegroup a particular filenode or manifestnode belongs to."""
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	967
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	968 # Set up some initial variables
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	969 # Make it easy to refer to self.changelog
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	970 cl = self.changelog
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	971 # msng is short for missing - compute the list of changesets in this
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	972 # changegroup.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	973 msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	974 # Some bases may turn out to be superfluous, and some heads may be
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	975 # too. nodesbetween will return the minimal set of bases and heads
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	976 # necessary to re-create the changegroup.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	977
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	978 # Known heads are the list of heads that it is assumed the recipient
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	979 # of this changegroup will know about.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	980 knownheads = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	981 # We assume that all parents of bases are known heads.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	982 for n in bases:
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	983 for p in cl.parents(n):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	984 if p != nullid:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	985 knownheads[p] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	986 knownheads = knownheads.keys()
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	987 if knownheads:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	988 # Now that we know what heads are known, we can compute which
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	989 # changesets are known. The recipient must know about all
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	990 # changesets required to reach the known heads from the null
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	991 # changeset.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	992 has_cl_set, junk, junk = cl.nodesbetween(None, knownheads)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	993 junk = None
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	994 # Transform the list into an ersatz set.
1464 00117edce2dd Fixed silly bug involving a non-existent variable. Eric Hopper <hopper@omnifarious.org> parents: 1462 diff changeset	995 has_cl_set = dict.fromkeys(has_cl_set)
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	996 else:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	997 # If there were no known heads, the recipient cannot be assumed to
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	998 # know about any changesets.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	999 has_cl_set = {}
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1000
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1001 # Make it easy to refer to self.manifest
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1002 mnfst = self.manifest
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1003 # We don't know which manifests are missing yet
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1004 msng_mnfst_set = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1005 # Nor do we know which filenodes are missing.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1006 msng_filenode_set = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1007
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1008 junk = mnfst.index[mnfst.count() - 1] # Get around a bug in lazyindex
40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1009 junk = None
40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1010
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1011 # A changeset always belongs to itself, so the changenode lookup
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1012 # function for a changenode is identity.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1013 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1014 return x
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1015
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1016 # A function generating function. Sets up an environment for the
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1017 # inner function.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1018 def cmp_by_rev_func(revlog):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1019 # Compare two nodes by their revision number in the environment's
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1020 # revision history. Since the revision number both represents the
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1021 # most efficient order to read the nodes in, and represents a
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1022 # topological sorting of the nodes, this function is often useful.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1023 def cmp_by_rev(a, b):
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1024 return cmp(revlog.rev(a), revlog.rev(b))
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1025 return cmp_by_rev
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1026
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1027 # If we determine that a particular file or manifest node must be a
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1028 # node that the recipient of the changegroup will already have, we can
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1029 # also assume the recipient will have all the parents. This function
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1030 # prunes them from the set of missing nodes.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1031 def prune_parents(revlog, hasset, msngset):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1032 haslst = hasset.keys()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1033 haslst.sort(cmp_by_rev_func(revlog))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1034 for node in haslst:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1035 parentlst = [p for p in revlog.parents(node) if p != nullid]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1036 while parentlst:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1037 n = parentlst.pop()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1038 if n not in hasset:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1039 hasset[n] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1040 p = [p for p in revlog.parents(n) if p != nullid]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1041 parentlst.extend(p)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1042 for n in hasset:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1043 msngset.pop(n, None)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1044
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1045 # This is a function generating function used to set up an environment
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1046 # for the inner function to execute in.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1047 def manifest_and_file_collector(changedfileset):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1048 # This is an information gathering function that gathers
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1049 # information from each changeset node that goes out as part of
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1050 # the changegroup. The information gathered is a list of which
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1051 # manifest nodes are potentially required (the recipient may
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1052 # already have them) and total list of all files which were
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1053 # changed in any changeset in the changegroup.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1054 #
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1055 # We also remember the first changenode we saw any manifest
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1056 # referenced by so we can later determine which changenode 'owns'
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1057 # the manifest.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1058 def collect_manifests_and_files(clnode):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1059 c = cl.read(clnode)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1060 for f in c[3]:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1061 # This is to make sure we only have one instance of each
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1062 # filename string for each filename.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1063 changedfileset.setdefault(f, f)
40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1064 msng_mnfst_set.setdefault(c[0], clnode)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1065 return collect_manifests_and_files
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1066
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1067 # Figure out which manifest nodes (of the ones we think might be part
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1068 # of the changegroup) the recipient must know about and remove them
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1069 # from the changegroup.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1070 def prune_manifests():
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1071 has_mnfst_set = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1072 for n in msng_mnfst_set:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1073 # If a 'missing' manifest thinks it belongs to a changenode
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1074 # the recipient is assumed to have, obviously the recipient
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1075 # must have that manifest.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1076 linknode = cl.node(mnfst.linkrev(n))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1077 if linknode in has_cl_set:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1078 has_mnfst_set[n] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1079 prune_parents(mnfst, has_mnfst_set, msng_mnfst_set)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1080
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1081 # Use the information collected in collect_manifests_and_files to say
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1082 # which changenode any manifestnode belongs to.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1083 def lookup_manifest_link(mnfstnode):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1084 return msng_mnfst_set[mnfstnode]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1085
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1086 # A function generating function that sets up the initial environment
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1087 # the inner function.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1088 def filenode_collector(changedfiles):
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1089 next_rev = [0]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1090 # This gathers information from each manifestnode included in the
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1091 # changegroup about which filenodes the manifest node references
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1092 # so we can include those in the changegroup too.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1093 #
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1094 # It also remembers which changenode each filenode belongs to. It
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1095 # does this by assuming the a filenode belongs to the changenode
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1096 # the first manifest that references it belongs to.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1097 def collect_msng_filenodes(mnfstnode):
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1098 r = mnfst.rev(mnfstnode)
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1099 if r == next_rev[0]:
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1100 # If the last rev we looked at was the one just previous,
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1101 # we only need to see a diff.
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1102 delta = mdiff.patchtext(mnfst.delta(mnfstnode))
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1103 # For each line in the delta
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1104 for dline in delta.splitlines():
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1105 # get the filename and filenode for that line
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1106 f, fnode = dline.split('\0')
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1107 fnode = bin(fnode[:40])
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1108 f = changedfiles.get(f, None)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1109 # And if the file is in the list of files we care
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1110 # about.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1111 if f is not None:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1112 # Get the changenode this manifest belongs to
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1113 clnode = msng_mnfst_set[mnfstnode]
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1114 # Create the set of filenodes for the file if
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1115 # there isn't one already.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1116 ndset = msng_filenode_set.setdefault(f, {})
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1117 # And set the filenode's changelog node to the
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1118 # manifest's if it hasn't been set already.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1119 ndset.setdefault(fnode, clnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1120 else:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1121 # Otherwise we need a full manifest.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1122 m = mnfst.read(mnfstnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1123 # For every file in we care about.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1124 for f in changedfiles:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1125 fnode = m.get(f, None)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1126 # If it's in the manifest
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1127 if fnode is not None:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1128 # See comments above.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1129 clnode = msng_mnfst_set[mnfstnode]
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1130 ndset = msng_filenode_set.setdefault(f, {})
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1131 ndset.setdefault(fnode, clnode)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1132 # Remember the revision we hope to see next.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1133 next_rev[0] = r + 1
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1134 return collect_msng_filenodes
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1135
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1136 # We have a list of filenodes we think we need for a file, lets remove
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1137 # all those we now the recipient must have.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1138 def prune_filenodes(f, filerevlog):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1139 msngset = msng_filenode_set[f]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1140 hasset = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1141 # If a 'missing' filenode thinks it belongs to a changenode we
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1142 # assume the recipient must have, then the recipient must have
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1143 # that filenode.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1144 for n in msngset:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1145 clnode = cl.node(filerevlog.linkrev(n))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1146 if clnode in has_cl_set:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1147 hasset[n] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1148 prune_parents(filerevlog, hasset, msngset)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1149
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1150 # A function generator function that sets up the a context for the
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1151 # inner function.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1152 def lookup_filenode_link_func(fname):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1153 msngset = msng_filenode_set[fname]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1154 # Lookup the changenode the filenode belongs to.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1155 def lookup_filenode_link(fnode):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1156 return msngset[fnode]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1157 return lookup_filenode_link
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1158
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1159 # Now that we have all theses utility functions to help out and
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1160 # logically divide up the task, generate the group.
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1161 def gengroup():
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1162 # The set of changed files starts empty.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1163 changedfiles = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1164 # Create a changenode group generator that will call our functions
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1165 # back to lookup the owning changenode and collect information.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1166 group = cl.group(msng_cl_lst, identity,
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1167 manifest_and_file_collector(changedfiles))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1168 for chnk in group:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1169 yield chnk
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1170
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1171 # The list of manifests has been collected by the generator
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1172 # calling our functions back.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1173 prune_manifests()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1174 msng_mnfst_lst = msng_mnfst_set.keys()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1175 # Sort the manifestnodes by revision number.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1176 msng_mnfst_lst.sort(cmp_by_rev_func(mnfst))
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1177 # Create a generator for the manifestnodes that calls our lookup
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1178 # and data collection functions back.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1179 group = mnfst.group(msng_mnfst_lst, lookup_manifest_link,
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1180 filenode_collector(changedfiles))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1181 for chnk in group:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1182 yield chnk
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1183
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1184 # These are no longer needed, dereference and toss the memory for
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1185 # them.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1186 msng_mnfst_lst = None
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1187 msng_mnfst_set.clear()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1188
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1189 changedfiles = changedfiles.keys()
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1190 changedfiles.sort()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1191 # Go through all our files in order sorted by name.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1192 for fname in changedfiles:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1193 filerevlog = self.file(fname)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1194 # Toss out the filenodes that the recipient isn't really
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1195 # missing.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1196 prune_filenodes(fname, filerevlog)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1197 msng_filenode_lst = msng_filenode_set[fname].keys()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1198 # If any filenodes are left, generate the group for them,
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1199 # otherwise don't bother.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1200 if len(msng_filenode_lst) > 0:
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1201 yield struct.pack(">l", len(fname) + 4) + fname
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1202 # Sort the filenodes by their revision #
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1203 msng_filenode_lst.sort(cmp_by_rev_func(filerevlog))
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1204 # Create a group generator and only pass in a changenode
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1205 # lookup function as we need to collect no information
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1206 # from filenodes.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1207 group = filerevlog.group(msng_filenode_lst,
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1208 lookup_filenode_link_func(fname))
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1209 for chnk in group:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1210 yield chnk
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1211 # Don't need this anymore, toss it to free memory.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1212 del msng_filenode_set[fname]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1213 # Signal that no more groups are left.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1214 yield struct.pack(">l", 0)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1215
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1216 return util.chunkbuffer(gengroup())
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1217
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1218 def changegroup(self, basenodes):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1219 """Generate a changegroup of all nodes that we have that a recipient
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1220 doesn't.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1221
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1222 This is much easier than the previous function as we can assume that
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1223 the recipient has any changenode we aren't sending them."""
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1224 cl = self.changelog
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1225 nodes = cl.nodesbetween(basenodes, None)[0]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1226 revset = dict.fromkeys([cl.rev(n) for n in nodes])
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1227
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1228 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1229 return x
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1230
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1231 def gennodelst(revlog):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1232 for r in xrange(0, revlog.count()):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1233 n = revlog.node(r)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1234 if revlog.linkrev(n) in revset:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1235 yield n
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1236
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1237 def changed_file_collector(changedfileset):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1238 def collect_changed_files(clnode):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1239 c = cl.read(clnode)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1240 for fname in c[3]:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1241 changedfileset[fname] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1242 return collect_changed_files
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1243
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1244 def lookuprevlink_func(revlog):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1245 def lookuprevlink(n):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1246 return cl.node(revlog.linkrev(n))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1247 return lookuprevlink
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1248
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1249 def gengroup():
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1250 # construct a list of all changed files
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1251 changedfiles = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1252
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1253 for chnk in cl.group(nodes, identity,
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1254 changed_file_collector(changedfiles)):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1255 yield chnk
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1256 changedfiles = changedfiles.keys()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1257 changedfiles.sort()
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1258
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1259 mnfst = self.manifest
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1260 nodeiter = gennodelst(mnfst)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1261 for chnk in mnfst.group(nodeiter, lookuprevlink_func(mnfst)):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1262 yield chnk
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1263
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1264 for fname in changedfiles:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1265 filerevlog = self.file(fname)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1266 nodeiter = gennodelst(filerevlog)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1267 nodeiter = list(nodeiter)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1268 if nodeiter:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1269 yield struct.pack(">l", len(fname) + 4) + fname
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1270 lookup = lookuprevlink_func(filerevlog)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1271 for chnk in filerevlog.group(nodeiter, lookup):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1272 yield chnk
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1273
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1274 yield struct.pack(">l", 0)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1275
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1276 return util.chunkbuffer(gengroup())
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1277
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1278 def addchangegroup(self, source):
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1279
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1280 def getchunk():
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1281 d = source.read(4)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1282 if not d: return ""
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1283 l = struct.unpack(">l", d)[0]
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1284 if l <= 4: return ""
1280 50553b99a5c9 pull/unbundle: raise an exception on premature EOF mpm@selenic.com parents: 1260 diff changeset	1285 d = source.read(l - 4)
50553b99a5c9 pull/unbundle: raise an exception on premature EOF mpm@selenic.com parents: 1260 diff changeset	1286 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	1287 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	1288 " (got %d bytes, expected %d)")
1280 50553b99a5c9 pull/unbundle: raise an exception on premature EOF mpm@selenic.com parents: 1260 diff changeset	1289 % (len(d), l - 4))
50553b99a5c9 pull/unbundle: raise an exception on premature EOF mpm@selenic.com parents: 1260 diff changeset	1290 return d
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1291
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1292 def getgroup():
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1293 while 1:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1294 c = getchunk()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1295 if not c: break
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1296 yield c
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1297
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1298 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	1299 self.ui.debug(_("add changeset %s\n") % short(x))
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1300 return self.changelog.count()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1301
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1302 def revmap(x):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1303 return self.changelog.rev(x)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1304
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1305 if not source: return
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1306 changesets = files = revisions = 0
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	1307
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1308 tr = self.transaction()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1309
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1310 oldheads = len(self.changelog.heads())
35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1311
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1312 # 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	1313 self.ui.status(_("adding changesets\n"))
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1314 co = self.changelog.tip()
224 ccbcc4d76f81 fix bad assumption about uniqueness of file versions mpm@selenic.com parents: 223 diff changeset	1315 cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique
1316 b650bfdfc7ee Hook fixups mpm@selenic.com parents: 1280 diff changeset	1316 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	1317 if cn == nullid:
f2b00be33e2c Fix traceback when nothing was added during unbundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1353 diff changeset	1318 cnr = cor
1316 b650bfdfc7ee Hook fixups mpm@selenic.com parents: 1280 diff changeset	1319 changesets = cnr - cor
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1320
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1321 # 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	1322 self.ui.status(_("adding manifests\n"))
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1323 mm = self.manifest.tip()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1324 mo = self.manifest.addgroup(getgroup(), revmap, tr)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1325
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1326 # 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	1327 self.ui.status(_("adding file changes\n"))
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1328 while 1:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1329 f = getchunk()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1330 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	1331 self.ui.debug(_("adding %s revisions\n") % f)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1332 fl = self.file(f)
529 aace5b681fe9 Attempt to fix negative revision count from pull mpm@selenic.com parents: 522 diff changeset	1333 o = fl.count()
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1334 n = fl.addgroup(getgroup(), revmap, tr)
529 aace5b681fe9 Attempt to fix negative revision count from pull mpm@selenic.com parents: 522 diff changeset	1335 revisions += fl.count() - o
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1336 files += 1
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1337
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1338 newheads = len(self.changelog.heads())
35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1339 heads = ""
35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1340 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	1341 heads = _(" (+%d heads)") % (newheads - oldheads)
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1342
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	1343 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	1344 " 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	1345 % (changesets, revisions, files, heads))
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1346
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1347 tr.close()
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1348
1375 f2b00be33e2c Fix traceback when nothing was added during unbundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1353 diff changeset	1349 if changesets > 0:
f2b00be33e2c Fix traceback when nothing was added during unbundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1353 diff changeset	1350 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	1351 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	1352 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	1353 return 1
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1354
1375 f2b00be33e2c Fix traceback when nothing was added during unbundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1353 diff changeset	1355 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	1356 self.hook("commit", node=hex(self.changelog.node(i)))
1316 b650bfdfc7ee Hook fixups mpm@selenic.com parents: 1280 diff changeset	1357
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1358 return
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1359
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1360 def update(self, node, allow=False, force=False, choose=None,
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1361 moddirstate=True):
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1362 pl = self.dirstate.parents()
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1363 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	1364 self.ui.warn(_("aborting: outstanding uncommitted merges\n"))
690 f762860f82c6 Minor merge fixups mpm@selenic.com parents: 686 diff changeset	1365 return 1
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1366
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1367 p1, p2 = pl[0], node
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1368 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	1369 m1n = self.changelog.read(p1)[0]
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1370 m2n = self.changelog.read(p2)[0]
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1371 man = self.manifest.ancestor(m1n, m2n)
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1372 m1 = self.manifest.read(m1n)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1373 mf1 = self.manifest.readflags(m1n)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1374 m2 = self.manifest.read(m2n)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1375 mf2 = self.manifest.readflags(m2n)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1376 ma = self.manifest.read(man)
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: 408 diff changeset	1377 mfa = self.manifest.readflags(man)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1378
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1379 (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	1380
408 3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1381 # 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	1382 # from p1 to p2?
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1383 linear_path = (pa == p1 or pa == p2)
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1384
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1385 # 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	1386 # 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	1387 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	1388 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	1389 (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	1390 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	1391 (short(man), short(m1n), short(m2n)))
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1392
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1393 merge = {}
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1394 get = {}
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1395 remove = []
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1396
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1397 # construct a working dir manifest
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1398 mw = m1.copy()
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1399 mfw = mf1.copy()
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1400 umap = dict.fromkeys(u)
da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1401
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1402 for f in a + c + u:
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1403 mw[f] = ""
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1404 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	1405
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	1406 if moddirstate:
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	1407 wlock = self.wlock()
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	1408
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1409 for f in d:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1410 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	1411
408 3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1412 # 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	1413 # 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	1414 # 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	1415 # 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	1416 # longer in the manifest.
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1417 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	1418 self.dirstate.forget((f,))
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1419
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1420 # Compare manifests
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1421 for f, n in mw.iteritems():
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1422 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	1423 if f in m2:
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1424 s = 0
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1425
407 0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1426 # is the wfile new since m1, and match m2?
428 183c87d4e1a0 Fix typo in merging new files mpm@selenic.com parents: 421 diff changeset	1427 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	1428 t1 = self.wread(f)
994 88c15682d9b0 Fix callers to file.revision to use file.read mpm@selenic.com parents: 993 diff changeset	1429 t2 = self.file(f).read(m2[f])
407 0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1430 if cmp(t1, t2) == 0:
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1431 n = m2[f]
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1432 del t1, t2
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1433
296 a3d83bf86755 hg update: fix clobbering files when going backwards mpm@selenic.com parents: 292 diff changeset	1434 # are files different?
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1435 if n != m2[f]:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1436 a = ma.get(f, nullid)
296 a3d83bf86755 hg update: fix clobbering files when going backwards mpm@selenic.com parents: 292 diff changeset	1437 # are both different from the ancestor?
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1438 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	1439 self.ui.debug(_(" %s versions differ, resolve\n") % f)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1440 # merge executable bits
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1441 # "if we changed or they changed, change in merge"
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1442 a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1443 mode = ((a^b) \| (a^c)) ^ a
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1444 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	1445 s = 1
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1446 # are we clobbering?
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1447 # is remote's version newer?
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1448 # or are we going back in time?
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1449 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	1450 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	1451 get[f] = m2[f]
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1452 s = 1
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1453 elif f in umap:
da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1454 # this unknown file is the same as the checkout
da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1455 get[f] = m2[f]
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1456
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1457 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	1458 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	1459 self.ui.debug(_(" updating permissions for %s\n") % f)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1460 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	1461 else:
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1462 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	1463 mode = ((a^b) \| (a^c)) ^ a
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1464 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	1465 self.ui.debug(_(" updating permissions for %s\n") % f)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1466 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	1467 del m2[f]
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1468 elif f in ma:
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1469 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	1470 r = _("d")
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1471 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	1472 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	1473 (_(" 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	1474 _("(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	1475 if r == _("d"):
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1476 remove.append(f)
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1477 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	1478 self.ui.debug(_("other deleted %s\n") % f)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1479 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	1480 else:
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: 1234 diff changeset	1481 # 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	1482 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	1483 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	1484 remove.append(f)
67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: 1234 diff changeset	1485 elif n == m1.get(f, nullid): # same as parent
1234 9ee8428d84a1 Revert unrelated changes in previous commit mpm@selenic.com parents: 1233 diff changeset	1486 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	1487 self.ui.debug(_("remote deleted %s\n") % f)
1234 9ee8428d84a1 Revert unrelated changes in previous commit mpm@selenic.com parents: 1233 diff changeset	1488 remove.append(f)
9ee8428d84a1 Revert unrelated changes in previous commit mpm@selenic.com parents: 1233 diff changeset	1489 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	1490 self.ui.debug(_("local modified %s, keeping\n") % f)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1491 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	1492 self.ui.debug(_("working dir created %s, keeping\n") % f)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1493
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1494 for f, n in m2.iteritems():
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1495 if choose and not choose(f): continue
256 649ed23e4661 minor fixes for update() mpm@selenic.com parents: 254 diff changeset	1496 if f[0] == "/": continue
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1497 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	1498 r = _("k")
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1499 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	1500 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	1501 (_("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	1502 _("(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	1503 if r == _("k"): get[f] = n
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1504 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	1505 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	1506 get[f] = n
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1507 else:
680 4b7b79d2db2c Handle undeletion of files when checking out old revisions Matt Mackall <mpm@selenic.com> parents: 679 diff changeset	1508 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	1509 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	1510 get[f] = n
680 4b7b79d2db2c Handle undeletion of files when checking out old revisions Matt Mackall <mpm@selenic.com> parents: 679 diff changeset	1511 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	1512 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	1513
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1514 del mw, m1, m2, ma
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1515
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1516 if force:
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1517 for f in merge:
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1518 get[f] = merge[f][1]
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1519 merge = {}
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1520
690 f762860f82c6 Minor merge fixups mpm@selenic.com parents: 686 diff changeset	1521 if linear_path or force:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1522 # 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	1523 branch_merge = False
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1524 p1, p2 = p2, nullid
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1525 else:
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1526 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	1527 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	1528 " affecting the following files:\n"))
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1529 fl = merge.keys() + get.keys()
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1530 fl.sort()
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1531 for f in fl:
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1532 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	1533 if f in merge: cf = _(" (resolve)")
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1534 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	1535 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	1536 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	1537 " or -C to lose changes)\n"))
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1538 return 1
993 6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1539 branch_merge = True
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1540
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1541 # 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	1542 files = get.keys()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1543 files.sort()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1544 for f in files:
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1545 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	1546 self.ui.note(_("getting %s\n") % f)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1547 t = self.file(f).read(get[f])
1477 d3566eda2bcb util.opener already create the base directory if it doesn't exist Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1473 diff changeset	1548 self.wwrite(f, t)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1549 util.set_exec(self.wjoin(f), mf2[f])
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1550 if moddirstate:
993 6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1551 if branch_merge:
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1552 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	1553 else:
f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	1554 self.dirstate.update([f], 'n')
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1555
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1556 # merge the tricky bits
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1557 files = merge.keys()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1558 files.sort()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1559 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	1560 self.ui.status(_("merging %s\n") % f)
993 6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1561 my, other, flag = merge[f]
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1562 self.merge3(f, my, other)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1563 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	1564 if moddirstate:
993 6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1565 if branch_merge:
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1566 # We've done a branch merge, mark this file as merged
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1567 # so that we properly record the merger later
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1568 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	1569 else:
993 6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1570 # We've update-merged a locally modified file, so
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1571 # we set the dirstate to emulate a normal checkout
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1572 # of that file some time in the past. Thus our
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1573 # merge will appear as a normal local file
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1574 # modification.
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1575 f_len = len(self.file(f).read(other))
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1576 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	1577
681 32b6bbf1c37b Sort files for removal Matt Mackall <mpm@selenic.com> parents: 680 diff changeset	1578 remove.sort()
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1579 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	1580 self.ui.note(_("removing %s\n") % f)
690 f762860f82c6 Minor merge fixups mpm@selenic.com parents: 686 diff changeset	1581 try:
1415 c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	1582 util.unlink(self.wjoin(f))
690 f762860f82c6 Minor merge fixups mpm@selenic.com parents: 686 diff changeset	1583 except OSError, inst:
1398 3f76ac60130d make update quieter when nothing is wrong Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1384 diff changeset	1584 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	1585 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	1586 (f, inst.strerror))
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1587 if moddirstate:
993 6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1588 if branch_merge:
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1589 self.dirstate.update(remove, 'r')
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1590 else:
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1591 self.dirstate.forget(remove)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1592
1495 1e265c2bec94 Deal with merge abort more gracefully Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1593 if moddirstate:
1e265c2bec94 Deal with merge abort more gracefully Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1594 self.dirstate.setparents(p1, p2)
1e265c2bec94 Deal with merge abort more gracefully Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1595
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1596 def merge3(self, fn, my, other):
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1597 """perform a 3-way merge in the working directory"""
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 247 diff changeset	1598
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1599 def temp(prefix, node):
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1600 pre = "%s~%s." % (os.path.basename(fn), prefix)
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1601 (fd, name) = tempfile.mkstemp("", pre)
417 f2d1f5fd0179 [PATCH] file type fixes for the other 'OS' mpm@selenic.com parents: 416 diff changeset	1602 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	1603 self.wwrite(fn, fl.read(node), f)
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1604 f.close()
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1605 return name
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1606
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1607 fl = self.file(fn)
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1608 base = fl.ancestor(my, other)
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	1609 a = self.wjoin(fn)
346 f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: 344 diff changeset	1610 b = temp("base", base)
f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: 344 diff changeset	1611 c = temp("other", other)
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1612
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	1613 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	1614 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	1615 (fn, short(my), short(other), short(base)))
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1616
703 fb6f85ecc863 merge program setting from hgrc wasn't used. Thomas Arendsen Hein <thomas@intevation.de> parents: 691 diff changeset	1617 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	1618 or "hgmerge")
1427 0980d77f5e9a Fixed problem with invoking hgmerge on paths with spaces. michael.w.dales@intel.com parents: 1415 diff changeset	1619 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	1620 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	1621 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	1622
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1623 os.unlink(b)
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1624 os.unlink(c)
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1625
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1626 def verify(self):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1627 filelinkrevs = {}
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1628 filenodes = {}
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1629 changesets = revisions = files = 0
1383 3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	1630 errors = [0]
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1631 neededmanifests = {}
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1632
1383 3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	1633 def err(msg):
3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	1634 self.ui.warn(msg + "\n")
3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	1635 errors[0] += 1
3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	1636
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1637 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	1638 self.ui.status(_("checking changesets\n"))
1493 1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1492 diff changeset	1639 d = self.changelog.checksize()
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1492 diff changeset	1640 if d:
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1492 diff changeset	1641 err(_("changeset data short %d bytes") % d)
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1642 for i in range(self.changelog.count()):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1643 changesets += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1644 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	1645 l = self.changelog.linkrev(n)
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1646 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	1647 err(_("incorrect link (%d) for changeset revision %d") %(l, i))
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1648 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	1649 err(_("duplicate changeset at revision %d") % i)
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1650 seen[n] = 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1651
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1652 for p in self.changelog.parents(n):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1653 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	1654 err(_("changeset %s has unknown parent %s") %
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1655 (short(n), short(p)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1656 try:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1657 changes = self.changelog.read(n)
1492 5f0522d31967 Allow interrupting all parts of verify Matt Mackall <mpm@selenic.com> parents: 1480 diff changeset	1658 except KeyboardInterrupt:
5f0522d31967 Allow interrupting all parts of verify Matt Mackall <mpm@selenic.com> parents: 1480 diff changeset	1659 self.ui.warn(_("interrupted"))
5f0522d31967 Allow interrupting all parts of verify Matt Mackall <mpm@selenic.com> parents: 1480 diff changeset	1660 raise
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1661 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	1662 err(_("unpacking changeset %s: %s") % (short(n), inst))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1663
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1664 neededmanifests[changes[0]] = n
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1665
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1666 for f in changes[3]:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1667 filelinkrevs.setdefault(f, []).append(i)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1668
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1669 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	1670 self.ui.status(_("checking manifests\n"))
1493 1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1492 diff changeset	1671 d = self.manifest.checksize()
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1492 diff changeset	1672 if d:
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1492 diff changeset	1673 err(_("manifest data short %d bytes") % d)
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1674 for i in range(self.manifest.count()):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1675 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	1676 l = self.manifest.linkrev(n)
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1677
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1678 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	1679 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	1680
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1681 if n in neededmanifests:
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1682 del neededmanifests[n]
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1683
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1684 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	1685 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	1686
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1687 seen[n] = 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1688
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1689 for p in self.manifest.parents(n):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1690 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	1691 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	1692 (short(n), short(p)))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1693
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1694 try:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1695 delta = mdiff.patchtext(self.manifest.delta(n))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1696 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	1697 self.ui.warn(_("interrupted"))
1097 1f89ccbab6ce localrepo: adjust some imports, remove sys dependency mpm@selenic.com parents: 1089 diff changeset	1698 raise
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1699 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	1700 err(_("unpacking manifest %s: %s") % (short(n), inst))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1701
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1702 ff = [ l.split('\0') for l in delta.splitlines() ]
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1703 for f, fn in ff:
284 d7c2efd0b541 verify: don't die from new permission bits mpm@selenic.com parents: 279 diff changeset	1704 filenodes.setdefault(f, {})[bin(fn[:40])] = 1
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1705
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	1706 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	1707
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1708 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	1709 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	1710 (short(m), short(c)))
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1711 del neededmanifests
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1712
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1713 for f in filenodes:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1714 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	1715 err(_("file %s in manifest but not in changesets") % f)
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1716
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1717 for f in filelinkrevs:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1718 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	1719 err(_("file %s in changeset but not in manifest") % f)
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1720
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	1721 self.ui.status(_("checking files\n"))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1722 ff = filenodes.keys()
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1723 ff.sort()
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1724 for f in ff:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1725 if f == "/dev/null": continue
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1726 files += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1727 fl = self.file(f)
1493 1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1492 diff changeset	1728 d = fl.checksize()
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1492 diff changeset	1729 if d:
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1492 diff changeset	1730 err(_("%s file data short %d bytes") % (f, d))
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1492 diff changeset	1731
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1732 nodes = { nullid: 1 }
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1733 seen = {}
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1734 for i in range(fl.count()):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1735 revisions += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1736 n = fl.node(i)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1737
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1738 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	1739 err(_("%s: duplicate revision %d") % (f, i))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1740 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	1741 err(_("%s: %d:%s not in manifests") % (f, i, short(n)))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1742 else:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1743 del filenodes[f][n]
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1744
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1745 flr = fl.linkrev(n)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1746 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	1747 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	1748 % (f, short(n), flr))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1749 else:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1750 filelinkrevs[f].remove(flr)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1751
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1752 # verify contents
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1753 try:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1754 t = fl.read(n)
1492 5f0522d31967 Allow interrupting all parts of verify Matt Mackall <mpm@selenic.com> parents: 1480 diff changeset	1755 except KeyboardInterrupt:
5f0522d31967 Allow interrupting all parts of verify Matt Mackall <mpm@selenic.com> parents: 1480 diff changeset	1756 self.ui.warn(_("interrupted"))
5f0522d31967 Allow interrupting all parts of verify Matt Mackall <mpm@selenic.com> parents: 1480 diff changeset	1757 raise
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1758 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	1759 err(_("unpacking file %s %s: %s") % (f, short(n), inst))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1760
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1761 # verify parents
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1762 (p1, p2) = fl.parents(n)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1763 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	1764 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	1765 (f, short(n), short(p1)))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1766 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	1767 err(_("file %s:%s unknown parent 2 %s") %
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1768 (f, short(n), short(p1)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1769 nodes[n] = 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1770
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1771 # cross-check
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1772 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	1773 err(_("node %s in manifests not in %s") % (hex(node), f))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1774
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	1775 self.ui.status(_("%d files, %d changesets, %d total revisions\n") %
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1776 (files, changesets, revisions))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1777
1383 3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	1778 if errors[0]:
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	1779 self.ui.warn(_("%d integrity errors encountered!\n") % errors[0])
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1780 return 1

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/localrepo.py @ 1562:2f97af0b522c