Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/dirstate.py @ 4207:7e1c8a565a4f
Move branch read/write to dirstate where it belongs
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 13 Mar 2007 18:50:02 -0500 |
parents | b36bd7534c08 |
children | dbc3846c09a1 24c22a3f2ef8 |
comparison
equal
deleted
inserted
replaced
4206:0b48e3985765 | 4207:7e1c8a565a4f |
---|---|
23 self.map = None | 23 self.map = None |
24 self.pl = None | 24 self.pl = None |
25 self.dirs = None | 25 self.dirs = None |
26 self.copymap = {} | 26 self.copymap = {} |
27 self.ignorefunc = None | 27 self.ignorefunc = None |
28 self._branch = None | |
28 | 29 |
29 def wjoin(self, f): | 30 def wjoin(self, f): |
30 return os.path.join(self.root, f) | 31 return os.path.join(self.root, f) |
31 | 32 |
32 def getcwd(self): | 33 def getcwd(self): |
135 | 136 |
136 def parents(self): | 137 def parents(self): |
137 self.lazyread() | 138 self.lazyread() |
138 return self.pl | 139 return self.pl |
139 | 140 |
141 def branch(self): | |
142 if not self._branch: | |
143 try: | |
144 self._branch = self.opener("branch").read().strip()\ | |
145 or "default" | |
146 except IOError: | |
147 self._branch = "default" | |
148 return self._branch | |
149 | |
140 def markdirty(self): | 150 def markdirty(self): |
141 if not self.dirty: | 151 if not self.dirty: |
142 self.dirty = 1 | 152 self.dirty = 1 |
143 | 153 |
144 def setparents(self, p1, p2=nullid): | 154 def setparents(self, p1, p2=nullid): |
145 self.lazyread() | 155 self.lazyread() |
146 self.markdirty() | 156 self.markdirty() |
147 self.pl = p1, p2 | 157 self.pl = p1, p2 |
158 | |
159 def setbranch(self, branch): | |
160 self._branch = branch | |
161 self.opener("branch", "w").write(branch + '\n') | |
148 | 162 |
149 def state(self, key): | 163 def state(self, key): |
150 try: | 164 try: |
151 return self[key][0] | 165 return self[key][0] |
152 except KeyError: | 166 except KeyError: |