Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 3440:0f1fd9854cdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: read branch with workingctx
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 22:26:14 -0500
parents a7ef6b6cc311
children e6045fc3cd50
comparison
equal deleted inserted replaced
3439:a7ef6b6cc311 3440:0f1fd9854cdc
608 c1 = self.changelog.read(p1) 608 c1 = self.changelog.read(p1)
609 c2 = self.changelog.read(p2) 609 c2 = self.changelog.read(p2)
610 m1 = self.manifest.read(c1[0]).copy() 610 m1 = self.manifest.read(c1[0]).copy()
611 m2 = self.manifest.read(c2[0]) 611 m2 = self.manifest.read(c2[0])
612 612
613 try: 613 branchname = self.workingctx().branch()
614 branchname = self.opener("branch").read().rstrip()
615 except IOError:
616 branchname = ""
617 oldname = c1[5].get("branch", "") 614 oldname = c1[5].get("branch", "")
618 615
619 if not commit and not remove and not force and p2 == nullid and \ 616 if not commit and not remove and not force and p2 == nullid and \
620 branchname == oldname: 617 branchname == oldname:
621 self.ui.status(_("nothing changed\n")) 618 self.ui.status(_("nothing changed\n"))