View | Details | Raw Unified | Return to bug 242463 | Differences between
and this patch

Collapse All | Expand All

(-)files/extra-patch-authormapsuffix (-5 / +21 lines)
Lines 1-6 Link Here
1 
--- hgext/convert/convcmd.py.orig	2020-06-05 21:21:27.000000000 +0200
 1 
--- hgext/convert/__init__.py.orig	2020-08-03 17:43:51 UTC
2 
+++ hgext/convert/convcmd.py	2020-06-06 17:13:20.086884000 +0200
 2 
+++ hgext/convert/__init__.py
3 
@@ -74,7 +74,7 @@
 3 
@@ -59,6 +59,13 @@ testedwith = b'ships-with-hg-core'
4 
         ),
5 
         (
6 
             b'',
7 
+            b'authormapsuffix',
8 
+            b'',
9 
+            _(b'append this suffix to remapped author names'),
10 
+            _(b'SUFFIX')
11 
+        ),
12 
+        (
13 
+            b'',
14 
             b'filemap',
15 
             b'',
16 
             _(b'remap file names using contents of file'),
17 
--- hgext/convert/convcmd.py.orig	2020-08-03 17:43:51 UTC
18 
+++ hgext/convert/convcmd.py
19 
@@ -74,7 +74,7 @@ def readauthormap(ui, authorfile, author
4 
                 continue
 20 
                 continue
5
21
6 
             srcauthor = srcauthor.strip()
 22 
             srcauthor = srcauthor.strip()
Lines 9-15 Link Here
9 
             if authors.get(srcauthor) in (None, dstauthor):
 25 
             if authors.get(srcauthor) in (None, dstauthor):
10 
                 msg = _(b'mapping author %s to %s\n')
 26 
                 msg = _(b'mapping author %s to %s\n')
11 
                 ui.debug(msg % (srcauthor, dstauthor))
 27 
                 ui.debug(msg % (srcauthor, dstauthor))
12 
@@ -209,12 +209,16 @@
 28 
@@ -209,12 +209,16 @@ class converter(object):
13 
         self.commitcache = {}
 29 
         self.commitcache = {}
14 
         self.authors = {}
 30 
         self.authors = {}
15 
         self.authorfile = None
 31 
         self.authorfile = None
Lines 26-32 Link Here
26 
         # Read first the dst author map if any
 42 
         # Read first the dst author map if any
27 
         authorfile = self.dest.authorfile()
 43 
         authorfile = self.dest.authorfile()
28 
         if authorfile and os.path.exists(authorfile):
 44 
         if authorfile and os.path.exists(authorfile):
29 
@@ -482,7 +486,7 @@
 45 
@@ -482,7 +486,7 @@ class converter(object):
30
46
31 
     def cachecommit(self, rev):
 47 
     def cachecommit(self, rev):
32 
         commit = self.source.getcommit(rev)
 48 
         commit = self.source.getcommit(rev)

Return to bug 242463