summaryrefslogtreecommitdiffstats
path: root/subcmds/sync.py
diff options
context:
space:
mode:
Diffstat (limited to 'subcmds/sync.py')
-rw-r--r--subcmds/sync.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py
index a66dd6cd..3b4c23c5 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -635,7 +635,7 @@ later is required to fix a server side protocol bug.
635 print('Failed to remove %s (%s)' % (os.path.join(path, '.git'), str(e)), file=sys.stderr) 635 print('Failed to remove %s (%s)' % (os.path.join(path, '.git'), str(e)), file=sys.stderr)
636 print('error: Failed to delete obsolete path %s' % path, file=sys.stderr) 636 print('error: Failed to delete obsolete path %s' % path, file=sys.stderr)
637 print(' remove manually, then run sync again', file=sys.stderr) 637 print(' remove manually, then run sync again', file=sys.stderr)
638 return -1 638 return 1
639 639
640 # Delete everything under the worktree, except for directories that contain 640 # Delete everything under the worktree, except for directories that contain
641 # another git project 641 # another git project
@@ -669,7 +669,7 @@ later is required to fix a server side protocol bug.
669 if failed: 669 if failed:
670 print('error: Failed to delete obsolete path %s' % path, file=sys.stderr) 670 print('error: Failed to delete obsolete path %s' % path, file=sys.stderr)
671 print(' remove manually, then run sync again', file=sys.stderr) 671 print(' remove manually, then run sync again', file=sys.stderr)
672 return -1 672 return 1
673 673
674 # Try deleting parent dirs if they are empty 674 # Try deleting parent dirs if they are empty
675 project_dir = path 675 project_dir = path
@@ -726,9 +726,9 @@ later is required to fix a server side protocol bug.
726 'are present' % project.relpath, file=sys.stderr) 726 'are present' % project.relpath, file=sys.stderr)
727 print(' commit changes, then run sync again', 727 print(' commit changes, then run sync again',
728 file=sys.stderr) 728 file=sys.stderr)
729 return -1 729 return 1
730 elif self._DeleteProject(project.worktree): 730 elif self._DeleteProject(project.worktree):
731 return -1 731 return 1
732 732
733 new_project_paths.sort() 733 new_project_paths.sort()
734 fd = open(file_path, 'w') 734 fd = open(file_path, 'w')