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

equal deleted inserted replaced

-:8d46056960ab
+:ff7253a0d1da
 if key in filetags:
 n, h = filetags[key]
 h.append(n)
 filetags[key] = (bin_n, h)
-for k,nh in filetags.items():
+for k, nh in filetags.items():
 if k not in globaltags:
 globaltags[k] = nh
 continue
 # we prefer the global tag if:
 #  it supercedes us OR
 #  mutual supercedes and it has a higher rank
 # otherwise we win because we're tip-most
 an, ah = nh
 bn, bh = globaltags[k]
-if bn != an and an in bh and \
+if (bn != an and an in bh and
-(bn not in ah or len(bh) > len(ah)):
+(bn not in ah or len(bh) > len(ah))):
 an = bn
 ah.extend([n for n in bh if n not in ah])
 globaltags[k] = an, ah
 # read the tags file from each head, ending with the tip
 else:
 branchname = ""
 if use_dirstate:
 oldname = c1[5].get("branch") # stored in UTF-8
-if not commit and not remove and not force and p2 == nullid and \
+if (not commit and not remove and not force and p2 == nullid
-branchname == oldname:
+and branchname == oldname):
 self.ui.status(_("nothing changed\n"))
 return None
 xp1 = hex(p1)
 if p2 == nullid: xp2 = ''
 mf2keys = mf2.keys()
 mf2keys.sort()
 getnode = lambda fn: mf1.get(fn, nullid)
 for fn in mf2keys:
 if mf1.has_key(fn):
-if mf1.flags(fn) != mf2.flags(fn) or \
+if (mf1.flags(fn) != mf2.flags(fn) or
-(mf1[fn] != mf2[fn] and (mf2[fn] != "" or
+(mf1[fn] != mf2[fn] and
-fcmp(fn, getnode))):
+(mf2[fn] != "" or fcmp(fn, getnode)))):
 modified.append(fn)
 elif list_clean:
 clean.append(fn)
 del mf1[fn]
 else: