Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 16253:17f179805297

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 12 Mar 2012 17:05:42 -0500
parents 97efd26eb957 b9c4302310e5
children 6097ede2be4d
comparison
equal deleted inserted replaced
16251:db68ee3289b6 16253:17f179805297
779 self.opener.write("journal.branch", 779 self.opener.write("journal.branch",
780 encoding.fromlocal(self.dirstate.branch())) 780 encoding.fromlocal(self.dirstate.branch()))
781 self.opener.write("journal.desc", 781 self.opener.write("journal.desc",
782 "%d\n%s\n" % (len(self), desc)) 782 "%d\n%s\n" % (len(self), desc))
783 783
784 bkname = self.join('bookmarks') 784 try:
785 if os.path.exists(bkname): 785 bk = self.opener.read("bookmarks")
786 util.copyfile(bkname, self.join('journal.bookmarks')) 786 except IOError:
787 else: 787 bk = ""
788 self.opener.write('journal.bookmarks', '') 788 self.opener.write("journal.bookmarks", bk)
789
789 phasesname = self.sjoin('phaseroots') 790 phasesname = self.sjoin('phaseroots')
790 if os.path.exists(phasesname): 791 if os.path.exists(phasesname):
791 util.copyfile(phasesname, self.sjoin('journal.phaseroots')) 792 util.copyfile(phasesname, self.sjoin('journal.phaseroots'))
792 else: 793 else:
793 self.sopener.write('journal.phaseroots', '') 794 self.sopener.write('journal.phaseroots', '')