hgkw/keyword.py
branchstable
changeset 949 dd81191ffac3
parent 940 4bd06014631e
child 953 cf67cd5f6834
equal deleted inserted replaced
947:23f0eeb598b5 949:dd81191ffac3
   593                 return ret
   593                 return ret
   594             finally:
   594             finally:
   595                 wlock.release()
   595                 wlock.release()
   596 
   596 
   597     # monkeypatches
   597     # monkeypatches
   598     def kwpatchfile_init(orig, self, ui, fname, opener,
   598     def kwpatchfile_init(orig, self, ui, fname, backend,
   599                          missing=False, eolmode=None):
   599                          missing=False, eolmode=None):
   600         '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
   600         '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
   601         rejects or conflicts due to expanded keywords in working dir.'''
   601         rejects or conflicts due to expanded keywords in working dir.'''
   602         orig(self, ui, fname, opener, missing, eolmode)
   602         orig(self, ui, fname, backend, missing, eolmode)
   603         # shrink keywords read from working dir
   603         # shrink keywords read from working dir
   604         self.lines = kwt.shrinklines(self.fname, self.lines)
   604         self.lines = kwt.shrinklines(self.fname, self.lines)
   605 
   605 
   606     def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None,
   606     def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None,
   607                 opts=None, prefix=''):
   607                 opts=None, prefix=''):