comparison hgsubversion/svncommands.py @ 1185:65ca78ac2ee1

svncommands: use meta.lastpulled instead of revmap.youngest
author Sean Farley <sean.michael.farley@gmail.com>
date Mon, 24 Mar 2014 11:20:44 -0500
parents 8f9619a67565
children 85fe080461c6 199933008ab5
comparison
equal deleted inserted replaced
1184:43384d2782dc 1185:65ca78ac2ee1
64 64
65 youngest = 0 65 youngest = 0
66 startrev = 0 66 startrev = 0
67 sofar = [] 67 sofar = []
68 branchinfo = {} 68 branchinfo = {}
69 youngestpath = os.path.join(meta.metapath, 'lastpulled')
70 if partial: 69 if partial:
71 try: 70 try:
71 # we can't use meta.lastpulled here because we are bootstraping the
72 # lastpulled and want to keep the cached value on disk during a
73 # partial rebuild
72 foundpartialinfo = False 74 foundpartialinfo = False
75 youngestpath = os.path.join(meta.metapath, 'lastpulled')
73 if os.path.exists(youngestpath): 76 if os.path.exists(youngestpath):
74 youngest = util.load(youngestpath) 77 youngest = util.load(youngestpath)
75 sofar = list(maps.RevMap.readmapfile(meta.revmap_file)) 78 sofar = list(maps.RevMap.readmapfile(meta.revmap_file))
76 if sofar and len(sofar[-1].split(' ', 2)) > 1: 79 if sofar and len(sofar[-1].split(' ', 2)) > 1:
77 lasthash = sofar[-1].split(' ', 2)[1] 80 lasthash = sofar[-1].split(' ', 2)[1]
135 parentbranch = None 138 parentbranch = None
136 branchinfo.pop(parentbranch) 139 branchinfo.pop(parentbranch)
137 else: 140 else:
138 closed.add(parentctx.rev()) 141 closed.add(parentctx.rev())
139 142
140 util.dump(youngest, youngestpath) 143 meta.lastpulled = youngest
141 ui.progress('prepare', None, total=numrevs) 144 ui.progress('prepare', None, total=numrevs)
142 145
143 for rev in xrange(startrev, len(repo)): 146 for rev in xrange(startrev, len(repo)):
144 ui.progress('rebuild', rev-startrev, total=numrevs) 147 ui.progress('rebuild', rev-startrev, total=numrevs)
145 try: 148 try: