Show More
@@ -1694,10 +1694,10 b' def pull(' | |||||
1694 | ) |
|
1694 | ) | |
1695 |
|
1695 | |||
1696 | pullop.trmanager = transactionmanager(repo, b'pull', remote.url()) |
|
1696 | pullop.trmanager = transactionmanager(repo, b'pull', remote.url()) | |
1697 |
wlock = util.nullcontextmanager |
|
1697 | wlock = util.nullcontextmanager | |
1698 | if not bookmod.bookmarksinstore(repo): |
|
1698 | if not bookmod.bookmarksinstore(repo): | |
1699 |
wlock = repo.wlock |
|
1699 | wlock = repo.wlock | |
1700 | with wlock, repo.lock(), pullop.trmanager: |
|
1700 | with wlock(), repo.lock(), pullop.trmanager: | |
1701 | if confirm or ( |
|
1701 | if confirm or ( | |
1702 | repo.ui.configbool(b"pull", b"confirm") and not repo.ui.plain() |
|
1702 | repo.ui.configbool(b"pull", b"confirm") and not repo.ui.plain() | |
1703 | ): |
|
1703 | ): |
General Comments 0
You need to be logged in to leave comments.
Login now