equal
deleted
inserted
replaced
482 if n is not None: |
482 if n is not None: |
483 kwt.overwrite(n, True, None) |
483 kwt.overwrite(n, True, None) |
484 repo.hook('commit', node=n, parent1=_p1, parent2=_p2) |
484 repo.hook('commit', node=n, parent1=_p1, parent2=_p2) |
485 return n |
485 return n |
486 finally: |
486 finally: |
487 del wlock, lock |
487 release(lock, wlock) |
488 |
488 |
489 # monkeypatches |
489 # monkeypatches |
490 def kwpatchfile_init(orig, self, ui, fname, opener, missing=False): |
490 def kwpatchfile_init(orig, self, ui, fname, opener, missing=False): |
491 '''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
491 '''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
492 rejects or conflicts due to expanded keywords in working dir.''' |
492 rejects or conflicts due to expanded keywords in working dir.''' |