Mercurial > public > mercurial-scm > hg

comparison mercurial/context.py @ 19691:33ae2052d924

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commitablectx: move bookmarks from workingctx
author Sean Farley <sean.michael.farley@gmail.com>
date Wed, 14 Aug 2013 16:24:33 -0500
parents 65ff9fd67d8d
children 594f4d2b0ce9
comparison
equal deleted inserted replaced
19690:65ff9fd67d8d 19691:33ae2052d924
998 t = [] 998 t = []
999 for p in self.parents(): 999 for p in self.parents():
1000 t.extend(p.tags()) 1000 t.extend(p.tags())
1001 return t 1001 return t
1002 1002
1003 def bookmarks(self):
1004 b = []
1005 for p in self.parents():
1006 b.extend(p.bookmarks())
1007 return b
1008
1003 class workingctx(commitablectx): 1009 class workingctx(commitablectx):
1004 """A workingctx object makes access to data related to 1010 """A workingctx object makes access to data related to
1005 the current working directory convenient. 1011 the current working directory convenient.
1006 date - any valid date string or (unixtime, offset), or None. 1012 date - any valid date string or (unixtime, offset), or None.
1007 user - username string, or None. 1013 user - username string, or None.
1023 def _parents(self): 1029 def _parents(self):
1024 p = self._repo.dirstate.parents() 1030 p = self._repo.dirstate.parents()
1025 if p[1] == nullid: 1031 if p[1] == nullid:
1026 p = p[:-1] 1032 p = p[:-1]
1027 return [changectx(self._repo, x) for x in p] 1033 return [changectx(self._repo, x) for x in p]
1028
1029 def bookmarks(self):
1030 b = []
1031 for p in self.parents():
1032 b.extend(p.bookmarks())
1033 return b
1034 1034
1035 def phase(self): 1035 def phase(self):
1036 phase = phases.draft # default phase to draft 1036 phase = phases.draft # default phase to draft
1037 for p in self.parents(): 1037 for p in self.parents():
1038 phase = max(phase, p.phase()) 1038 phase = max(phase, p.phase())