comparison mercurial/phases.py @ 17537:31f32a96e1e3

Merge spelling fixes
author Bryan O'Sullivan <bryano@fb.com>
date Tue, 11 Sep 2012 08:36:09 -0700
parents fb72eec7efd8 63e302be813f
children fdd0fc046cf1
comparison
equal deleted inserted replaced
17475:63e45aee46d4 17537:31f32a96e1e3
313 # client phase data. 313 # client phase data.
314 keys['publishing'] = 'True' 314 keys['publishing'] = 'True'
315 return keys 315 return keys
316 316
317 def pushphase(repo, nhex, oldphasestr, newphasestr): 317 def pushphase(repo, nhex, oldphasestr, newphasestr):
318 """List phases root for serialisation over pushkey""" 318 """List phases root for serialization over pushkey"""
319 lock = repo.lock() 319 lock = repo.lock()
320 try: 320 try:
321 currentphase = repo[nhex].phase() 321 currentphase = repo[nhex].phase()
322 newphase = abs(int(newphasestr)) # let's avoid negative index surprise 322 newphase = abs(int(newphasestr)) # let's avoid negative index surprise
323 oldphase = abs(int(oldphasestr)) # let's avoid negative index surprise 323 oldphase = abs(int(oldphasestr)) # let's avoid negative index surprise