##// END OF EJS Templates
Minor default branch cleanups
Matt Mackall -
r4178:0b48e398 default
parent child Browse files
Show More
@@ -67,7 +67,7 b' class changectx(object):'
67 def date(self): return self._changeset[2]
67 def date(self): return self._changeset[2]
68 def files(self): return self._changeset[3]
68 def files(self): return self._changeset[3]
69 def description(self): return self._changeset[4]
69 def description(self): return self._changeset[4]
70 def branch(self): return self._changeset[5].get("branch", "")
70 def branch(self): return self._changeset[5].get("branch")
71
71
72 def parents(self):
72 def parents(self):
73 """return contexts for each parent changeset"""
73 """return contexts for each parent changeset"""
@@ -709,7 +709,7 b' class localrepository(repo.repository):'
709 branchname = ""
709 branchname = ""
710
710
711 if use_dirstate:
711 if use_dirstate:
712 oldname = c1[5].get("branch") or "default" # stored in UTF-8
712 oldname = c1[5].get("branch") # stored in UTF-8
713 if not commit and not remove and not force and p2 == nullid and \
713 if not commit and not remove and not force and p2 == nullid and \
714 branchname == oldname:
714 branchname == oldname:
715 self.ui.status(_("nothing changed\n"))
715 self.ui.status(_("nothing changed\n"))
General Comments 0
You need to be logged in to leave comments. Login now