Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 18000:f9459bcd25fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clfilter: ensure changeset creation in the repo is run unfiltered This applies to both creation of new commits and application of changegroups.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Mon, 26 Nov 2012 19:24:11 +0100
parents 85027e98100b
children 2e30972d859d
comparison
equal deleted inserted replaced
17999:85027e98100b 18000:f9459bcd25fc
1238 if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): 1238 if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags():
1239 changelist.append(fname) 1239 changelist.append(fname)
1240 1240
1241 return fparent1 1241 return fparent1
1242 1242
1243 @unfilteredmeth
1243 def commit(self, text="", user=None, date=None, match=None, force=False, 1244 def commit(self, text="", user=None, date=None, match=None, force=False,
1244 editor=False, extra={}): 1245 editor=False, extra={}):
1245 """Add a new revision to current repository. 1246 """Add a new revision to current repository.
1246 1247
1247 Revision information is gathered from the working directory, 1248 Revision information is gathered from the working directory,
1408 def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2): 1409 def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2):
1409 self.hook("commit", node=node, parent1=parent1, parent2=parent2) 1410 self.hook("commit", node=node, parent1=parent1, parent2=parent2)
1410 self._afterlock(commithook) 1411 self._afterlock(commithook)
1411 return ret 1412 return ret
1412 1413
1414 @unfilteredmeth
1413 def commitctx(self, ctx, error=False): 1415 def commitctx(self, ctx, error=False):
1414 """Add a new revision to current repository. 1416 """Add a new revision to current repository.
1415 Revision information is passed via the context argument. 1417 Revision information is passed via the context argument.
1416 """ 1418 """
1417 1419
2289 if nodes: 2291 if nodes:
2290 self.hook('outgoing', node=hex(nodes[0]), source=source) 2292 self.hook('outgoing', node=hex(nodes[0]), source=source)
2291 2293
2292 return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN') 2294 return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN')
2293 2295
2296 @unfilteredmeth
2294 def addchangegroup(self, source, srctype, url, emptyok=False): 2297 def addchangegroup(self, source, srctype, url, emptyok=False):
2295 """Add the changegroup returned by source.read() to this repo. 2298 """Add the changegroup returned by source.read() to this repo.
2296 srctype is a string like 'push', 'pull', or 'unbundle'. url is 2299 srctype is a string like 'push', 'pull', or 'unbundle'. url is
2297 the URL of the repo where this changegroup is coming from. 2300 the URL of the repo where this changegroup is coming from.
2298 2301