mercurial/localrepo.py
changeset 4178 0b48e3985765
parent 4177 a7af0eeae8a3
child 4209 dbc3846c09a1
child 4210 caff92047e87
equal deleted inserted replaced
4177:a7af0eeae8a3 4178:0b48e3985765
   707                 raise util.Abort(_('branch name not in UTF-8!'))
   707                 raise util.Abort(_('branch name not in UTF-8!'))
   708         else:
   708         else:
   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"))
   716                 return None
   716                 return None
   717 
   717