equal
deleted
inserted
replaced
13 import shutil |
13 import shutil |
14 |
14 |
15 from .i18n import _ |
15 from .i18n import _ |
16 from .node import ( |
16 from .node import ( |
17 hex, |
17 hex, |
18 nullid, |
|
19 short, |
18 short, |
20 ) |
19 ) |
21 from .pycompat import ( |
20 from .pycompat import ( |
22 getattr, |
21 getattr, |
23 open, |
22 open, |
109 |
108 |
110 def data(self): |
109 def data(self): |
111 return None |
110 return None |
112 |
111 |
113 def filenode(self): |
112 def filenode(self): |
114 return nullid |
113 return self._ctx.repo().nullid |
115 |
114 |
116 _customcmp = True |
115 _customcmp = True |
117 |
116 |
118 def cmp(self, fctx): |
117 def cmp(self, fctx): |
119 """compare with other file context |
118 """compare with other file context |