Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/localrepo.py @ 4206:0b48e3985765
Minor default branch cleanups
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 13 Mar 2007 15:47:55 -0500 |
parents | a7af0eeae8a3 |
children | dbc3846c09a1 caff92047e87 |
comparison
equal
deleted
inserted
replaced
4205:a7af0eeae8a3 | 4206: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 |