Mercurial > hg > mercurial-crew-with-dirclash
comparison hgext/mq.py @ 2921:addb58e3b41c
redo merge with mpm.
previous merge at ef8ee4477019 was bad.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Wed, 16 Aug 2006 10:52:19 -0700 |
parents | b70740aefa4d 3848488244fc |
children | 773c5b82d052 |
comparison
equal
deleted
inserted
replaced
2907:b70740aefa4d | 2921:addb58e3b41c |
---|---|
75 lines = self.opener(self.status_path).read().splitlines() | 75 lines = self.opener(self.status_path).read().splitlines() |
76 self.applied = [statusentry(l) for l in lines] | 76 self.applied = [statusentry(l) for l in lines] |
77 | 77 |
78 def diffopts(self): | 78 def diffopts(self): |
79 if self._diffopts is None: | 79 if self._diffopts is None: |
80 self._diffopts = self.ui.diffopts() | 80 self._diffopts = patch.diffopts(self.ui) |
81 return self._diffopts | 81 return self._diffopts |
82 | 82 |
83 def join(self, *p): | 83 def join(self, *p): |
84 return os.path.join(self.path, *p) | 84 return os.path.join(self.path, *p) |
85 | 85 |