summaryrefslogtreecommitdiffstats
path: root/subcmds
diff options
context:
space:
mode:
Diffstat (limited to 'subcmds')
-rw-r--r--subcmds/rebase.py12
-rw-r--r--subcmds/sync.py8
2 files changed, 10 insertions, 10 deletions
diff --git a/subcmds/rebase.py b/subcmds/rebase.py
index 9464091f..9d4b1672 100644
--- a/subcmds/rebase.py
+++ b/subcmds/rebase.py
@@ -71,7 +71,7 @@ branch but need to incorporate new upstream changes "underneath" them.
71 if len(args) == 1: 71 if len(args) == 1:
72 print('note: project %s is mapped to more than one path' % (args[0],), 72 print('note: project %s is mapped to more than one path' % (args[0],),
73 file=sys.stderr) 73 file=sys.stderr)
74 return -1 74 return 1
75 75
76 for project in all_projects: 76 for project in all_projects:
77 cb = project.CurrentBranch 77 cb = project.CurrentBranch
@@ -79,7 +79,7 @@ branch but need to incorporate new upstream changes "underneath" them.
79 if one_project: 79 if one_project:
80 print("error: project %s has a detached HEAD" % project.relpath, 80 print("error: project %s has a detached HEAD" % project.relpath,
81 file=sys.stderr) 81 file=sys.stderr)
82 return -1 82 return 1
83 # ignore branches with detatched HEADs 83 # ignore branches with detatched HEADs
84 continue 84 continue
85 85
@@ -88,7 +88,7 @@ branch but need to incorporate new upstream changes "underneath" them.
88 if one_project: 88 if one_project:
89 print("error: project %s does not track any remote branches" 89 print("error: project %s does not track any remote branches"
90 % project.relpath, file=sys.stderr) 90 % project.relpath, file=sys.stderr)
91 return -1 91 return 1
92 # ignore branches without remotes 92 # ignore branches without remotes
93 continue 93 continue
94 94
@@ -131,13 +131,13 @@ branch but need to incorporate new upstream changes "underneath" them.
131 stash_args = ["stash"] 131 stash_args = ["stash"]
132 132
133 if GitCommand(project, stash_args).Wait() != 0: 133 if GitCommand(project, stash_args).Wait() != 0:
134 return -1 134 return 1
135 135
136 if GitCommand(project, args).Wait() != 0: 136 if GitCommand(project, args).Wait() != 0:
137 return -1 137 return 1
138 138
139 if needs_stash: 139 if needs_stash:
140 stash_args.append('pop') 140 stash_args.append('pop')
141 stash_args.append('--quiet') 141 stash_args.append('--quiet')
142 if GitCommand(project, stash_args).Wait() != 0: 142 if GitCommand(project, stash_args).Wait() != 0:
143 return -1 143 return 1
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')