[PATCH 1 of 3] branchmap: fix blank line position
pierre-yves.david at ens-lyon.org
pierre-yves.david at ens-lyon.org
Mon Sep 30 15:54:22 UTC 2013
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1380549157 -7200
# Mon Sep 30 15:52:37 2013 +0200
# Node ID 2c13179e5107a9008c11a83f13f95cca39bc644f
# Parent 0a986233ecbf2f103e7dbf80fa80fdf66879ca9c
branchmap: fix blank line position
The blank line was after was after the `if` condition instead of before.
diff --git a/mercurial/branchmap.py b/mercurial/branchmap.py
--- a/mercurial/branchmap.py
+++ b/mercurial/branchmap.py
@@ -208,12 +208,12 @@ class branchcache(dict):
nodes = [head for head in self[branch]
if cl.hasnode(head)]
if not nodes:
droppednodes.extend(nodes)
del self[branch]
+
if ((not self.validfor(repo)) or (self.tipnode in droppednodes)):
-
# cache key are not valid anymore
self.tipnode = nullid
self.tiprev = nullrev
for heads in self.values():
tiprev = max(cl.rev(node) for node in heads)
More information about the Mercurial-devel
mailing list