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

comparison mercurial/localrepo.py @ 1779:a1e6e02e9d05

Merge with mpm

author	Josef "Jeff" Sipek <jeffpc@optonline.net>
date	Sat, 18 Feb 2006 22:24:42 -0500
parents	2c9872a4f3fd
children	91c56c427171

comparison

equal deleted inserted replaced

-:b08b87cecc37
+:a1e6e02e9d05
 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"):
 self.ui.warn(_("waiting for lock held by %s\n") % inst.args[0])
 wlock = lock.lock(self.join("wlock"), wait, self.dirstate.write)
 self.dirstate.read()
 return wlock
+def checkfilemerge(self, filename, text, filelog, manifest1, manifest2):
+"determine whether a new filenode is needed"
+fp1 = manifest1.get(filename, nullid)
+fp2 = manifest2.get(filename, nullid)
+if fp2 != nullid:
+# is one parent an ancestor of the other?
+fpa = filelog.ancestor(fp1, fp2)
+if fpa == fp1:
+fp1, fp2 = fp2, nullid
+elif fpa == fp2:
+fp2 = nullid
+# is the file unmodified from the parent? report existing entry
+if fp2 == nullid and text == filelog.read(fp1):
+return (fp1, None, None)
+return (None, fp1, fp2)
 def rawcommit(self, files, text, user, date, p1=None, p2=None, wlock=None):
 orig_parent = self.dirstate.parents()[0] or nullid
 p1 = p1 or self.dirstate.parents()[0] or nullid
 p2 = p2 or self.dirstate.parents()[1] or nullid
 c1 = self.changelog.read(p1)
 t = self.wread(f)
 tm = util.is_exec(self.wjoin(f), mfm.get(f, False))
 r = self.file(f)
 mfm[f] = tm
-fp1 = m1.get(f, nullid)
+(entry, fp1, fp2) = self.checkfilemerge(f, t, r, m1, m2)
-fp2 = m2.get(f, nullid)
+if entry:
+mm[f] = entry
-# is the same revision on two branches of a merge?
+continue
-if fp2 == fp1:
-fp2 = nullid
-if fp2 != nullid:
-# is one parent an ancestor of the other?
-fpa = r.ancestor(fp1, fp2)
-if fpa == fp1:
-fp1, fp2 = fp2, nullid
-elif fpa == fp2:
-fp2 = nullid
-# is the file unmodified from the parent?
-if t == r.read(fp1):
-# record the proper existing parent in manifest
-# no need to add a revision
-mm[f] = fp1
-continue
 mm[f] = r.add(t, {}, tr, linkrev, fp1, fp2)
 changed.append(f)
 if update_dirstate:
 self.dirstate.update([f], "n")
 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()
 meta["copy"] = cp
 meta["copyrev"] = hex(m1.get(cp, m2.get(cp, nullid)))
 self.ui.debug(_(" %s: copy %s:%s\n") % (f, cp, meta["copyrev"]))
 fp1, fp2 = nullid, nullid
 else:
-fp1 = m1.get(f, nullid)
+entry, fp1, fp2 = self.checkfilemerge(f, t, r, m1, m2)
-fp2 = m2.get(f, nullid)
+if entry:
+new[f] = entry
-if fp2 != nullid:
-# is one parent an ancestor of the other?
-fpa = r.ancestor(fp1, fp2)
-if fpa == fp1:
-fp1, fp2 = fp2, nullid
-elif fpa == fp2:
-fp2 = nullid
-# is the file unmodified from the parent?
-if not meta and t == r.read(fp1) and fp2 == nullid:
-# record the proper existing parent in manifest
-# no need to add a revision
-new[f] = fp1
 continue
 new[f] = r.add(t, meta, tr, linkrev, fp1, fp2)
 # remember what we've added so that we can later calculate
 # the files to pull from a set of changesets
 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:

Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 1779:a1e6e02e9d05