Show More
@@ -697,7 +697,7 b' def _findcommonincoming(orig, *args, **k' | |||||
697 |
|
697 | |||
698 | def _push(orig, ui, repo, dest=None, *args, **opts): |
|
698 | def _push(orig, ui, repo, dest=None, *args, **opts): | |
699 |
|
699 | |||
700 | bookmark = opts.get('bookmark') |
|
700 | bookmark = opts.get(r'bookmark') | |
701 | # we only support pushing one infinitepush bookmark at once |
|
701 | # we only support pushing one infinitepush bookmark at once | |
702 | if len(bookmark) == 1: |
|
702 | if len(bookmark) == 1: | |
703 | bookmark = bookmark[0] |
|
703 | bookmark = bookmark[0] | |
@@ -718,7 +718,7 b' def _push(orig, ui, repo, dest=None, *ar' | |||||
718 | if scratchpush: |
|
718 | if scratchpush: | |
719 | # this is an infinitepush, we don't want the bookmark to be applied |
|
719 | # this is an infinitepush, we don't want the bookmark to be applied | |
720 | # rather that should be stored in the bundlestore |
|
720 | # rather that should be stored in the bundlestore | |
721 | opts['bookmark'] = [] |
|
721 | opts[r'bookmark'] = [] | |
722 | ui.setconfig(experimental, configscratchpush, True) |
|
722 | ui.setconfig(experimental, configscratchpush, True) | |
723 | oldphasemove = extensions.wrapfunction(exchange, |
|
723 | oldphasemove = extensions.wrapfunction(exchange, | |
724 | '_localphasemove', |
|
724 | '_localphasemove', | |
@@ -914,7 +914,7 b' def storetobundlestore(orig, repo, op, u' | |||||
914 | fd, bundlefile = tempfile.mkstemp() |
|
914 | fd, bundlefile = tempfile.mkstemp() | |
915 | try: |
|
915 | try: | |
916 | try: |
|
916 | try: | |
917 | fp = os.fdopen(fd, 'wb') |
|
917 | fp = os.fdopen(fd, r'wb') | |
918 | fp.write(buf.read()) |
|
918 | fp.write(buf.read()) | |
919 | finally: |
|
919 | finally: | |
920 | fp.close() |
|
920 | fp.close() | |
@@ -1000,7 +1000,7 b' def processparts(orig, repo, op, unbundl' | |||||
1000 | fd, bundlefile = tempfile.mkstemp() |
|
1000 | fd, bundlefile = tempfile.mkstemp() | |
1001 | try: |
|
1001 | try: | |
1002 | try: |
|
1002 | try: | |
1003 | fp = os.fdopen(fd, 'wb') |
|
1003 | fp = os.fdopen(fd, r'wb') | |
1004 | fp.write(buf.read()) |
|
1004 | fp.write(buf.read()) | |
1005 | finally: |
|
1005 | finally: | |
1006 | fp.close() |
|
1006 | fp.close() | |
@@ -1112,7 +1112,7 b' def bundle2scratchbranch(op, part):' | |||||
1112 | fd, bundlefile = tempfile.mkstemp() |
|
1112 | fd, bundlefile = tempfile.mkstemp() | |
1113 | try: |
|
1113 | try: | |
1114 | try: |
|
1114 | try: | |
1115 | fp = os.fdopen(fd, 'wb') |
|
1115 | fp = os.fdopen(fd, r'wb') | |
1116 | fp.write(buf.read()) |
|
1116 | fp.write(buf.read()) | |
1117 | finally: |
|
1117 | finally: | |
1118 | fp.close() |
|
1118 | fp.close() |
@@ -1637,7 +1637,7 b' class gitsubrepo(abstractsubrepo):' | |||||
1637 | # This should be much faster than manually traversing the trees |
|
1637 | # This should be much faster than manually traversing the trees | |
1638 | # and objects with many subprocess calls. |
|
1638 | # and objects with many subprocess calls. | |
1639 | tarstream = self._gitcommand(['archive', revision], stream=True) |
|
1639 | tarstream = self._gitcommand(['archive', revision], stream=True) | |
1640 | tar = tarfile.open(fileobj=tarstream, mode='r|') |
|
1640 | tar = tarfile.open(fileobj=tarstream, mode=r'r|') | |
1641 | relpath = subrelpath(self) |
|
1641 | relpath = subrelpath(self) | |
1642 | self.ui.progress(_('archiving (%s)') % relpath, 0, unit=_('files')) |
|
1642 | self.ui.progress(_('archiving (%s)') % relpath, 0, unit=_('files')) | |
1643 | for i, info in enumerate(tar): |
|
1643 | for i, info in enumerate(tar): |
General Comments 0
You need to be logged in to leave comments.
Login now