equal
deleted
inserted
replaced
1798 |
1798 |
1799 # internal config: ui.quietbookmarkmove |
1799 # internal config: ui.quietbookmarkmove |
1800 quiet = self.ui.backupconfig('ui', 'quietbookmarkmove') |
1800 quiet = self.ui.backupconfig('ui', 'quietbookmarkmove') |
1801 try: |
1801 try: |
1802 self.ui.setconfig('ui', 'quietbookmarkmove', True, 'clone') |
1802 self.ui.setconfig('ui', 'quietbookmarkmove', True, 'clone') |
1803 ret = exchange.pull(self, remote, heads).cgresult |
1803 pullop = exchange.pull(self, remote, heads, |
|
1804 streamclonerequested=stream) |
|
1805 return pullop.cgresult |
1804 finally: |
1806 finally: |
1805 self.ui.restoreconfig(quiet) |
1807 self.ui.restoreconfig(quiet) |
1806 return ret |
|
1807 |
1808 |
1808 def pushkey(self, namespace, key, old, new): |
1809 def pushkey(self, namespace, key, old, new): |
1809 try: |
1810 try: |
1810 tr = self.currenttransaction() |
1811 tr = self.currenttransaction() |
1811 hookargs = {} |
1812 hookargs = {} |