Mercurial > hg > pyhgsh
diff mercurial/hg.py @ 442:3e2aee6c5500
rawcommit dirstate tweak
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
rawcommit dirstate tweak
Before this patch, rawcommit can mess up the dirstate unless it is
committing against the current parent.
This patch changes rawcommit, such that when adding a child to some
node other than the current parent, rawcommit does not attempt update
the current dirstate.
This seems easily debatable; it creates an asymmetric behavior for
rawcommit. It means that when doing a rawcommit against the current
parent, there's effectively an implied "hg update" to the newly
created node. When doing a rawcommit against any other node, no such
"hg update" occurs.
The other obvious alternates would be:
1) rawcommit never update the dirstate
2) rawcommit always does an "hg update"...
This patch also includes a test for various uses of rawcommit...
Michael Fetterman
manifest hash: 428517d82a02501f14b0d8fac064411980780e91
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuymPywK+sNU5EO8RAvdvAKCxW1QZtyOviNfuwO592IaKApwvEACfdrYD
83m/o8oJvRKu3yGvNGHtwfk=
=KbmU
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Thu, 23 Jun 2005 13:28:47 -0800 |
| parents | e8af362cfb01 |
| children | a1e91c24dab5 |
line wrap: on
line diff
--- a/mercurial/hg.py Thu Jun 23 09:33:18 2005 -0800 +++ b/mercurial/hg.py Thu Jun 23 13:28:47 2005 -0800 @@ -477,19 +477,24 @@ raise inst def rawcommit(self, files, text, user, date, p1=None, p2=None): - p1 = p1 or self.dirstate.parents()[0] or nullid - p2 = p2 or self.dirstate.parents()[1] or nullid + orig_parent = self.dirstate.parents()[0] or nullid + p1 = (p1 and self.lookup(p1)) or self.dirstate.parents()[0] or nullid + p2 = (p2 and self.lookup(p2)) or self.dirstate.parents()[1] or nullid c1 = self.changelog.read(p1) c2 = self.changelog.read(p2) m1 = self.manifest.read(c1[0]) mf1 = self.manifest.readflags(c1[0]) m2 = self.manifest.read(c2[0]) + if orig_parent == p1: + update_dirstate = 1 + else: + update_dirstate = 0 + tr = self.transaction() mm = m1.copy() mfm = mf1.copy() linkrev = self.changelog.count() - self.dirstate.setparents(p1, p2) for f in files: try: t = self.wfile(f).read() @@ -498,12 +503,14 @@ mfm[f] = tm mm[f] = r.add(t, {}, tr, linkrev, m1.get(f, nullid), m2.get(f, nullid)) - self.dirstate.update([f], "n") + if update_dirstate: + self.dirstate.update([f], "n") except IOError: try: del mm[f] del mfm[f] - self.dirstate.forget([f]) + if update_dirstate: + self.dirstate.forget([f]) except: # deleted from p2? pass @@ -511,6 +518,8 @@ mnode = self.manifest.add(mm, mfm, tr, linkrev, c1[0], c2[0]) n = self.changelog.add(mnode, files, text, tr, p1, p2, user, date) tr.close() + if update_dirstate: + self.dirstate.setparents(n, nullid) def commit(self, files = None, text = "", user = None, date = None): commit = []