facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

phase: fix warning text from invalid remote phase

Browse Source 
add missing end of line and substitution.
This commit is contained in:
Pierre-Yves David 2012-01-20 19:18:09 +01:00
parent f813e53446
commit bcece1636b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mercurial/phases.py
View File

@ -276,14 +276,14 @@ def analyzeremotephases(repo, subset, roots):
phase = int(phase) phase = int(phase)
if phase == 0: if phase == 0:
if node != nullid: if node != nullid:
msg = _('ignoring inconsistent public root from remote: %s') repo.ui.warn(_('ignoring inconsistent public root'
repo.ui.warn(msg, nhex) ' from remote: %s\n') % nhex)
elif phase == 1: elif phase == 1:
if node in nodemap: if node in nodemap:
draftroots.append(node) draftroots.append(node)
else: else:
msg = _('ignoring unexpected root from remote: %i %s') repo.ui.warn(_('ignoring unexpected root from remote: %i %s\n')
repo.ui.warn(msg, phase, nhex) % (phase, nhex))
# compute heads # compute heads
revset = repo.set('heads((%ln + parents(%ln)) - (%ln::%ln))', revset = repo.set('heads((%ln + parents(%ln)) - (%ln::%ln))',
subset, draftroots, draftroots, subset) subset, draftroots, draftroots, subset)