Show More
@@ -238,8 +238,14 b' def _oldheadssummary(repo, remoteheads, ' | |||||
238 | unsynced = set() |
|
238 | unsynced = set() | |
239 | return {None: (oldheads, newheads, unsynced)} |
|
239 | return {None: (oldheads, newheads, unsynced)} | |
240 |
|
240 | |||
241 |
def _nowarnheads( |
|
241 | def _nowarnheads(pushop): | |
242 | # Compute newly pushed bookmarks. We don't warn about bookmarked heads. |
|
242 | # Compute newly pushed bookmarks. We don't warn about bookmarked heads. | |
|
243 | ||||
|
244 | # internal config: bookmarks.pushing | |||
|
245 | newbookmarks = pushop.ui.configlist('bookmarks', 'pushing') | |||
|
246 | ||||
|
247 | repo = pushop.repo.unfiltered() | |||
|
248 | remote = pushop.remote | |||
243 | localbookmarks = repo._bookmarks |
|
249 | localbookmarks = repo._bookmarks | |
244 | remotebookmarks = remote.listkeys('bookmarks') |
|
250 | remotebookmarks = remote.listkeys('bookmarks') | |
245 | bookmarkedheads = set() |
|
251 | bookmarkedheads = set() | |
@@ -268,9 +274,6 b' def checkheads(pushop):' | |||||
268 | newbranch = pushop.newbranch |
|
274 | newbranch = pushop.newbranch | |
269 | inc = bool(pushop.incoming) |
|
275 | inc = bool(pushop.incoming) | |
270 |
|
276 | |||
271 | # internal config: bookmarks.pushing |
|
|||
272 | newbookmarks = pushop.ui.configlist('bookmarks', 'pushing') |
|
|||
273 |
|
||||
274 | # Check for each named branch if we're creating new remote heads. |
|
277 | # Check for each named branch if we're creating new remote heads. | |
275 | # To be a remote head after push, node must be either: |
|
278 | # To be a remote head after push, node must be either: | |
276 | # - unknown locally |
|
279 | # - unknown locally | |
@@ -296,7 +299,7 b' def checkheads(pushop):' | |||||
296 | " new remote branches")) |
|
299 | " new remote branches")) | |
297 |
|
300 | |||
298 | # 2. Find heads that we need not warn about |
|
301 | # 2. Find heads that we need not warn about | |
299 |
nowarnheads = _nowarnheads( |
|
302 | nowarnheads = _nowarnheads(pushop) | |
300 |
|
303 | |||
301 | # 3. Check for new heads. |
|
304 | # 3. Check for new heads. | |
302 | # If there are more heads after the push than before, a suitable |
|
305 | # If there are more heads after the push than before, a suitable |
General Comments 0
You need to be logged in to leave comments.
Login now