Show More
@@ -1783,6 +1783,7 b' class localrepository(object):' | |||||
1783 | # should be seen as public |
|
1783 | # should be seen as public | |
1784 | phases.advanceboundary(self, phases.public, subset) |
|
1784 | phases.advanceboundary(self, phases.public, subset) | |
1785 |
|
1785 | |||
|
1786 | self.ui.debug('fetching remote obsolete markers') | |||
1786 | remoteobs = remote.listkeys('obsolete') |
|
1787 | remoteobs = remote.listkeys('obsolete') | |
1787 | if 'dump' in remoteobs: |
|
1788 | if 'dump' in remoteobs: | |
1788 | if tr is None: |
|
1789 | if tr is None: | |
@@ -1951,6 +1952,7 b' class localrepository(object):' | |||||
1951 | if not r: |
|
1952 | if not r: | |
1952 | self.ui.warn(_('updating %s to public failed!\n') |
|
1953 | self.ui.warn(_('updating %s to public failed!\n') | |
1953 | % newremotehead) |
|
1954 | % newremotehead) | |
|
1955 | self.ui.debug('try to push obsolete markers to remote\n') | |||
1954 | if (self.obsstore and |
|
1956 | if (self.obsstore and | |
1955 | 'obsolete' in remote.listkeys('namespaces')): |
|
1957 | 'obsolete' in remote.listkeys('namespaces')): | |
1956 | data = self.listkeys('obsolete')['dump'] |
|
1958 | data = self.listkeys('obsolete')['dump'] |
@@ -117,7 +117,7 b' Extension disabled for lack of a hook' | |||||
117 | files: 3/3 chunks (100.00%) |
|
117 | files: 3/3 chunks (100.00%) | |
118 | added 3 changesets with 3 changes to 3 files |
|
118 | added 3 changesets with 3 changes to 3 files | |
119 | listing keys for "phases" |
|
119 | listing keys for "phases" | |
120 | listing keys for "namespaces" |
|
120 | try to push obsolete markers to remote | |
121 | updating the branch cache |
|
121 | updating the branch cache | |
122 | checking for updated bookmarks |
|
122 | checking for updated bookmarks | |
123 | listing keys for "bookmarks" |
|
123 | listing keys for "bookmarks" | |
@@ -178,7 +178,7 b' Extension disabled for lack of acl.sourc' | |||||
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 | listing keys for "phases" |
|
180 | listing keys for "phases" | |
181 | listing keys for "namespaces" |
|
181 | try to push obsolete markers to remote | |
182 | updating the branch cache |
|
182 | updating the branch cache | |
183 | checking for updated bookmarks |
|
183 | checking for updated bookmarks | |
184 | listing keys for "bookmarks" |
|
184 | listing keys for "bookmarks" | |
@@ -250,7 +250,7 b' No [acl.allow]/[acl.deny]' | |||||
250 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
250 | acl: branch access granted: "911600dab2ae" on branch "default" | |
251 | acl: path access granted: "911600dab2ae" |
|
251 | acl: path access granted: "911600dab2ae" | |
252 | listing keys for "phases" |
|
252 | listing keys for "phases" | |
253 | listing keys for "namespaces" |
|
253 | try to push obsolete markers to remote | |
254 | updating the branch cache |
|
254 | updating the branch cache | |
255 | checking for updated bookmarks |
|
255 | checking for updated bookmarks | |
256 | listing keys for "bookmarks" |
|
256 | listing keys for "bookmarks" | |
@@ -742,7 +742,7 b' barney is allowed everywhere' | |||||
742 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
742 | acl: branch access granted: "911600dab2ae" on branch "default" | |
743 | acl: path access granted: "911600dab2ae" |
|
743 | acl: path access granted: "911600dab2ae" | |
744 | listing keys for "phases" |
|
744 | listing keys for "phases" | |
745 | listing keys for "namespaces" |
|
745 | try to push obsolete markers to remote | |
746 | updating the branch cache |
|
746 | updating the branch cache | |
747 | checking for updated bookmarks |
|
747 | checking for updated bookmarks | |
748 | listing keys for "bookmarks" |
|
748 | listing keys for "bookmarks" | |
@@ -1059,7 +1059,7 b' acl.config can set only [acl.allow]/[acl' | |||||
1059 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
1059 | acl: branch access granted: "911600dab2ae" on branch "default" | |
1060 | acl: path access granted: "911600dab2ae" |
|
1060 | acl: path access granted: "911600dab2ae" | |
1061 | listing keys for "phases" |
|
1061 | listing keys for "phases" | |
1062 | listing keys for "namespaces" |
|
1062 | try to push obsolete markers to remote | |
1063 | updating the branch cache |
|
1063 | updating the branch cache | |
1064 | checking for updated bookmarks |
|
1064 | checking for updated bookmarks | |
1065 | listing keys for "bookmarks" |
|
1065 | listing keys for "bookmarks" | |
@@ -1139,7 +1139,7 b' fred is always allowed' | |||||
1139 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
1139 | acl: branch access granted: "911600dab2ae" on branch "default" | |
1140 | acl: path access granted: "911600dab2ae" |
|
1140 | acl: path access granted: "911600dab2ae" | |
1141 | listing keys for "phases" |
|
1141 | listing keys for "phases" | |
1142 | listing keys for "namespaces" |
|
1142 | try to push obsolete markers to remote | |
1143 | updating the branch cache |
|
1143 | updating the branch cache | |
1144 | checking for updated bookmarks |
|
1144 | checking for updated bookmarks | |
1145 | listing keys for "bookmarks" |
|
1145 | listing keys for "bookmarks" | |
@@ -1291,7 +1291,7 b' OS-level groups' | |||||
1291 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
1291 | acl: branch access granted: "911600dab2ae" on branch "default" | |
1292 | acl: path access granted: "911600dab2ae" |
|
1292 | acl: path access granted: "911600dab2ae" | |
1293 | listing keys for "phases" |
|
1293 | listing keys for "phases" | |
1294 | listing keys for "namespaces" |
|
1294 | try to push obsolete markers to remote | |
1295 | updating the branch cache |
|
1295 | updating the branch cache | |
1296 | checking for updated bookmarks |
|
1296 | checking for updated bookmarks | |
1297 | listing keys for "bookmarks" |
|
1297 | listing keys for "bookmarks" | |
@@ -1492,7 +1492,7 b' No branch acls specified' | |||||
1492 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" |
|
1492 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" | |
1493 | acl: path access granted: "e8fc755d4d82" |
|
1493 | acl: path access granted: "e8fc755d4d82" | |
1494 | listing keys for "phases" |
|
1494 | listing keys for "phases" | |
1495 | listing keys for "namespaces" |
|
1495 | try to push obsolete markers to remote | |
1496 | updating the branch cache |
|
1496 | updating the branch cache | |
1497 | checking for updated bookmarks |
|
1497 | checking for updated bookmarks | |
1498 | listing keys for "bookmarks" |
|
1498 | listing keys for "bookmarks" | |
@@ -1799,7 +1799,7 b' Branch acl allow other' | |||||
1799 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" |
|
1799 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" | |
1800 | acl: path access granted: "e8fc755d4d82" |
|
1800 | acl: path access granted: "e8fc755d4d82" | |
1801 | listing keys for "phases" |
|
1801 | listing keys for "phases" | |
1802 | listing keys for "namespaces" |
|
1802 | try to push obsolete markers to remote | |
1803 | updating the branch cache |
|
1803 | updating the branch cache | |
1804 | checking for updated bookmarks |
|
1804 | checking for updated bookmarks | |
1805 | listing keys for "bookmarks" |
|
1805 | listing keys for "bookmarks" | |
@@ -1888,7 +1888,7 b' push foobar into the remote' | |||||
1888 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" |
|
1888 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" | |
1889 | acl: path access granted: "e8fc755d4d82" |
|
1889 | acl: path access granted: "e8fc755d4d82" | |
1890 | listing keys for "phases" |
|
1890 | listing keys for "phases" | |
1891 | listing keys for "namespaces" |
|
1891 | try to push obsolete markers to remote | |
1892 | updating the branch cache |
|
1892 | updating the branch cache | |
1893 | checking for updated bookmarks |
|
1893 | checking for updated bookmarks | |
1894 | listing keys for "bookmarks" |
|
1894 | listing keys for "bookmarks" | |
@@ -2050,7 +2050,7 b" User 'astro' must not be denied" | |||||
2050 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" |
|
2050 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" | |
2051 | acl: path access granted: "e8fc755d4d82" |
|
2051 | acl: path access granted: "e8fc755d4d82" | |
2052 | listing keys for "phases" |
|
2052 | listing keys for "phases" | |
2053 | listing keys for "namespaces" |
|
2053 | try to push obsolete markers to remote | |
2054 | updating the branch cache |
|
2054 | updating the branch cache | |
2055 | checking for updated bookmarks |
|
2055 | checking for updated bookmarks | |
2056 | listing keys for "bookmarks" |
|
2056 | listing keys for "bookmarks" |
General Comments 0
You need to be logged in to leave comments.
Login now