Patchwork [2,of,2,V2] issue6588 fix: filelog can store rev-dups - revs with same content on same parents, but on different changeID

login
register
mail settings
Submitter alexrayne
Date Sept. 26, 2021, 6:08 p.m.
Message ID <5274a25b2336bc099f91.1632679690@black2>
Download mbox | patch
Permalink /patch/49820/
State New
Headers show

Comments

alexrayne - Sept. 26, 2021, 6:08 p.m.
# HG changeset patch
# User alexrayne <alexraynepe196@gmail.com>
# Date 1632679317 -10800
#      Sun Sep 26 21:01:57 2021 +0300
# Branch stable
# Node ID 5274a25b2336bc099f9188bd108c1edf487993ec
# Parent  62ac25b53bc873864c8ab3ce896678958bbdfde4
issue6588 fix: filelog can store rev-dups - revs with same content on same parents, but on different changeID.

* to solve problem with rev-dups, this patch infers changes into revision meta-data - current timestamp.

Patch

# HG changeset patch
# User alexrayne <alexraynepe196@gmail.com>
# Date 1632679317 -10800
#      Sun Sep 26 21:01:57 2021 +0300
# Branch stable
# Node ID 5274a25b2336bc099f9188bd108c1edf487993ec
# Parent  62ac25b53bc873864c8ab3ce896678958bbdfde4
issue6588 fix: filelog can store rev-dups - revs with same content on same parents, but on different changeID.

* to solve problem with rev-dups, this patch infers changes into revision meta-data - current timestamp.

diff --git a/mercurial/filelog.py b/mercurial/filelog.py
--- a/mercurial/filelog.py
+++ b/mercurial/filelog.py
@@ -18,6 +18,7 @@ 
     util as interfaceutil,
 )
 from .utils import storageutil
+from .utils import dateutil
 from .revlogutils import (
     constants as revlog_constants,
     rewrite,
@@ -209,8 +210,14 @@ 
 
     def add(self, text, meta, transaction, link, p1=None, p2=None):
         if meta or text.startswith(b'\1\n'):
-            text = storageutil.packmeta(meta, text)
-        rev = self.addrevision(text, transaction, link, p1, p2)
+            revdata = storageutil.packmeta(meta, text)
+        else :
+            revdata = text
+        rev = self.addrevision(revdata, transaction, link, p1, p2)
+        if self.linkrev(rev) != link:
+            meta[b"dup-date"] = dateutil.datestr()
+            revdata = storageutil.packmeta(meta, text)
+            rev = self.addrevision(revdata, transaction, link, p1, p2)
         return self.node(rev)
 
     def renamed(self, node):