hgext/keyword.py
changeset 42620 d98ec36be808
parent 40220 c7ffc53fbd19
child 43076 2372284d9457
equal deleted inserted replaced
42619:20d0e59be79b 42620:d98ec36be808
   783             try:
   783             try:
   784                 return super(kwrepo, self).commit(*args, **opts)
   784                 return super(kwrepo, self).commit(*args, **opts)
   785             finally:
   785             finally:
   786                 del self.commitctx
   786                 del self.commitctx
   787 
   787 
   788         def kwcommitctx(self, ctx, error=False):
   788         def kwcommitctx(self, ctx, error=False, origctx=None):
   789             n = super(kwrepo, self).commitctx(ctx, error)
   789             n = super(kwrepo, self).commitctx(ctx, error, origctx)
   790             # no lock needed, only called from repo.commit() which already locks
   790             # no lock needed, only called from repo.commit() which already locks
   791             if not kwt.postcommit:
   791             if not kwt.postcommit:
   792                 restrict = kwt.restrict
   792                 restrict = kwt.restrict
   793                 kwt.restrict = True
   793                 kwt.restrict = True
   794                 kwt.overwrite(self[n], sorted(ctx.added() + ctx.modified()),
   794                 kwt.overwrite(self[n], sorted(ctx.added() + ctx.modified()),