Mercurial > hg
comparison mercurial/changegroup.py @ 46794:e2f7b2695ba1
merge with stable
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Thu, 18 Mar 2021 18:24:59 -0400 |
| parents | 6266d19556ad 70f8c64812db |
| children | d4ba4d51f85f |
comparison
equal
deleted
inserted
replaced
| 46782:6b52cffd8d0a | 46794:e2f7b2695ba1 |
|---|---|
| 908 topic, unit=_(b'chunks'), total=len(nodes) | 908 topic, unit=_(b'chunks'), total=len(nodes) |
| 909 ) | 909 ) |
| 910 | 910 |
| 911 configtarget = repo.ui.config(b'devel', b'bundle.delta') | 911 configtarget = repo.ui.config(b'devel', b'bundle.delta') |
| 912 if configtarget not in (b'', b'p1', b'full'): | 912 if configtarget not in (b'', b'p1', b'full'): |
| 913 msg = _("""config "devel.bundle.delta" as unknown value: %s""") | 913 msg = _(b"""config "devel.bundle.delta" as unknown value: %s""") |
| 914 repo.ui.warn(msg % configtarget) | 914 repo.ui.warn(msg % configtarget) |
| 915 | 915 |
| 916 deltamode = repository.CG_DELTAMODE_STD | 916 deltamode = repository.CG_DELTAMODE_STD |
| 917 if forcedeltaparentprev: | 917 if forcedeltaparentprev: |
| 918 deltamode = repository.CG_DELTAMODE_PREV | 918 deltamode = repository.CG_DELTAMODE_PREV |
| 1309 # revisions. | 1309 # revisions. |
| 1310 # Returns the linkrev node (collected in lookupcl). | 1310 # Returns the linkrev node (collected in lookupcl). |
| 1311 def makelookupmflinknode(tree, nodes): | 1311 def makelookupmflinknode(tree, nodes): |
| 1312 if fastpathlinkrev: | 1312 if fastpathlinkrev: |
| 1313 assert not tree | 1313 assert not tree |
| 1314 return ( | 1314 |
| 1315 manifests.__getitem__ | 1315 # pytype: disable=unsupported-operands |
| 1316 ) # pytype: disable=unsupported-operands | 1316 return manifests.__getitem__ |
| 1317 # pytype: enable=unsupported-operands | |
| 1317 | 1318 |
| 1318 def lookupmflinknode(x): | 1319 def lookupmflinknode(x): |
| 1319 """Callback for looking up the linknode for manifests. | 1320 """Callback for looking up the linknode for manifests. |
| 1320 | 1321 |
| 1321 Returns the linkrev node for the specified manifest. | 1322 Returns the linkrev node for the specified manifest. |