Show More
@@ -238,8 +238,14 b' def _oldheadssummary(repo, remoteheads, ' | |||
|
238 | 238 | unsynced = set() |
|
239 | 239 | return {None: (oldheads, newheads, unsynced)} |
|
240 | 240 | |
|
241 |
def _nowarnheads( |
|
|
241 | def _nowarnheads(pushop): | |
|
242 | 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 | 249 | localbookmarks = repo._bookmarks |
|
244 | 250 | remotebookmarks = remote.listkeys('bookmarks') |
|
245 | 251 | bookmarkedheads = set() |
@@ -268,9 +274,6 b' def checkheads(pushop):' | |||
|
268 | 274 | newbranch = pushop.newbranch |
|
269 | 275 | inc = bool(pushop.incoming) |
|
270 | 276 | |
|
271 | # internal config: bookmarks.pushing | |
|
272 | newbookmarks = pushop.ui.configlist('bookmarks', 'pushing') | |
|
273 | ||
|
274 | 277 | # Check for each named branch if we're creating new remote heads. |
|
275 | 278 | # To be a remote head after push, node must be either: |
|
276 | 279 | # - unknown locally |
@@ -296,7 +299,7 b' def checkheads(pushop):' | |||
|
296 | 299 | " new remote branches")) |
|
297 | 300 | |
|
298 | 301 | # 2. Find heads that we need not warn about |
|
299 |
nowarnheads = _nowarnheads( |
|
|
302 | nowarnheads = _nowarnheads(pushop) | |
|
300 | 303 | |
|
301 | 304 | # 3. Check for new heads. |
|
302 | 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