commit a850ca2712b61cd820a9138c9e97f3fbb583e509
author Mike Frysinger <vapier@google.com> Wed Aug 07 17:19:24 2019 -0400
committer Mike Frysinger <vapier@google.com> Thu Aug 08 05:07:31 2019 +0000
tree 0ba9843537bec95dd6d7cdfbbb644faba72e27e0
parent a34186e4813170f3c71ec51c740cd571c79e12b5

rebase/sync: use exit(1) for errors instead of exit(-1)

Callers don't actually see -1 (they'll usually see 255, but the exact
answer here is complicated).  Just switch to 1 as that's the standard
value tools use to indicate an error.

Change-Id: Ib712db1924bc3e5f7920bafd7bb5fb61f3bda44f
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/233553
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>

subcmds/rebase.py

diff --git a/subcmds/rebase.py b/subcmds/rebase.py
index 9464091..9d4b167 100644
--- a/subcmds/rebase.py
+++ b/subcmds/rebase.py
@@ -71,7 +71,7 @@
       if len(args) == 1:
         print('note: project %s is mapped to more than one path' % (args[0],),
             file=sys.stderr)
-      return -1
+      return 1
 
     for project in all_projects:
       cb = project.CurrentBranch
@@ -79,7 +79,7 @@
         if one_project:
           print("error: project %s has a detached HEAD" % project.relpath,
                 file=sys.stderr)
-          return -1
+          return 1
         # ignore branches with detatched HEADs
         continue
 
@@ -88,7 +88,7 @@
         if one_project:
           print("error: project %s does not track any remote branches"
                 % project.relpath, file=sys.stderr)
-          return -1
+          return 1
         # ignore branches without remotes
         continue
 
@@ -131,13 +131,13 @@
           stash_args = ["stash"]
 
           if GitCommand(project, stash_args).Wait() != 0:
-            return -1
+            return 1
 
       if GitCommand(project, args).Wait() != 0:
-        return -1
+        return 1
 
       if needs_stash:
         stash_args.append('pop')
         stash_args.append('--quiet')
         if GitCommand(project, stash_args).Wait() != 0:
-          return -1
+          return 1

subcmds/sync.py

diff --git a/subcmds/sync.py b/subcmds/sync.py
index a66dd6c..3b4c23c 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -635,7 +635,7 @@
       print('Failed to remove %s (%s)' % (os.path.join(path, '.git'), str(e)), file=sys.stderr)
       print('error: Failed to delete obsolete path %s' % path, file=sys.stderr)
       print('       remove manually, then run sync again', file=sys.stderr)
-      return -1
+      return 1
 
     # Delete everything under the worktree, except for directories that contain
     # another git project
@@ -669,7 +669,7 @@
     if failed:
       print('error: Failed to delete obsolete path %s' % path, file=sys.stderr)
       print('       remove manually, then run sync again', file=sys.stderr)
-      return -1
+      return 1
 
     # Try deleting parent dirs if they are empty
     project_dir = path
@@ -726,9 +726,9 @@
                     'are present' % project.relpath, file=sys.stderr)
               print('       commit changes, then run sync again',
                     file=sys.stderr)
-              return -1
+              return 1
             elif self._DeleteProject(project.worktree):
-              return -1
+              return 1
 
     new_project_paths.sort()
     fd = open(file_path, 'w')