Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/dirstate.py @ 4209:dbc3846c09a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with -stable, fix small test failure
author Matt Mackall <mpm@selenic.com>
date Wed, 14 Mar 2007 01:26:09 -0500
parents b5d1eaade333 7e1c8a565a4f
children 0d51eb296fb9
comparison
equal deleted inserted replaced
4203:bd9b84b9a84b 4209:dbc3846c09a1
22 self.map = None 22 self.map = None
23 self.pl = None 23 self.pl = None
24 self.dirs = None 24 self.dirs = None
25 self.copymap = {} 25 self.copymap = {}
26 self.ignorefunc = None 26 self.ignorefunc = None
27 self._branch = None
27 28
28 def wjoin(self, f): 29 def wjoin(self, f):
29 return os.path.join(self.root, f) 30 return os.path.join(self.root, f)
30 31
31 def getcwd(self): 32 def getcwd(self):
134 135
135 def parents(self): 136 def parents(self):
136 self.lazyread() 137 self.lazyread()
137 return self.pl 138 return self.pl
138 139
140 def branch(self):
141 if not self._branch:
142 try:
143 self._branch = self.opener("branch").read().strip()\
144 or "default"
145 except IOError:
146 self._branch = "default"
147 return self._branch
148
139 def markdirty(self): 149 def markdirty(self):
140 if not self.dirty: 150 if not self.dirty:
141 self.dirty = 1 151 self.dirty = 1
142 152
143 def setparents(self, p1, p2=nullid): 153 def setparents(self, p1, p2=nullid):
144 self.lazyread() 154 self.lazyread()
145 self.markdirty() 155 self.markdirty()
146 self.pl = p1, p2 156 self.pl = p1, p2
157
158 def setbranch(self, branch):
159 self._branch = branch
160 self.opener("branch", "w").write(branch + '\n')
147 161
148 def state(self, key): 162 def state(self, key):
149 try: 163 try:
150 return self[key][0] 164 return self[key][0]
151 except KeyError: 165 except KeyError: