Show More
@@ -409,7 +409,6 b' class cg1unpacker(object):' | |||||
409 | # coming call to `destroyed` will repair it. |
|
409 | # coming call to `destroyed` will repair it. | |
410 | # In other case we can safely update cache on |
|
410 | # In other case we can safely update cache on | |
411 | # disk. |
|
411 | # disk. | |
412 | repo.ui.debug('updating the branch cache\n') |
|
|||
413 | branchmap.updatecache(repo.filtered('served')) |
|
412 | branchmap.updatecache(repo.filtered('served')) | |
414 |
|
413 | |||
415 | def runhooks(): |
|
414 | def runhooks(): |
@@ -1246,6 +1246,7 b' class localrepository(object):' | |||||
1246 |
|
1246 | |||
1247 | if tr is None or tr.changes['revs']: |
|
1247 | if tr is None or tr.changes['revs']: | |
1248 | # updating the unfiltered branchmap should refresh all the others, |
|
1248 | # updating the unfiltered branchmap should refresh all the others, | |
|
1249 | self.ui.debug('updating the branch cache\n') | |||
1249 | branchmap.updatecache(self.filtered('served')) |
|
1250 | branchmap.updatecache(self.filtered('served')) | |
1250 |
|
1251 | |||
1251 | def invalidatecaches(self): |
|
1252 | def invalidatecaches(self): |
@@ -112,11 +112,11 b' Extension disabled for lack of a hook' | |||||
112 | adding foo/file.txt revisions |
|
112 | adding foo/file.txt revisions | |
113 | adding quux/file.py revisions |
|
113 | adding quux/file.py revisions | |
114 | added 3 changesets with 3 changes to 3 files |
|
114 | added 3 changesets with 3 changes to 3 files | |
115 | updating the branch cache |
|
|||
116 | bundle2-input-part: total payload size 1553 |
|
115 | bundle2-input-part: total payload size 1553 | |
117 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
116 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
118 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
117 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
119 | bundle2-input-bundle: 3 parts total |
|
118 | bundle2-input-bundle: 3 parts total | |
|
119 | updating the branch cache | |||
120 | bundle2-output-bundle: "HG20", 2 parts total |
|
120 | bundle2-output-bundle: "HG20", 2 parts total | |
121 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
121 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
122 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload |
|
122 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | |
@@ -177,11 +177,11 b' Extension disabled for lack of acl.sourc' | |||||
177 | added 3 changesets with 3 changes to 3 files |
|
177 | added 3 changesets with 3 changes to 3 files | |
178 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
178 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
179 | acl: changes have source "push" - skipping |
|
179 | acl: changes have source "push" - skipping | |
180 | updating the branch cache |
|
|||
181 | bundle2-input-part: total payload size 1553 |
|
180 | bundle2-input-part: total payload size 1553 | |
182 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
181 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
183 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
182 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
184 | bundle2-input-bundle: 3 parts total |
|
183 | bundle2-input-bundle: 3 parts total | |
|
184 | updating the branch cache | |||
185 | bundle2-output-bundle: "HG20", 2 parts total |
|
185 | bundle2-output-bundle: "HG20", 2 parts total | |
186 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
186 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
187 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload |
|
187 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | |
@@ -253,11 +253,11 b' No [acl.allow]/[acl.deny]' | |||||
253 | acl: path access granted: "f9cafe1212c8" |
|
253 | acl: path access granted: "f9cafe1212c8" | |
254 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
254 | acl: branch access granted: "911600dab2ae" on branch "default" | |
255 | acl: path access granted: "911600dab2ae" |
|
255 | acl: path access granted: "911600dab2ae" | |
256 | updating the branch cache |
|
|||
257 | bundle2-input-part: total payload size 1553 |
|
256 | bundle2-input-part: total payload size 1553 | |
258 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
257 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
259 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
258 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
260 | bundle2-input-bundle: 3 parts total |
|
259 | bundle2-input-bundle: 3 parts total | |
|
260 | updating the branch cache | |||
261 | bundle2-output-bundle: "HG20", 2 parts total |
|
261 | bundle2-output-bundle: "HG20", 2 parts total | |
262 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
262 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
263 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload |
|
263 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | |
@@ -743,11 +743,11 b' barney is allowed everywhere' | |||||
743 | acl: path access granted: "f9cafe1212c8" |
|
743 | acl: path access granted: "f9cafe1212c8" | |
744 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
744 | acl: branch access granted: "911600dab2ae" on branch "default" | |
745 | acl: path access granted: "911600dab2ae" |
|
745 | acl: path access granted: "911600dab2ae" | |
746 | updating the branch cache |
|
|||
747 | bundle2-input-part: total payload size 1553 |
|
746 | bundle2-input-part: total payload size 1553 | |
748 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
747 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
749 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
748 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
750 | bundle2-input-bundle: 3 parts total |
|
749 | bundle2-input-bundle: 3 parts total | |
|
750 | updating the branch cache | |||
751 | bundle2-output-bundle: "HG20", 2 parts total |
|
751 | bundle2-output-bundle: "HG20", 2 parts total | |
752 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
752 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
753 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload |
|
753 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | |
@@ -1061,11 +1061,11 b' acl.config can set only [acl.allow]/[acl' | |||||
1061 | acl: path access granted: "f9cafe1212c8" |
|
1061 | acl: path access granted: "f9cafe1212c8" | |
1062 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
1062 | acl: branch access granted: "911600dab2ae" on branch "default" | |
1063 | acl: path access granted: "911600dab2ae" |
|
1063 | acl: path access granted: "911600dab2ae" | |
1064 | updating the branch cache |
|
|||
1065 | bundle2-input-part: total payload size 1553 |
|
1064 | bundle2-input-part: total payload size 1553 | |
1066 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1065 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1067 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
1066 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
1068 | bundle2-input-bundle: 3 parts total |
|
1067 | bundle2-input-bundle: 3 parts total | |
|
1068 | updating the branch cache | |||
1069 | bundle2-output-bundle: "HG20", 2 parts total |
|
1069 | bundle2-output-bundle: "HG20", 2 parts total | |
1070 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
1070 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
1071 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload |
|
1071 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | |
@@ -1147,11 +1147,11 b' fred is always allowed' | |||||
1147 | acl: path access granted: "f9cafe1212c8" |
|
1147 | acl: path access granted: "f9cafe1212c8" | |
1148 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
1148 | acl: branch access granted: "911600dab2ae" on branch "default" | |
1149 | acl: path access granted: "911600dab2ae" |
|
1149 | acl: path access granted: "911600dab2ae" | |
1150 | updating the branch cache |
|
|||
1151 | bundle2-input-part: total payload size 1553 |
|
1150 | bundle2-input-part: total payload size 1553 | |
1152 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1151 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1153 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
1152 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
1154 | bundle2-input-bundle: 3 parts total |
|
1153 | bundle2-input-bundle: 3 parts total | |
|
1154 | updating the branch cache | |||
1155 | bundle2-output-bundle: "HG20", 2 parts total |
|
1155 | bundle2-output-bundle: "HG20", 2 parts total | |
1156 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
1156 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
1157 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload |
|
1157 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | |
@@ -1306,11 +1306,11 b' OS-level groups' | |||||
1306 | acl: path access granted: "f9cafe1212c8" |
|
1306 | acl: path access granted: "f9cafe1212c8" | |
1307 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
1307 | acl: branch access granted: "911600dab2ae" on branch "default" | |
1308 | acl: path access granted: "911600dab2ae" |
|
1308 | acl: path access granted: "911600dab2ae" | |
1309 | updating the branch cache |
|
|||
1310 | bundle2-input-part: total payload size 1553 |
|
1309 | bundle2-input-part: total payload size 1553 | |
1311 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1310 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1312 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
1311 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
1313 | bundle2-input-bundle: 3 parts total |
|
1312 | bundle2-input-bundle: 3 parts total | |
|
1313 | updating the branch cache | |||
1314 | bundle2-output-bundle: "HG20", 2 parts total |
|
1314 | bundle2-output-bundle: "HG20", 2 parts total | |
1315 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
1315 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
1316 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload |
|
1316 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | |
@@ -1508,13 +1508,13 b' No branch acls specified' | |||||
1508 | acl: path access granted: "911600dab2ae" |
|
1508 | acl: path access granted: "911600dab2ae" | |
1509 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" |
|
1509 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" | |
1510 | acl: path access granted: "e8fc755d4d82" |
|
1510 | acl: path access granted: "e8fc755d4d82" | |
1511 | updating the branch cache |
|
|||
1512 | bundle2-input-part: total payload size 2068 |
|
1511 | bundle2-input-part: total payload size 2068 | |
1513 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1512 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1514 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
1513 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
1515 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1514 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1516 | pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" |
|
1515 | pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" | |
1517 | bundle2-input-bundle: 4 parts total |
|
1516 | bundle2-input-bundle: 4 parts total | |
|
1517 | updating the branch cache | |||
1518 | bundle2-output-bundle: "HG20", 3 parts total |
|
1518 | bundle2-output-bundle: "HG20", 3 parts total | |
1519 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
1519 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
1520 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload |
|
1520 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | |
@@ -1804,13 +1804,13 b' Branch acl allow other' | |||||
1804 | acl: path access granted: "911600dab2ae" |
|
1804 | acl: path access granted: "911600dab2ae" | |
1805 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" |
|
1805 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" | |
1806 | acl: path access granted: "e8fc755d4d82" |
|
1806 | acl: path access granted: "e8fc755d4d82" | |
1807 | updating the branch cache |
|
|||
1808 | bundle2-input-part: total payload size 2068 |
|
1807 | bundle2-input-part: total payload size 2068 | |
1809 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1808 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1810 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
1809 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
1811 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1810 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1812 | pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" |
|
1811 | pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" | |
1813 | bundle2-input-bundle: 4 parts total |
|
1812 | bundle2-input-bundle: 4 parts total | |
|
1813 | updating the branch cache | |||
1814 | bundle2-output-bundle: "HG20", 3 parts total |
|
1814 | bundle2-output-bundle: "HG20", 3 parts total | |
1815 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
1815 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
1816 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload |
|
1816 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | |
@@ -1897,13 +1897,13 b' push foobar into the remote' | |||||
1897 | acl: path access granted: "911600dab2ae" |
|
1897 | acl: path access granted: "911600dab2ae" | |
1898 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" |
|
1898 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" | |
1899 | acl: path access granted: "e8fc755d4d82" |
|
1899 | acl: path access granted: "e8fc755d4d82" | |
1900 | updating the branch cache |
|
|||
1901 | bundle2-input-part: total payload size 2068 |
|
1900 | bundle2-input-part: total payload size 2068 | |
1902 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1901 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1903 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
1902 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
1904 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1903 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1905 | pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" |
|
1904 | pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" | |
1906 | bundle2-input-bundle: 4 parts total |
|
1905 | bundle2-input-bundle: 4 parts total | |
|
1906 | updating the branch cache | |||
1907 | bundle2-output-bundle: "HG20", 3 parts total |
|
1907 | bundle2-output-bundle: "HG20", 3 parts total | |
1908 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
1908 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
1909 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload |
|
1909 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | |
@@ -2058,13 +2058,13 b" User 'astro' must not be denied" | |||||
2058 | acl: path access granted: "911600dab2ae" |
|
2058 | acl: path access granted: "911600dab2ae" | |
2059 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" |
|
2059 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" | |
2060 | acl: path access granted: "e8fc755d4d82" |
|
2060 | acl: path access granted: "e8fc755d4d82" | |
2061 | updating the branch cache |
|
|||
2062 | bundle2-input-part: total payload size 2068 |
|
2061 | bundle2-input-part: total payload size 2068 | |
2063 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
2062 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
2064 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
2063 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
2065 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
2064 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
2066 | pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" |
|
2065 | pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" | |
2067 | bundle2-input-bundle: 4 parts total |
|
2066 | bundle2-input-bundle: 4 parts total | |
|
2067 | updating the branch cache | |||
2068 | bundle2-output-bundle: "HG20", 3 parts total |
|
2068 | bundle2-output-bundle: "HG20", 3 parts total | |
2069 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
2069 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
2070 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload |
|
2070 | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload |
@@ -53,6 +53,7 b' Convert while testing all possible outpu' | |||||
53 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@1 |
|
53 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@1 | |
54 | converting: 0/6 revisions (0.00%) |
|
54 | converting: 0/6 revisions (0.00%) | |
55 | committing changelog |
|
55 | committing changelog | |
|
56 | updating the branch cache | |||
56 | 4 hello |
|
57 | 4 hello | |
57 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2 |
|
58 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2 | |
58 | converting: 1/6 revisions (16.67%) |
|
59 | converting: 1/6 revisions (16.67%) | |
@@ -67,6 +68,7 b' Convert while testing all possible outpu' | |||||
67 | getting files: \xc3\xa9 2/2 files (100.00%) (esc) |
|
68 | getting files: \xc3\xa9 2/2 files (100.00%) (esc) | |
68 | committing manifest |
|
69 | committing manifest | |
69 | committing changelog |
|
70 | committing changelog | |
|
71 | updating the branch cache | |||
70 | 3 copy files |
|
72 | 3 copy files | |
71 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@3 |
|
73 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@3 | |
72 | converting: 2/6 revisions (33.33%) |
|
74 | converting: 2/6 revisions (33.33%) | |
@@ -93,6 +95,7 b' Convert while testing all possible outpu' | |||||
93 | \xc3\xb9/e\xcc\x81: copy \xc3\xa0/e\xcc\x81:a9092a3d84a37b9993b5c73576f6de29b7ea50f6 (esc) |
|
95 | \xc3\xb9/e\xcc\x81: copy \xc3\xa0/e\xcc\x81:a9092a3d84a37b9993b5c73576f6de29b7ea50f6 (esc) | |
94 | committing manifest |
|
96 | committing manifest | |
95 | committing changelog |
|
97 | committing changelog | |
|
98 | updating the branch cache | |||
96 | 2 remove files |
|
99 | 2 remove files | |
97 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@4 |
|
100 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@4 | |
98 | converting: 3/6 revisions (50.00%) |
|
101 | converting: 3/6 revisions (50.00%) | |
@@ -109,18 +112,21 b' Convert while testing all possible outpu' | |||||
109 | committing files: |
|
112 | committing files: | |
110 | committing manifest |
|
113 | committing manifest | |
111 | committing changelog |
|
114 | committing changelog | |
|
115 | updating the branch cache | |||
112 | 1 branch to branch? |
|
116 | 1 branch to branch? | |
113 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5 |
|
117 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5 | |
114 | converting: 4/6 revisions (66.67%) |
|
118 | converting: 4/6 revisions (66.67%) | |
115 | reparent to file://*/svn-repo/branches/branch%C3%A9 (glob) |
|
119 | reparent to file://*/svn-repo/branches/branch%C3%A9 (glob) | |
116 | scanning paths: /branches/branch\xc3\xa9 0/1 paths (0.00%) (esc) |
|
120 | scanning paths: /branches/branch\xc3\xa9 0/1 paths (0.00%) (esc) | |
117 | committing changelog |
|
121 | committing changelog | |
|
122 | updating the branch cache | |||
118 | 0 branch to branch?e |
|
123 | 0 branch to branch?e | |
119 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6 |
|
124 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6 | |
120 | converting: 5/6 revisions (83.33%) |
|
125 | converting: 5/6 revisions (83.33%) | |
121 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) |
|
126 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) | |
122 | scanning paths: /branches/branch\xc3\xa9e 0/1 paths (0.00%) (esc) |
|
127 | scanning paths: /branches/branch\xc3\xa9e 0/1 paths (0.00%) (esc) | |
123 | committing changelog |
|
128 | committing changelog | |
|
129 | updating the branch cache | |||
124 | reparent to file://*/svn-repo (glob) |
|
130 | reparent to file://*/svn-repo (glob) | |
125 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) |
|
131 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) | |
126 | reparent to file://*/svn-repo (glob) |
|
132 | reparent to file://*/svn-repo (glob) | |
@@ -130,6 +136,7 b' Convert while testing all possible outpu' | |||||
130 | .hgtags |
|
136 | .hgtags | |
131 | committing manifest |
|
137 | committing manifest | |
132 | committing changelog |
|
138 | committing changelog | |
|
139 | updating the branch cache | |||
133 | run hg sink post-conversion action |
|
140 | run hg sink post-conversion action | |
134 | $ cd A-hg |
|
141 | $ cd A-hg | |
135 | $ hg up |
|
142 | $ hg up |
@@ -32,6 +32,7 b'' | |||||
32 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
32 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
33 | committing manifest |
|
33 | committing manifest | |
34 | committing changelog |
|
34 | committing changelog | |
|
35 | updating the branch cache | |||
35 | committed changeset 1:93580a2c28a50a56f63526fb305067e6fbf739c4 |
|
36 | committed changeset 1:93580a2c28a50a56f63526fb305067e6fbf739c4 | |
36 |
|
37 | |||
37 | we should see two history entries |
|
38 | we should see two history entries |
@@ -114,6 +114,7 b' Test cache warming command' | |||||
114 |
|
114 | |||
115 | $ rm -rf .hg/cache/ |
|
115 | $ rm -rf .hg/cache/ | |
116 | $ hg debugupdatecaches --debug |
|
116 | $ hg debugupdatecaches --debug | |
|
117 | updating the branch cache | |||
117 | $ ls -r .hg/cache/* |
|
118 | $ ls -r .hg/cache/* | |
118 | .hg/cache/rbc-revs-v1 |
|
119 | .hg/cache/rbc-revs-v1 | |
119 | .hg/cache/rbc-names-v1 |
|
120 | .hg/cache/rbc-names-v1 |
@@ -177,6 +177,7 b' Graft out of order, skipping a merge and' | |||||
177 | b |
|
177 | b | |
178 | committing manifest |
|
178 | committing manifest | |
179 | committing changelog |
|
179 | committing changelog | |
|
180 | updating the branch cache | |||
180 | grafting 5:97f8bfe72746 "5" |
|
181 | grafting 5:97f8bfe72746 "5" | |
181 | searching for copies back to rev 1 |
|
182 | searching for copies back to rev 1 | |
182 | unmatched files in other (from topological common ancestor): |
|
183 | unmatched files in other (from topological common ancestor): | |
@@ -190,6 +191,7 b' Graft out of order, skipping a merge and' | |||||
190 | e |
|
191 | e | |
191 | committing manifest |
|
192 | committing manifest | |
192 | committing changelog |
|
193 | committing changelog | |
|
194 | updating the branch cache | |||
193 | $ HGEDITOR=cat hg graft 4 3 --log --debug |
|
195 | $ HGEDITOR=cat hg graft 4 3 --log --debug | |
194 | scanning for duplicate grafts |
|
196 | scanning for duplicate grafts | |
195 | grafting 4:9c233e8e184d "4" |
|
197 | grafting 4:9c233e8e184d "4" |
@@ -648,6 +648,7 b' make sure --traceback works' | |||||
648 | foo |
|
648 | foo | |
649 | committing manifest |
|
649 | committing manifest | |
650 | committing changelog |
|
650 | committing changelog | |
|
651 | updating the branch cache | |||
651 | committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708 |
|
652 | committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708 | |
652 | calling hook commit.auto: hgext_hookext.autohook |
|
653 | calling hook commit.auto: hgext_hookext.autohook | |
653 | Automatically installed hook |
|
654 | Automatically installed hook |
@@ -33,6 +33,7 b' https://bz.mercurial-scm.org/1175' | |||||
33 | warning: can't find ancestor for 'b' copied from 'a'! |
|
33 | warning: can't find ancestor for 'b' copied from 'a'! | |
34 | committing manifest |
|
34 | committing manifest | |
35 | committing changelog |
|
35 | committing changelog | |
|
36 | updating the branch cache | |||
36 | committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1 |
|
37 | committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1 | |
37 |
|
38 | |||
38 | $ hg verify |
|
39 | $ hg verify |
@@ -178,6 +178,7 b' Commit with several checks' | |||||
178 | committing manifest |
|
178 | committing manifest | |
179 | committing changelog |
|
179 | committing changelog | |
180 | overwriting a expanding keywords |
|
180 | overwriting a expanding keywords | |
|
181 | updating the branch cache | |||
181 | committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
|
182 | committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 | |
182 | running hook commit.test: cp a hooktest |
|
183 | running hook commit.test: cp a hooktest | |
183 | $ hg status |
|
184 | $ hg status | |
@@ -650,6 +651,7 b' Commit and show expansion in original an' | |||||
650 | committing manifest |
|
651 | committing manifest | |
651 | committing changelog |
|
652 | committing changelog | |
652 | overwriting c expanding keywords |
|
653 | overwriting c expanding keywords | |
|
654 | updating the branch cache | |||
653 | committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
|
655 | committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d | |
654 | $ cat a c |
|
656 | $ cat a c | |
655 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
657 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ | |
@@ -823,6 +825,7 b' Commit with multi-line message and custo' | |||||
823 | committing manifest |
|
825 | committing manifest | |
824 | committing changelog |
|
826 | committing changelog | |
825 | overwriting a expanding keywords |
|
827 | overwriting a expanding keywords | |
|
828 | updating the branch cache | |||
826 | committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
|
829 | committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 | |
827 | $ rm log |
|
830 | $ rm log | |
828 |
|
831 | |||
@@ -866,6 +869,7 b' remove with status checks' | |||||
866 | committing files: |
|
869 | committing files: | |
867 | committing manifest |
|
870 | committing manifest | |
868 | committing changelog |
|
871 | committing changelog | |
|
872 | updating the branch cache | |||
869 | committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
|
873 | committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 | |
870 | $ hg status |
|
874 | $ hg status | |
871 | ? c |
|
875 | ? c | |
@@ -941,6 +945,7 b' Imported patch should not be rejected' | |||||
941 | committing manifest |
|
945 | committing manifest | |
942 | committing changelog |
|
946 | committing changelog | |
943 | overwriting a expanding keywords |
|
947 | overwriting a expanding keywords | |
|
948 | updating the branch cache | |||
944 | committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
|
949 | committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 | |
945 | $ hg export -o ../rejecttest.diff tip |
|
950 | $ hg export -o ../rejecttest.diff tip | |
946 | $ cd ../Test |
|
951 | $ cd ../Test | |
@@ -985,6 +990,7 b' kwexpand x/a should abort' | |||||
985 | committing manifest |
|
990 | committing manifest | |
986 | committing changelog |
|
991 | committing changelog | |
987 | overwriting x/a expanding keywords |
|
992 | overwriting x/a expanding keywords | |
|
993 | updating the branch cache | |||
988 | committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
|
994 | committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 | |
989 | $ cat a |
|
995 | $ cat a | |
990 | expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
|
996 | expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
@@ -51,6 +51,7 b' test updating a symlink' | |||||
51 | a |
|
51 | a | |
52 | committing manifest |
|
52 | committing manifest | |
53 | committing changelog |
|
53 | committing changelog | |
|
54 | updating the branch cache | |||
54 | now at: updatelink |
|
55 | now at: updatelink | |
55 | $ readlink.py a |
|
56 | $ readlink.py a | |
56 | a -> c |
|
57 | a -> c |
@@ -144,11 +144,11 b' client only pulls down 1 changeset' | |||||
144 | adding file changes |
|
144 | adding file changes | |
145 | adding foo revisions |
|
145 | adding foo revisions | |
146 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
146 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
147 | updating the branch cache |
|
|||
148 | bundle2-input-part: total payload size 476 |
|
147 | bundle2-input-part: total payload size 476 | |
149 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
|
148 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported | |
150 | bundle2-input-part: total payload size 58 |
|
149 | bundle2-input-part: total payload size 58 | |
151 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
|
150 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported | |
152 | bundle2-input-bundle: 2 parts total |
|
151 | bundle2-input-bundle: 2 parts total | |
153 | checking for updated bookmarks |
|
152 | checking for updated bookmarks | |
|
153 | updating the branch cache | |||
154 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
154 | (run 'hg heads' to see heads, 'hg merge' to merge) |
@@ -268,6 +268,7 b' Check that the right ancestors is used w' | |||||
268 | rebased as 2a7f09cac94c |
|
268 | rebased as 2a7f09cac94c | |
269 | rebase merging completed |
|
269 | rebase merging completed | |
270 | rebase status stored |
|
270 | rebase status stored | |
|
271 | updating the branch cache | |||
271 | update back to initial working directory parent |
|
272 | update back to initial working directory parent | |
272 | resolving manifests |
|
273 | resolving manifests | |
273 | branchmerge: False, force: False, partial: False |
|
274 | branchmerge: False, force: False, partial: False | |
@@ -303,6 +304,7 b' Check that the right ancestors is used w' | |||||
303 | added 2 changesets with 2 changes to 1 files |
|
304 | added 2 changesets with 2 changes to 1 files | |
304 | bundle2-input-part: total payload size 1686 |
|
305 | bundle2-input-part: total payload size 1686 | |
305 | bundle2-input-bundle: 0 parts total |
|
306 | bundle2-input-bundle: 0 parts total | |
|
307 | updating the branch cache | |||
306 | invalid branchheads cache (served): tip differs |
|
308 | invalid branchheads cache (served): tip differs | |
307 | history modification detected - truncating revision branch cache to revision 9 |
|
309 | history modification detected - truncating revision branch cache to revision 9 | |
308 | rebase completed |
|
310 | rebase completed |
@@ -841,6 +841,7 b' check strip behavior' | |||||
841 | bundle2-output-bundle: "HG20", (1 params) 1 parts total |
|
841 | bundle2-output-bundle: "HG20", (1 params) 1 parts total | |
842 | bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
|
842 | bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload | |
843 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg (glob) |
|
843 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg (glob) | |
|
844 | updating the branch cache | |||
844 | invalid branchheads cache (served): tip differs |
|
845 | invalid branchheads cache (served): tip differs | |
845 | truncating cache/rbc-revs-v1 to 24 |
|
846 | truncating cache/rbc-revs-v1 to 24 | |
846 | $ hg log -G |
|
847 | $ hg log -G |
General Comments 0
You need to be logged in to leave comments.
Login now