mercurial-crew-with-dirclash: comparison mercurial/localrepo.py

equal deleted inserted replaced

-:ef8cd889a78b
+:2c9872a4f3fd
 try:
 self.ui.readconfig(self.join("hgrc"))
 except IOError:
 pass
-def hook(self, name, **args):
+def hook(self, name, throw=False, **args):
 def runhook(name, cmd):
 self.ui.note(_("running hook %s: %s\n") % (name, cmd))
 old = {}
 for k, v in args.items():
 k = k.upper()
+old['HG_' + k] = os.environ.get(k, None)
 old[k] = os.environ.get(k, None)
-os.environ[k] = v
+os.environ['HG_' + k] = str(v)
+os.environ[k] = str(v)
-# Hooks run in the repository root
-olddir = os.getcwd()
+try:
-os.chdir(self.root)
+# Hooks run in the repository root
-r = os.system(cmd)
+olddir = os.getcwd()
-os.chdir(olddir)
+os.chdir(self.root)
+r = os.system(cmd)
-for k, v in old.items():
+finally:
-if v != None:
+for k, v in old.items():
-os.environ[k] = v
+if v is not None:
-else:
+os.environ[k] = v
-del os.environ[k]
+else:
+del os.environ[k]
+os.chdir(olddir)
 if r:
-self.ui.warn(_("abort: %s hook failed with status %d!\n") %
+desc, r = util.explain_exit(r)
-(name, r))
+if throw:
+raise util.Abort(_('%s hook %s') % (name, desc))
+self.ui.warn(_('error: %s hook %s\n') % (name, desc))
 return False
 return True
 r = True
 for hname, cmd in self.ui.configitems("hooks"):
 if not commit and not remove and not force and p2 == nullid:
 self.ui.status(_("nothing changed\n"))
 return None
-if not self.hook("precommit"):
+xp1 = hex(p1)
-return None
+if p2 == nullid: xp2 = ''
+else: xp2 = hex(p2)
+self.hook("precommit", throw=True, parent1=xp1, parent2=xp2)
 if not wlock:
 wlock = self.wlock()
 lock = self.lock()
 tr = self.transaction()
 return None
 text = edittext
 user = user or self.ui.username()
 n = self.changelog.add(mn, changed + remove, text, tr, p1, p2, user, date)
+self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
+parent2=xp2)
 tr.close()
 self.dirstate.setparents(n)
 self.dirstate.update(new, "n")
 self.dirstate.forget(remove)
-if not self.hook("commit", node=hex(n)):
+self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2)
-return None
 return n
 def walk(self, node=None, files=[], match=util.always):
 if node:
 fdict = dict.fromkeys(files)
 if not fetch:
 self.ui.status(_("no changes found\n"))
 return 1
 if heads is None:
-cg = remote.changegroup(fetch)
+cg = remote.changegroup(fetch, 'pull')
 else:
-cg = remote.changegroupsubset(fetch, heads)
+cg = remote.changegroupsubset(fetch, heads, 'pull')
 return self.addchangegroup(cg)
 def push(self, remote, force=False):
 lock = remote.lock()
 self.ui.warn(_("abort: push creates new remote branches!\n"))
 self.ui.status(_("(did you forget to merge?"
 " use push -f to force)\n"))
 return 1
-cg = self.changegroup(update)
+cg = self.changegroup(update, 'push')
 return remote.addchangegroup(cg)
-def changegroupsubset(self, bases, heads):
+def changegroupsubset(self, bases, heads, source):
 """This function generates a changegroup consisting of all the nodes
 that are descendents of any of the bases, and ancestors of any of
 the heads.
 It is fairly complex as determining which filenodes and which
 manifest nodes need to be included for the changeset to be complete
 is non-trivial.
 Another wrinkle is doing the reverse, figuring out which changeset in
 the changegroup a particular filenode or manifestnode belongs to."""
+self.hook('preoutgoing', throw=True, source=source)
 # Set up some initial variables
 # Make it easy to refer to self.changelog
 cl = self.changelog
 # msng is short for missing - compute the list of changesets in this
 # Don't need this anymore, toss it to free memory.
 del msng_filenode_set[fname]
 # Signal that no more groups are left.
 yield struct.pack(">l", 0)
+self.hook('outgoing', node=hex(msng_cl_lst[0]), source=source)
 return util.chunkbuffer(gengroup())
-def changegroup(self, basenodes):
+def changegroup(self, basenodes, source):
 """Generate a changegroup of all nodes that we have that a recipient
 doesn't.
 This is much easier than the previous function as we can assume that
 the recipient has any changenode we aren't sending them."""
+self.hook('preoutgoing', throw=True, source=source)
 cl = self.changelog
 nodes = cl.nodesbetween(basenodes, None)[0]
 revset = dict.fromkeys([cl.rev(n) for n in nodes])
 def identity(x):
 lookup = lookuprevlink_func(filerevlog)
 for chnk in filerevlog.group(nodeiter, lookup):
 yield chnk
 yield struct.pack(">l", 0)
+self.hook('outgoing', node=hex(nodes[0]), source=source)
 return util.chunkbuffer(gengroup())
 def addchangegroup(self, source):
 def revmap(x):
 return self.changelog.rev(x)
 if not source:
 return
+self.hook('prechangegroup', throw=True)
 changesets = files = revisions = 0
 tr = self.transaction()
 oldheads = len(self.changelog.heads())
 self.ui.status(_("added %d changesets"
 " with %d changes to %d files%s\n")
 % (changesets, revisions, files, heads))
+self.hook('pretxnchangegroup', throw=True,
+node=hex(self.changelog.node(cor+1)))
 tr.close()
 if changesets > 0:
-if not self.hook("changegroup",
+self.hook("changegroup", node=hex(self.changelog.node(cor+1)))
-node=hex(self.changelog.node(cor+1))):
-self.ui.warn(_("abort: changegroup hook returned failure!\n"))
-return 1
 for i in range(cor + 1, cnr + 1):
 self.hook("incoming", node=hex(self.changelog.node(i)))
-return
 def update(self, node, allow=False, force=False, choose=None,
 moddirstate=True, forcemerge=False, wlock=None):
 pl = self.dirstate.parents()
 if not force and pl[1] != nullid:

changeset 1737	2c9872a4f3fd
parent 1716	ef8cd889a78b
parent 1736	50de0887bbcd
child 1747	91c56c427171